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

conversions: Use NEXT_ID for usermessage_id.

Browse Source 
This is mostly complicated due to the way that the
Slack import passes around tuples of ids to maintain
four different parallel sequences.
This commit is contained in:
Steve Howell
2018-10-23 20:45:43 +00:00
committed by Tim Abbott
parent e90f47a530
commit 5194701787
4 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zerver/data_import/import_util.py
View File

@@ -259,9 +259,9 @@ def build_realm(zerver_realm: List[ZerverFieldsT], realm_id: int,
zerver_realmfilter=[])
return realm
def build_usermessages(zerver_usermessage: List[ZerverFieldsT], usermessage_id: int,
def build_usermessages(zerver_usermessage: List[ZerverFieldsT],
zerver_subscription: List[ZerverFieldsT], recipient_id: int,
mentioned_users_id: List[int], message_id: int) -> int:
mentioned_users_id: List[int], message_id: int) -> None:
for subscription in zerver_subscription:
if subscription['recipient'] == recipient_id:
flags_mask = 1 # For read
@@ -270,12 +270,10 @@ def build_usermessages(zerver_usermessage: List[ZerverFieldsT], usermessage_id:
usermessage = dict(
user_profile=subscription['user_profile'],
id=usermessage_id,
id=NEXT_ID('user_message'),
flags_mask=flags_mask,
message=message_id)
usermessage_id += 1
zerver_usermessage.append(usermessage)
return usermessage_id
def build_user_message(id: int,
user_id: int,