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

Merge branch 'follow-request-notifications' into 'develop'

Browse source 
Follow request notifications enforcement

See merge request pleroma/pleroma!2451
This commit is contained in:
rinpatch 2020-05-02 12:24:49 +00:00
commit 9e3ec58280
5 changed files with 3 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/pleroma/notification.ex
View file

@ -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