diff --git a/app/__pycache__/google_calendar.cpython-311.pyc b/app/__pycache__/google_calendar.cpython-311.pyc index b0a9228..eff54d6 100644 Binary files a/app/__pycache__/google_calendar.cpython-311.pyc and b/app/__pycache__/google_calendar.cpython-311.pyc differ diff --git a/app/__pycache__/telegram_bot.cpython-311.pyc b/app/__pycache__/telegram_bot.cpython-311.pyc index b3f71bb..5d88a3b 100644 Binary files a/app/__pycache__/telegram_bot.cpython-311.pyc and b/app/__pycache__/telegram_bot.cpython-311.pyc differ diff --git a/app/__pycache__/timenet_manager.cpython-311.pyc b/app/__pycache__/timenet_manager.cpython-311.pyc index 6a63aaa..bf7205b 100644 Binary files a/app/__pycache__/timenet_manager.cpython-311.pyc and b/app/__pycache__/timenet_manager.cpython-311.pyc differ diff --git a/app/telegram_bot.py b/app/telegram_bot.py index 1848138..fc3d9e3 100644 --- a/app/telegram_bot.py +++ b/app/telegram_bot.py @@ -1,5 +1,5 @@ -import telegram from app import config_parser +import telegram config = config_parser.ConfigParser().loadConfig() @@ -7,8 +7,7 @@ config = config_parser.ConfigParser().loadConfig() class telegramBot: bot = None - def __init__(self): - self.bot = telegram.Bot(token=config['telegram']['token']) - - def sendMessage(self, message): - self.bot.sendMessage(chat_id=config['telegram']['chat_id'], text=str(message), parse_mode=telegram.ParseMode.HTML) + async def sendMessage(self, message): + self.bot = telegram.Bot(config['telegram']['token']) + async with self.bot: + await self.bot.sendMessage(chat_id=config['telegram']['chat_id'], text=str(message)) diff --git a/app/timenet_manager.py b/app/timenet_manager.py index e9923b3..5df0386 100644 --- a/app/timenet_manager.py +++ b/app/timenet_manager.py @@ -1,3 +1,5 @@ +import asyncio + import requests, json, pytz from datetime import datetime from time import sleep @@ -34,11 +36,11 @@ class timenetManager: return requests.post(furl, data=data, headers=headers) def addMessage(self, message): - print(message) self.message_acumulator += message + "\n" def sendReport(self): - self.telegram.sendMessage(self.message_acumulator) + # self.telegram.sendMessage(self.message_acumulator) + asyncio.run(self.telegram.sendMessage(self.message_acumulator)) def updateTime(self): self.headers["tn-d"] = "\"" + datetime.now().astimezone(pytz.UTC).strftime("%Y-%m-%dT%H:%M:%SZ") + "\""