projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[#1335] Reorganized `users.mutes` as relation to UserMute entity.
[akkoma]
/
lib
/
pleroma
/
notification.ex
diff --git
a/lib/pleroma/notification.ex
b/lib/pleroma/notification.ex
index 83844d3be4c58f78f81f17e6fc6e47a71af3ad1b..82faef85e3e28bd3053cb8fe72fea66c40b99060 100644
(file)
--- a/
lib/pleroma/notification.ex
+++ b/
lib/pleroma/notification.ex
@@
-60,11
+60,13
@@
defmodule Pleroma.Notification do
end
defp exclude_blocked(query, user) do
end
defp exclude_blocked(query, user) do
+ blocked_ap_ids = User.blocked_ap_ids(user)
+
query
query
- |> where([n, a], a.actor not in ^
user.info.block
s)
+ |> where([n, a], a.actor not in ^
blocked_ap_id
s)
|> where(
[n, a],
|> where(
[n, a],
- fragment("substring(? from '.*://([^/]*)')", a.actor) not in ^user.
info.
domain_blocks
+ fragment("substring(? from '.*://([^/]*)')", a.actor) not in ^user.domain_blocks
)
end
)
end