paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-19 14:08:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reintroduce updated internal_send_message to support sending personals.

Browse Source 
internal_send_message now has the ability to send personals as well as
stream messages.

This change was accidentally lost during a rebase.

(imported from commit 153a3929c5c64be82288293c1f0cc02fcc03c08d)
This commit is contained in:
Luke Faraone
2013-01-14 11:30:13 -05:00
parent 47b2b1cb1c
commit 155cd1e821
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
zephyr/lib/actions.py
View File

@@ -168,14 +168,20 @@ def create_stream_if_needed(realm, stream_name):
Recipient.objects.create(type_id=stream.id, type=Recipient.STREAM)
return stream
def internal_send_message(sender_email, recipient_type, recipient_name,
def internal_send_message(sender_email, recipient_type, recipient,
subject, content):
if len(content) > MAX_MESSAGE_LENGTH:
content = content[0:3900] + "\n\n[message was too long and has been truncated]"
message = Message()
message.sender = UserProfile.objects.get(user__email=sender_email)
message.recipient = Recipient.objects.get(type_id=create_stream_if_needed(
message.sender.realm, recipient_name).id, type=recipient_type)
if recipient_type == Recipient.STREAM:
type_id = create_stream_if_needed(message.sender.realm, recipient).id
else:
type_id = UserProfile.objects.get(user__email=recipient).id
message.recipient = Recipient.objects.get(type_id=type_id, type=recipient_type)
message.subject = subject
message.content = content
message.pub_date = timezone.now()