summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2023-02-09 19:54:59 +0000
committerlain <lain@soykaf.club>2023-02-09 19:54:59 +0000
commit7abb248cebaa10edfad34f304eb929d654956a54 (patch)
tree6b133f606a83ebe4c41dac6c34dc704f5144c89f /lib
parent00b39dea5d33a4595af1b63148b39c2bf335d4bc (diff)
parent55a8aa978782b9f2ee34c21404a98af833451380 (diff)
downloadpleroma-7abb248cebaa10edfad34f304eb929d654956a54.tar.gz
pleroma-7abb248cebaa10edfad34f304eb929d654956a54.zip
Merge branch 'notification-content-filtering-noobj' into 'develop'
Require related object for content-filtering on notification See merge request pleroma/pleroma!3837
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/notification.ex1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex
index 60c1a80ba..48d467c59 100644
--- a/lib/pleroma/notification.ex
+++ b/lib/pleroma/notification.ex
@@ -178,6 +178,7 @@ defmodule Pleroma.Notification do
from([_n, a, o] in query,
where:
fragment("not(?->>'content' ~* ?)", o.data, ^regex) or
+ fragment("?->>'content' is null", o.data) or
fragment("?->>'actor' = ?", o.data, ^user.ap_id)
)
end