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

streams: Eliminate last use of get_stream in views.

Browse Source
This commit is contained in:
Tim Abbott
2017-01-29 21:42:09 -08:00
parent 4d3e97f304
commit 884aa2b184
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
zerver/lib/streams.py
View File

@@ -5,10 +5,10 @@ from typing import Any, Iterable, List, Mapping, Set, Text, Tuple
from django.http import HttpRequest, HttpResponse
from django.utils.translation import ugettext as _
from zerver.lib.actions import create_streams_if_needed
from zerver.lib.actions import check_stream_name, create_streams_if_needed
from zerver.lib.request import JsonableError
from zerver.models import UserProfile, Stream, Subscription, \
Recipient, bulk_get_recipients, get_recipient, get_stream, \
Realm, Recipient, bulk_get_recipients, get_recipient, get_stream, \
bulk_get_streams, valid_stream_name
def access_stream_common(user_profile, stream, error):
@@ -55,6 +55,12 @@ def access_stream_by_id(user_profile, stream_id):
(recipient, sub) = access_stream_common(user_profile, stream, error)
return (stream, recipient, sub)
def check_stream_name_available(realm, name):
# type: (Realm, Text) -> None
check_stream_name(name)
if get_stream(name, realm) is not None:
raise JsonableError(_("Stream name '%s' is already taken") % (name,))
def access_stream_by_name(user_profile, stream_name):
# type: (UserProfile, Text) -> Tuple[Stream, Recipient, Subscription]
error = _("Invalid stream name '%s'" % (stream_name,))