projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix duplicate recipients
[akkoma]
/
lib
/
pleroma
/
notification.ex
diff --git
a/lib/pleroma/notification.ex
b/lib/pleroma/notification.ex
index d145f8d5b5a42c8ba3b685196754e45a1eaf682e..b7ecf51e4681fc9a25b8d1cd9d596c928f930bba 100644
(file)
--- a/
lib/pleroma/notification.ex
+++ b/
lib/pleroma/notification.ex
@@
-40,7
+40,7
@@
defmodule Pleroma.Notification do
|> where(
[n, a],
fragment(
|> where(
[n, a],
fragment(
- "? not in (SELECT ap_id FROM users WHERE
info->'deactivated' @>
'true')",
+ "? not in (SELECT ap_id FROM users WHERE
deactivated =
'true')",
a.actor
)
)
a.actor
)
)
@@
-55,21
+55,26
@@
defmodule Pleroma.Notification do
)
|> preload([n, a, o], activity: {a, object: o})
|> exclude_muted(user, opts)
)
|> preload([n, a, o], activity: {a, object: o})
|> exclude_muted(user, opts)
+ |> exclude_blocked(user)
|> exclude_visibility(opts)
end
|> exclude_visibility(opts)
end
+ defp exclude_blocked(query, user) do
+ query
+ |> where([n, a], a.actor not in ^user.blocks)
+ |> where(
+ [n, a],
+ fragment("substring(? from '.*://([^/]*)')", a.actor) not in ^user.domain_blocks
+ )
+ end
+
defp exclude_muted(query, _, %{with_muted: true}) do
query
end
defp exclude_muted(query, user, _opts) do
query
defp exclude_muted(query, _, %{with_muted: true}) do
query
end
defp exclude_muted(query, user, _opts) do
query
- |> where([n, a], a.actor not in ^user.info.muted_notifications)
- |> where([n, a], a.actor not in ^user.info.blocks)
- |> where(
- [n, a],
- fragment("substring(? from '.*://([^/]*)')", a.actor) not in ^user.info.domain_blocks
- )
+ |> where([n, a], a.actor not in ^user.muted_notifications)
|> join(:left, [n, a], tm in Pleroma.ThreadMute,
on: tm.user_id == ^user.id and tm.context == fragment("?->>'context'", a.data)
)
|> join(:left, [n, a], tm in Pleroma.ThreadMute,
on: tm.user_id == ^user.id and tm.context == fragment("?->>'context'", a.data)
)
@@
-309,7
+314,7
@@
defmodule Pleroma.Notification do
def skip?(
:followers,
activity,
def skip?(
:followers,
activity,
- %{
info: %{notification_settings: %{"followers" => false}
}} = user
+ %{
notification_settings: %{"followers" => false
}} = user
) do
actor = activity.data["actor"]
follower = User.get_cached_by_ap_id(actor)
) do
actor = activity.data["actor"]
follower = User.get_cached_by_ap_id(actor)
@@
-319,14
+324,14
@@
defmodule Pleroma.Notification do
def skip?(
:non_followers,
activity,
def skip?(
:non_followers,
activity,
- %{
info: %{notification_settings: %{"non_followers" => false}
}} = user
+ %{
notification_settings: %{"non_followers" => false
}} = user
) do
actor = activity.data["actor"]
follower = User.get_cached_by_ap_id(actor)
!User.following?(follower, user)
end
) do
actor = activity.data["actor"]
follower = User.get_cached_by_ap_id(actor)
!User.following?(follower, user)
end
- def skip?(:follows, activity, %{
info: %{notification_settings: %{"follows" => false}
}} = user) do
+ def skip?(:follows, activity, %{
notification_settings: %{"follows" => false
}} = user) do
actor = activity.data["actor"]
followed = User.get_cached_by_ap_id(actor)
User.following?(user, followed)
actor = activity.data["actor"]
followed = User.get_cached_by_ap_id(actor)
User.following?(user, followed)
@@
-335,7
+340,7
@@
defmodule Pleroma.Notification do
def skip?(
:non_follows,
activity,
def skip?(
:non_follows,
activity,
- %{
info: %{notification_settings: %{"non_follows" => false}
}} = user
+ %{
notification_settings: %{"non_follows" => false
}} = user
) do
actor = activity.data["actor"]
followed = User.get_cached_by_ap_id(actor)
) do
actor = activity.data["actor"]
followed = User.get_cached_by_ap_id(actor)