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

Forward instanced zephyr personals to Humbug.

Browse source 
(imported from commit eee338e89e9f875a37c5e56682ea32b919fa37d0)
This commit is contained in:
Tim Abbott 2012-10-17 11:20:52 -04:00
parent 1ffaa3bb28
commit 6246722096
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
zephyr_mirror.py
View file

@ -208,7 +208,7 @@ def process_notice(notice, log):
zephyr_class = notice.cls.lower() zephyr_class = notice.cls.lower()
instance = notice.instance.lower() instance = notice.instance.lower()
if (zephyr_class == "message" and instance == "personal"): if (zephyr_class == "message" and recipient != ""):
is_personal = True is_personal = True
if body.startswith("CC:"): if body.startswith("CC:"):
is_huddle = True is_huddle = True
@ -251,6 +251,10 @@ def process_notice(notice, log):
'zsig' : zsig, # logged here but not used by app 'zsig' : zsig, # logged here but not used by app
'content' : body } 'content' : body }
# Add instances in for instanced personals
if zeph['type'] == "personal" and instance != "personal":
zeph["content"] = "[-i %s]" % (instance,) + "\n" + zeph["content"]
print "%s: zephyr=>humbug: received a message on %s/%s from %s..." % \ print "%s: zephyr=>humbug: received a message on %s/%s from %s..." % \
(datetime.datetime.now(), zephyr_class, instance, notice.sender) (datetime.datetime.now(), zephyr_class, instance, notice.sender)
log.write(simplejson.dumps(zeph) + '\n') log.write(simplejson.dumps(zeph) + '\n')
@ -272,7 +276,7 @@ def zephyr_to_humbug(options):
ensure_subscribed(sub) ensure_subscribed(sub)
update_subscriptions_from_humbug() update_subscriptions_from_humbug()
if options.forward_personals: if options.forward_personals:
subs.add(("message", "personal", os.environ["USER"] + "@ATHENA.MIT.EDU")) subs.add(("message", "*", os.environ["USER"] + "@ATHENA.MIT.EDU"))
if subscribed_to_mail_messages(): if subscribed_to_mail_messages():
subs.add(("mail", "inbox", os.environ["USER"] + "@ATHENA.MIT.EDU")) subs.add(("mail", "inbox", os.environ["USER"] + "@ATHENA.MIT.EDU"))