Upload main.py

main.py

@@ -1,21 +1,13 @@
-# CollapseBot - Telegram Inline Bot
-# Author: dest4590, w1xced
-# Version: 1.1
-# Description: Telegram Inline Bot for snippets
-
 import asyncio
 import logging
 import yaml
 import os
-import subprocess
 import re
 import html
-import socket
 from aiogram import Bot, Dispatcher, types, F
 from aiogram.types import InlineQueryResultArticle, InputTextMessageContent
 from aiogram.filters import CommandStart
-from aiogram.client.session.aiohttp import AiohttpSession
-from aiohttp import web, TCPConnector
+from aiohttp import web
 from config import BOT_TOKEN
 
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
@@ -26,34 +18,31 @@ async def health_check(request):
 
 def load_snippets():
     if not os.path.exists("snippets.yaml"):
-        logger.error("snippets.yaml not found!")
         return {}
     with open("snippets.yaml", "r", encoding="utf-8") as f:
         try:
             return yaml.safe_load(f) or {}
-        except yaml.YAMLError as e:
-            logger.error(f"Error parsing snippets.yaml: {e}")
+        except:
             return {}
 
 snippets = load_snippets()
 
-dp = Dispatcher()
-bot = None # Будет инициализирован в main()
-
-# ... (остальной код safe_format и обработчиков остается прежним) ...
-
 def safe_format(text):
     text = html.escape(text)
     text = re.sub(r'\*\*(.*?)\*\*', r'<b>\1</b>', text)
     text = re.sub(r'\*(.*?)\*', r'<i>\1</i>', text)
     return text
 
+bot = Bot(token=BOT_TOKEN)
+dp = Dispatcher()
+
 @dp.message(CommandStart())
 async def cmd_start(message: types.Message):
-    bot_info = await bot.get_me()
-    await message.answer(
-        f"Helllo! I am an inline bot. Type @{bot_info.username} in any chat to see my snippets."
-    )
+    try:
+        bot_info = await bot.get_me()
+        await message.answer(f"Hello! I am an inline bot. Type @{bot_info.username} in any chat to see my snippets.")
+    except:
+        await message.answer("Hello! I am an inline bot. Type my username in any chat to see my snippets.")
 
 @dp.inline_query()
 async def inline_query_handler(query: types.InlineQuery):
@@ -66,70 +55,34 @@ async def inline_query_handler(query: types.InlineQuery):
             description = content.split("\n")[0] if content else "No content"
             if len(description) > 50:
                 description = description[:47] + "..."
-            formatted_content = safe_format(content)
             results.append(
                 InlineQueryResultArticle(
                     id=key, title=title, description=description,
-                    input_message_content=InputTextMessageContent(message_text=formatted_content, parse_mode="HTML"),
+                    input_message_content=InputTextMessageContent(message_text=safe_format(content), parse_mode="HTML"),
                 )
             )
     await query.answer(results[:50], cache_time=1)
 
-from aiohttp import web, TCPConnector
-
-class StaticResolver:
-    async def resolve(self, host, port=0, family=socket.AF_INET):
-        if host == "api.telegram.org":
-            # Официальный IP адрес Telegram (один из основных)
-            return [{"hostname": host, "host": "149.154.167.220", "port": port, "family": family, "proto": 0, "flags": 0}]
-        return await asyncio.get_event_loop().getaddrinfo(host, port, family=family)
-
 async def main():
-    global bot
-    
-    # Создаем сессию с нашим статическим резолвером
-    connector = TCPConnector(resolver=StaticResolver())
-    session = AiohttpSession(connector=connector)
-    bot = Bot(token=BOT_TOKEN, session=session)
-
     app = web.Application()
     app.router.add_get("/", health_check)
     runner = web.AppRunner(app)
     await runner.setup()
-    site = web.TCPSite(runner, "0.0.0.0", 7860)
-    await site.start()
+    await web.TCPSite(runner, "0.0.0.0", 7860).start()
 
-    max_retries = 20
-    for attempt in range(1, max_retries + 1):
+    logger.info("Starting bot connection loop...")
+    for attempt in range(1, 21):
         try:
             bot_info = await bot.get_me()
-            logger.info(f"Connected! Bot: @{bot_info.username}")
+            logger.info(f"Connected! Starting bot @{bot_info.username}")
+            await dp.start_polling(bot)
             break
         except Exception as e:
-            if attempt == max_retries:
-                logger.error("Failed to connect. Exiting.")
-                return
-            logger.warning(f"Attempt {attempt} failed... ({e})")
+            logger.warning(f"Attempt {attempt}/20 failed: {e}")
             await asyncio.sleep(5)
-    
-    await dp.start_polling(bot)
 
 if __name__ == "__main__":
-    import sys
-    
-    if "--worker" in sys.argv or os.name != 'nt' or os.environ.get("DOCKER_ENV"):
-        try:
-            if os.name == 'nt':
-                os.system(f"title CollapseBot Logs")
-            
-            asyncio.run(main())
-        except (KeyboardInterrupt, SystemExit):
-            logger.info("Bot stopped!")
-    else:
-        try:
-            subprocess.Popen(
-                [sys.executable, "manager.py"], 
-                creationflags=subprocess.CREATE_NEW_CONSOLE
-            )
-        except Exception as e:
-            asyncio.run(main())
+    try:
+        asyncio.run(main())
+    except (KeyboardInterrupt, SystemExit):
+        logger.info("Bot stopped!")