Merge branch 'fix-notification-filtering' into 'develop'

Notifications: Never return `nil` in the notification list.

See merge request pleroma/pleroma!2705
This commit is contained in:
rinpatch 2020-06-29 18:06:25 +00:00
commit 7bb3618939
2 changed files with 11 additions and 0 deletions

View File

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

View File

@ -22,6 +22,16 @@ defmodule Pleroma.NotificationTest do
alias Pleroma.Web.Streamer
describe "create_notifications" do
test "never returns nil" do
user = insert(:user)
other_user = insert(:user, %{invisible: true})
{:ok, activity} = CommonAPI.post(user, %{status: "yeah"})
{:ok, activity} = CommonAPI.react_with_emoji(activity.id, other_user, "")
refute {:ok, [nil]} == Notification.create_notifications(activity)
end
test "creates a notification for an emoji reaction" do
user = insert(:user)
other_user = insert(:user)