alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'patch-3' into 'develop' 

Add visible_in_picker to status emojis

See merge request pleroma/pleroma!342
This commit is contained in:
Haelwenn 2018-09-12 18:01:11 +00:00
parent da3f930543 85b8590109
commit 90661e20cf
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/mastodon_api/views/status_view.ex
View File

@ -117,7 +117,7 @@ def render("status.json", %{activity: %{data: %{"object" => object}} = activity}
HtmlSanitizeEx.strip_tags(url) HtmlSanitizeEx.strip_tags(url)
|> MediaProxy.url() |> MediaProxy.url()
%{shortcode: name, url: url, static_url: url} %{shortcode: name, url: url, static_url: url, visible_in_picker: false}
end) end)
%{ %{

3
test/web/mastodon_api/status_view_test.exs
View File

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