paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-28 18:43:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

json_get_stream_id: Use access_stream_by_name.

Browse Source
This commit is contained in:
Tim Abbott
2017-01-29 16:57:25 -08:00
parent 1ced8d3eb6
commit 0d980b7cef
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/tests/test_subs.py
View File

@@ -2073,7 +2073,7 @@ class StreamIdTest(ZulipTestCase):
def test_get_stream_id_wrong_name(self): def test_get_stream_id_wrong_name(self):
# type: () -> None # type: () -> None
result = self.client_get("/json/get_stream_id?stream=wrongname") result = self.client_get("/json/get_stream_id?stream=wrongname")
self.assert_json_error(result, u'No such stream name') self.assert_json_error(result, u"Invalid stream name 'wrongname'")
class InviteOnlyStreamTest(ZulipTestCase): class InviteOnlyStreamTest(ZulipTestCase):
def test_must_be_subbed_to_send(self): def test_must_be_subbed_to_send(self):

9
zerver/views/streams.py
View File

@@ -485,13 +485,10 @@ def get_and_validate_stream_by_id(stream_id, realm):
return stream return stream
@has_request_variables @has_request_variables
def json_get_stream_id(request, user_profile, stream=REQ()): def json_get_stream_id(request, user_profile, stream_name=REQ('stream')):
# type: (HttpRequest, UserProfile, Text) -> HttpResponse # type: (HttpRequest, UserProfile, Text) -> HttpResponse
try: (stream, recipient, sub) = access_stream_by_name(user_profile, stream_name)
stream_id = Stream.objects.get(realm=user_profile.realm, name=stream).id return json_success({'stream_id': stream.id})
except Stream.DoesNotExist:
return json_error(_("No such stream name"))
return json_success({'stream_id': stream_id})
@authenticated_json_view @authenticated_json_view
@has_request_variables @has_request_variables