commit: 70f1496eb861650d16310205cef1957fcd201948
parent 0b1c05ca1e387d4a929dce3cac7214fdaf1c2444
Author: Alex Gleason <alex@alexgleason.me>
Date: Sun, 18 Jul 2021 11:03:56 -0500
Poll notification: only notify local users
Diffstat:
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex
@@ -471,9 +471,11 @@ defmodule Pleroma.Notification do
end
notifications =
- Enum.map([actor | voters], fn ap_id ->
- with %User{} = user <- User.get_by_ap_id(ap_id) do
- create_notification(activity, user, type: "poll")
+ Enum.reduce([actor | voters], [], fn ap_id, acc ->
+ with %User{local: true} = user <- User.get_by_ap_id(ap_id) do
+ [create_notification(activity, user, type: "poll") | acc]
+ else
+ _ -> acc
end
end)
diff --git a/test/pleroma/notification_test.exs b/test/pleroma/notification_test.exs
@@ -139,7 +139,7 @@ defmodule Pleroma.NotificationTest do
{:ok, notifications} = Notification.create_poll_notifications(activity)
- assert [user1.id, user3.id, user2.id] == Enum.map(notifications, & &1.user_id)
+ assert [user2.id, user3.id, user1.id] == Enum.map(notifications, & &1.user_id)
end
describe "CommonApi.post/2 notification-related functionality" do