1.9.8

Author: fyaz05

Dockerfile

@@ -20,4 +20,4 @@ RUN pip install --upgrade pip && \
 
 COPY . .
 
-CMD ["python", "-m", "Thunder"]
+CMD ["bash", "thunder.sh"]

Thunder/__init__.py

@@ -3,4 +3,4 @@
 import time
 
 StartTime = time.time()
-__version__ = "1.9.7"
+__version__ = "1.9.8"

Thunder/__main__.py

@@ -6,12 +6,10 @@
 import sys
 from datetime import datetime
 
+from uvloop import install
 from pathlib import Path
 
-import uvloop
-uvloop.install()
-asyncio.set_event_loop(asyncio.new_event_loop())
-
+install()
 from aiohttp import web
 from pyrogram import idle
 
@@ -252,11 +250,14 @@ async def schedule_token_cleanup():
             logger.error(f"Token cleanup error: {e}", exc_info=True)
 
 if __name__ == '__main__':
+    loop = asyncio.get_event_loop()
     try:
-        asyncio.run(start_services())
+        loop.run_until_complete(start_services())
     except KeyboardInterrupt:
         print("╔═══════════════════════════════════════════════════════════╗")
         print("║                   Bot stopped by user (CTRL+C)            ║")
         print("╚═══════════════════════════════════════════════════════════╝")
     except Exception as e:
         logger.error(f"An unexpected error occurred: {e}")
+    finally:
+        loop.close()

Thunder/bot/plugins/admin.py

@@ -143,7 +143,7 @@ async def show_stats(client: Client, message: Message):
 async def restart_bot(client: Client, message: Message):
     msg = await reply(message, text=MSG_RESTARTING)
     await db.add_restart_message(msg.id, message.chat.id)
-    os.execv(sys.executable, [sys.executable, "-m", "Thunder"])
+    os.execv("/bin/bash", ["bash", "thunder.sh"])
 
 
 @StreamBot.on_message(filters.command("log") & owner_filter)

Thunder/bot/plugins/stream.py

@@ -325,7 +325,7 @@ async def process_single(
             )
         elif not original_request_msg:
             await send_link(msg, links)
-        if msg.chat.type != enums.ChatType.PRIVATE and msg.from_user:
+        if msg.chat.type != enums.ChatType.PRIVATE and msg.from_user and not original_request_msg:
             await send_dm_links(bot, msg.from_user.id, links, msg.chat.title or "the chat")
         source_msg = original_request_msg if original_request_msg else msg
         source_info = ""

Thunder/utils/commands.py

@@ -18,7 +18,7 @@ def get_commands():
         "ban": "(Admin) Ban a user",
         "unban": "(Admin) Unban a user",
         "log": "(Admin) Send bot logs",
-        "restart": "(Admin) Restart the bot",
+        "restart": "(Admin) Update and restart the bot",
         "shell": "(Admin) Execute a shell command",
         "speedtest": "(Admin) Run network speed test",
         "users": "(Admin) Show the total number of users",

Thunder/utils/messages.py

@@ -111,7 +111,7 @@
 
 MSG_WORKLOAD_ITEM = "   {bot_name}: {load}\n"
 MSG_ADMIN_RESTART_DONE = "✅ **Restart Successful!**"
-MSG_RESTARTING = "♻️ **Restarting Bot...**\n\n> ⏳ Please wait a moment."
+MSG_RESTARTING = "♻️ **Updating and Restarting Bot...**\n\n> ⏳ Please wait a moment."
 MSG_LOG_FILE_CAPTION = "📄 **System Logs**"
 
 MSG_LOG_FILE_EMPTY = "ℹ️ **Log File Empty:** No data found in the log file."

config_sample.env

@@ -99,6 +99,16 @@ RATE_LIMIT_PERIOD_MINUTES=1
 # Maximum number of requests that can be queued.
 MAX_QUEUE_SIZE=100
 
+####################
+## UPDATE SETTINGS
+####################
+
+# Git repository for updates
+UPSTREAM_REPO="https://github.com/fyaz05/FileToLink"
+
+# Branch to update from
+UPSTREAM_BRANCH="main" # Default branch for updates
+
 ####################
 ## ADVANCED SETTINGS (modify with caution)
 ####################

requirements.txt

@@ -7,4 +7,4 @@ psutil
 python-dotenv
 speedtest-cli
 tgcrypto
-uvloop
+uvloop==0.21.0

thunder.sh

@@ -0,0 +1 @@
+python3 update.py && python3 -m Thunder