pleroma

commit: 7798fdc71121459f479e0729fefdac195b1dca7d
parent e93ae96e1323fae954c2ce482cbb1df9ed9441c6
Author: lain <lain@soykaf.club>
Date:   Mon, 27 May 2024 15:33:50 +0000

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

Display reposted replies with exclude_replies: true

See merge request pleroma/pleroma!3961
Diffstat:
A
changelog.d/show-reposter-replies.add
2
++
M
lib/pleroma/web/activity_pub/activity_pub.ex
5
+++--

2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/changelog.d/show-reposter-replies.add b/changelog.d/show-reposter-replies.add
@@ -0,0 +1 @@
+Display reposted replies with exclude_replies: true
+\ No newline at end of file
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -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