Poll notification: notify for polls even when block_from_strangers is set
This commit is contained in:
parent
0114754db2
commit
cbd1a10c16
1 changed files with 8 additions and 2 deletions
|
@ -631,11 +631,17 @@ defmodule Pleroma.Notification do
|
|||
:block_from_strangers,
|
||||
%Activity{} = activity,
|
||||
%User{notification_settings: %{block_from_strangers: true}} = user,
|
||||
_opts
|
||||
opts
|
||||
) do
|
||||
actor = activity.data["actor"]
|
||||
follower = User.get_cached_by_ap_id(actor)
|
||||
!User.following?(follower, user)
|
||||
|
||||
cond do
|
||||
opts[:type] == "poll" -> false
|
||||
user.ap_id == actor -> false
|
||||
!User.following?(follower, user) -> true
|
||||
true -> false
|
||||
end
|
||||
end
|
||||
|
||||
# To do: consider defining recency in hours and checking FollowingRelationship with a single SQL
|
||||
|
|
Loading…
Reference in a new issue