diff --git a/api/management/commands/telegram_watcher.py b/api/management/commands/telegram_watcher.py index 42af760e..5b06e700 100644 --- a/api/management/commands/telegram_watcher.py +++ b/api/management/commands/telegram_watcher.py @@ -27,7 +27,6 @@ class Command(BaseCommand): time.sleep(self.rest) params = {'offset' : offset + 1 , 'timeout' : 5} - print(params) response = self.session.get(self.updates_url, params=params).json() if len(list(response['result'])) == 0: continue @@ -36,7 +35,6 @@ class Command(BaseCommand): splitted_text = text.split(' ') if splitted_text[0] == '/start': token = splitted_text[-1] - print(token) try : profile = Profile.objects.get(telegram_token=token) except: diff --git a/api/messages.py b/api/messages.py index 704baf25..eec79f28 100644 --- a/api/messages.py +++ b/api/messages.py @@ -38,8 +38,7 @@ class Telegram(): return - @classmethod - def welcome(cls, user): + def welcome(self, user): lang = user.profile.telegram_lang_code order = Order.objects.get(maker=user) print(str(order.id)) @@ -47,15 +46,15 @@ class Telegram(): text = f'Hola ⚡{user.username}⚡, Te enviaré un mensaje cuando tu orden con ID {str(order.id)} haya sido tomada.' else: text = f"Hey ⚡{user.username}⚡, I will send you a message when someone takes your order with ID {str(order.id)}." - cls.send_message(user, text) + self.send_message(user=user, text=text) return - @classmethod - def order_taken(cls, order): + + def order_taken(self, order): user = order.maker if not user.profile.telegram_enabled: return - + lang = user.profile.telegram_lang_code taker_nick = order.taker.username site = config('HOST_NAME') @@ -64,5 +63,5 @@ class Telegram(): else: text = f'Your order with ID {order.id} was taken by {taker_nick}!🥳 Visit http://{site}/order/{order.id} to proceed with the trade.' - cls.send_message(user, text) + self.send_message(user=user, text=text) return \ No newline at end of file