projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
[akkoma]
/
lib
/
pleroma
/
web
/
twitter_api
/
views
/
activity_view.ex
diff --git
a/lib/pleroma/web/twitter_api/views/activity_view.ex
b/lib/pleroma/web/twitter_api/views/activity_view.ex
index aa1d41fa2dd125d3d42b67a9a362620c784157eb..433322eb8fbfce70632803921504a234d789b3b8 100644
(file)
--- a/
lib/pleroma/web/twitter_api/views/activity_view.ex
+++ b/
lib/pleroma/web/twitter_api/views/activity_view.ex
@@
-254,10
+254,10
@@
defmodule Pleroma.Web.TwitterAPI.ActivityView do
html =
content
html =
content
- |> HTML.get_cached_scrubbed_html_for_
object
(
+ |> HTML.get_cached_scrubbed_html_for_
activity
(
User.html_filter_policy(opts[:for]),
activity,
User.html_filter_policy(opts[:for]),
activity,
- __MODULE__
+ "twitterapi:content"
)
|> Formatter.emojify(object["emoji"])
)
|> Formatter.emojify(object["emoji"])
@@
-265,7
+265,7
@@
defmodule Pleroma.Web.TwitterAPI.ActivityView do
if content do
content
|> String.replace(~r/<br\s?\/?>/, "\n")
if content do
content
|> String.replace(~r/<br\s?\/?>/, "\n")
- |> HTML.get_cached_stripped_html_for_
object(activity, __MODULE__
)
+ |> HTML.get_cached_stripped_html_for_
activity(activity, "twitterapi:content"
)
else
""
end
else
""
end