diff --git a/.gitignore b/.gitignore index 28c693d..33d7ba8 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ misc/* bkp/* test/* *log* - +.Admin_id +.token diff --git a/speaker.py b/speaker.py index e62e606..c0500c6 100644 --- a/speaker.py +++ b/speaker.py @@ -1,5 +1,6 @@ #!/usr/bin/env python3 +from logging import Logger import random import time from sys import stderr @@ -318,7 +319,8 @@ class Speaker(object): # Handling /count command def get_count(self, update, context): cid = str(update.message.chat.id) - reader = self.load_reader(cid) + chat = update.message.chat + reader = self.load_reader(chat) num = str(reader.count()) if reader else "no" update.message.reply_text("I remember {} messages.".format(num)) @@ -333,7 +335,7 @@ class Speaker(object): # Print the current period or set a new one if one is given def period(self, update, context): chat = update.message.chat - reader = self.load_reader(str(chat.id)) + reader = self.load_reader(chat) words = update.message.text.split() if len(words) <= 1: @@ -356,7 +358,7 @@ class Speaker(object): # Print the current answer probability or set a new one if one is given def answer(self, update, context): chat = update.message.chat - reader = self.load_reader(str(chat.id)) + reader = self.load_reader(chat) words = update.message.text.split() if len(words) <= 1: @@ -383,7 +385,7 @@ class Speaker(object): return chat = update.message.chat user = chat.get_member(update.message.from_user.id) - reader = self.load_reader(str(chat.id)) + reader = self.load_reader(chat) if reader.is_restricted(): if not self.user_is_admin(user): @@ -401,7 +403,7 @@ class Speaker(object): return chat = update.message.chat user = chat.get_member(update.message.from_user.id) - reader = self.load_reader(str(chat.id)) + reader = self.load_reader(chat) if reader.is_restricted(): if not self.user_is_admin(user): @@ -450,3 +452,9 @@ class Speaker(object): a=reader.answer(), perm=permissions) msg.reply_markdown(answer) + + +def static_reply(text, format=None): + def reply(update, context): + update.message.reply_text(text, parse_mode=format) + return reply \ No newline at end of file diff --git a/velasco.py b/velasco.py index c1bc703..57eeb07 100644 --- a/velasco.py +++ b/velasco.py @@ -13,7 +13,7 @@ try: except ImportError as e: coloredlogsError = e -username = "velascobot" +username = "velaskoespbot" speakerbot = None logger = logging.getLogger(__name__)