paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-11 17:36:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove explicit "client" parameter from send_message_backend.

Browse Source 
Instead we now rely on the request._client value, which we were previously
passing along to s_m_b in all but one case.

For that one case, we just modify the Request object to include the value
beforehand.

(imported from commit 542f38f94bc447149cd4d2efaa5e8f48f756725b)
This commit is contained in:
Luke Faraone
2013-03-18 14:07:56 -07:00
parent fc2a071314
commit b6ed350c55
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
zephyr/views.py
View File

@@ -677,11 +677,11 @@ def json_update_flags(request, user_profile, messages=POST('messages', converter
@authenticated_api_view @authenticated_api_view
def api_send_message(request, user_profile): def api_send_message(request, user_profile):
return send_message_backend(request, user_profile, request._client) return send_message_backend(request, user_profile)
@authenticated_json_post_view @authenticated_json_post_view
def json_send_message(request, user_profile): def json_send_message(request, user_profile):
return send_message_backend(request, user_profile, request._client) return send_message_backend(request, user_profile)
@authenticated_json_post_view @authenticated_json_post_view
@has_request_variables @has_request_variables
@@ -772,12 +772,13 @@ def json_tutorial_send_message(request, user_profile,
# send_message_backend should either check the API key or check that # send_message_backend should either check the API key or check that
# the user is logged in. # the user is logged in.
@has_request_variables @has_request_variables
def send_message_backend(request, user_profile, client, def send_message_backend(request, user_profile,
message_type_name = POST('type'), message_type_name = POST('type'),
message_to = POST('to', converter=extract_recipients), message_to = POST('to', converter=extract_recipients),
forged = POST(default=False), forged = POST(default=False),
subject_name = POST('subject', lambda x: x.strip(), None), subject_name = POST('subject', lambda x: x.strip(), None),
message_content = POST('content')): message_content = POST('content')):
client = request.client
is_super_user = is_super_user_api(request) is_super_user = is_super_user_api(request)
if forged and not is_super_user: if forged and not is_super_user:
return json_error("User not authorized for this query") return json_error("User not authorized for this query")
@@ -1261,7 +1262,8 @@ def api_github_landing(request, user_profile, event=POST,
if len(subject) > MAX_SUBJECT_LENGTH: if len(subject) > MAX_SUBJECT_LENGTH:
subject = subject[:57].rstrip() + '...' subject = subject[:57].rstrip() + '...'
return send_message_backend(request, user_profile, get_client("github_bot"), request.client = get_client("github_bot")
return send_message_backend(request, user_profile,
message_type_name="stream", message_type_name="stream",
message_to=["commits"], message_to=["commits"],
forged=False, subject_name=subject, forged=False, subject_name=subject,