summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-06-29 18:06:25 +0000
committerrinpatch <rinpatch@sdf.org>2020-06-29 18:06:25 +0000
commit7bb36189392280fef3c3a20279671885273383d2 (patch)
treea696d00fb90e50498646a306a4d60d021de3982b /lib
parentb2b332984c42d4be8f5d4890e53faa09c44a4fb2 (diff)
parent09c5991f82e91878a940f5957ac993e1fca72545 (diff)
downloadpleroma-7bb36189392280fef3c3a20279671885273383d2.tar.gz
pleroma-7bb36189392280fef3c3a20279671885273383d2.zip
Merge branch 'fix-notification-filtering' into 'develop'
Notifications: Never return `nil` in the notification list. See merge request pleroma/pleroma!2705
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/notification.ex1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex
index 9ee9606be..2ef1a80c5 100644
--- a/lib/pleroma/notification.ex
+++ b/lib/pleroma/notification.ex
@@ -367,6 +367,7 @@ defmodule Pleroma.Notification do
do_send = do_send && user in enabled_receivers
create_notification(activity, user, do_send)
end)
+ |> Enum.reject(&is_nil/1)
{:ok, notifications}
end