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

jabber_mirror: Use zulip.init_from_options

Browse source 
(imported from commit 5839c5308a948d2c060d1eb5688b9cf0bd9ed3a2)
This commit is contained in:
Zev Benjamin 2014-02-21 15:16:46 -05:00
parent 5fe2caeb5e
commit d0a875f88a
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
bots/jabber_mirror.py
View file

@ -95,7 +95,7 @@ class JabberToZulipBot(ClientXMPP):
to = recipient, to = recipient,
content = msg["body"], content = msg["body"],
) )
ret = self.zulip.send_message(zulip_message) ret = self.zulip.client.send_message(zulip_message)
if ret.get("status") != "success": if ret.get("status") != "success":
logging.error(ret) logging.error(ret)
@ -117,7 +117,7 @@ class JabberToZulipBot(ClientXMPP):
to = stream, to = stream,
content = msg["body"], content = msg["body"],
) )
ret = self.zulip.send_message(zulip_message) ret = self.zulip.client.send_message(zulip_message)
if ret.get("status") != "success": if ret.get("status") != "success":
logging.error(ret) logging.error(ret)
@ -128,12 +128,10 @@ class JabberToZulipBot(ClientXMPP):
else: else:
return jid return jid
class ZulipToJabberBot(zulip.Client): class ZulipToJabberBot(object):
def __init__(self, email, api_key): def __init__(self, zulip_client):
zulip.Client.__init__(self, email, api_key, client="jabber_mirror", self.client = zulip_client
site=options.zulip_site, verbose=False)
self.jabber = None self.jabber = None
self.email = email
def set_jabber_client(self, client): def set_jabber_client(self, client):
self.jabber = client self.jabber = client
@ -143,7 +141,7 @@ class ZulipToJabberBot(zulip.Client):
if event['type'] != 'message': if event['type'] != 'message':
return return
message = event["message"] message = event["message"]
if message['sender_email'] != self.email: if message['sender_email'] != self.client.email:
return return
if message['type'] == 'stream': if message['type'] == 'stream':
self.stream_message(message) self.stream_message(message)
@ -163,7 +161,7 @@ class ZulipToJabberBot(zulip.Client):
def private_message(self, msg): def private_message(self, msg):
for recipient in msg['display_recipient']: for recipient in msg['display_recipient']:
if recipient["email"] == self.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)] username = recip_email[:recip_email.rfind(options.zulip_domain)]
@ -217,8 +215,8 @@ if __name__ == '__main__':
(username, options.zulip_domain) = options.zulip_email.split("@") (username, options.zulip_domain) = options.zulip_email.split("@")
jabber_username = username + '@' + options.jabber_domain jabber_username = username + '@' + options.jabber_domain
zulip = ZulipToJabberBot(email=options.zulip_email, api_key=options.zulip_api_key); zulip = ZulipToJabberBot(zulip.init_from_options(options, "jabber_mirror"))
rooms = [s['name'] for s in zulip.get_streams()['streams']] rooms = [s['name'] for s in zulip.client.get_streams()['streams']]
xmpp = JabberToZulipBot(jabber_username, options.jabber_password, rooms, xmpp = JabberToZulipBot(jabber_username, options.jabber_password, rooms,
openfire=options.openfire) openfire=options.openfire)
xmpp.connect(use_tls=not options.no_use_tls) xmpp.connect(use_tls=not options.no_use_tls)
@ -227,7 +225,7 @@ if __name__ == '__main__':
zulip.set_jabber_client(xmpp) zulip.set_jabber_client(xmpp)
try: try:
logging.info("Connecting to Zulip.") logging.info("Connecting to Zulip.")
zulip.call_on_each_event(zulip.process_message) zulip.client.call_on_each_event(zulip.process_message)
except BaseException as e: except BaseException as e:
logging.exception("Exception in main loop") logging.exception("Exception in main loop")
xmpp.abort() xmpp.abort()