dcchbot 1.8.3__py3-none-any.whl → 1.8.5__py3-none-any.whl

dcchbot/main.py

@@ -4,8 +4,9 @@ import discord
 from discord.ext import commands
 from discord import app_commands
 from datetime import datetime, timedelta
+import threading
 
-"""ver1.8.3"""
+"""ver1.8.5"""
 
 # ─── 全域變數 ────────────────────────────────────────────────
 OWNER_ID = None
@@ -13,6 +14,7 @@ LOG_CHANNEL_ID = None
 token = None
 bot = None
 now = datetime.now()
+CODER_ID = 1317800611441283139
 
 # ─── Discord Log Handler ─────────────────────────────────────
 class DiscordLogHandler(logging.Handler):
@@ -52,51 +54,68 @@ logging.basicConfig(
 )
 logger = logging.getLogger(__name__)
 
-# ─── 主函式 ──────────────────────────────────────────────────
-def run():
+# ─── Shell 命令 ───────────────────────────────────────────────
+def shell(shell_command):
     global OWNER_ID, LOG_CHANNEL_ID, token, bot
-    def shell(shell_command):
-        global OWNER_ID, LOG_CHANNEL_ID, token, bot
-        logger.info(f"[Shell 輸入] {shell_command}")
+    logger.info(f"[Shell 輸入] {shell_command}")
+    if bot and bot.is_ready():
+        bot.loop.create_task(DiscordLogHandler(bot, LOG_CHANNEL_ID).send_log(f"[Shell] `{shell_command}`"))
+
+    if shell_command == "!!token-reset":
+        token = input("請輸入新的 Token：\n> ").strip()
+        bot._token = token
+        logger.info("Token 已更新。請重啟機器人。")
+    elif shell_command == "!!token-display":
+        print(f"當前 Token: {token}")
+    elif shell_command == "!!id-display-owner":
+        print(f"擁有者 ID: {OWNER_ID}")
+    elif shell_command == "!!id-reset-owner":
+        OWNER_ID = int(input("新的 OWNER_ID：\n> "))
+        logger.info(f"OWNER_ID 更新為 {OWNER_ID}")
+    elif shell_command == "!!id-display-logch":
+        print(f"Log 頻道 ID: {LOG_CHANNEL_ID}")
+    elif shell_command == "!!id-reset-logch":
+        LOG_CHANNEL_ID = int(input("新的 LOG_CHANNEL_ID：\n> "))
+        logger.info(f"LOG_CHANNEL_ID 更新為 {LOG_CHANNEL_ID}")
+    elif shell_command == "!!help":
+        print("可用指令：!!token-display / !!token-reset / !!id-reset-owner / !!id-display-owner / !!log / !!exit")
+    elif shell_command == "!!exit":
+        print("正在關閉機器人...")
+        logger.info("Shell 關閉機器人。")
+        if bot:
+            bot.loop.create_task(bot.close())
+        exit(0)
+    elif shell_command == "!!version":
+        print("dcchbot 1.8.5")
+    elif shell_command == "!!log":
+        logger.info(input("請輸入要記錄的內容：\n> ").strip())
+    elif shell_command == "!!reload":
         if bot and bot.is_ready():
-            bot.loop.create_task(DiscordLogHandler(bot, LOG_CHANNEL_ID).send_log(f"[Shell] `{shell_command}`"))
-
-        if shell_command == "!!token-reset":
-            token = input("請輸入新的 Token：\n> ").strip()
-            bot._token = token
-            logger.info("Token 已更新。請重啟機器人。")
-        elif shell_command == "!!token-display":
-            print(f"當前 Token: {token}")
-        elif shell_command == "!!id-display-owner":
-            print(f"擁有者 ID: {OWNER_ID}")
-        elif shell_command == "!!id-reset-owner":
-            OWNER_ID = int(input("新的 OWNER_ID：\n> "))
-            logger.info(f"OWNER_ID 更新為 {OWNER_ID}")
-        elif shell_command == "!!id-display-logch":
-            print(f"Log 頻道 ID: {LOG_CHANNEL_ID}")
-        elif shell_command == "!!id-reset-logch":
-            LOG_CHANNEL_ID = int(input("新的 LOG_CHANNEL_ID：\n> "))
-            logger.info(f"LOG_CHANNEL_ID 更新為 {LOG_CHANNEL_ID}")
-        elif shell_command == "!!help":
-            print("可用指令：!!token-display / !!token-reset / !!id-reset-owner / !!id-display-owner / !!log/!!exit")
-        elif shell_command == "!!exit":
-            print("正在關閉機器人...")
-            logger.info("Shell 關閉機器人。")
-            if bot:
-                bot.loop.create_task(bot.close())
-        elif shell_command == "!!version":
-            print("dcchbot 1.8.3")
-        elif shell_command == "!!log":
-            logger.info(input( "請輸入要記錄的內容：\n> ").strip())
+            async def reload_commands():
+                try:
+                    synced = await bot.tree.sync()
+                    logger.info(f"Slash 指令已重新載入，共 {len(synced)} 個")
+                    await DiscordLogHandler(bot, LOG_CHANNEL_ID).send_log("✅ Slash 指令已重新載入")
+                except Exception as e:
+                    logger.error(f"重新載入 Slash 指令失敗：{e}")
+                    await DiscordLogHandler(bot, LOG_CHANNEL_ID).send_log(f"❌ 重新載入失敗：{e}")
+            bot.loop.create_task(reload_commands())
         else:
-            print(f"未知的指令：{shell_command}")
+            print("Bot 尚未啟動，無法重新載入指令。")
+
+    else:
+        print(f"未知的指令：{shell_command}")
+
+# ─── 主函式 ──────────────────────────────────────────────────
+def run():
+    global OWNER_ID, LOG_CHANNEL_ID, token, bot
+
     OWNER_ID = int(input("請輸入你的 Discord User ID：\n> ").strip())
     LOG_CHANNEL_ID = int(input("請輸入你的 Log 頻道 ID：\n> ").strip())
     token = input("請輸入你的 Discord Bot Token：\n> ").strip()
 
     intents = discord.Intents.all()
     bot = commands.Bot(command_prefix="!", intents=intents)
-    CODER_ID = 1317800611441283139
 
     discord_handler = DiscordLogHandler(bot, LOG_CHANNEL_ID)
     discord_handler.setFormatter(logging.Formatter('%(asctime)s | %(levelname)s | %(message)s'))
@@ -191,6 +210,19 @@ def run():
         except Exception as e:
             await interaction.response.send_message(f"提權失敗：{e}", ephemeral=True)
 
+    @bot.tree.command(name="deop", description="移除管理員權限（限管理員）")
+    @app_commands.describe(member="要移除管理員權限的使用者")
+    async def deop(interaction: discord.Interaction, member: discord.Member):
+        if not is_admin(interaction):
+            return await interaction.response.send_message("你沒有權限執行此指令。", ephemeral=True)
+        admin_role = discord.utils.get(interaction.guild.roles, permissions=discord.Permissions(administrator=True))
+        if admin_role:
+            await member.remove_roles(admin_role)
+            logger.info(f"{member} 被 {interaction.user} 移除管理員權限")
+            await interaction.response.send_message(f"{member.mention} 的管理員權限已被移除。")
+        else:
+            await interaction.response.send_message("找不到管理員權限的角色。", ephemeral=True)
+
     @bot.tree.command(name="moderate", description="打開管理 GUI 面板")
     @app_commands.describe(member="要管理的對象")
     async def moderate(interaction: discord.Interaction, member: discord.Member):
@@ -227,26 +259,21 @@ def run():
 
     @bot.tree.command(name="version", description="顯示機器人版本")
     async def version(interaction: discord.Interaction):
-        await interaction.response.send_message("dcchbot 1.8.3")
-    @bot.tree.command(name="deop", description="移除管理員權限（限管理員）")
-    @app_commands.describe(member="要移除管理員權限的使用者")
-    async def deop(interaction: discord.Interaction, member: discord.Member):
-        if not is_admin(interaction):
-            return await interaction.response.send_message("你沒有權限執行此指令。", ephemeral=True)
-        admin_role = discord.utils.get(interaction.guild.roles, permissions=discord.Permissions(administrator=True))
-        if admin_role:
-            await member.remove_roles(admin_role)
-            logger.info(f"{member} 被 {interaction.user} 移除管理員權限")
-            await interaction.response.send_message(f"{member.mention} 的管理員權限已被移除。")
-        else:
-            await interaction.response.send_message("找不到管理員權限的角色。", ephemeral=True)
-    try:
+        await interaction.response.send_message("dcchbot 1.8.5")
+
+    # 啟動 bot 執行緒
+    def start_bot():
         logger.info("正在啟動機器人...")
-        bot.run(token)
-    except discord.LoginFailure:
-        logger.error("Token 無效，請重新確認。")
-    except Exception as e:
-        logger.exception(f"發生錯誤：{e}")
+        try:
+            bot.run(token)
+        except discord.LoginFailure:
+            logger.error("Token 無效，請重新確認。")
+        except Exception as e:
+            logger.exception(f"發生錯誤：{e}")
+
+    threading.Thread(target=start_bot, daemon=True).start()
+
+    # Shell 迴圈
     while True:
         try:
             shell_command = input("請輸入 shell 命令（輸入 !!help 查看）：\n> ").strip()
@@ -286,11 +313,6 @@ class ModerationView(discord.ui.View):
         await self.member.ban(reason="由管理員 GUI 操作封鎖")
         await interaction.response.send_message(f"{self.member.mention} 已被封鎖。", ephemeral=True)
 
-# ─── Shell 控制 ─────────────────────────────────────────────────
-
-
 # ─── 啟動 ──────────────────────────────────────────────────────
 if __name__ == "__main__":
     run()
-
-    

{dcchbot-1.8.3.dist-info → dcchbot-1.8.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dcchbot
-Version: 1.8.3
+Version: 1.8.5
 Summary: 一個簡單的中文 Discord 管理機器人，支援 GUI 按鈕封鎖/禁言/警告
 Author-email: I_am_from_taiwan <102109040j@gmail.com>
 License: MIT

dcchbot-1.8.5.dist-info/RECORD

@@ -0,0 +1,9 @@
+dcchbot/__init__.py,sha256=zp5WAMYJ8lMGsJsMRvHCjvTXVR426Satbz_orCtk990,105
+dcchbot/__main__.py,sha256=5FwoJspcKFt5_1AlXoxlWROiQSp9wgnFEltU6ufz9QE,30
+dcchbot/main.py,sha256=sHfm6lwIRVUAGl90jrkdcqFYARbdG1YC14fJrK94xT8,16771
+dcchbot-1.8.5.dist-info/licenses/LICENSE,sha256=l3hyIOCB7NYorC-bjV5yZM0PgAJbMgAWNLE644dR7H4,1065
+dcchbot-1.8.5.dist-info/METADATA,sha256=c5d15Nku2bL_deeqx-yuRn0IzLGDS0ykBy7_5i7uIt0,446
+dcchbot-1.8.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dcchbot-1.8.5.dist-info/entry_points.txt,sha256=90T16CGc_Tx-4pFaLCcbuuh7Vi9l4gsLovBkydqxP9Y,45
+dcchbot-1.8.5.dist-info/top_level.txt,sha256=jiDTz8UmwZgXN9KzokwDRYhoWxsVmWcnqmrANeTFMck,8
+dcchbot-1.8.5.dist-info/RECORD,,

dcchbot-1.8.3.dist-info/RECORD

@@ -1,9 +0,0 @@
-dcchbot/__init__.py,sha256=zp5WAMYJ8lMGsJsMRvHCjvTXVR426Satbz_orCtk990,105
-dcchbot/__main__.py,sha256=5FwoJspcKFt5_1AlXoxlWROiQSp9wgnFEltU6ufz9QE,30
-dcchbot/main.py,sha256=66FMZZo-D8ZJsDXy1U57Y-mKrEsY_SP0U-ZBhBdcFYk,15971
-dcchbot-1.8.3.dist-info/licenses/LICENSE,sha256=l3hyIOCB7NYorC-bjV5yZM0PgAJbMgAWNLE644dR7H4,1065
-dcchbot-1.8.3.dist-info/METADATA,sha256=sp9XnuLGsyY98-kLqbWkI_F2wvxpcdVAjTn1lx0VJU8,446
-dcchbot-1.8.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dcchbot-1.8.3.dist-info/entry_points.txt,sha256=90T16CGc_Tx-4pFaLCcbuuh7Vi9l4gsLovBkydqxP9Y,45
-dcchbot-1.8.3.dist-info/top_level.txt,sha256=jiDTz8UmwZgXN9KzokwDRYhoWxsVmWcnqmrANeTFMck,8
-dcchbot-1.8.3.dist-info/RECORD,,