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

Extract is_active_subscriber() helper for streams views.

This commit is contained in:
Steve Howell 2016-11-05 08:10:14 -07:00 committed by Tim Abbott
parent 7c0970d171
commit 89b2e51129
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zerver/views/streams.py
View File

@ -31,6 +31,12 @@ from six.moves import urllib
import six import six
from six import text_type from six import text_type
def is_active_subscriber(user_profile, recipient):
# type: (UserProfile, Recipient) -> bool
return Subscription.objects.filter(user_profile=user_profile,
recipient=recipient,
active=True).exists()
def list_to_streams(streams_raw, user_profile, autocreate=False, invite_only=False): def list_to_streams(streams_raw, user_profile, autocreate=False, invite_only=False):
# type: (Iterable[text_type], UserProfile, Optional[bool], Optional[bool]) -> Tuple[List[Stream], List[Stream]] # type: (Iterable[text_type], UserProfile, Optional[bool], Optional[bool]) -> Tuple[List[Stream], List[Stream]]
"""Converts plaintext stream names to a list of Streams, validating input in the process """Converts plaintext stream names to a list of Streams, validating input in the process
@ -464,9 +470,10 @@ def stream_exists_backend(request, user_profile, stream_name, autosubscribe):
recipient = get_recipient(Recipient.STREAM, stream.id) recipient = get_recipient(Recipient.STREAM, stream.id)
if autosubscribe: if autosubscribe:
bulk_add_subscriptions([stream], [user_profile]) bulk_add_subscriptions([stream], [user_profile])
result["subscribed"] = Subscription.objects.filter(user_profile=user_profile, result["subscribed"] = is_active_subscriber(
recipient=recipient, user_profile=user_profile,
active=True).exists() recipient=recipient)
return json_success(result) # results are ignored for HEAD requests return json_success(result) # results are ignored for HEAD requests
return json_response(data=result, status=404) return json_response(data=result, status=404)