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

Display reposted replies with exclude_replies: true

See merge request pleroma/pleroma!3961
This commit is contained in:
lain 2024-05-27 15:33:50 +00:00
commit 7798fdc711
2 changed files with 4 additions and 2 deletions

View File

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

View File

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