diff options
| author | lain <lain@soykaf.club> | 2024-05-27 15:33:50 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2024-05-27 15:33:50 +0000 |
| commit | 7798fdc71121459f479e0729fefdac195b1dca7d (patch) | |
| tree | 9bef9d92ad5732c88a1a68289e615223b9d13751 | |
| parent | e93ae96e1323fae954c2ce482cbb1df9ed9441c6 (diff) | |
| parent | b6a9d87f16a4806eab7a6da874d6f75b65d4f214 (diff) | |
| download | pleroma-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
| -rw-r--r-- | changelog.d/show-reposter-replies.add | 1 | ||||
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/changelog.d/show-reposter-replies.add b/changelog.d/show-reposter-replies.add new file mode 100644 index 000000000..3b852ec3b --- /dev/null +++ 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 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 |