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

Strip HTML in and allow emoji in summaries.

This commit is contained in:
scarlett 2019-01-05 17:28:47 +00:00
parent eaaf701319
commit 0787f0dfbe
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/common_api/common_api.ex
View File

@ -124,7 +124,7 @@ defmodule Pleroma.Web.CommonAPI do
Map.put( Map.put(
object, object,
"emoji", "emoji",
Formatter.get_emoji(status) Formatter.get_emoji(status) ++ Formatter.get_emoji(data["spoiler_text"])
|> Enum.reduce(%{}, fn {name, file}, acc -> |> Enum.reduce(%{}, fn {name, file}, acc ->
Map.put(acc, name, "#{Pleroma.Web.Endpoint.static_url()}#{file}") Map.put(acc, name, "#{Pleroma.Web.Endpoint.static_url()}#{file}")
end) end)

2
lib/pleroma/web/twitter_api/views/activity_view.ex
View File

@ -285,7 +285,7 @@ defmodule Pleroma.Web.TwitterAPI.ActivityView do
"activity_type" => "post", "activity_type" => "post",
"possibly_sensitive" => possibly_sensitive, "possibly_sensitive" => possibly_sensitive,
"visibility" => Pleroma.Web.MastodonAPI.StatusView.get_visibility(object), "visibility" => Pleroma.Web.MastodonAPI.StatusView.get_visibility(object),
"summary" => summary "summary" => HTML.strip_tags(summary) |> Formatter.emojify(object["emoji"])
} }
end end