projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't crash on AP request for tombstone
[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 7d0dea8c256c97dfaa3e3d66d1ead9ebc4c89eb4..a0be5cfc57399fdab9fdea107686f7a9c279ec47 100644
(file)
--- a/
lib/pleroma/web/twitter_api/views/activity_view.ex
+++ b/
lib/pleroma/web/twitter_api/views/activity_view.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-201
8
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-201
9
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.TwitterAPI.ActivityView do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.TwitterAPI.ActivityView do
@@
-11,6
+11,7
@@
defmodule Pleroma.Web.TwitterAPI.ActivityView do
alias Pleroma.Web.TwitterAPI.TwitterAPI
alias Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter
alias Pleroma.Activity
alias Pleroma.Web.TwitterAPI.TwitterAPI
alias Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter
alias Pleroma.Activity
+ alias Pleroma.HTML
alias Pleroma.Object
alias Pleroma.User
alias Pleroma.Repo
alias Pleroma.Object
alias Pleroma.User
alias Pleroma.Repo
@@
-244,14
+245,18
@@
defmodule Pleroma.Web.TwitterAPI.ActivityView do
html =
content
html =
content
- |> Utils.get_scrubbed_html_for_object(User.html_filter_policy(opts[:for]), activity)
+ |> HTML.get_cached_scrubbed_html_for_object(
+ User.html_filter_policy(opts[:for]),
+ activity,
+ __MODULE__
+ )
|> Formatter.emojify(object["emoji"])
text =
if content do
content
|> String.replace(~r/<br\s?\/?>/, "\n")
|> Formatter.emojify(object["emoji"])
text =
if content do
content
|> String.replace(~r/<br\s?\/?>/, "\n")
- |>
Utils.get_stripped_html_for_object(activity
)
+ |>
HTML.get_cached_stripped_html_for_object(activity, __MODULE__
)
end
reply_parent = Activity.get_in_reply_to_activity(activity)
end
reply_parent = Activity.get_in_reply_to_activity(activity)