version-0.2.1

main.py

@@ -3,49 +3,49 @@ import logging
 import signal
 import sys
 from aiohttp import ClientSession
-from handlers.commands import handle_command
 from handlers.messages_routing import messages_routing
-from handlers.handle_join_request import handle_join_request
+from handlers.handle_join_request import handle_join_request, handle_reaction_on_request
 from bot.config import BOT_TOKEN, FEEDBACK_CHAT_ID
-from bot.api import send_message
+from bot.api import telegram_api
 
+logging.basicConfig(level=logging.DEBUG)
 logger = logging.getLogger(__name__)
-logging.basicConfig(level=logging.INFO)
 state = dict()
 
 api_url = f'https://api.telegram.org/bot{BOT_TOKEN}/'
 
 
 async def fetch(session, url):
+    logger.debug(f"fetching: {url}")
     async with session.get(url) as response:
+        logger.debug(response)
         return await response.json()
 
 
-async def main():
+async def start():
+    logger.info("\tstarted")
     async with ClientSession() as session:
         offset = 0  # начальное значение offset
         while True:
-            updates = await fetch(session, f"{api_url}getUpdates?offset={offset}")
+            updates = await fetch(session, f"{api_url}getUpdates?offset={offset}&allowed_updates=['message', 'join_chat_request', 'message_reaction']")
+            # logger.info('.' if updates['result'] == [] else updates)
             for update in updates.get("result", []):
                 try:
                     message = update.get("message")
                     join_chat_request = update.get("join_chat_request")
+                    message_reaction = update.get("message_reaction")
                     if message:
-                        text = message.get("text")
-                        if text.startswith('/'):
-                            await handle_command(message, state)
-                        else:
-                            await messages_routing(message, state)
-
+                        await messages_routing(message, state)
                     elif join_chat_request:
                         await handle_join_request(join_chat_request)
+                    elif message_reaction:
+                        await handle_reaction_on_request(message_reaction)
 
                 except Exception as e:
                     logger.error(e)
-                    logger.debug(update)
                     import traceback
                     text = traceback.format_exc()
-                    await send_message(FEEDBACK_CHAT_ID, text)
+                    await telegram_api("sendMessage", chat_id=FEEDBACK_CHAT_ID, text=text)
 
                 offset = update["update_id"] + 1
 
@@ -53,7 +53,5 @@ async def main():
 
 
 if __name__ == "__main__":
-    logging.basicConfig(level=logging.INFO, stream=sys.stdout)
-
     # Запуск асинхронного цикла
-    asyncio.run(main())
+    asyncio.run(start())