paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 14:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

mattermost: Split get_recipient_id_from_receiver_name to 3 functions.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2024-07-17 14:01:58 -07:00
committed by Tim Abbott
parent 27b0618704
commit 90cc88c88e
1 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
zerver/data_import/mattermost.py
View File

@@ -408,7 +408,9 @@ def process_raw_message_batch(
subscriber_map: dict[int, set[int]], subscriber_map: dict[int, set[int]],
user_id_mapper: IdMapper[str], user_id_mapper: IdMapper[str],
user_handler: UserHandler, user_handler: UserHandler,
get_recipient_id_from_receiver_name: Callable[[str, int], int], get_recipient_id_from_channel_name: Callable[[str], int],
get_recipient_id_from_direct_message_group_name: Callable[[str], int],
get_recipient_id_from_username: Callable[[str], int],
is_pm_data: bool, is_pm_data: bool,
output_dir: str, output_dir: str,
zerver_realmemoji: list[dict[str, Any]], zerver_realmemoji: list[dict[str, Any]],
@@ -456,21 +458,19 @@ def process_raw_message_batch(
date_sent = raw_message["date_sent"] date_sent = raw_message["date_sent"]
sender_user_id = raw_message["sender_id"] sender_user_id = raw_message["sender_id"]
if "channel_name" in raw_message: if "channel_name" in raw_message:
recipient_id = get_recipient_id_from_receiver_name( recipient_id = get_recipient_id_from_channel_name(raw_message["channel_name"])
raw_message["channel_name"], Recipient.STREAM
)
elif "huddle_name" in raw_message: elif "huddle_name" in raw_message:
recipient_id = get_recipient_id_from_receiver_name( recipient_id = get_recipient_id_from_direct_message_group_name(
raw_message["huddle_name"], Recipient.DIRECT_MESSAGE_GROUP raw_message["huddle_name"]
) )
elif "pm_members" in raw_message: elif "pm_members" in raw_message:
members = raw_message["pm_members"] members = raw_message["pm_members"]
member_ids = {user_id_mapper.get(member) for member in members} member_ids = {user_id_mapper.get(member) for member in members}
pm_members[message_id] = member_ids pm_members[message_id] = member_ids
if sender_user_id == user_id_mapper.get(members[0]): if sender_user_id == user_id_mapper.get(members[0]):
recipient_id = get_recipient_id_from_receiver_name(members[1], Recipient.PERSONAL) recipient_id = get_recipient_id_from_username(members[1])
else: else:
recipient_id = get_recipient_id_from_receiver_name(members[0], Recipient.PERSONAL) recipient_id = get_recipient_id_from_username(members[0])
else: else:
raise AssertionError("raw_message without channel_name, huddle_name or pm_members key") raise AssertionError("raw_message without channel_name, huddle_name or pm_members key")
@@ -544,7 +544,9 @@ def process_posts(
team_name: str, team_name: str,
realm_id: int, realm_id: int,
post_data: list[dict[str, Any]], post_data: list[dict[str, Any]],
get_recipient_id_from_receiver_name: Callable[[str, int], int], get_recipient_id_from_channel_name: Callable[[str], int],
get_recipient_id_from_direct_message_group_name: Callable[[str], int],
get_recipient_id_from_username: Callable[[str], int],
subscriber_map: dict[int, set[int]], subscriber_map: dict[int, set[int]],
output_dir: str, output_dir: str,
is_pm_data: bool, is_pm_data: bool,
@@ -630,7 +632,9 @@ def process_posts(
subscriber_map=subscriber_map, subscriber_map=subscriber_map,
user_id_mapper=user_id_mapper, user_id_mapper=user_id_mapper,
user_handler=user_handler, user_handler=user_handler,
get_recipient_id_from_receiver_name=get_recipient_id_from_receiver_name, get_recipient_id_from_channel_name=get_recipient_id_from_channel_name,
get_recipient_id_from_direct_message_group_name=get_recipient_id_from_direct_message_group_name,
get_recipient_id_from_username=get_recipient_id_from_username,
is_pm_data=is_pm_data, is_pm_data=is_pm_data,
output_dir=output_dir, output_dir=output_dir,
zerver_realmemoji=zerver_realmemoji, zerver_realmemoji=zerver_realmemoji,
@@ -680,19 +684,17 @@ def write_message_data(
if d["type"] == Recipient.PERSONAL: if d["type"] == Recipient.PERSONAL:
user_id_to_recipient_id[d["type_id"]] = d["id"] user_id_to_recipient_id[d["type_id"]] = d["id"]
def get_recipient_id_from_receiver_name(receiver_name: str, recipient_type: int) -> int: def get_recipient_id_from_channel_name(channel_name: str) -> int:
if recipient_type == Recipient.STREAM: receiver_id = stream_id_mapper.get(channel_name)
receiver_id = stream_id_mapper.get(receiver_name) return stream_id_to_recipient_id[receiver_id]
recipient_id = stream_id_to_recipient_id[receiver_id]
elif recipient_type == Recipient.DIRECT_MESSAGE_GROUP: def get_recipient_id_from_direct_message_group_name(direct_message_group_name: str) -> int:
receiver_id = huddle_id_mapper.get(receiver_name) receiver_id = huddle_id_mapper.get(direct_message_group_name)
recipient_id = huddle_id_to_recipient_id[receiver_id] return huddle_id_to_recipient_id[receiver_id]
elif recipient_type == Recipient.PERSONAL:
receiver_id = user_id_mapper.get(receiver_name) def get_recipient_id_from_username(username: str) -> int:
recipient_id = user_id_to_recipient_id[receiver_id] receiver_id = user_id_mapper.get(username)
else: return user_id_to_recipient_id[receiver_id]
raise AssertionError("Invalid recipient_type")
return recipient_id
if num_teams == 1: if num_teams == 1:
post_types = ["channel_post", "direct_post"] post_types = ["channel_post", "direct_post"]
@@ -708,7 +710,9 @@ def write_message_data(
team_name=team_name, team_name=team_name,
realm_id=realm_id, realm_id=realm_id,
post_data=post_data[post_type], post_data=post_data[post_type],
get_recipient_id_from_receiver_name=get_recipient_id_from_receiver_name, get_recipient_id_from_channel_name=get_recipient_id_from_channel_name,
get_recipient_id_from_direct_message_group_name=get_recipient_id_from_direct_message_group_name,
get_recipient_id_from_username=get_recipient_id_from_username,
subscriber_map=subscriber_map, subscriber_map=subscriber_map,
output_dir=output_dir, output_dir=output_dir,
is_pm_data=post_type == "direct_post", is_pm_data=post_type == "direct_post",