2018-08-02 15:24:34 +02:00
|
|
|
import logging
|
2018-08-03 19:15:01 +02:00
|
|
|
import os
|
2020-06-11 00:54:34 +02:00
|
|
|
import random
|
|
|
|
import shutil
|
2020-06-13 03:34:01 +02:00
|
|
|
from typing import AbstractSet, Any, Callable, Dict, Iterable, List, Optional, Set, Tuple, TypeVar
|
2018-08-02 15:24:34 +02:00
|
|
|
|
2020-06-11 00:54:34 +02:00
|
|
|
import requests
|
|
|
|
import ujson
|
2018-08-01 01:01:55 +02:00
|
|
|
from django.forms.models import model_to_dict
|
|
|
|
|
2018-10-23 21:58:51 +02:00
|
|
|
from zerver.data_import.sequencer import NEXT_ID
|
2018-08-02 00:35:02 +02:00
|
|
|
from zerver.lib.actions import STREAM_ASSIGNMENT_COLORS as stream_colors
|
2018-08-02 15:24:34 +02:00
|
|
|
from zerver.lib.avatar_hash import user_avatar_path_from_ids
|
2019-02-02 23:53:34 +01:00
|
|
|
from zerver.lib.parallel import run_parallel
|
2020-06-11 00:54:34 +02:00
|
|
|
from zerver.models import (
|
|
|
|
Attachment,
|
|
|
|
Huddle,
|
|
|
|
Message,
|
|
|
|
Realm,
|
|
|
|
RealmEmoji,
|
|
|
|
Recipient,
|
|
|
|
Stream,
|
|
|
|
Subscription,
|
|
|
|
UserProfile,
|
|
|
|
)
|
2018-08-01 01:01:55 +02:00
|
|
|
|
|
|
|
# stubs
|
|
|
|
ZerverFieldsT = Dict[str, Any]
|
|
|
|
|
2019-03-20 13:36:09 +01:00
|
|
|
class SubscriberHandler:
|
|
|
|
def __init__(self) -> None:
|
python: Convert assignment type annotations to Python 3.6 style.
This commit was split by tabbott; this piece covers the vast majority
of files in Zulip, but excludes scripts/, tools/, and puppet/ to help
ensure we at least show the right error messages for Xenial systems.
We can likely further refine the remaining pieces with some testing.
Generated by com2ann, with whitespace fixes and various manual fixes
for runtime issues:
- invoiced_through: Optional[LicenseLedger] = models.ForeignKey(
+ invoiced_through: Optional["LicenseLedger"] = models.ForeignKey(
-_apns_client: Optional[APNsClient] = None
+_apns_client: Optional["APNsClient"] = None
- notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- signup_notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ signup_notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- author: Optional[UserProfile] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
+ author: Optional["UserProfile"] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
- bot_owner: Optional[UserProfile] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
+ bot_owner: Optional["UserProfile"] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
- default_sending_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
- default_events_register_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_sending_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_events_register_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
-descriptors_by_handler_id: Dict[int, ClientDescriptor] = {}
+descriptors_by_handler_id: Dict[int, "ClientDescriptor"] = {}
-worker_classes: Dict[str, Type[QueueProcessingWorker]] = {}
-queues: Dict[str, Dict[str, Type[QueueProcessingWorker]]] = {}
+worker_classes: Dict[str, Type["QueueProcessingWorker"]] = {}
+queues: Dict[str, Dict[str, Type["QueueProcessingWorker"]]] = {}
-AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional[LDAPSearch] = None
+AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional["LDAPSearch"] = None
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-22 01:09:50 +02:00
|
|
|
self.stream_info: Dict[int, Set[int]] = dict()
|
|
|
|
self.huddle_info: Dict[int, Set[int]] = dict()
|
2019-03-20 13:36:09 +01:00
|
|
|
|
|
|
|
def set_info(self,
|
2019-08-27 12:01:07 +02:00
|
|
|
users: Set[int],
|
|
|
|
stream_id: Optional[int]=None,
|
|
|
|
huddle_id: Optional[int]=None,
|
|
|
|
) -> None:
|
|
|
|
if stream_id is not None:
|
|
|
|
self.stream_info[stream_id] = users
|
|
|
|
elif huddle_id is not None:
|
|
|
|
self.huddle_info[huddle_id] = users
|
|
|
|
else:
|
|
|
|
raise AssertionError("stream_id or huddle_id is required")
|
2019-03-20 13:36:09 +01:00
|
|
|
|
|
|
|
def get_users(self,
|
2019-08-27 12:01:07 +02:00
|
|
|
stream_id: Optional[int]=None,
|
|
|
|
huddle_id: Optional[int]=None) -> Set[int]:
|
|
|
|
if stream_id is not None:
|
|
|
|
return self.stream_info[stream_id]
|
|
|
|
elif huddle_id is not None:
|
|
|
|
return self.huddle_info[huddle_id]
|
|
|
|
else:
|
|
|
|
raise AssertionError("stream_id or huddle_id is required")
|
2019-03-20 13:36:09 +01:00
|
|
|
|
2018-08-01 01:01:55 +02:00
|
|
|
def build_zerver_realm(realm_id: int, realm_subdomain: str, time: float,
|
|
|
|
other_product: str) -> List[ZerverFieldsT]:
|
|
|
|
realm = Realm(id=realm_id, date_created=time,
|
|
|
|
name=realm_subdomain, string_id=realm_subdomain,
|
2020-06-10 06:41:04 +02:00
|
|
|
description=f"Organization imported from {other_product}!")
|
2018-08-01 01:01:55 +02:00
|
|
|
auth_methods = [[flag[0], flag[1]] for flag in realm.authentication_methods]
|
|
|
|
realm_dict = model_to_dict(realm, exclude='authentication_methods')
|
|
|
|
realm_dict['authentication_methods'] = auth_methods
|
|
|
|
return[realm_dict]
|
2018-08-01 01:10:55 +02:00
|
|
|
|
2018-10-17 20:35:22 +02:00
|
|
|
def build_user_profile(avatar_source: str,
|
|
|
|
date_joined: Any,
|
|
|
|
delivery_email: str,
|
|
|
|
email: str,
|
|
|
|
full_name: str,
|
|
|
|
id: int,
|
|
|
|
is_active: bool,
|
2019-10-05 02:35:07 +02:00
|
|
|
role: int,
|
2018-10-17 20:35:22 +02:00
|
|
|
is_mirror_dummy: bool,
|
|
|
|
realm_id: int,
|
|
|
|
short_name: str,
|
|
|
|
timezone: Optional[str]) -> ZerverFieldsT:
|
2018-09-28 13:00:32 +02:00
|
|
|
pointer = -1
|
|
|
|
obj = UserProfile(
|
|
|
|
avatar_source=avatar_source,
|
|
|
|
date_joined=date_joined,
|
|
|
|
delivery_email=delivery_email,
|
|
|
|
email=email,
|
|
|
|
full_name=full_name,
|
|
|
|
id=id,
|
2019-03-27 08:27:36 +01:00
|
|
|
is_mirror_dummy=is_mirror_dummy,
|
2018-09-28 23:49:59 +02:00
|
|
|
is_active=is_active,
|
2019-10-05 02:35:07 +02:00
|
|
|
role=role,
|
2018-09-28 13:00:32 +02:00
|
|
|
pointer=pointer,
|
|
|
|
realm_id=realm_id,
|
|
|
|
short_name=short_name,
|
|
|
|
timezone=timezone,
|
|
|
|
)
|
|
|
|
dct = model_to_dict(obj)
|
|
|
|
return dct
|
|
|
|
|
2018-08-01 01:10:55 +02:00
|
|
|
def build_avatar(zulip_user_id: int, realm_id: int, email: str, avatar_url: str,
|
|
|
|
timestamp: Any, avatar_list: List[ZerverFieldsT]) -> None:
|
|
|
|
avatar = dict(
|
|
|
|
path=avatar_url, # Save original avatar url here, which is downloaded later
|
|
|
|
realm_id=realm_id,
|
|
|
|
content_type=None,
|
|
|
|
user_profile_id=zulip_user_id,
|
|
|
|
last_modified=timestamp,
|
|
|
|
user_profile_email=email,
|
|
|
|
s3_path="",
|
|
|
|
size="")
|
|
|
|
avatar_list.append(avatar)
|
2018-08-02 00:35:02 +02:00
|
|
|
|
2018-10-23 16:53:09 +02:00
|
|
|
def make_subscriber_map(zerver_subscription: List[ZerverFieldsT]) -> Dict[int, Set[int]]:
|
|
|
|
'''
|
|
|
|
This can be convenient for building up UserMessage
|
|
|
|
rows.
|
|
|
|
'''
|
python: Convert assignment type annotations to Python 3.6 style.
This commit was split by tabbott; this piece covers the vast majority
of files in Zulip, but excludes scripts/, tools/, and puppet/ to help
ensure we at least show the right error messages for Xenial systems.
We can likely further refine the remaining pieces with some testing.
Generated by com2ann, with whitespace fixes and various manual fixes
for runtime issues:
- invoiced_through: Optional[LicenseLedger] = models.ForeignKey(
+ invoiced_through: Optional["LicenseLedger"] = models.ForeignKey(
-_apns_client: Optional[APNsClient] = None
+_apns_client: Optional["APNsClient"] = None
- notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- signup_notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ signup_notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- author: Optional[UserProfile] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
+ author: Optional["UserProfile"] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
- bot_owner: Optional[UserProfile] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
+ bot_owner: Optional["UserProfile"] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
- default_sending_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
- default_events_register_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_sending_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_events_register_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
-descriptors_by_handler_id: Dict[int, ClientDescriptor] = {}
+descriptors_by_handler_id: Dict[int, "ClientDescriptor"] = {}
-worker_classes: Dict[str, Type[QueueProcessingWorker]] = {}
-queues: Dict[str, Dict[str, Type[QueueProcessingWorker]]] = {}
+worker_classes: Dict[str, Type["QueueProcessingWorker"]] = {}
+queues: Dict[str, Dict[str, Type["QueueProcessingWorker"]]] = {}
-AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional[LDAPSearch] = None
+AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional["LDAPSearch"] = None
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-22 01:09:50 +02:00
|
|
|
subscriber_map: Dict[int, Set[int]] = dict()
|
2018-10-23 16:53:09 +02:00
|
|
|
for sub in zerver_subscription:
|
|
|
|
user_id = sub['user_profile']
|
|
|
|
recipient_id = sub['recipient']
|
|
|
|
if recipient_id not in subscriber_map:
|
|
|
|
subscriber_map[recipient_id] = set()
|
|
|
|
subscriber_map[recipient_id].add(user_id)
|
|
|
|
|
|
|
|
return subscriber_map
|
|
|
|
|
2019-03-26 12:46:29 +01:00
|
|
|
def make_user_messages(zerver_message: List[ZerverFieldsT],
|
|
|
|
subscriber_map: Dict[int, Set[int]],
|
|
|
|
is_pm_data: bool,
|
|
|
|
mention_map: Dict[int, Set[int]]) -> List[ZerverFieldsT]:
|
|
|
|
|
|
|
|
zerver_usermessage = []
|
|
|
|
|
|
|
|
for message in zerver_message:
|
|
|
|
message_id = message['id']
|
|
|
|
recipient_id = message['recipient']
|
|
|
|
sender_id = message['sender']
|
|
|
|
mention_user_ids = mention_map[message_id]
|
|
|
|
subscriber_ids = subscriber_map.get(recipient_id, set())
|
|
|
|
user_ids = subscriber_ids | {sender_id}
|
|
|
|
|
|
|
|
for user_id in user_ids:
|
|
|
|
is_mentioned = user_id in mention_user_ids
|
|
|
|
user_message = build_user_message(
|
|
|
|
user_id=user_id,
|
|
|
|
message_id=message_id,
|
|
|
|
is_private=is_pm_data,
|
|
|
|
is_mentioned=is_mentioned,
|
|
|
|
)
|
|
|
|
zerver_usermessage.append(user_message)
|
|
|
|
|
|
|
|
return zerver_usermessage
|
|
|
|
|
2018-08-02 00:35:02 +02:00
|
|
|
def build_subscription(recipient_id: int, user_id: int,
|
|
|
|
subscription_id: int) -> ZerverFieldsT:
|
2018-08-17 00:51:32 +02:00
|
|
|
subscription = Subscription(
|
2018-08-02 00:35:02 +02:00
|
|
|
color=random.choice(stream_colors),
|
|
|
|
id=subscription_id)
|
2018-08-17 00:51:32 +02:00
|
|
|
subscription_dict = model_to_dict(subscription, exclude=['user_profile', 'recipient_id'])
|
|
|
|
subscription_dict['user_profile'] = user_id
|
|
|
|
subscription_dict['recipient'] = recipient_id
|
|
|
|
return subscription_dict
|
2018-08-02 00:35:02 +02:00
|
|
|
|
2018-10-23 23:56:14 +02:00
|
|
|
def build_public_stream_subscriptions(
|
2018-09-28 13:00:32 +02:00
|
|
|
zerver_userprofile: List[ZerverFieldsT],
|
|
|
|
zerver_recipient: List[ZerverFieldsT],
|
|
|
|
zerver_stream: List[ZerverFieldsT]) -> List[ZerverFieldsT]:
|
|
|
|
'''
|
|
|
|
This function is only used for Hipchat now, but it may apply to
|
|
|
|
future conversions. We often don't get full subscriber data in
|
|
|
|
the Hipchat export, so this function just autosubscribes all
|
|
|
|
users to every public stream. This returns a list of Subscription
|
|
|
|
dicts.
|
|
|
|
'''
|
python: Convert assignment type annotations to Python 3.6 style.
This commit was split by tabbott; this piece covers the vast majority
of files in Zulip, but excludes scripts/, tools/, and puppet/ to help
ensure we at least show the right error messages for Xenial systems.
We can likely further refine the remaining pieces with some testing.
Generated by com2ann, with whitespace fixes and various manual fixes
for runtime issues:
- invoiced_through: Optional[LicenseLedger] = models.ForeignKey(
+ invoiced_through: Optional["LicenseLedger"] = models.ForeignKey(
-_apns_client: Optional[APNsClient] = None
+_apns_client: Optional["APNsClient"] = None
- notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- signup_notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ signup_notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- author: Optional[UserProfile] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
+ author: Optional["UserProfile"] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
- bot_owner: Optional[UserProfile] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
+ bot_owner: Optional["UserProfile"] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
- default_sending_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
- default_events_register_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_sending_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_events_register_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
-descriptors_by_handler_id: Dict[int, ClientDescriptor] = {}
+descriptors_by_handler_id: Dict[int, "ClientDescriptor"] = {}
-worker_classes: Dict[str, Type[QueueProcessingWorker]] = {}
-queues: Dict[str, Dict[str, Type[QueueProcessingWorker]]] = {}
+worker_classes: Dict[str, Type["QueueProcessingWorker"]] = {}
+queues: Dict[str, Dict[str, Type["QueueProcessingWorker"]]] = {}
-AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional[LDAPSearch] = None
+AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional["LDAPSearch"] = None
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-22 01:09:50 +02:00
|
|
|
subscriptions: List[ZerverFieldsT] = []
|
2018-09-28 13:00:32 +02:00
|
|
|
|
|
|
|
public_stream_ids = {
|
|
|
|
stream['id']
|
|
|
|
for stream in zerver_stream
|
|
|
|
if not stream['invite_only']
|
|
|
|
}
|
|
|
|
|
|
|
|
public_stream_recipient_ids = {
|
|
|
|
recipient['id']
|
|
|
|
for recipient in zerver_recipient
|
|
|
|
if recipient['type'] == Recipient.STREAM
|
|
|
|
and recipient['type_id'] in public_stream_ids
|
|
|
|
}
|
|
|
|
|
|
|
|
user_ids = [
|
|
|
|
user['id']
|
|
|
|
for user in zerver_userprofile
|
|
|
|
]
|
|
|
|
|
|
|
|
for recipient_id in public_stream_recipient_ids:
|
|
|
|
for user_id in user_ids:
|
|
|
|
subscription = build_subscription(
|
|
|
|
recipient_id=recipient_id,
|
|
|
|
user_id=user_id,
|
2018-10-24 18:15:29 +02:00
|
|
|
subscription_id=NEXT_ID('subscription'),
|
|
|
|
)
|
|
|
|
subscriptions.append(subscription)
|
|
|
|
|
|
|
|
return subscriptions
|
|
|
|
|
2019-01-10 01:17:54 +01:00
|
|
|
def build_stream_subscriptions(
|
2018-10-24 18:15:29 +02:00
|
|
|
get_users: Callable[..., Set[int]],
|
|
|
|
zerver_recipient: List[ZerverFieldsT],
|
|
|
|
zerver_stream: List[ZerverFieldsT]) -> List[ZerverFieldsT]:
|
|
|
|
|
python: Convert assignment type annotations to Python 3.6 style.
This commit was split by tabbott; this piece covers the vast majority
of files in Zulip, but excludes scripts/, tools/, and puppet/ to help
ensure we at least show the right error messages for Xenial systems.
We can likely further refine the remaining pieces with some testing.
Generated by com2ann, with whitespace fixes and various manual fixes
for runtime issues:
- invoiced_through: Optional[LicenseLedger] = models.ForeignKey(
+ invoiced_through: Optional["LicenseLedger"] = models.ForeignKey(
-_apns_client: Optional[APNsClient] = None
+_apns_client: Optional["APNsClient"] = None
- notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- signup_notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ signup_notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- author: Optional[UserProfile] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
+ author: Optional["UserProfile"] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
- bot_owner: Optional[UserProfile] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
+ bot_owner: Optional["UserProfile"] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
- default_sending_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
- default_events_register_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_sending_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_events_register_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
-descriptors_by_handler_id: Dict[int, ClientDescriptor] = {}
+descriptors_by_handler_id: Dict[int, "ClientDescriptor"] = {}
-worker_classes: Dict[str, Type[QueueProcessingWorker]] = {}
-queues: Dict[str, Dict[str, Type[QueueProcessingWorker]]] = {}
+worker_classes: Dict[str, Type["QueueProcessingWorker"]] = {}
+queues: Dict[str, Dict[str, Type["QueueProcessingWorker"]]] = {}
-AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional[LDAPSearch] = None
+AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional["LDAPSearch"] = None
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-22 01:09:50 +02:00
|
|
|
subscriptions: List[ZerverFieldsT] = []
|
2018-10-24 18:15:29 +02:00
|
|
|
|
2019-01-10 01:17:54 +01:00
|
|
|
stream_ids = {stream['id'] for stream in zerver_stream}
|
2018-10-24 18:15:29 +02:00
|
|
|
|
|
|
|
recipient_map = {
|
|
|
|
recipient['id']: recipient['type_id'] # recipient_id -> stream_id
|
|
|
|
for recipient in zerver_recipient
|
|
|
|
if recipient['type'] == Recipient.STREAM
|
|
|
|
and recipient['type_id'] in stream_ids
|
|
|
|
}
|
|
|
|
|
|
|
|
for recipient_id, stream_id in recipient_map.items():
|
|
|
|
user_ids = get_users(stream_id=stream_id)
|
|
|
|
for user_id in user_ids:
|
|
|
|
subscription = build_subscription(
|
|
|
|
recipient_id=recipient_id,
|
|
|
|
user_id=user_id,
|
2018-10-23 21:58:51 +02:00
|
|
|
subscription_id=NEXT_ID('subscription'),
|
2018-09-28 13:00:32 +02:00
|
|
|
)
|
|
|
|
subscriptions.append(subscription)
|
|
|
|
|
2018-10-23 23:56:14 +02:00
|
|
|
return subscriptions
|
|
|
|
|
2019-09-25 15:46:05 +02:00
|
|
|
def build_huddle_subscriptions(
|
|
|
|
get_users: Callable[..., Set[int]],
|
|
|
|
zerver_recipient: List[ZerverFieldsT],
|
|
|
|
zerver_huddle: List[ZerverFieldsT]) -> List[ZerverFieldsT]:
|
|
|
|
|
python: Convert assignment type annotations to Python 3.6 style.
This commit was split by tabbott; this piece covers the vast majority
of files in Zulip, but excludes scripts/, tools/, and puppet/ to help
ensure we at least show the right error messages for Xenial systems.
We can likely further refine the remaining pieces with some testing.
Generated by com2ann, with whitespace fixes and various manual fixes
for runtime issues:
- invoiced_through: Optional[LicenseLedger] = models.ForeignKey(
+ invoiced_through: Optional["LicenseLedger"] = models.ForeignKey(
-_apns_client: Optional[APNsClient] = None
+_apns_client: Optional["APNsClient"] = None
- notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- signup_notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ signup_notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- author: Optional[UserProfile] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
+ author: Optional["UserProfile"] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
- bot_owner: Optional[UserProfile] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
+ bot_owner: Optional["UserProfile"] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
- default_sending_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
- default_events_register_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_sending_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_events_register_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
-descriptors_by_handler_id: Dict[int, ClientDescriptor] = {}
+descriptors_by_handler_id: Dict[int, "ClientDescriptor"] = {}
-worker_classes: Dict[str, Type[QueueProcessingWorker]] = {}
-queues: Dict[str, Dict[str, Type[QueueProcessingWorker]]] = {}
+worker_classes: Dict[str, Type["QueueProcessingWorker"]] = {}
+queues: Dict[str, Dict[str, Type["QueueProcessingWorker"]]] = {}
-AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional[LDAPSearch] = None
+AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional["LDAPSearch"] = None
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-22 01:09:50 +02:00
|
|
|
subscriptions: List[ZerverFieldsT] = []
|
2019-09-25 15:46:05 +02:00
|
|
|
|
|
|
|
huddle_ids = {huddle['id'] for huddle in zerver_huddle}
|
|
|
|
|
|
|
|
recipient_map = {
|
|
|
|
recipient['id']: recipient['type_id'] # recipient_id -> stream_id
|
|
|
|
for recipient in zerver_recipient
|
|
|
|
if recipient['type'] == Recipient.HUDDLE
|
|
|
|
and recipient['type_id'] in huddle_ids
|
|
|
|
}
|
|
|
|
|
|
|
|
for recipient_id, huddle_id in recipient_map.items():
|
|
|
|
user_ids = get_users(huddle_id=huddle_id)
|
|
|
|
for user_id in user_ids:
|
|
|
|
subscription = build_subscription(
|
|
|
|
recipient_id=recipient_id,
|
|
|
|
user_id=user_id,
|
|
|
|
subscription_id=NEXT_ID('subscription'),
|
|
|
|
)
|
|
|
|
subscriptions.append(subscription)
|
|
|
|
|
|
|
|
return subscriptions
|
|
|
|
|
2018-10-23 23:56:14 +02:00
|
|
|
def build_personal_subscriptions(zerver_recipient: List[ZerverFieldsT]) -> List[ZerverFieldsT]:
|
|
|
|
|
python: Convert assignment type annotations to Python 3.6 style.
This commit was split by tabbott; this piece covers the vast majority
of files in Zulip, but excludes scripts/, tools/, and puppet/ to help
ensure we at least show the right error messages for Xenial systems.
We can likely further refine the remaining pieces with some testing.
Generated by com2ann, with whitespace fixes and various manual fixes
for runtime issues:
- invoiced_through: Optional[LicenseLedger] = models.ForeignKey(
+ invoiced_through: Optional["LicenseLedger"] = models.ForeignKey(
-_apns_client: Optional[APNsClient] = None
+_apns_client: Optional["APNsClient"] = None
- notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- signup_notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ signup_notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- author: Optional[UserProfile] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
+ author: Optional["UserProfile"] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
- bot_owner: Optional[UserProfile] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
+ bot_owner: Optional["UserProfile"] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
- default_sending_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
- default_events_register_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_sending_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_events_register_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
-descriptors_by_handler_id: Dict[int, ClientDescriptor] = {}
+descriptors_by_handler_id: Dict[int, "ClientDescriptor"] = {}
-worker_classes: Dict[str, Type[QueueProcessingWorker]] = {}
-queues: Dict[str, Dict[str, Type[QueueProcessingWorker]]] = {}
+worker_classes: Dict[str, Type["QueueProcessingWorker"]] = {}
+queues: Dict[str, Dict[str, Type["QueueProcessingWorker"]]] = {}
-AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional[LDAPSearch] = None
+AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional["LDAPSearch"] = None
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-22 01:09:50 +02:00
|
|
|
subscriptions: List[ZerverFieldsT] = []
|
2018-10-23 23:56:14 +02:00
|
|
|
|
2018-09-28 13:00:32 +02:00
|
|
|
personal_recipients = [
|
|
|
|
recipient
|
|
|
|
for recipient in zerver_recipient
|
|
|
|
if recipient['type'] == Recipient.PERSONAL
|
|
|
|
]
|
|
|
|
|
|
|
|
for recipient in personal_recipients:
|
|
|
|
recipient_id = recipient['id']
|
|
|
|
user_id = recipient['type_id']
|
|
|
|
subscription = build_subscription(
|
|
|
|
recipient_id=recipient_id,
|
|
|
|
user_id=user_id,
|
2018-10-23 21:58:51 +02:00
|
|
|
subscription_id=NEXT_ID('subscription'),
|
2018-09-28 13:00:32 +02:00
|
|
|
)
|
|
|
|
subscriptions.append(subscription)
|
|
|
|
|
|
|
|
return subscriptions
|
|
|
|
|
2018-08-02 00:35:02 +02:00
|
|
|
def build_recipient(type_id: int, recipient_id: int, type: int) -> ZerverFieldsT:
|
2018-08-17 00:51:32 +02:00
|
|
|
recipient = Recipient(
|
2018-08-02 00:35:02 +02:00
|
|
|
type_id=type_id, # stream id
|
|
|
|
id=recipient_id,
|
|
|
|
type=type)
|
2018-08-17 00:51:32 +02:00
|
|
|
recipient_dict = model_to_dict(recipient)
|
|
|
|
return recipient_dict
|
2018-08-02 15:24:34 +02:00
|
|
|
|
2020-06-13 05:24:42 +02:00
|
|
|
def build_recipients(zerver_userprofile: Iterable[ZerverFieldsT],
|
|
|
|
zerver_stream: Iterable[ZerverFieldsT],
|
|
|
|
zerver_huddle: Iterable[ZerverFieldsT] = []) -> List[ZerverFieldsT]:
|
2018-09-28 13:00:32 +02:00
|
|
|
'''
|
|
|
|
As of this writing, we only use this in the HipChat
|
|
|
|
conversion. The Slack and Gitter conversions do it more
|
|
|
|
tightly integrated with creating other objects.
|
|
|
|
'''
|
|
|
|
|
|
|
|
recipients = []
|
|
|
|
|
|
|
|
for user in zerver_userprofile:
|
|
|
|
type_id = user['id']
|
|
|
|
type = Recipient.PERSONAL
|
|
|
|
recipient = Recipient(
|
|
|
|
type_id=type_id,
|
2018-10-23 21:58:51 +02:00
|
|
|
id=NEXT_ID('recipient'),
|
2018-09-28 13:00:32 +02:00
|
|
|
type=type,
|
|
|
|
)
|
|
|
|
recipient_dict = model_to_dict(recipient)
|
|
|
|
recipients.append(recipient_dict)
|
|
|
|
|
|
|
|
for stream in zerver_stream:
|
|
|
|
type_id = stream['id']
|
|
|
|
type = Recipient.STREAM
|
|
|
|
recipient = Recipient(
|
|
|
|
type_id=type_id,
|
2018-10-23 21:58:51 +02:00
|
|
|
id=NEXT_ID('recipient'),
|
2018-09-28 13:00:32 +02:00
|
|
|
type=type,
|
|
|
|
)
|
|
|
|
recipient_dict = model_to_dict(recipient)
|
|
|
|
recipients.append(recipient_dict)
|
|
|
|
|
2019-09-25 15:46:05 +02:00
|
|
|
for huddle in zerver_huddle:
|
|
|
|
type_id = huddle['id']
|
|
|
|
type = Recipient.HUDDLE
|
|
|
|
recipient = Recipient(
|
|
|
|
type_id=type_id,
|
|
|
|
id=NEXT_ID('recipient'),
|
|
|
|
type=type,
|
|
|
|
)
|
|
|
|
recipient_dict = model_to_dict(recipient)
|
|
|
|
recipients.append(recipient_dict)
|
2018-09-28 13:00:32 +02:00
|
|
|
return recipients
|
|
|
|
|
2018-08-10 02:27:17 +02:00
|
|
|
def build_realm(zerver_realm: List[ZerverFieldsT], realm_id: int,
|
|
|
|
domain_name: str) -> ZerverFieldsT:
|
|
|
|
realm = dict(zerver_client=[{"name": "populate_db", "id": 1},
|
|
|
|
{"name": "website", "id": 2},
|
|
|
|
{"name": "API", "id": 3}],
|
|
|
|
zerver_customprofilefield=[],
|
|
|
|
zerver_customprofilefieldvalue=[],
|
|
|
|
zerver_userpresence=[], # shows last logged in data, which is not available
|
|
|
|
zerver_userprofile_mirrordummy=[],
|
|
|
|
zerver_realmdomain=[{"realm": realm_id,
|
|
|
|
"allow_subdomains": False,
|
|
|
|
"domain": domain_name,
|
|
|
|
"id": realm_id}],
|
|
|
|
zerver_useractivity=[],
|
|
|
|
zerver_realm=zerver_realm,
|
|
|
|
zerver_huddle=[],
|
|
|
|
zerver_userprofile_crossrealm=[],
|
|
|
|
zerver_useractivityinterval=[],
|
|
|
|
zerver_reaction=[],
|
|
|
|
zerver_realmemoji=[],
|
|
|
|
zerver_realmfilter=[])
|
|
|
|
return realm
|
|
|
|
|
2018-10-23 22:45:43 +02:00
|
|
|
def build_usermessages(zerver_usermessage: List[ZerverFieldsT],
|
2018-10-25 17:33:52 +02:00
|
|
|
subscriber_map: Dict[int, Set[int]],
|
|
|
|
recipient_id: int,
|
|
|
|
mentioned_user_ids: List[int],
|
2018-12-17 02:26:51 +01:00
|
|
|
message_id: int,
|
2019-07-02 07:41:51 +02:00
|
|
|
is_private: bool,
|
2020-06-13 03:34:01 +02:00
|
|
|
long_term_idle: AbstractSet[int] = set()) -> Tuple[int, int]:
|
2018-10-25 17:33:52 +02:00
|
|
|
user_ids = subscriber_map.get(recipient_id, set())
|
|
|
|
|
2018-12-17 02:26:51 +01:00
|
|
|
user_messages_created = 0
|
|
|
|
user_messages_skipped = 0
|
2018-10-25 17:33:52 +02:00
|
|
|
if user_ids:
|
|
|
|
for user_id in sorted(user_ids):
|
|
|
|
is_mentioned = user_id in mentioned_user_ids
|
2018-10-25 16:33:50 +02:00
|
|
|
|
2018-12-17 02:26:51 +01:00
|
|
|
if not is_mentioned and not is_private and user_id in long_term_idle:
|
|
|
|
# these users are long-term idle
|
|
|
|
user_messages_skipped += 1
|
|
|
|
continue
|
|
|
|
user_messages_created += 1
|
|
|
|
|
2018-10-25 16:33:50 +02:00
|
|
|
usermessage = build_user_message(
|
|
|
|
user_id=user_id,
|
|
|
|
message_id=message_id,
|
|
|
|
is_private=is_private,
|
|
|
|
is_mentioned=is_mentioned,
|
|
|
|
)
|
|
|
|
|
2018-08-03 21:11:47 +02:00
|
|
|
zerver_usermessage.append(usermessage)
|
2018-12-17 02:26:51 +01:00
|
|
|
return (user_messages_created, user_messages_skipped)
|
2018-08-03 21:11:47 +02:00
|
|
|
|
2018-10-25 16:33:50 +02:00
|
|
|
def build_user_message(user_id: int,
|
2018-09-29 21:11:22 +02:00
|
|
|
message_id: int,
|
2018-10-25 15:58:53 +02:00
|
|
|
is_private: bool,
|
2018-09-29 21:11:22 +02:00
|
|
|
is_mentioned: bool) -> ZerverFieldsT:
|
|
|
|
flags_mask = 1 # For read
|
|
|
|
if is_mentioned:
|
|
|
|
flags_mask += 8 # For mentioned
|
2018-10-25 15:58:53 +02:00
|
|
|
if is_private:
|
|
|
|
flags_mask += 2048 # For is_private
|
2018-09-29 21:11:22 +02:00
|
|
|
|
2018-10-25 16:33:50 +02:00
|
|
|
id = NEXT_ID('user_message')
|
|
|
|
|
2018-09-29 21:11:22 +02:00
|
|
|
usermessage = dict(
|
|
|
|
id=id,
|
|
|
|
user_profile=user_id,
|
|
|
|
message=message_id,
|
|
|
|
flags_mask=flags_mask,
|
|
|
|
)
|
|
|
|
return usermessage
|
|
|
|
|
2018-08-03 21:19:47 +02:00
|
|
|
def build_defaultstream(realm_id: int, stream_id: int,
|
|
|
|
defaultstream_id: int) -> ZerverFieldsT:
|
|
|
|
defaultstream = dict(
|
|
|
|
stream=stream_id,
|
|
|
|
realm=realm_id,
|
|
|
|
id=defaultstream_id)
|
|
|
|
return defaultstream
|
|
|
|
|
2018-08-17 20:17:28 +02:00
|
|
|
def build_stream(date_created: Any, realm_id: int, name: str,
|
|
|
|
description: str, stream_id: int, deactivated: bool=False,
|
|
|
|
invite_only: bool=False) -> ZerverFieldsT:
|
|
|
|
stream = Stream(
|
|
|
|
name=name,
|
|
|
|
deactivated=deactivated,
|
2019-02-20 21:09:21 +01:00
|
|
|
description=description.replace("\n", " "),
|
2019-01-11 13:48:22 +01:00
|
|
|
# We don't set rendered_description here; it'll be added on import
|
2018-08-17 20:17:28 +02:00
|
|
|
date_created=date_created,
|
|
|
|
invite_only=invite_only,
|
|
|
|
id=stream_id)
|
|
|
|
stream_dict = model_to_dict(stream,
|
|
|
|
exclude=['realm'])
|
|
|
|
stream_dict['realm'] = realm_id
|
|
|
|
return stream_dict
|
|
|
|
|
2019-07-02 07:41:51 +02:00
|
|
|
def build_huddle(huddle_id: int) -> ZerverFieldsT:
|
|
|
|
huddle = Huddle(
|
python: Use trailing commas consistently.
Automatically generated by the following script, based on the output
of lint with flake8-comma:
import re
import sys
last_filename = None
last_row = None
lines = []
for msg in sys.stdin:
m = re.match(
r"\x1b\[35mflake8 \|\x1b\[0m \x1b\[1;31m(.+):(\d+):(\d+): (\w+)", msg
)
if m:
filename, row_str, col_str, err = m.groups()
row, col = int(row_str), int(col_str)
if filename == last_filename:
assert last_row != row
else:
if last_filename is not None:
with open(last_filename, "w") as f:
f.writelines(lines)
with open(filename) as f:
lines = f.readlines()
last_filename = filename
last_row = row
line = lines[row - 1]
if err in ["C812", "C815"]:
lines[row - 1] = line[: col - 1] + "," + line[col - 1 :]
elif err in ["C819"]:
assert line[col - 2] == ","
lines[row - 1] = line[: col - 2] + line[col - 1 :].lstrip(" ")
if last_filename is not None:
with open(last_filename, "w") as f:
f.writelines(lines)
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-10 05:23:40 +02:00
|
|
|
id=huddle_id,
|
2019-07-02 07:41:51 +02:00
|
|
|
)
|
|
|
|
return model_to_dict(huddle)
|
|
|
|
|
2019-08-28 02:43:19 +02:00
|
|
|
def build_message(topic_name: str, date_sent: float, message_id: int, content: str,
|
2018-08-17 23:47:37 +02:00
|
|
|
rendered_content: Optional[str], user_id: int, recipient_id: int,
|
|
|
|
has_image: bool=False, has_link: bool=False,
|
|
|
|
has_attachment: bool=True) -> ZerverFieldsT:
|
|
|
|
zulip_message = Message(
|
|
|
|
rendered_content_version=1, # this is Zulip specific
|
2019-08-28 02:43:19 +02:00
|
|
|
date_sent=date_sent,
|
2018-08-17 23:47:37 +02:00
|
|
|
id=message_id,
|
|
|
|
content=content,
|
|
|
|
rendered_content=rendered_content,
|
|
|
|
has_image=has_image,
|
|
|
|
has_attachment=has_attachment,
|
|
|
|
has_link=has_link)
|
2018-11-10 17:10:45 +01:00
|
|
|
zulip_message.set_topic_name(topic_name)
|
2018-08-17 23:47:37 +02:00
|
|
|
zulip_message_dict = model_to_dict(zulip_message,
|
|
|
|
exclude=['recipient', 'sender', 'sending_client'])
|
|
|
|
zulip_message_dict['sender'] = user_id
|
|
|
|
zulip_message_dict['sending_client'] = 1
|
|
|
|
zulip_message_dict['recipient'] = recipient_id
|
|
|
|
|
|
|
|
return zulip_message_dict
|
|
|
|
|
2018-10-28 18:32:15 +01:00
|
|
|
def build_attachment(realm_id: int, message_ids: Set[int],
|
2018-08-03 22:33:41 +02:00
|
|
|
user_id: int, fileinfo: ZerverFieldsT, s3_path: str,
|
|
|
|
zerver_attachment: List[ZerverFieldsT]) -> None:
|
|
|
|
"""
|
|
|
|
This function should be passed a 'fileinfo' dictionary, which contains
|
|
|
|
information about 'size', 'created' (created time) and ['name'] (filename).
|
|
|
|
"""
|
2018-10-28 18:32:15 +01:00
|
|
|
attachment_id = NEXT_ID('attachment')
|
|
|
|
|
2018-08-17 02:21:52 +02:00
|
|
|
attachment = Attachment(
|
2018-08-03 22:33:41 +02:00
|
|
|
id=attachment_id,
|
|
|
|
size=fileinfo['size'],
|
|
|
|
create_time=fileinfo['created'],
|
|
|
|
is_realm_public=True,
|
|
|
|
path_id=s3_path,
|
|
|
|
file_name=fileinfo['name'])
|
2018-08-17 02:21:52 +02:00
|
|
|
|
|
|
|
attachment_dict = model_to_dict(attachment,
|
|
|
|
exclude=['owner', 'messages', 'realm'])
|
|
|
|
attachment_dict['owner'] = user_id
|
2018-10-13 22:04:42 +02:00
|
|
|
attachment_dict['messages'] = list(message_ids)
|
2018-08-17 02:21:52 +02:00
|
|
|
attachment_dict['realm'] = realm_id
|
|
|
|
|
|
|
|
zerver_attachment.append(attachment_dict)
|
2018-08-03 22:33:41 +02:00
|
|
|
|
2018-08-02 15:24:34 +02:00
|
|
|
def process_avatars(avatar_list: List[ZerverFieldsT], avatar_dir: str, realm_id: int,
|
|
|
|
threads: int, size_url_suffix: str='') -> List[ZerverFieldsT]:
|
|
|
|
"""
|
|
|
|
This function gets the avatar of the user and saves it in the
|
|
|
|
user's avatar directory with both the extensions '.png' and '.original'
|
|
|
|
Required parameters:
|
|
|
|
|
|
|
|
1. avatar_list: List of avatars to be mapped in avatars records.json file
|
|
|
|
2. avatar_dir: Folder where the downloaded avatars are saved
|
|
|
|
3. realm_id: Realm ID.
|
2018-09-29 03:11:55 +02:00
|
|
|
|
|
|
|
We use this for Slack and Gitter conversions, where avatars need to be
|
|
|
|
downloaded. For simpler conversions see write_avatar_png.
|
2018-08-02 15:24:34 +02:00
|
|
|
"""
|
|
|
|
|
2018-12-01 01:15:55 +01:00
|
|
|
def get_avatar(avatar_upload_item: List[str]) -> None:
|
2018-11-09 00:03:39 +01:00
|
|
|
avatar_url = avatar_upload_item[0]
|
2018-09-01 14:23:04 +02:00
|
|
|
|
2018-11-09 00:03:39 +01:00
|
|
|
image_path = os.path.join(avatar_dir, avatar_upload_item[1])
|
|
|
|
original_image_path = os.path.join(avatar_dir, avatar_upload_item[2])
|
2018-09-01 14:23:04 +02:00
|
|
|
|
2018-08-02 15:24:34 +02:00
|
|
|
response = requests.get(avatar_url + size_url_suffix, stream=True)
|
|
|
|
with open(image_path, 'wb') as image_file:
|
|
|
|
shutil.copyfileobj(response.raw, image_file)
|
|
|
|
shutil.copy(image_path, original_image_path)
|
|
|
|
|
|
|
|
logging.info('######### GETTING AVATARS #########\n')
|
|
|
|
logging.info('DOWNLOADING AVATARS .......\n')
|
|
|
|
avatar_original_list = []
|
|
|
|
avatar_upload_list = []
|
|
|
|
for avatar in avatar_list:
|
|
|
|
avatar_hash = user_avatar_path_from_ids(avatar['user_profile_id'], realm_id)
|
|
|
|
avatar_url = avatar['path']
|
|
|
|
avatar_original = dict(avatar)
|
|
|
|
|
2020-06-10 06:41:04 +02:00
|
|
|
image_path = f'{avatar_hash}.png'
|
|
|
|
original_image_path = f'{avatar_hash}.original'
|
2018-08-02 15:24:34 +02:00
|
|
|
|
|
|
|
avatar_upload_list.append([avatar_url, image_path, original_image_path])
|
|
|
|
# We don't add the size field here in avatar's records.json,
|
|
|
|
# since the metadata is not needed on the import end, and we
|
|
|
|
# don't have it until we've downloaded the files anyway.
|
|
|
|
avatar['path'] = image_path
|
|
|
|
avatar['s3_path'] = image_path
|
|
|
|
|
|
|
|
avatar_original['path'] = original_image_path
|
|
|
|
avatar_original['s3_path'] = original_image_path
|
|
|
|
avatar_original_list.append(avatar_original)
|
|
|
|
|
2020-03-28 01:25:56 +01:00
|
|
|
# Run downloads in parallel
|
2018-08-02 15:24:34 +02:00
|
|
|
output = []
|
2018-12-01 01:15:55 +01:00
|
|
|
for (status, job) in run_parallel_wrapper(get_avatar, avatar_upload_list, threads=threads):
|
2018-08-02 15:24:34 +02:00
|
|
|
output.append(job)
|
|
|
|
|
|
|
|
logging.info('######### GETTING AVATARS FINISHED #########\n')
|
|
|
|
return avatar_list + avatar_original_list
|
2018-08-03 19:15:01 +02:00
|
|
|
|
2018-09-29 03:11:55 +02:00
|
|
|
def write_avatar_png(avatar_folder: str,
|
|
|
|
realm_id: int,
|
|
|
|
user_id: int,
|
|
|
|
bits: bytes) -> ZerverFieldsT:
|
|
|
|
'''
|
|
|
|
Use this function for conversions like Hipchat where
|
|
|
|
the bits for the .png file come in something like
|
|
|
|
a users.json file, and where we don't have to
|
|
|
|
fetch avatar images externally.
|
|
|
|
'''
|
|
|
|
avatar_hash = user_avatar_path_from_ids(
|
|
|
|
user_profile_id=user_id,
|
|
|
|
realm_id=realm_id,
|
|
|
|
)
|
|
|
|
|
|
|
|
image_fn = avatar_hash + '.original'
|
|
|
|
image_path = os.path.join(avatar_folder, image_fn)
|
|
|
|
|
|
|
|
with open(image_path, 'wb') as image_file:
|
|
|
|
image_file.write(bits)
|
|
|
|
|
|
|
|
# Return metadata that eventually goes in records.json.
|
|
|
|
metadata = dict(
|
|
|
|
path=image_path,
|
|
|
|
s3_path=image_path,
|
|
|
|
realm_id=realm_id,
|
|
|
|
user_profile_id=user_id,
|
2018-11-27 02:28:34 +01:00
|
|
|
# We only write the .original file; ask the importer to do the thumbnailing.
|
|
|
|
importer_should_thumbnail=True,
|
2018-09-29 03:11:55 +02:00
|
|
|
)
|
|
|
|
|
|
|
|
return metadata
|
|
|
|
|
2018-12-01 01:15:55 +01:00
|
|
|
ListJobData = TypeVar('ListJobData')
|
|
|
|
def run_parallel_wrapper(f: Callable[[ListJobData], None], full_items: List[ListJobData],
|
|
|
|
threads: int=6) -> Iterable[Tuple[int, List[ListJobData]]]:
|
2020-05-02 08:44:14 +02:00
|
|
|
logging.info("Distributing %s items across %s threads", len(full_items), threads)
|
2018-12-01 01:15:55 +01:00
|
|
|
|
|
|
|
def wrapping_function(items: List[ListJobData]) -> int:
|
|
|
|
count = 0
|
|
|
|
for item in items:
|
|
|
|
try:
|
|
|
|
f(item)
|
|
|
|
except Exception:
|
2020-06-12 01:35:37 +02:00
|
|
|
logging.exception("Error processing item: %s", item)
|
2018-12-01 01:15:55 +01:00
|
|
|
count += 1
|
|
|
|
if count % 1000 == 0:
|
2020-05-02 08:44:14 +02:00
|
|
|
logging.info("A download thread finished %s items", count)
|
2018-12-01 01:15:55 +01:00
|
|
|
return 0
|
python: Convert assignment type annotations to Python 3.6 style.
This commit was split by tabbott; this piece covers the vast majority
of files in Zulip, but excludes scripts/, tools/, and puppet/ to help
ensure we at least show the right error messages for Xenial systems.
We can likely further refine the remaining pieces with some testing.
Generated by com2ann, with whitespace fixes and various manual fixes
for runtime issues:
- invoiced_through: Optional[LicenseLedger] = models.ForeignKey(
+ invoiced_through: Optional["LicenseLedger"] = models.ForeignKey(
-_apns_client: Optional[APNsClient] = None
+_apns_client: Optional["APNsClient"] = None
- notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- signup_notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ signup_notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- author: Optional[UserProfile] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
+ author: Optional["UserProfile"] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
- bot_owner: Optional[UserProfile] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
+ bot_owner: Optional["UserProfile"] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
- default_sending_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
- default_events_register_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_sending_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_events_register_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
-descriptors_by_handler_id: Dict[int, ClientDescriptor] = {}
+descriptors_by_handler_id: Dict[int, "ClientDescriptor"] = {}
-worker_classes: Dict[str, Type[QueueProcessingWorker]] = {}
-queues: Dict[str, Dict[str, Type[QueueProcessingWorker]]] = {}
+worker_classes: Dict[str, Type["QueueProcessingWorker"]] = {}
+queues: Dict[str, Dict[str, Type["QueueProcessingWorker"]]] = {}
-AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional[LDAPSearch] = None
+AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional["LDAPSearch"] = None
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-22 01:09:50 +02:00
|
|
|
job_lists: List[List[ListJobData]] = [full_items[i::threads] for i in range(threads)]
|
2018-12-01 01:15:55 +01:00
|
|
|
return run_parallel(wrapping_function, job_lists, threads=threads)
|
|
|
|
|
2018-08-03 19:15:01 +02:00
|
|
|
def process_uploads(upload_list: List[ZerverFieldsT], upload_dir: str,
|
|
|
|
threads: int) -> List[ZerverFieldsT]:
|
|
|
|
"""
|
|
|
|
This function downloads the uploads and saves it in the realm's upload directory.
|
|
|
|
Required parameters:
|
|
|
|
|
|
|
|
1. upload_list: List of uploads to be mapped in uploads records.json file
|
|
|
|
2. upload_dir: Folder where the downloaded uploads are saved
|
|
|
|
"""
|
2018-12-01 01:15:55 +01:00
|
|
|
def get_uploads(upload: List[str]) -> None:
|
2018-08-03 19:15:01 +02:00
|
|
|
upload_url = upload[0]
|
|
|
|
upload_path = upload[1]
|
|
|
|
upload_path = os.path.join(upload_dir, upload_path)
|
|
|
|
|
|
|
|
response = requests.get(upload_url, stream=True)
|
|
|
|
os.makedirs(os.path.dirname(upload_path), exist_ok=True)
|
|
|
|
with open(upload_path, 'wb') as upload_file:
|
|
|
|
shutil.copyfileobj(response.raw, upload_file)
|
|
|
|
|
|
|
|
logging.info('######### GETTING ATTACHMENTS #########\n')
|
|
|
|
logging.info('DOWNLOADING ATTACHMENTS .......\n')
|
|
|
|
upload_url_list = []
|
|
|
|
for upload in upload_list:
|
|
|
|
upload_url = upload['path']
|
|
|
|
upload_s3_path = upload['s3_path']
|
|
|
|
upload_url_list.append([upload_url, upload_s3_path])
|
|
|
|
upload['path'] = upload_s3_path
|
|
|
|
|
2020-03-28 01:25:56 +01:00
|
|
|
# Run downloads in parallel
|
2018-08-03 19:15:01 +02:00
|
|
|
output = []
|
2018-12-01 01:15:55 +01:00
|
|
|
for (status, job) in run_parallel_wrapper(get_uploads, upload_url_list, threads=threads):
|
2018-08-03 19:15:01 +02:00
|
|
|
output.append(job)
|
|
|
|
|
|
|
|
logging.info('######### GETTING ATTACHMENTS FINISHED #########\n')
|
|
|
|
return upload_list
|
|
|
|
|
2018-09-29 15:43:53 +02:00
|
|
|
def build_realm_emoji(realm_id: int,
|
|
|
|
name: str,
|
|
|
|
id: int,
|
|
|
|
file_name: str) -> ZerverFieldsT:
|
|
|
|
return model_to_dict(
|
|
|
|
RealmEmoji(
|
|
|
|
realm_id=realm_id,
|
|
|
|
name=name,
|
|
|
|
id=id,
|
|
|
|
file_name=file_name,
|
python: Use trailing commas consistently.
Automatically generated by the following script, based on the output
of lint with flake8-comma:
import re
import sys
last_filename = None
last_row = None
lines = []
for msg in sys.stdin:
m = re.match(
r"\x1b\[35mflake8 \|\x1b\[0m \x1b\[1;31m(.+):(\d+):(\d+): (\w+)", msg
)
if m:
filename, row_str, col_str, err = m.groups()
row, col = int(row_str), int(col_str)
if filename == last_filename:
assert last_row != row
else:
if last_filename is not None:
with open(last_filename, "w") as f:
f.writelines(lines)
with open(filename) as f:
lines = f.readlines()
last_filename = filename
last_row = row
line = lines[row - 1]
if err in ["C812", "C815"]:
lines[row - 1] = line[: col - 1] + "," + line[col - 1 :]
elif err in ["C819"]:
assert line[col - 2] == ","
lines[row - 1] = line[: col - 2] + line[col - 1 :].lstrip(" ")
if last_filename is not None:
with open(last_filename, "w") as f:
f.writelines(lines)
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-10 05:23:40 +02:00
|
|
|
),
|
2018-09-29 15:43:53 +02:00
|
|
|
)
|
|
|
|
|
2018-08-03 19:15:01 +02:00
|
|
|
def process_emojis(zerver_realmemoji: List[ZerverFieldsT], emoji_dir: str,
|
|
|
|
emoji_url_map: ZerverFieldsT, threads: int) -> List[ZerverFieldsT]:
|
|
|
|
"""
|
|
|
|
This function downloads the custom emojis and saves in the output emoji folder.
|
|
|
|
Required parameters:
|
|
|
|
|
|
|
|
1. zerver_realmemoji: List of all RealmEmoji objects to be imported
|
|
|
|
2. emoji_dir: Folder where the downloaded emojis are saved
|
|
|
|
3. emoji_url_map: Maps emoji name to its url
|
|
|
|
"""
|
2018-12-01 01:15:55 +01:00
|
|
|
def get_emojis(upload: List[str]) -> None:
|
2018-08-03 19:15:01 +02:00
|
|
|
emoji_url = upload[0]
|
|
|
|
emoji_path = upload[1]
|
|
|
|
upload_emoji_path = os.path.join(emoji_dir, emoji_path)
|
|
|
|
|
|
|
|
response = requests.get(emoji_url, stream=True)
|
|
|
|
os.makedirs(os.path.dirname(upload_emoji_path), exist_ok=True)
|
|
|
|
with open(upload_emoji_path, 'wb') as emoji_file:
|
|
|
|
shutil.copyfileobj(response.raw, emoji_file)
|
|
|
|
|
|
|
|
emoji_records = []
|
|
|
|
upload_emoji_list = []
|
|
|
|
logging.info('######### GETTING EMOJIS #########\n')
|
|
|
|
logging.info('DOWNLOADING EMOJIS .......\n')
|
|
|
|
for emoji in zerver_realmemoji:
|
|
|
|
emoji_url = emoji_url_map[emoji['name']]
|
|
|
|
emoji_path = RealmEmoji.PATH_ID_TEMPLATE.format(
|
|
|
|
realm_id=emoji['realm'],
|
|
|
|
emoji_file_name=emoji['name'])
|
|
|
|
|
|
|
|
upload_emoji_list.append([emoji_url, emoji_path])
|
|
|
|
|
|
|
|
emoji_record = dict(emoji)
|
|
|
|
emoji_record['path'] = emoji_path
|
|
|
|
emoji_record['s3_path'] = emoji_path
|
|
|
|
emoji_record['realm_id'] = emoji_record['realm']
|
|
|
|
emoji_record.pop('realm')
|
|
|
|
|
|
|
|
emoji_records.append(emoji_record)
|
|
|
|
|
2020-03-28 01:25:56 +01:00
|
|
|
# Run downloads in parallel
|
2018-08-03 19:15:01 +02:00
|
|
|
output = []
|
2018-12-01 01:15:55 +01:00
|
|
|
for (status, job) in run_parallel_wrapper(get_emojis, upload_emoji_list, threads=threads):
|
2018-08-03 19:15:01 +02:00
|
|
|
output.append(job)
|
|
|
|
|
|
|
|
logging.info('######### GETTING EMOJIS FINISHED #########\n')
|
|
|
|
return emoji_records
|
2018-10-13 16:41:18 +02:00
|
|
|
|
|
|
|
def create_converted_data_files(data: Any, output_dir: str, file_path: str) -> None:
|
|
|
|
output_file = output_dir + file_path
|
|
|
|
os.makedirs(os.path.dirname(output_file), exist_ok=True)
|
2018-10-17 01:14:09 +02:00
|
|
|
with open(output_file, 'w') as fp:
|
|
|
|
ujson.dump(data, fp, indent=4)
|