From cbd1a10c16db026fac96fa2ddcb05b4eb106d290 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 18 Jul 2021 10:48:37 -0500 Subject: [PATCH] Poll notification: notify for polls even when block_from_strangers is set --- lib/pleroma/notification.ex | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex index 43a0e8f49..4a6e5d3f9 100644 --- a/lib/pleroma/notification.ex +++ b/lib/pleroma/notification.ex @@ -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