paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-30 19:43:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

slack_data_import: Update how Slack user avatars are processed.

Browse Source 
Previously, the Slack export converter can only process Slack's avatar
URL from Slack's "ca.slack-edge.com" server, which looks like this:

https://ca.slack-edge.com/T0CDRA6HM3P-U06NABE26M9-1173e04f818e-512

This commit adds support for converting any public downloadable image
URLs.

This is done to support importing Slack's integration bots and their
messages, which typically have PNG type file url:

https://avatars.slack-edge.com/2024-05-01/7057208497908_a4351f6deb91094eac4c_72.png
This commit is contained in:
PieterCK
2024-10-09 17:20:58 +07:00
committed by Tim Abbott
parent e856294da6
commit 10946caa3d
3 changed files with 51 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
zerver/data_import/slack.py
View File

@@ -301,10 +301,9 @@ def users_to_zerver_userprofile(
found_emails[email.lower()] = user_id
# ref: https://zulip.com/help/change-your-profile-picture
avatar_url = build_avatar_url(
slack_user_id, user["team_id"], user["profile"]["avatar_hash"]
)
build_avatar(user_id, realm_id, email, avatar_url, timestamp, avatar_list)
avatar_source, avatar_url = build_avatar_url(slack_user_id, user)
if avatar_source == UserProfile.AVATAR_FROM_USER:
build_avatar(user_id, realm_id, email, avatar_url, timestamp, avatar_list)
role = UserProfile.ROLE_MEMBER
if get_owner(user):
role = UserProfile.ROLE_REALM_OWNER
@@ -340,7 +339,7 @@ def users_to_zerver_userprofile(
id=user_id,
email=email,
delivery_email=email,
avatar_source="U",
avatar_source=avatar_source,
is_bot=user.get("is_bot", False),
role=role,
bot_type=1 if user.get("is_bot", False) else None,
@@ -464,9 +463,18 @@ def get_user_email(user: ZerverFieldsT, domain_name: str) -> str:
raise AssertionError(f"Could not find email address for Slack user {user}")
def build_avatar_url(slack_user_id: str, team_id: str, avatar_hash: str) -> str:
avatar_url = f"https://ca.slack-edge.com/{team_id}-{slack_user_id}-{avatar_hash}"
return avatar_url
def build_avatar_url(slack_user_id: str, user: ZerverFieldsT) -> tuple[str, str]:
avatar_url: str = ""
avatar_source = UserProfile.AVATAR_FROM_GRAVATAR
if user["profile"].get("avatar_hash"):
# Process avatar image for a typical Slack user.
team_id = user["team_id"]
avatar_hash = user["profile"]["avatar_hash"]
avatar_url = f"https://ca.slack-edge.com/{team_id}-{slack_user_id}-{avatar_hash}"
avatar_source = UserProfile.AVATAR_FROM_USER
else:
logging.info("Failed to process avatar for user -> %s\n", user.get("name"))
return avatar_source, avatar_url
def get_owner(user: ZerverFieldsT) -> bool: