From 32c308958f7ab475b12b71cca725ace982849b2f Mon Sep 17 00:00:00 2001 From: drymer Date: Sun, 8 May 2016 23:12:04 +0200 Subject: [PATCH] Fix stupid things --- jabbergram.py | 12 +++++------- setup.py | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/jabbergram.py b/jabbergram.py index 8478a65..e286572 100644 --- a/jabbergram.py +++ b/jabbergram.py @@ -45,13 +45,12 @@ class EchoBot(sleekxmpp.ClientXMPP): try: for update in self.bot.getUpdates(offset=update_id, timeout=10): - update_id = update.update_id + 1 message = update.message.text user = str(update.message.from_user.username) + if not user: user = str(update.message.from_user.first_name) - if not user: - user = "Unidentified: " + mensaje = user + ": " + message chat_id = update.message.chat_id @@ -59,10 +58,12 @@ class EchoBot(sleekxmpp.ClientXMPP): self.send_message(mto=self.muc_room, mbody=mensaje, mtype='groupchat') + update_id = update.update_id + 1 + except NetworkError: sleep(1) except Unauthorized: - update_id += 1 + sleep(1) def start(self, event): self.get_roster() @@ -70,12 +71,9 @@ class EchoBot(sleekxmpp.ClientXMPP): self.plugin['xep_0045'].joinMUC(self.muc_room, self.nick, wait=True) def muc_message(self, msg): - print(msg) if msg['mucnick'] != self.nick: mensaje = str(msg['from']).split('/')[1] + ': ' + str(msg['body']) - print(mensaje) self.bot.sendMessage(self.group, text=mensaje) - print("fuera") if __name__ == '__main__': diff --git a/setup.py b/setup.py index 86920d4..5ef310c 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup -VERSION = '0.1' +VERSION = '0.1.2' setup(name='jabbergram', version=VERSION,