paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-31 20:13:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extract get_stream_recipient().

Browse Source 
Do you call get_recipient(Recipient.STREAM, stream_id) or
get_recipient(stream_id, Recipient.STREAM)?  I could never
remember, and it was not very type safe, since both parameters
are integers.
This commit is contained in:
Steve Howell
2017-10-28 11:26:11 -07:00
committed by Tim Abbott
parent b7a9068724
commit a28841e8aa
16 changed files with 45 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zerver/management/commands/merge_streams.py
View File

@@ -5,7 +5,7 @@ from zerver.lib.actions import bulk_remove_subscriptions, bulk_add_subscriptions
do_deactivate_stream
from zerver.lib.cache import cache_delete_many, to_dict_cache_key_id
from zerver.lib.management import ZulipBaseCommand
from zerver.models import get_stream, Subscription, Recipient, get_recipient, Message
from zerver.models import get_stream, Subscription, Recipient, get_stream_recipient, Message
from argparse import ArgumentParser
@@ -34,8 +34,8 @@ class Command(ZulipBaseCommand):
stream_to_keep = get_stream(options["stream_to_keep"], realm)
stream_to_destroy = get_stream(options["stream_to_destroy"], realm)
recipient_to_destroy = get_recipient(Recipient.STREAM, stream_to_destroy.id)
recipient_to_keep = get_recipient(Recipient.STREAM, stream_to_keep.id)
recipient_to_destroy = get_stream_recipient(stream_to_destroy.id)
recipient_to_keep = get_stream_recipient(stream_to_keep.id)
# The high-level approach here is to move all the messages to
# the surviving stream, deactivate all the subscriptions on