hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Exclude blockers from notifications when blockers_visible: false

Browse source
This commit is contained in:
Alex Gleason 2021-01-06 15:39:14 -06:00
commit cc09079aea
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
2 changed files with 31 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/pleroma/notification.ex
View file

@ -132,6 +132,7 @@ defmodule Pleroma.Notification do
|> preload([n, a, o], activity: {a, object: o})
|> exclude_notification_muted(user, exclude_notification_muted_opts)
|> exclude_blocked(user, exclude_blocked_opts)
|> exclude_blockers(user)
|> exclude_filtered(user)
|> exclude_visibility(opts)
end
@ -145,6 +146,17 @@ defmodule Pleroma.Notification do
|> FollowingRelationship.keep_following_or_not_domain_blocked(user)
end
defp exclude_blockers(query, user) do
if Pleroma.Config.get([:activitypub, :blockers_visible]) == true do
query
else
blocker_ap_ids = User.incoming_relationships_ungrouped_ap_ids(user, [:block])
query
|> where([n, a], a.actor not in ^blocker_ap_ids)
end
end
defp exclude_notification_muted(query, _, %{@include_muted_option => true}) do
query
end