Commit 90661e20 by Haelwenn

Merge branch 'patch-3' into 'develop'

Add visible_in_picker to status emojis See merge request !342
parents da3f9305 85b85901
Pipeline #3734 passed with stages
in 6 minutes 20 seconds
......@@ -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)
%{
......
......@@ -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
}
]
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment