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

Display reposted replies with exclude_replies: true

See merge request pleroma/pleroma!3961

changelog.d/show-reposter-replies.add

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

lib/pleroma/web/activity_pub/activity_pub.ex

@@ -980,8 +980,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