Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

zephyr_mirror: Add support for discuss-format messages.

This commit is contained in:
Tim Abbott 2017-05-10 11:43:16 -07:00
parent a0a50d410c
commit 87f06fd837
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bots/zephyr_mirror_backend.py
View File

@ -294,10 +294,17 @@ def process_loop(log):
except Exception: except Exception:
logger.exception("Error updating subscriptions from Zulip:") logger.exception("Error updating subscriptions from Zulip:")
def parse_zephyr_body(zephyr_data): def parse_zephyr_body(zephyr_data, notice_format):
# type: (str) -> Tuple[str, str] # type: (str, str) -> Tuple[str, str]
try: try:
(zsig, body) = zephyr_data.split("\x00", 1) (zsig, body) = zephyr_data.split("\x00", 1)
if (notice_format == 'New transaction [$1] entered in $2\nFrom: $3 ($5)\nSubject: $4' or
notice_format == 'New transaction [$1] entered in $2\nFrom: $3\nSubject: $4'):
# Logic based off of owl_zephyr_get_message in barnowl
fields = body.split('\x00')
if len(fields) == 5:
body = 'New transaction [%s] entered in %s\nFrom: %s (%s)\nSubject: %s' % (
fields[0], fields[1], fields[2], fields[4], fields[3])
except ValueError: except ValueError:
(zsig, body) = ("", zephyr_data) (zsig, body) = ("", zephyr_data)
return (zsig, body) return (zsig, body)
@ -357,7 +364,7 @@ def decrypt_zephyr(zephyr_class, instance, body):
def process_notice(notice, log): def process_notice(notice, log):
# type: (zulip, IO) -> None # type: (zulip, IO) -> None
(zsig, body) = parse_zephyr_body(notice.message) (zsig, body) = parse_zephyr_body(notice.message, notice.format)
is_personal = False is_personal = False
is_huddle = False is_huddle = False