From 2e12586bc06d959e0d2012f6dc28561ba7ea1a18 Mon Sep 17 00:00:00 2001 From: Aevann Date: Sun, 31 Mar 2024 00:06:32 +0200 Subject: [PATCH] switch to AEVANN_EXCLUDED_MODACTION_TYPES --- files/classes/user.py | 2 +- files/helpers/config/modaction_types.py | 6 ++---- files/routes/notifications.py | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/files/classes/user.py b/files/classes/user.py index 8045da3a9..ba084ea19 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -902,7 +902,7 @@ class User(Base): ModAction.user_id != self.id, ) if self.id == AEVANN_ID: - q = q.filter(ModAction.kind.in_(AEVANN_MODACTION_TYPES)) + q = q.filter(ModAction.kind.notin_(AEVANN_EXCLUDED_MODACTION_TYPES)) if self.admin_level < PERMS['PROGSTACK']: q = q.filter(ModAction.kind.notin_(MODACTION_PRIVILEGED__TYPES)) diff --git a/files/helpers/config/modaction_types.py b/files/helpers/config/modaction_types.py index 6f1d9fc23..a933c6508 100644 --- a/files/helpers/config/modaction_types.py +++ b/files/helpers/config/modaction_types.py @@ -485,7 +485,5 @@ MODACTION_TYPES_FILTERED = deepcopy({t:v for t,v in MODACTION_TYPES.items() if not t in MODACTION_PRIVILEGED_TYPES}) MODACTION_TYPES__FILTERED = deepcopy({t:v for t,v in MODACTION_TYPES.items() if not t in MODACTION_PRIVILEGED__TYPES}) -AEVANN_MODACTION_TYPES = {'ban_user','unban_user', - 'shadowban','unshadowban', - 'delete_media','reset_password','unchud', - 'mark_effortpost', 'unmark_effortpost'} +AEVANN_EXCLUDED_MODACTION_TYPES = {'pin_post', 'unpin_post' + 'pin_comment', 'unpin_comment'} diff --git a/files/routes/notifications.py b/files/routes/notifications.py index dd1484eb2..aa3b01420 100644 --- a/files/routes/notifications.py +++ b/files/routes/notifications.py @@ -257,7 +257,7 @@ def notifications_modactions(v): listing = g.db.query(cls).filter(cls.user_id != v.id) if v.id == AEVANN_ID: - listing = listing.filter(cls.kind.in_(AEVANN_MODACTION_TYPES)) + listing = listing.filter(cls.kind.notin_(AEVANN_EXCLUDED_MODACTION_TYPES)) if v.admin_level < PERMS['PROGSTACK']: listing = listing.filter(cls.kind.notin_(MODACTION_PRIVILEGED__TYPES))