Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mattermost: Rename get_recipient_id to get_recipient_id_from_receiver_name.

This commit is contained in:
Vishnu KS 2019-09-25 20:05:54 +05:30
parent a743991935
commit 23d70bb685
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
zerver/data_import/mattermost.py
View File

@ -262,7 +262,7 @@ def process_raw_message_batch(realm_id: int,
subscriber_map: Dict[int, Set[int]], subscriber_map: Dict[int, Set[int]],
user_id_mapper: IdMapper, user_id_mapper: IdMapper,
user_handler: UserHandler, user_handler: UserHandler,
get_recipient_id: Callable[[ZerverFieldsT], int], get_recipient_id_from_receiver_name: Callable[[str, int], 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]],
@ -308,11 +308,10 @@ def process_raw_message_batch(realm_id: int,
pub_date = raw_message['pub_date'] pub_date = raw_message['pub_date']
try: try:
recipient_id = get_recipient_id(raw_message) recipient_id = get_recipient_id_from_receiver_name(raw_message["receiver_id"], Recipient.STREAM)
except KeyError: except KeyError:
logging.debug("Could not find recipient_id for a message, skipping.") logging.debug("Could not find recipient_id for a message, skipping.")
continue continue
rendered_content = None rendered_content = None
topic_name = 'imported from mattermost' topic_name = 'imported from mattermost'
@ -352,7 +351,7 @@ def process_posts(num_teams: int,
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: Callable[[ZerverFieldsT], int], get_recipient_id_from_receiver_name: Callable[[str, int], 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,
@ -415,7 +414,7 @@ def process_posts(num_teams: int,
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=get_recipient_id, get_recipient_id_from_receiver_name=get_recipient_id_from_receiver_name,
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,
@ -444,17 +443,16 @@ def write_message_data(num_teams: int,
username_to_user: Dict[str, Dict[str, Any]], username_to_user: Dict[str, Dict[str, Any]],
zerver_realmemoji: List[Dict[str, Any]], zerver_realmemoji: List[Dict[str, Any]],
total_reactions: List[Dict[str, Any]]) -> None: total_reactions: List[Dict[str, Any]]) -> None:
stream_id_to_recipient_id = {}
stream_id_to_recipient_id = { for d in zerver_recipient:
d['type_id']: d['id'] if d['type'] == Recipient.STREAM:
for d in zerver_recipient stream_id_to_recipient_id[d['type_id']] = d['id']
if d['type'] == Recipient.STREAM
}
def get_stream_recipient_id(raw_message: ZerverFieldsT) -> int: def get_recipient_id_from_receiver_name(receiver_name: str, recipient_type: int) -> int:
receiver_id = raw_message['receiver_id'] if recipient_type == Recipient.STREAM:
stream_id = stream_id_mapper.get(receiver_id) receiver_id = stream_id_mapper.get(receiver_name)
recipient_id = stream_id_to_recipient_id[stream_id] recipient_id = stream_id_to_recipient_id[receiver_id]
return recipient_id return recipient_id
process_posts( process_posts(
@ -462,7 +460,7 @@ def write_message_data(num_teams: int,
team_name=team_name, team_name=team_name,
realm_id=realm_id, realm_id=realm_id,
post_data=post_data, post_data=post_data,
get_recipient_id=get_stream_recipient_id, get_recipient_id_from_receiver_name=get_recipient_id_from_receiver_name,
subscriber_map=subscriber_map, subscriber_map=subscriber_map,
output_dir=output_dir, output_dir=output_dir,
is_pm_data=False, is_pm_data=False,