diff options
| author | Haelwenn <git.pleroma.social@hacktivis.me> | 2018-09-12 18:01:11 +0000 |
|---|---|---|
| committer | Haelwenn <git.pleroma.social@hacktivis.me> | 2018-09-12 18:01:11 +0000 |
| commit | 90661e20cf91b2b1e95fdee73f2e95aa18c1be65 (patch) | |
| tree | 04df310540c2363c289f93e1d48d9b11724ab68d /lib | |
| parent | da3f93054392447638d4bc558fae0969e6a9bbf9 (diff) | |
| parent | 85b8590109bc1f1f13ac26fa06b607909ade7bb2 (diff) | |
| download | pleroma-90661e20cf91b2b1e95fdee73f2e95aa18c1be65.tar.gz | |
Merge branch 'patch-3' into 'develop'
Add visible_in_picker to status emojis
See merge request pleroma/pleroma!342
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/status_view.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex index 6962aa54f..cdae2de7a 100644 --- a/lib/pleroma/web/mastodon_api/views/status_view.ex +++ b/lib/pleroma/web/mastodon_api/views/status_view.ex @@ -117,7 +117,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do HtmlSanitizeEx.strip_tags(url) |> MediaProxy.url() - %{shortcode: name, url: url, static_url: url} + %{shortcode: name, url: url, static_url: url, visible_in_picker: false} end) %{ |