Infinidoge/nomen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

further refactor the query

Browse source
This commit is contained in:
Infinidoge 2025-02-21 21:18:08 -05:00
parent 8d2694d8b7
commit 448fd2a7fd
Signed by: Infinidoge
SSH key fingerprint: SHA256:oAMyvotlNFraMmZmr+p6AxnNfW/GioTs1pOn3V4tQ7A
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
nomen/notifications.py
View file

@ -151,26 +151,27 @@ async def handle_triggers(ctx, message):
WITH WITH
pauses AS (SELECT user_id FROM user_pauses WHERE guild_id=:guild), pauses AS (SELECT user_id FROM user_pauses WHERE guild_id=:guild),
ignores AS ( ignores AS (
SELECT target, user_id FROM user_ignores WHERE guild_id=:guild SELECT target, user_id AS ignorer FROM user_ignores WHERE guild_id=:guild
UNION UNION
SELECT target, user_id FROM user_blocks SELECT target, user_id AS ignorer FROM user_blocks
) )
SELECT keyword, user_id, use_embed SELECT keyword, user_id, use_embed
FROM ( -- Deduplicate notification recipients by user_id FROM ( -- Deduplicate notification recipients by user_id
SELECT keyword, user_id, use_embed, row_number() over (partition by user_id) n SELECT *, row_number() over (partition by user_id) n
FROM keywords FROM keywords
LEFT JOIN users USING (user_id) LEFT JOIN users USING (user_id)
WHERE likely(disabled IS NOT 1) -- Don't notify users who opted out WHERE guild_id=:guild
AND (unlikely(notify_self IS 1) OR user_id IS NOT :author) -- Don't notify author unless wanted AND likely(disabled IS NOT 1) -- Don't notify users who opted out
AND (unlikely(bots_notify IS 1) OR :is_bot IS NOT 1) -- Don't notify from bots unless wanted AND likely(user_id NOT IN pauses) -- Don't notify users who are paused
AND likely(:author NOT IN (SELECT target FROM ignores WHERE user_id=user_id)) AND unlikely(contains(:content, keyword, regex))
AND likely(:channel NOT IN (SELECT target FROM ignores WHERE user_id=user_id))
AND likely(:category NOT IN (SELECT target FROM ignores WHERE user_id=user_id))
AND likely(:parent NOT IN (SELECT target FROM ignores WHERE user_id=user_id))
AND likely(user_id NOT IN pauses)
AND guild_id=:guild AND unlikely(contains(:content, keyword, regex))
) )
WHERE n=1 WHERE n=1
AND (unlikely(notify_self IS 1) OR user_id IS NOT :author) -- Don't notify author unless wanted
AND (unlikely(bots_notify IS 1) OR :is_bot IS NOT 1) -- Don't notify from bots unless wanted
AND likely(:author NOT IN (SELECT target FROM ignores WHERE ignorer=user_id)) -- Ignored user
AND likely(:channel NOT IN (SELECT target FROM ignores WHERE ignorer=user_id)) -- Ignored channel
AND likely(:category NOT IN (SELECT target FROM ignores WHERE ignorer=user_id)) -- Ignored category
AND likely(:parent NOT IN (SELECT target FROM ignores WHERE ignorer=user_id)) -- Ignored parent channel of thread
""" """
async with TaskGroup() as tg: async with TaskGroup() as tg: