Merge branch 'show-reposted-replies' into 'develop'
Display reposted replies with exclude_replies: true See merge request pleroma/pleroma!3961
This commit is contained in:
commit
7798fdc711
1
changelog.d/show-reposter-replies.add
Normal file
1
changelog.d/show-reposter-replies.add
Normal file
@ -0,0 +1 @@
|
||||
Display reposted replies with exclude_replies: true
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user