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

events_register: Eliminate unnecessary api_events_register wrapper.

Browse Source
This commit is contained in:
Tim Abbott
2017-02-19 22:53:47 -08:00
parent b3119b0d67
commit 1cbc86499e
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
zerver/views/events_register.py
View File

@@ -24,19 +24,10 @@ def _default_narrow(user_profile, narrow):
narrow = [['stream', default_stream.name]] narrow = [['stream', default_stream.name]]
return narrow return narrow
# Does not need to be authenticated because it's called from rest_dispatch
@has_request_variables @has_request_variables
def api_events_register(request, user_profile, def events_register_backend(request, user_profile,
apply_markdown=REQ(default=False, validator=check_bool), apply_markdown=REQ(default=False, validator=check_bool),
all_public_streams=REQ(default=None, validator=check_bool)): all_public_streams=REQ(default=None, validator=check_bool),
# type: (HttpRequest, UserProfile, bool, Optional[bool]) -> HttpResponse
return events_register_backend(request, user_profile,
apply_markdown=apply_markdown,
all_public_streams=all_public_streams)
@has_request_variables
def events_register_backend(request, user_profile, apply_markdown=True,
all_public_streams=None,
event_types=REQ(validator=check_list(check_string), default=None), event_types=REQ(validator=check_list(check_string), default=None),
narrow=REQ(validator=check_list(check_list(check_string, length=2)), default=[]), narrow=REQ(validator=check_list(check_list(check_string, length=2)), default=[]),
queue_lifespan_secs=REQ(converter=int, default=0)): queue_lifespan_secs=REQ(converter=int, default=0)):

2
zproject/urls.py
View File

@@ -327,7 +327,7 @@ v1_api_and_json_patterns = [
# used to register for an event queue in tornado # used to register for an event queue in tornado
url(r'^register$', rest_dispatch, url(r'^register$', rest_dispatch,
{'POST': 'zerver.views.events_register.api_events_register'}), {'POST': 'zerver.views.events_register.events_register_backend'}),
# events -> zerver.tornado.views # events -> zerver.tornado.views
url(r'^events$', rest_dispatch, url(r'^events$', rest_dispatch,