mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-06-10 09:19:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'show-reposted-replies' into 'develop'

Browse source 
Display reposted replies with exclude_replies: true

See merge request pleroma/pleroma!3961
This commit is contained in:
marcin mikołajczak 2024-05-17 00:30:35 +00:00
parent 99eab1fa2a b6a9d87f16
commit 19a1a57895
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/show-reposter-replies.add Normal file
View file

@ -0,0 +1 @@
Display reposted replies with exclude_replies: true

5
lib/pleroma/web/activity_pub/activity_pub.ex
View file

@ -979,8 +979,9 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
defp restrict_replies(query, %{exclude_replies: true}) do
from(
[_activity, object] in query,
where: fragment("?->>'inReplyTo' is null", object.data)
[activity, object] in query,
where:
fragment("?->>'inReplyTo' is null or ?->>'type' = 'Announce'", object.data, activity.data)
)
end