diff options
| author | marcin mikołajczak <git@mkljczk.pl> | 2023-03-15 19:44:42 +0100 |
|---|---|---|
| committer | marcin mikołajczak <git@mkljczk.pl> | 2023-10-28 00:10:13 +0200 |
| commit | b6a9d87f16a4806eab7a6da874d6f75b65d4f214 (patch) | |
| tree | 724c46aeff58b7e2eda53639dfa2832c81b19d89 | |
| parent | e3ea311cd594d4f0bc8c4e05ca8eb1eee18ae6be (diff) | |
| download | pleroma-b6a9d87f16a4806eab7a6da874d6f75b65d4f214.tar.gz pleroma-b6a9d87f16a4806eab7a6da874d6f75b65d4f214.zip | |
Display reposted replies with exclude_replies: true
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
| -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 3979d418e..4b956c680 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -964,8 +964,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 |