pleroma

commit: 90661e20cf91b2b1e95fdee73f2e95aa18c1be65
parent: da3f93054392447638d4bc558fae0969e6a9bbf9
Author: Haelwenn <git.pleroma.social@hacktivis.me>
Date:   Wed, 12 Sep 2018 18:01:11 +0000

Merge branch 'patch-3' into 'develop'

Add visible_in_picker to status emojis

See merge request pleroma/pleroma!342
Diffstat:
M
lib/pleroma/web/mastodon_api/views/status_view.ex
2
+-
M
test/web/mastodon_api/status_view_test.exs
3
++-

2 files changed, 3 insertions(+), 2 deletions(-)
diff --git 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)
 
     %{
diff --git a/test/web/mastodon_api/status_view_test.exs b/test/web/mastodon_api/status_view_test.exs
@@ -47,7 +47,8 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
         %{
           shortcode: "2hu",
           url: "corndog.png",
-          static_url: "corndog.png"
+          static_url: "corndog.png",
+          visible_in_picker: false
         }
       ]
     }