Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

send_message_backend: Reorganize subject argument checking. 

(imported from commit 80daa46f47e7e5279f746db89b3632eeadb27325)
This commit is contained in:
Tim Abbott 2013-03-18 14:12:28 -04:00
parent 34021ffc29
commit 14efaea0bb
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
zephyr/views.py
View File

@ -866,24 +866,26 @@ def send_message_backend(request, user_profile, client,
sender = user_profile sender = user_profile
if message_type_name == 'stream': if message_type_name == 'stream':
if subject_name is None:
return json_error("Missing subject")
if len(message_to) > 1: if len(message_to) > 1:
return json_error("Cannot send to multiple streams") return json_error("Cannot send to multiple streams")
stream_name = message_to[0].strip() stream_name = message_to[0].strip()
if stream_name == "": if stream_name == "":
return json_error("Stream can't be empty") return json_error("Stream can't be empty")
if subject_name == "":
return json_error("Subject can't be empty")
if len(stream_name) > 30: if len(stream_name) > 30:
return json_error("Stream name too long") return json_error("Stream name too long")
if len(subject_name) > MAX_SUBJECT_LENGTH:
return json_error("Subject too long")
if not valid_stream_name(stream_name): if not valid_stream_name(stream_name):
return json_error("Invalid stream name") return json_error("Invalid stream name")
if subject_name is None:
return json_error("Missing subject")
subject = subject_name.strip()
if subject == "":
return json_error("Subject can't be empty")
if len(subject) > MAX_SUBJECT_LENGTH:
return json_error("Subject too long")
## FIXME: Commented out temporarily while we figure out what we want ## FIXME: Commented out temporarily while we figure out what we want
# if not valid_stream_name(subject_name): # if not valid_stream_name(subject):
# return json_error("Invalid subject name") # return json_error("Invalid subject name")
stream = get_stream(stream_name, user_profile.realm) stream = get_stream(stream_name, user_profile.realm)
@ -908,7 +910,7 @@ def send_message_backend(request, user_profile, client,
message.content = message_content message.content = message_content
message.recipient = recipient message.recipient = recipient
if message_type_name == 'stream': if message_type_name == 'stream':
message.subject = subject_name message.subject = subject
if forged: if forged:
# Forged messages come with a timestamp # Forged messages come with a timestamp
message.pub_date = timestamp_to_datetime(request.POST['time']) message.pub_date = timestamp_to_datetime(request.POST['time'])