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

Replace do_add_subscription() in add_users_to_streams.

This commit is contained in:
Steve Howell 2016-10-19 16:10:15 -07:00 committed by Tim Abbott
parent bea8ba620b
commit 98e4452e07
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zerver/management/commands/add_users_to_streams.py
View File

@ -7,7 +7,7 @@ from typing import Any
from django.core.management.base import BaseCommand from django.core.management.base import BaseCommand
from zerver.lib.actions import create_stream_if_needed, do_add_subscription from zerver.lib.actions import create_stream_if_needed, bulk_add_subscriptions
from zerver.models import UserProfile, get_realm, get_user_profile_by_email from zerver.models import UserProfile, get_realm, get_user_profile_by_email
class Command(BaseCommand): class Command(BaseCommand):
@ -54,7 +54,8 @@ class Command(BaseCommand):
for stream_name in set(stream_names): for stream_name in set(stream_names):
for user_profile in user_profiles: for user_profile in user_profiles:
stream, _ = create_stream_if_needed(user_profile.realm, stream_name) stream, _ = create_stream_if_needed(user_profile.realm, stream_name)
did_subscribe = do_add_subscription(user_profile, stream) _ignore, already_subscribed = bulk_add_subscriptions([stream], [user_profile])
was_there_already = user_profile.id in {tup[0].id for tup in already_subscribed}
print("%s %s to %s" % ( print("%s %s to %s" % (
"Subscribed" if did_subscribe else "Already subscribed", "Already subscribed" if was_there_already else "Subscribed",
user_profile.email, stream_name)) user_profile.email, stream_name))