From 2007a582a1accc6e59bd1089f2e196e75a47f02c Mon Sep 17 00:00:00 2001 From: Sahil Batra Date: Sat, 18 May 2024 13:22:33 +0530 Subject: [PATCH] message: Optimize checking if mentioning user group is allowed. This commit updates the code to not call is_user_in_group function if can_mention_group setting is set to "role:everyone" group. --- zerver/lib/message.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/zerver/lib/message.py b/zerver/lib/message.py index 5b37f745d4..7005bb2b6f 100644 --- a/zerver/lib/message.py +++ b/zerver/lib/message.py @@ -1220,12 +1220,12 @@ def check_user_group_mention_allowed(sender: UserProfile, user_group_ids: List[i for group in user_groups: can_mention_group = group.can_mention_group + if ( + hasattr(can_mention_group, "named_user_group") + and can_mention_group.named_user_group.name == SystemGroups.EVERYONE + ): + continue if sender_is_system_bot: - if ( - hasattr(can_mention_group, "named_user_group") - and can_mention_group.named_user_group.name == SystemGroups.EVERYONE - ): - continue raise JsonableError( _("You are not allowed to mention user group '{user_group_name}'.").format( user_group_name=group.name