hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#1505] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation.

Browse source
This commit is contained in:
Ivan Tashkinov 2020-02-08 19:58:02 +03:00
commit d458f4fdca
7 changed files with 45 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/pleroma/web/activity_pub/transmogrifier.ex
View file

@ -914,7 +914,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
Based on Mastodon's ActivityPub::NoteSerializer#replies.
"""
def set_replies(obj) do
limit = Pleroma.Config.get([:mastodon_compatibility, :federated_note_replies_limit], 0)
limit = Pleroma.Config.get([:activitypub, :note_replies_output_limit], 0)
replies_uris =
with true <- limit > 0 || nil,
@ -953,7 +953,13 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
end
def replies(%{"replies" => replies = %{}}) do
replies = with %{} <- replies["first"], do: replies["first"], else: (_ -> replies)
replies =
if is_map(replies["first"]) do
replies["first"]
else
replies
end
replies["items"] || []
end