From c75840f7b8a117e973713c8cb47523f09deaab79 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Sat, 2 May 2020 12:24:49 +0000 Subject: Merge branch 'follow-request-notifications' into 'develop' Follow request notifications enforcement See merge request pleroma/pleroma!2451 --- lib/pleroma/notification.ex | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'lib') diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex index 94dc0c2b0..815356a5e 100644 --- a/lib/pleroma/notification.ex +++ b/lib/pleroma/notification.ex @@ -293,17 +293,8 @@ defmodule Pleroma.Notification do end end - def create_notifications(%Activity{data: %{"type" => "Follow"}} = activity) do - if Pleroma.Config.get([:notifications, :enable_follow_request_notifications]) || - Activity.follow_accepted?(activity) do - do_create_notifications(activity) - else - {:ok, []} - end - end - def create_notifications(%Activity{data: %{"type" => type}} = activity) - when type in ["Like", "Announce", "Move", "EmojiReact"] do + when type in ["Follow", "Like", "Announce", "Move", "EmojiReact"] do do_create_notifications(activity) end -- cgit v1.2.3