From 0d980b7cef5173f3f8a7510239c5da04f1e4e5df Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Sun, 29 Jan 2017 16:57:25 -0800 Subject: [PATCH] json_get_stream_id: Use access_stream_by_name. --- zerver/tests/test_subs.py | 2 +- zerver/views/streams.py | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/zerver/tests/test_subs.py b/zerver/tests/test_subs.py index 1212928596..020c4bce71 100644 --- a/zerver/tests/test_subs.py +++ b/zerver/tests/test_subs.py @@ -2073,7 +2073,7 @@ class StreamIdTest(ZulipTestCase): def test_get_stream_id_wrong_name(self): # type: () -> None 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): def test_must_be_subbed_to_send(self): diff --git a/zerver/views/streams.py b/zerver/views/streams.py index 43d0cea80e..8bd91701a6 100644 --- a/zerver/views/streams.py +++ b/zerver/views/streams.py @@ -485,13 +485,10 @@ def get_and_validate_stream_by_id(stream_id, realm): return stream @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 - try: - stream_id = Stream.objects.get(realm=user_profile.realm, name=stream).id - except Stream.DoesNotExist: - return json_error(_("No such stream name")) - return json_success({'stream_id': stream_id}) + (stream, recipient, sub) = access_stream_by_name(user_profile, stream_name) + return json_success({'stream_id': stream.id}) @authenticated_json_view @has_request_variables