From f18525acd1d9ea8e7cb968ac22637e74a233b649 Mon Sep 17 00:00:00 2001 From: Zev Benjamin Date: Fri, 21 Feb 2014 13:32:18 -0500 Subject: [PATCH] jabber_mirror: Do domain replacement more safely (imported from commit 1a6a3d23120f06d54bc954d4e89d5fccf666332e) --- bots/jabber_mirror.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bots/jabber_mirror.py b/bots/jabber_mirror.py index 5bdaa05..4f56730 100755 --- a/bots/jabber_mirror.py +++ b/bots/jabber_mirror.py @@ -165,7 +165,9 @@ class ZulipToJabberBot(zulip.Client): for recipient in msg['display_recipient']: if recipient["email"] == self.email: continue - jabber_recipient = recipient['email'].replace(options.zulip_domain, options.jabber_domain) + recip_email = recipient['email'] + username = recip_email[:recip_email.rfind(options.zulip_domain)] + jabber_recipient = username + options.jabber_domain outgoing = self.jabber.make_message( mto = jabber_recipient, mbody = msg['content'],