summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2024-05-27 15:33:50 +0000
committerlain <lain@soykaf.club>2024-05-27 15:33:50 +0000
commit7798fdc71121459f479e0729fefdac195b1dca7d (patch)
tree9bef9d92ad5732c88a1a68289e615223b9d13751 /lib
parente93ae96e1323fae954c2ce482cbb1df9ed9441c6 (diff)
parentb6a9d87f16a4806eab7a6da874d6f75b65d4f214 (diff)
downloadpleroma-7798fdc71121459f479e0729fefdac195b1dca7d.tar.gz
pleroma-7798fdc71121459f479e0729fefdac195b1dca7d.zip
Merge branch 'show-reposted-replies' into 'develop'
Display reposted replies with exclude_replies: true See merge request pleroma/pleroma!3961
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/activity_pub/activity_pub.ex5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 643877268..5bb0fba6e 100644
--- 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