ussr/jabbergram
ussr
/
jabbergram
2
0
Fork 0
Code Issues Pull Requests Releases Activity

Minor fix

This commit is contained in:
drymer 2016-09-23 21:36:46 +02:00
parent 9987811b53
commit 8d09508463
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jabbergram.py
View File

@ -12,10 +12,10 @@ from sys import argv
from sys import exit from sys import exit
class EchoBot(sleekxmpp.ClientXMPP): class jabbegram(sleekxmpp.ClientXMPP):
def __init__(self, jid, password, rooms, nick, token, groups): def __init__(self, jid, password, rooms, nick, token, groups):
# XMPP # XMPP
super(EchoBot, self).__init__(jid, password) super(jabbergram, self).__init__(jid, password)
self.add_event_handler('session_start', self.start) self.add_event_handler('session_start', self.start)
self.add_event_handler('groupchat_message', self.muc_message) self.add_event_handler('groupchat_message', self.muc_message)
@ -35,7 +35,7 @@ class EchoBot(sleekxmpp.ClientXMPP):
self.bot = telegram.Bot(self.token) self.bot = telegram.Bot(self.token)
self.telegram_users = {} self.telegram_users = {}
# meter el conector del tg en un hilo # put tg connector in a thread
t = Thread(target=self.read_tg) t = Thread(target=self.read_tg)
t.daemon = True t.daemon = True
t.start() t.start()
@ -57,6 +57,11 @@ class EchoBot(sleekxmpp.ClientXMPP):
if not user: if not user:
user = str(update.message.from_user.first_name) user = str(update.message.from_user.first_name)
# even weirder is that none of them exist
# let's take last_name
if not user:
user = str(update.message.from_user.last_name)
msg = user + ": " + message msg = user + ": " + message
chat_id = update.message.chat_id chat_id = update.message.chat_id
@ -86,6 +91,7 @@ class EchoBot(sleekxmpp.ClientXMPP):
sleep(1) sleep(1)
except Exception as e: except Exception as e:
update_id += 1
print(e) print(e)
@ -176,7 +182,7 @@ if __name__ == '__main__':
token = config[4] token = config[4]
groups = config[5] groups = config[5]
xmpp = EchoBot(jid, password, muc_rooms, nick, token, groups) xmpp = jabbergram(jid, password, muc_rooms, nick, token, groups)
xmpp.register_plugin('xep_0045') xmpp.register_plugin('xep_0045')
if xmpp.connect(): if xmpp.connect():