projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'refactor/db-not-null-constraints-for-moderation_log' into 'develop'
[akkoma]
/
lib
/
pleroma
/
notification.ex
diff --git
a/lib/pleroma/notification.ex
b/lib/pleroma/notification.ex
index 83844d3be4c58f78f81f17e6fc6e47a71af3ad1b..b7ecf51e4681fc9a25b8d1cd9d596c928f930bba 100644
(file)
--- a/
lib/pleroma/notification.ex
+++ b/
lib/pleroma/notification.ex
@@
-61,10
+61,10
@@
defmodule Pleroma.Notification do
defp exclude_blocked(query, user) do
query
defp exclude_blocked(query, user) do
query
- |> where([n, a], a.actor not in ^user.
info.
blocks)
+ |> where([n, a], a.actor not in ^user.blocks)
|> 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