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

jabber_mirror: Use sleekxmpp.JID when manipulating message recipients

Browse source 
(imported from commit 57b8384bf79a60abbaf535bd11f222d7f63db251)
This commit is contained in:
Zev Benjamin 2014-03-03 14:17:27 -05:00
parent 98a8680af7
commit d2bc74003e
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
bots/jabber_mirror.py
View file

@ -51,7 +51,7 @@ import re
__version__ = "1.1" __version__ = "1.1"
def room_to_stream(room): def room_to_stream(room):
return str(room).rpartition("@")[0] + "/xmpp" return room + "/xmpp"
def stream_to_room(stream): def stream_to_room(stream):
return stream.lower().rpartition("/xmpp")[0] return stream.lower().rpartition("/xmpp")[0]
@ -96,12 +96,12 @@ class JabberToZulipBot(ClientXMPP):
return return
logging.debug("Joining " + room) logging.debug("Joining " + room)
self.rooms.add(room) self.rooms.add(room)
muc_jid = room + "@" + options.conference_domain muc_jid = JID(local=room, domain=options.conference_domain)
xep0045 = self.plugin['xep_0045'] xep0045 = self.plugin['xep_0045']
try: try:
xep0045.joinMUC(muc_jid, self.nick, wait=True) xep0045.joinMUC(muc_jid, self.nick, wait=True)
except InvalidJID: except InvalidJID:
logging.error("Could not join room: " + muc_jid) logging.error("Could not join room: " + str(muc_jid))
return return
# Configure the room. Really, we should only do this if the room is # Configure the room. Really, we should only do this if the room is
@ -114,14 +114,14 @@ class JabberToZulipBot(ClientXMPP):
if form: if form:
xep0045.configureRoom(muc_jid, form) xep0045.configureRoom(muc_jid, form)
else: else:
logging.error("Could not configure room: " + muc_jid) logging.error("Could not configure room: " + str(muc_jid))
def leave_muc(self, room): def leave_muc(self, room):
if room not in self.rooms: if room not in self.rooms:
return return
logging.debug("Leaving " + room) logging.debug("Leaving " + room)
self.rooms.remove(room) self.rooms.remove(room)
muc_jid = room + "@" + options.conference_domain muc_jid = JID(local=room, domain=options.conference_domain)
self.plugin['xep_0045'].leaveMUC(muc_jid, self.nick) self.plugin['xep_0045'].leaveMUC(muc_jid, self.nick)
def message(self, msg): def message(self, msg):
@ -159,7 +159,7 @@ class JabberToZulipBot(ClientXMPP):
subject = msg["subject"] subject = msg["subject"]
if len(subject) == 0: if len(subject) == 0:
subject = "(no topic)" subject = "(no topic)"
stream = room_to_stream(msg.get_mucroom()) stream = room_to_stream(msg['from'].local)
sender_nick = msg.get_mucnick() sender_nick = msg.get_mucnick()
if not sender_nick: if not sender_nick:
# Messages from the room itself have no nickname. We should not try # Messages from the room itself have no nickname. We should not try
@ -218,7 +218,7 @@ class ZulipToJabberBot(object):
return return
room = stream_to_room(stream) room = stream_to_room(stream)
jabber_recipient = "%s@%s" % (room, options.conference_domain) jabber_recipient = JID(local=room, domain=options.conference_domain)
outgoing = self.jabber.make_message( outgoing = self.jabber.make_message(
mto = jabber_recipient, mto = jabber_recipient,
mbody = msg['content'], mbody = msg['content'],
@ -231,8 +231,7 @@ class ZulipToJabberBot(object):
if recipient["email"] == self.client.email: if recipient["email"] == self.client.email:
continue continue
recip_email = recipient['email'] recip_email = recipient['email']
username = recip_email[:recip_email.rfind(options.zulip_domain)] jabber_recipient = JID(recip_email, domain=self.jabber.boundjid.domain)
jabber_recipient = username + self.jabber.boundjid.domain
outgoing = self.jabber.make_message( outgoing = self.jabber.make_message(
mto = jabber_recipient, mto = jabber_recipient,
mbody = msg['content'], mbody = msg['content'],