From 3fe8f87df889e0b0ea56ccde1f3075dfa06ee948 Mon Sep 17 00:00:00 2001 From: Allah Date: Mon, 20 Aug 2018 15:50:10 +0200 Subject: [PATCH] Summon func were improved. --- .worker.py.swo | Bin 0 -> 24576 bytes .worker.py.swp | Bin 0 -> 24576 bytes worker.py | 54 +++++++++++++++++++++++++++++++++---------------- 3 files changed, 37 insertions(+), 17 deletions(-) create mode 100644 .worker.py.swo create mode 100644 .worker.py.swp diff --git a/.worker.py.swo b/.worker.py.swo new file mode 100644 index 0000000000000000000000000000000000000000..8c71a6127223bdffeb0f06ac8adc3e1f1be6133f GIT binary patch literal 24576 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 literal 0 HcmV?d00001 diff --git a/.worker.py.swp b/.worker.py.swp new file mode 100644 index 0000000000000000000000000000000000000000..3b6db956027f3ba2a56a278aac8bbadc7b915b41 GIT binary patch literal 24576 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 literal 0 HcmV?d00001 diff --git a/worker.py b/worker.py index 9421e29..18ae7e5 100755 --- a/worker.py +++ b/worker.py @@ -39,6 +39,26 @@ class MessageWorker: def handleUpdate(self, msg): try: try: + input_message = msg['message']['text'] + if ('@here' in input_message) or (' @'+self.me['result']['username'] in input_message): + conf_id = msg['message']['chat']['id'] + user_id = msg['message']['from']['id'] + chat_title = msg['message']['chat']['title'] + self.db.add_conf(conf_id, chat_title) + if msg['message']['text'] != '@here': + message = msg['message']['text'].replace('@here', '\n').replace(' @'+self.me['result']['username'], '\n') + else: + message = """I summon you!\n""" + + users = self.db.here( + user_id=user_id, + conf_id=conf_id + ) + for user in users: + message += ' @%s ' % (user[0]) + self.send(id=conf_id, msg=message) + return True + input_message = msg['message']['text'].replace( '@' + self.me['result']['username'], '') except: @@ -102,24 +122,24 @@ class MessageWorker: self.send(id=conf_id, msg=msg + ' ```') return True - if '@here' in input_message: - conf_id = msg['message']['chat']['id'] - user_id = msg['message']['from']['id'] - chat_title = msg['message']['chat']['title'] - self.db.add_conf(conf_id, chat_title) - if msg['message']['text'] != '@here': - message = msg['message']['text'].replace('@here', '\n') - else: - message = """I summon you!\n""" +# if '@here' in input_message: +# conf_id = msg['message']['chat']['id'] +# user_id = msg['message']['from']['id'] +# chat_title = msg['message']['chat']['title'] +# self.db.add_conf(conf_id, chat_title) +# if msg['message']['text'] != '@here': +# message = msg['message']['text'].replace('@here', '\n') +# else: +# message = """I summon you!\n""" - users = self.db.here( - user_id=user_id, - conf_id=conf_id - ) - for user in users: - message += ' @%s ' % (user[0]) - self.send(id=conf_id, msg=message) - return True +# users = self.db.here( +# user_id=user_id, +# conf_id=conf_id +# ) +# for user in users: +# message += ' @%s ' % (user[0]) +# self.send(id=conf_id, msg=message) +# return True if input_message[:5] == '/code': conf_id = msg['message']['chat']['id'] user_id = msg['message']['from']['id']