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

Sync messages on Zephyr instances to corresponding humbug stream intelligently.

Browse source 
(imported from commit 182cab9442f6444c0a710699420524e82542d9cc)
This commit is contained in:
Tim Abbott 2012-10-16 14:57:42 -04:00
parent e718d31cd6
commit f4953e4e5b
1 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
zephyr_mirror.py
View file

@ -77,6 +77,14 @@ def send_humbug(zeph):
zeph['shortname'] = zeph['sender'].split('@')[0] zeph['shortname'] = zeph['sender'].split('@')[0]
if "subject" in zeph: if "subject" in zeph:
zeph["subject"] = zeph["subject"][:60] zeph["subject"] = zeph["subject"][:60]
if zeph['type'] == 'stream':
# Forward messages sent to -c foo -i bar to stream bar subject "instance"
if zeph["stream"] == "message":
zeph['stream'] = zeph['subject']
zeph['subject'] = "instance %s" % (zeph['stream'])
elif zeph["stream"] == "tabbott-test5":
zeph['stream'] = zeph['subject']
zeph['subject'] = "test instance %s" % (zeph['stream'])
for key in zeph.keys(): for key in zeph.keys():
if isinstance(zeph[key], unicode): if isinstance(zeph[key], unicode):
@ -306,9 +314,20 @@ def forward_to_zephyr(message):
print "%s: humbug=>zephyr: Forwarding message from %s" % \ print "%s: humbug=>zephyr: Forwarding message from %s" % \
(datetime.datetime.now(), sender_email) (datetime.datetime.now(), sender_email)
if message['type'] == "stream": if message['type'] == "stream":
zephyr_class = message["display_recipient"]
instance = message["subject"]
if (instance == "instance %s" % (zephyr_class,) or
instance == "test instance %s" % (zephyr_class,)):
# Forward messages to e.g. -c -i white-magic back from the
# place we forward them to
if instance.startswith("test"):
instance = zephyr_class
zephyr_class = "tabbott-test5"
else:
instance = zephyr_class
zephyr_class = "message"
zeph = zephyr.ZNotice(sender=sender_email, auth=True, zeph = zephyr.ZNotice(sender=sender_email, auth=True,
cls=message["display_recipient"], cls=zephyr_class, instance=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()
@ -358,7 +377,14 @@ def subscribed_to_mail_messages():
def add_humbug_subscriptions(): def add_humbug_subscriptions():
zephyr_subscriptions = set() zephyr_subscriptions = set()
for (cls, instance, recipient) in parse_zephyr_subs(verbose=options.verbose): for (cls, instance, recipient) in parse_zephyr_subs(verbose=options.verbose):
if instance != "*" or recipient != "*": if cls == "message" and recipient == "*":
if instance == "*":
continue
# If you're on -i white-magic on zephyr, get on stream white-magic on humbug
# instead of subscribing to stream message
zephyr_subscriptions.add(instance)
continue
elif instance != "*" or recipient != "*":
if options.verbose: if options.verbose:
print "Skipping ~/.zephyr.subs line: [%s,%s,%s]: Non-* values" % \ print "Skipping ~/.zephyr.subs line: [%s,%s,%s]: Non-* values" % \
(cls, instance, recipient) (cls, instance, recipient)
@ -388,7 +414,7 @@ def parse_zephyr_subs(verbose=False):
if verbose: if verbose:
print >>sys.stderr, "Couldn't parse ~/.zephyr.subs line: [%s]" % (line,) print >>sys.stderr, "Couldn't parse ~/.zephyr.subs line: [%s]" % (line,)
continue continue
zephyr_subscriptions.add((cls, instance, recipient)) zephyr_subscriptions.add((cls.strip(), instance.strip(), recipient.strip()))
return zephyr_subscriptions return zephyr_subscriptions
if options.forward_from_humbug: if options.forward_from_humbug: