xenofem/python-zulip-api
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename instance to subject.

Browse source 
(imported from commit 6b4693da03f106448c137cf81cf9801cac44f2b8)
This commit is contained in:
Tim Abbott 2012-10-10 18:01:39 -04:00
parent 567256ede0
commit ea07716d32
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
zephyr_mirror.py
View file

@ -66,8 +66,8 @@ def send_humbug(zeph):
zeph["sender"] = compute_humbug_username(zeph["sender"]) zeph["sender"] = compute_humbug_username(zeph["sender"])
zeph['fullname'] = username_to_fullname(zeph['sender']) zeph['fullname'] = username_to_fullname(zeph['sender'])
zeph['shortname'] = zeph['sender'].split('@')[0] zeph['shortname'] = zeph['sender'].split('@')[0]
if "instance" in zeph: if "subject" in zeph:
zeph["instance"] = zeph["instance"][:30] zeph["subject"] = zeph["subject"][:30]
for key in zeph.keys(): for key in zeph.keys():
if isinstance(zeph[key], unicode): if isinstance(zeph[key], unicode):
@ -157,7 +157,7 @@ def process_loop(log):
'time' : str(notice.time), 'time' : str(notice.time),
'sender' : sender, 'sender' : sender,
'stream' : notice.cls.lower(), 'stream' : notice.cls.lower(),
'instance' : notice.instance.lower(), 'subject' : notice.instance.lower(),
'zsig' : zsig, # logged here but not used by app 'zsig' : zsig, # logged here but not used by app
'content' : body } 'content' : body }
@ -224,7 +224,7 @@ def forward_to_zephyr(message):
if message['type'] == "stream": if message['type'] == "stream":
zeph = zephyr.ZNotice(sender=message["sender_email"].replace("mit.edu", "ATHENA.MIT.EDU"), zeph = zephyr.ZNotice(sender=message["sender_email"].replace("mit.edu", "ATHENA.MIT.EDU"),
auth=True, cls=message["display_recipient"], auth=True, cls=message["display_recipient"],
instance=message["instance"]) instance=message["subject"])
body = "%s\0%s" % (zsig, wrapped_content) body = "%s\0%s" % (zsig, wrapped_content)
zeph.setmessage(body) zeph.setmessage(body)
zeph.send() zeph.send()