Skip to content
This repository has been archived by the owner on Sep 20, 2024. It is now read-only.

Slack: user groups speedup #4318

Merged
merged 4 commits into from
Jan 16, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions openpype/modules/slack/plugins/publish/integrate_slack_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ def process(self, instance):
token = instance.data["slack_token"]
if additional_message:
message = "{} \n".format(additional_message)
users = groups = None
for message_profile in instance.data["slack_channel_message_profiles"]:
message += self._get_filled_message(message_profile["message"],
instance,
Expand All @@ -60,8 +61,18 @@ def process(self, instance):
else:
client = SlackPython3Operations(token, self.log)

users, groups = client.get_users_and_groups()
message = self._translate_users(message, users, groups)
if "@" in message:
cache_key = "__cache_slack_ids"
slack_ids = instance.context.data.get(cache_key, None)
if slack_ids is None:
users, groups = client.get_users_and_groups()
instance.context.data[cache_key] = {}
instance.context.data[cache_key]["users"] = users
instance.context.data[cache_key]["groups"] = groups
else:
users = slack_ids["users"]
groups = slack_ids["groups"]
message = self._translate_users(message, users, groups)

msg_id, file_ids = client.send_message(channel,
message,
Expand Down Expand Up @@ -212,7 +223,7 @@ def _get_group_id(self, groups, group_name):

def _translate_users(self, message, users, groups):
"""Replace all occurences of @mentions with proper <@name> format."""
matches = re.findall(r"(?<!<)@[^ ]+", message)
matches = re.findall(r"(?<!<)@\S+", message)
in_quotes = re.findall(r"(?<!<)(['\"])(@[^'\"]+)", message)
for item in in_quotes:
matches.append(item[1])
Expand Down