mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-05-17 01:02:38 +00:00
Code Issues Projects Releases Wiki Activity

Skip generating notifications for internal users

Browse source
This commit is contained in:
Mark Felder 2024-01-30 10:41:52 -05:00
parent 291d531e4c
commit c25fda34e7
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/pleroma/notification.ex
View file

@ -630,6 +630,7 @@ defmodule Pleroma.Notification do
def skip?(%Activity{} = activity, %User{} = user, opts) do def skip?(%Activity{} = activity, %User{} = user, opts) do
[ [
:self, :self,
:internal,
:invisible, :invisible,
:block_from_strangers, :block_from_strangers,
:recently_followed, :recently_followed,
@ -649,6 +650,12 @@ defmodule Pleroma.Notification do
end end
end end
def skip?(:internal, %Activity{} = activity, _user, _opts) do
actor = activity.data["actor"]
user = User.get_cached_by_ap_id(actor)
User.internal?(user)
end
def skip?(:invisible, %Activity{} = activity, _user, _opts) do def skip?(:invisible, %Activity{} = activity, _user, _opts) do
actor = activity.data["actor"] actor = activity.data["actor"]
user = User.get_cached_by_ap_id(actor) user = User.get_cached_by_ap_id(actor)

11
lib/pleroma/web/activity_pub/side_effects.ex
View file

@ -261,16 +261,9 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
Utils.add_announce_to_object(object, announced_object) Utils.add_announce_to_object(object, announced_object)
notifications = {:ok, notifications} = Notification.create_notifications(object)
if !User.is_internal_user?(user) do
{:ok, notifications} = Notification.create_notifications(object)
ap_streamer().stream_out(object) if !User.internal?(user), do: ap_streamer().stream_out(object)
notifications
else
[]
end
meta = meta =
meta meta