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

zephyr_mirror: Comment subject truncation.

Browse source 
(imported from commit eb292b47d74388d9c0065661c8b6fef9ab6f3554)
This commit is contained in:
Tim Abbott 2012-11-02 20:55:07 -04:00
parent c783a52384
commit 54ce5be16d
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bots/zephyr_mirror.py
View file

@ -85,13 +85,13 @@ def to_humbug_username(zephyr_username):
(user, realm) = (zephyr_username, "mit.edu") (user, realm) = (zephyr_username, "mit.edu")
if realm.upper() == "ATHENA.MIT.EDU": if realm.upper() == "ATHENA.MIT.EDU":
return user.lower() + "@mit.edu" return user.lower() + "@mit.edu"
return user.lower() + "|" + realm + "@mit.edu" return user.lower() + "|" + realm.upper() + "@mit.edu"
def to_zephyr_username(humbug_username): def to_zephyr_username(humbug_username):
(user, realm) = humbug_username.split("@") (user, realm) = humbug_username.split("@")
if "|" not in user: if "|" not in user:
return user.lower() + "@ATHENA.MIT.EDU" return user.lower() + "@ATHENA.MIT.EDU"
match_user = re.match(r'([a-zA-Z0-9_]+)\|(.*)@mit\.edu', user) match_user = re.match(r'([a-zA-Z0-9_]+)\|(.+)@mit\.edu', user)
if not match_user: if not match_user:
raise Exception("Could not parse Zephyr realm for cross-realm user %s" % (humbug_username,)) raise Exception("Could not parse Zephyr realm for cross-realm user %s" % (humbug_username,))
return match_user.group(1).lower() + "@" + match_user.group(2).upper() return match_user.group(1).lower() + "@" + match_user.group(2).upper()
@ -111,6 +111,9 @@ def send_humbug(zeph):
message['fullname'] = username_to_fullname(zeph['sender']) message['fullname'] = username_to_fullname(zeph['sender'])
message['shortname'] = zeph['sender'].split('@')[0] message['shortname'] = zeph['sender'].split('@')[0]
if "subject" in zeph: if "subject" in zeph:
# Truncate the subject to the current limit in Humbug. No
# need to do this for stream names, since we're only
# subscribed to valid stream names.
message["subject"] = zeph["subject"][:60] message["subject"] = zeph["subject"][:60]
if zeph['type'] == 'stream': if zeph['type'] == 'stream':
# Forward messages sent to -c foo -i bar to stream bar subject "instance" # Forward messages sent to -c foo -i bar to stream bar subject "instance"