projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changelog: Add info about search fixes.
[akkoma]
/
lib
/
pleroma
/
notification.ex
diff --git
a/lib/pleroma/notification.ex
b/lib/pleroma/notification.ex
index b952e81fac9bdd70c637b38dd38faf2ac3a20519..dd7a1c82405f6e8e8ed5fd926bfeb2d2e5a494b5 100644
(file)
--- a/
lib/pleroma/notification.ex
+++ b/
lib/pleroma/notification.ex
@@
-70,6
+70,7
@@
defmodule Pleroma.Notification do
move
pleroma:chat_mention
pleroma:emoji_reaction
move
pleroma:chat_mention
pleroma:emoji_reaction
+ pleroma:report
reblog
}
reblog
}
@@
-367,7
+368,7
@@
defmodule Pleroma.Notification do
end
def create_notifications(%Activity{data: %{"type" => type}} = activity, options)
end
def create_notifications(%Activity{data: %{"type" => type}} = activity, options)
- when type in ["Follow", "Like", "Announce", "Move", "EmojiReact"] do
+ when type in ["Follow", "Like", "Announce", "Move", "EmojiReact"
, "Flag"
] do
do_create_notifications(activity, options)
end
do_create_notifications(activity, options)
end
@@
-410,6
+411,9
@@
defmodule Pleroma.Notification do
"EmojiReact" ->
"pleroma:emoji_reaction"
"EmojiReact" ->
"pleroma:emoji_reaction"
+ "Flag" ->
+ "pleroma:report"
+
# Compatibility with old reactions
"EmojiReaction" ->
"pleroma:emoji_reaction"
# Compatibility with old reactions
"EmojiReaction" ->
"pleroma:emoji_reaction"
@@
-467,7
+471,7
@@
defmodule Pleroma.Notification do
def get_notified_from_activity(activity, local_only \\ true)
def get_notified_from_activity(%Activity{data: %{"type" => type}} = activity, local_only)
def get_notified_from_activity(activity, local_only \\ true)
def get_notified_from_activity(%Activity{data: %{"type" => type}} = activity, local_only)
- when type in ["Create", "Like", "Announce", "Follow", "Move", "EmojiReact"] do
+ when type in ["Create", "Like", "Announce", "Follow", "Move", "EmojiReact"
, "Flag"
] do
potential_receiver_ap_ids = get_potential_receiver_ap_ids(activity)
potential_receivers =
potential_receiver_ap_ids = get_potential_receiver_ap_ids(activity)
potential_receivers =
@@
-503,6
+507,10
@@
defmodule Pleroma.Notification do
[object_id]
end
[object_id]
end
+ def get_potential_receiver_ap_ids(%{data: %{"type" => "Flag"}}) do
+ User.all_superusers() |> Enum.map(fn user -> user.ap_id end)
+ end
+
def get_potential_receiver_ap_ids(activity) do
[]
|> Utils.maybe_notify_to_recipients(activity)
def get_potential_receiver_ap_ids(activity) do
[]
|> Utils.maybe_notify_to_recipients(activity)
@@
-649,8
+657,8
@@
defmodule Pleroma.Notification do
|> Repo.one()
end
|> Repo.one()
end
- @spec mark_
as_read(User.t(), Activity
.t()) :: {integer(), nil | [term()]}
- def mark_
as_read(%User{id: id}, %Activity{data: %{"context" => context}}
) do
+ @spec mark_
context_as_read(User.t(), String
.t()) :: {integer(), nil | [term()]}
+ def mark_
context_as_read(%User{id: id}, context
) do
from(
n in Notification,
join: a in assoc(n, :activity),
from(
n in Notification,
join: a in assoc(n, :activity),