From 06ee153faa01ed1393359c700d6fa340caa65789 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Fri, 28 Sep 2012 15:45:11 -0400 Subject: [PATCH] Use zero-width characters for message loop checking. (imported from commit 61f6dca96cd1d8431258afc0181e71d5b709e300) --- zephyr/zephyr_mirror.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/zephyr/zephyr_mirror.py b/zephyr/zephyr_mirror.py index fcfd627ddd..6b5c477b22 100644 --- a/zephyr/zephyr_mirror.py +++ b/zephyr/zephyr_mirror.py @@ -115,10 +115,11 @@ def process_loop(log): zsig, body = notice.message.split("\x00", 1) is_personal = False is_huddle = False - - if zsig.endswith("`") and zsig.startswith("`"): - print "Skipping message from Humbug!" - continue + if isinstance(zsig, str): + # Check for width unicode character u'\u200B'.encode("utf-8") + if u'\u200B'.encode("utf-8") in zsig: + print "Skipping message from Humbug!" + continue sender = notice.sender.lower().replace("athena.mit.edu", "mit.edu") recipient = notice.recipient.lower().replace("athena.mit.edu", "mit.edu") @@ -217,7 +218,7 @@ def get_new_zephyrs(): return simplejson.loads(res.read())['zephyrs'] def send_zephyr(message): - zsig = "`%s`" % (username_to_fullname(message["sender_email"])) + zsig = u"%s\u200B" % (username_to_fullname(message["sender_email"])) if ' dot ' in zsig: print "ERROR! Couldn't compute zsig for %s!" % (message["sender_email"]) return