diff --git a/extensions/hooks/db_connection.py b/extensions/hooks/db_connection.py index d6d1b16..ec568db 100644 --- a/extensions/hooks/db_connection.py +++ b/extensions/hooks/db_connection.py @@ -61,7 +61,7 @@ if dbconn: @post_hook def db_interaction_hook(message, metadata, context, change): # Check if user is in the database - if not dbconn: + if not dbconn or context.event == "suppressed": return with db_singleton.obtain_cursor() as cursor: cursor.execute( diff --git a/extensions/hooks/edit_alerts.py b/extensions/hooks/edit_alerts.py index 2cac179..fe195be 100644 --- a/extensions/hooks/edit_alerts.py +++ b/extensions/hooks/edit_alerts.py @@ -126,6 +126,10 @@ def edit_alerts_hook(message, metadata, context, change): # If current action isn't in config for this requirement AND current event type is not in the requirements in settings skip this requirement if req_action and context.event not in req_action and context.event.split('/', 1)[0] not in req_action: raise RequirementNotMet + if context.event == "suppressed": + if req_action and context.event in req_action: + break + raise RequirementNotMet req_user = requirement.get("user", []) change_user = None change_anon = False diff --git a/extensions/hooks/usertalk.py b/extensions/hooks/usertalk.py index b85401d..a09b8e6 100644 --- a/extensions/hooks/usertalk.py +++ b/extensions/hooks/usertalk.py @@ -37,7 +37,7 @@ def add_mention(message, userid): @post_hook def usertalk_hook(message: DiscordMessage, metadata: DiscordMessageMetadata, context: Context, change: dict): - if not discord_users: + if not discord_users or context.event == "suppressed": return if context.feed_type in ["recentchanges", "abuselog"] and change["ns"] in [2, 3, 202, 1200] and "/" not in change["title"]: username = change["title"].split(':', 1)[1]