Merge branch 'patch-3' into 'develop'

Add visible_in_picker to status emojis

See merge request pleroma/pleroma!342

lib/pleroma/web/mastodon_api/views/status_view.ex

@@ -117,7 +117,7 @@ def render("status.json", %{activity: %{data: %{"object" => object}} = activity}
           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)
 
     %{

test/web/mastodon_api/status_view_test.exs

@@ -47,7 +47,8 @@ test "a note activity" do
         %{
           shortcode: "2hu",
           url: "corndog.png",
-          static_url: "corndog.png"
+          static_url: "corndog.png",
+          visible_in_picker: false
         }
       ]
     }