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

zephyr_mirror: Reorder process_notice to log fewer "Skipping" messages.

Browse source 
Previously, we were sending "Skipping message we got from Humbug!"
for messages we wouldn't have forwarded anyway.

(imported from commit 36df85a61336ac00e3d7913d5a417d6b42764350)
This commit is contained in:
Tim Abbott 2012-11-26 18:54:21 -05:00
parent f45a8bebf2
commit b081d2fa5a
1 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
bots/zephyr_mirror_backend.py
View file

@ -237,25 +237,11 @@ def process_notice(notice, log):
# skip PING messages # skip PING messages
return return
if notice.format.endswith("@(@color(blue))"):
logger.debug("Skipping message we got from Humbug!")
return
zephyr_class = notice.cls.lower() zephyr_class = notice.cls.lower()
if (zephyr_class == "message" and notice.recipient != ""): if ((zephyr_class == "message" and notice.recipient != "") or
(zephyr_class == "mail" and notice.instance.lower() == "inbox")):
is_personal = True is_personal = True
if body.startswith("CC:"):
is_huddle = True
# Map "CC: sipbtest espuser" => "starnine@mit.edu,espuser@mit.edu"
huddle_recipients = [to_humbug_username(x.strip()) for x in
body.split("\n")[0][4:].split()]
if notice.sender not in huddle_recipients:
huddle_recipients.append(to_humbug_username(notice.sender))
body = body.split("\n", 1)[1]
if (zephyr_class == "mail" and notice.instance.lower() == "inbox"):
is_personal = True
# Drop messages not to the listed subscriptions # Drop messages not to the listed subscriptions
if is_personal and not options.forward_personals: if is_personal and not options.forward_personals:
return return
@ -264,6 +250,19 @@ def process_notice(notice, log):
logger.debug("Skipping ... %s/%s/%s" % logger.debug("Skipping ... %s/%s/%s" %
(zephyr_class, notice.instance, is_personal)) (zephyr_class, notice.instance, is_personal))
return return
if notice.format.endswith("@(@color(blue))"):
logger.debug("Skipping message we got from Humbug!")
return
if is_personal:
if body.startswith("CC:"):
is_huddle = True
# Map "CC: sipbtest espuser" => "starnine@mit.edu,espuser@mit.edu"
huddle_recipients = [to_humbug_username(x.strip()) for x in
body.split("\n")[0][4:].split()]
if notice.sender not in huddle_recipients:
huddle_recipients.append(to_humbug_username(notice.sender))
body = body.split("\n", 1)[1]
zeph = { 'time' : str(notice.time), zeph = { 'time' : str(notice.time),
'sender' : notice.sender, 'sender' : notice.sender,