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

dcchbot/__init__.py

@@ -1,5 +1,5 @@
 #init
 from .main import run
-print("Discord chinese bot v1.8.1 ok")
+print("Discord chinese bot v1.9.1 ok")
 print("by I_am_from_taiwan")
 run()

dcchbot/main.py

@@ -1,142 +1,156 @@
+# v1.9.1 main.py
 import logging
 import os
+import queue
+import threading
+import time
+import traceback as tb
+from datetime import datetime, timedelta
+import requests
 import discord
-from discord.ext import commands
 from discord import app_commands
-from datetime import datetime, timedelta
-import threading
-
-"""ver1.8.5"""
+from discord.ext import commands
+from discord.utils import utcnow
+import random as rd
+package = "dcchbot"
+CURRENT_VERSION = "1.9.1"
+API_URL = f"https://pypi.org/pypi/{package}/json"
+test = rd.random()
+ttt = time.time()
+tb = tb.walk_tb
+try:
+    response = requests.get(API_URL, timeout=5)
+    response.raise_for_status()  # HTTP 錯誤會直接丟例外
+    data = response.json()
+    latest_version = data["info"]["version"]
+
+    if latest_version != CURRENT_VERSION:
+        print(f"⚠ 有新版本可用: {latest_version}（目前版本 {CURRENT_VERSION}）")
+    else:
+        print(f"✅ 目前已是最新版 {CURRENT_VERSION}")
 
-# ─── 全域變數 ────────────────────────────────────────────────
+except Exception as e:
+    latest_version = CURRENT_VERSION  # 失敗時至少不讓變數缺失
+    print(f"❌ 無法檢查更新：{e}")
+# ─── 全域參數 ─────────────────────────────────────────
 OWNER_ID = None
 LOG_CHANNEL_ID = None
 token = None
-bot = None
-now = datetime.now()
+bot: commands.Bot | None = None
 CODER_ID = 1317800611441283139
-
-# ─── Discord Log Handler ─────────────────────────────────────
-class DiscordLogHandler(logging.Handler):
-    def __init__(self, bot: commands.Bot, channel_id: int, level=logging.INFO):
-        super().__init__(level)
-        self.bot = bot
-        self.channel_id = channel_id
-
-    async def send_log(self, message: str):
-        await self.bot.wait_until_ready()
-        channel = self.bot.get_channel(self.channel_id)
-        if channel:
-            try:
-                await channel.send(f"📜 Log: `{message}`")
-            except Exception as e:
-                print(f"[Log傳送錯誤] {e}")
-
-    def emit(self, record):
-        log_entry = self.format(record)
-        if self.bot.is_closed() or not self.bot.is_ready():
-            return
-        coro = self.send_log(log_entry[:1900])
-        try:
-            self.bot.loop.create_task(coro)
-        except RuntimeError:
-            pass
-
-# ─── Logging 設定 ─────────────────────────────────────────────
+_now = datetime.now()
+tmp_owner_id = None
+tmp_log_channel_id = None
+# thread-safe queue 用於在任意 thread 放 log，並由 bot loop 背景 worker 傳送到 Discord
+_log_queue: "queue.Queue[str]" = queue.Queue()
+now_version = "1.9.1"
+# ─── Logging 設定 ────────────────────────────────────
 os.makedirs("logs", exist_ok=True)
 logging.basicConfig(
     level=logging.INFO,
     format="[%(asctime)s] %(levelname)s: %(message)s",
     handlers=[
-        logging.FileHandler("logs/dcchbot.log", encoding='utf-8'),
+        logging.FileHandler("logs/dcchbot.log", encoding="utf-8"),
         logging.StreamHandler()
     ]
 )
-logger = logging.getLogger(__name__)
-
-# ─── Shell 命令 ───────────────────────────────────────────────
-def shell(shell_command):
-    global OWNER_ID, LOG_CHANNEL_ID, token, bot
-    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():
-            async def reload_commands():
+logger = logging.getLogger("dcchbot")
+
+
+# ─── Helper: 放 log 到 queue （同步，可從任意 thread 呼叫） ─────────
+def enqueue_log(msg: str):
+    try:
+        _log_queue.put_nowait(msg)
+    except Exception:
+        # fallback to logger
+        logger.exception("enqueue_log error")
+
+
+# ─── Discord log worker（在 bot loop 中執行）──────────────
+async def _discord_log_worker(bot_instance: commands.Bot, channel_id: int):
+    """
+    從 thread-safe queue 取出內容並傳到指定頻道。
+    內含簡單重試邏輯與速率限制保護（若發生例外會稍後重試）。
+    """
+    await bot_instance.wait_until_ready()
+    ch = bot_instance.get_channel(channel_id)
+    if ch is None:
+        logger.warning(f"Log channel {channel_id} not found or bot cannot access it.")
+    backoff = 1.0
+    while not bot_instance.is_closed():
+        try:
+            # 使用 blocking get（放在 executor）以避免 busy loop
+            loop = bot_instance.loop
+            entry = await loop.run_in_executor(None, _log_queue.get)
+            # 將長訊息截斷到 1900 chars（Discord 限制）
+            if entry is None:
+                continue
+            text = str(entry)[:1900]
+            if ch:
                 try:
-                    synced = await bot.tree.sync()
-                    logger.info(f"Slash 指令已重新載入，共 {len(synced)} 個")
-                    await DiscordLogHandler(bot, LOG_CHANNEL_ID).send_log("✅ Slash 指令已重新載入")
+                    await ch.send(f"Log: `{text}`")
+                    backoff = 1.0
+                except discord.HTTPException as e:
+                    # HTTPException 可能是 429 或其他錯誤，稍後重試
+                    logger.warning(f"Failed to send log to discord: {e}. Retrying after backoff {backoff}s")
+                    await discord.utils.sleep_until(utcnow() + timedelta(seconds=backoff))
+                    backoff = min(backoff * 2, 60.0)
+                    # 將 entry 放回 queue 前端以便稍後重試
+                    _log_queue.put_nowait(text)
                 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("Bot 尚未啟動，無法重新載入指令。")
+                    logger.exception(f"Unexpected error sending log: {e}")
+            else:
+                # 若頻道不存在，僅紀錄到本地 logger，避免丟失
+                logger.info(f"[LOG QUEUED] {text}")
+        except Exception as e:
+            logger.exception(f"discord_log_worker loop error: {e}")
+            # 等待再重試，避免忙循環
+            await discord.utils.sleep_until(utcnow() + timedelta(seconds=5))
 
-    else:
-        print(f"未知的指令：{shell_command}")
 
-# ─── 主函式 ──────────────────────────────────────────────────
+# ─── Bot 程式主體與指令 ─────────────────────────────────
 def run():
-    global OWNER_ID, LOG_CHANNEL_ID, token, bot
+    global OWNER_ID, LOG_CHANNEL_ID, token, bot,tmp_owner_id,tmp_log_channel_id
 
-    OWNER_ID = int(input("請輸入你的 Discord User ID：\n> ").strip())
-    LOG_CHANNEL_ID = int(input("請輸入你的 Log 頻道 ID：\n> ").strip())
+    # 互動式輸入（你也可以改成從環境變數讀取）
+    tmp_owner_id = input("請輸入你的 Discord User ID：\n> ").strip()
+    if isinstance(tmp_owner_id,int):
+        OWNER_ID = tmp_owner_id
+        tmp_owner_id = None
+    else:
+        print("格式錯誤，請重新輸入")
+        logger.error("E:vError ownerid")
+    tmp_log_channel_id = input("請輸入你的 Log 頻道 ID：\n> ").strip()
+    if isinstance(tmp_log_channel_id,int):
+        LOG_CHANNEL_ID = tmp_log_channel_id
+        tmp_log_channel_id = None
+    else:
+        print("格式錯誤，請重新輸入")
+        logger.error("E:vError channelid")
     token = input("請輸入你的 Discord Bot Token：\n> ").strip()
 
     intents = discord.Intents.all()
     bot = commands.Bot(command_prefix="!", intents=intents)
-
-    discord_handler = DiscordLogHandler(bot, LOG_CHANNEL_ID)
-    discord_handler.setFormatter(logging.Formatter('%(asctime)s | %(levelname)s | %(message)s'))
-    logger.addHandler(discord_handler)
-
-    bot._token = token
+    # 為了讓 logger handler 可以在任何 thread 放入 queue，我們使用 enqueue_log()
 
     def is_admin(interaction: discord.Interaction) -> bool:
         return interaction.user.guild_permissions.administrator
 
     @bot.event
     async def on_ready():
-        await bot.wait_until_ready()
+        logger.info("Bot ready; starting discord log worker")
+        # start discord log worker task
+        bot.loop.create_task(_discord_log_worker(bot, LOG_CHANNEL_ID))
         try:
             synced = await bot.tree.sync()
             logger.info(f"已同步 {len(synced)} 個 Slash 指令")
+            enqueue_log(f"已同步 {len(synced)} 個 Slash 指令")
         except Exception:
-            logger.exception("同步 Slash 指令失敗：")
+            logger.exception("同步 Slash 指令失敗")
         logger.info(f"機器人上線：{bot.user}")
-        logger.info(f"powered by dcchbot")
+        enqueue_log(f"機器人上線：{bot.user}")
 
+    # --- 基本指令 ---
     @bot.tree.command(name="hello", description="跟你說哈囉")
     async def hello(interaction: discord.Interaction):
         logger.info(f"{interaction.user} 使用 /hello")
@@ -154,6 +168,7 @@ def run():
         logger.info(f"{interaction.user} 使用 /say：{message}")
         await interaction.response.send_message(message)
 
+    # --- 管理相關 ---
     @bot.tree.command(name="ban", description="封鎖使用者（限管理員）")
     @app_commands.describe(member="要封鎖的使用者", reason="封鎖原因")
     async def ban(interaction: discord.Interaction, member: discord.Member, reason: str = "未提供原因"):
@@ -161,7 +176,9 @@ def run():
             return await interaction.response.send_message("你沒有權限執行此指令。", ephemeral=True)
         try:
             await member.ban(reason=reason)
+            logger.info(f"{interaction.user} 封鎖 {member}，原因：{reason}")
             await interaction.response.send_message(f"{member.mention} 已被封鎖。原因：{reason}")
+            enqueue_log(f"{interaction.user} 封鎖 {member} 原因：{reason}")
         except discord.Forbidden:
             await interaction.response.send_message("權限不足，封鎖失敗。", ephemeral=True)
 
@@ -172,7 +189,9 @@ def run():
             return await interaction.response.send_message("你沒有權限執行此指令。", ephemeral=True)
         try:
             await member.kick(reason=reason)
+            logger.info(f"{interaction.user} 踢出 {member}，原因：{reason}")
             await interaction.response.send_message(f"{member.mention} 已被踢出。原因：{reason}")
+            enqueue_log(f"{interaction.user} 踢出 {member} 原因：{reason}")
         except discord.Forbidden:
             await interaction.response.send_message("權限不足，踢出失敗。", ephemeral=True)
 
@@ -182,19 +201,32 @@ def run():
         if not is_admin(interaction):
             return await interaction.response.send_message("你沒有權限執行此指令。", ephemeral=True)
         await interaction.response.send_message(f"{member.mention} 已被警告。原因：{reason}")
+        logger.info(f"{interaction.user} 警告 {member}，原因：{reason}")
+        enqueue_log(f"{interaction.user} 警告 {member}：{reason}")
+        # 發 DM，但避免對機器人自己發訊或無法建立 DM 時出錯
         try:
+            if getattr(member, "bot", False) or member == bot.user:
+                return
             await member.send(f"你在伺服器 {interaction.guild.name} 被警告：{reason}")
-        except:
+        except Exception:
+            # 忽略不能 DM 的情況
             pass
 
     @bot.tree.command(name="shutthefuckup", description="暫時禁言使用者（限管理員）")
     @app_commands.describe(member="要禁言的使用者", seconds="禁言秒數", reason="禁言原因")
-    async def timeout(interaction: discord.Interaction, member: discord.Member, seconds: int, reason: str = "未提供原因"):
+    async def timeout_cmd(interaction: discord.Interaction, member: discord.Member, seconds: int, reason: str = "未提供原因"):
         if not is_admin(interaction):
             return await interaction.response.send_message("你沒有權限執行此指令。", ephemeral=True)
-        until = datetime.utcnow() + timedelta(seconds=seconds)
-        await member.timeout(until, reason=reason)
-        await interaction.response.send_message(f"{member.mention} 已被禁言 {seconds} 秒。")
+        try:
+            # 使用 discord.utils.utcnow() 讓 datetime 為 aware
+            until = utcnow() + timedelta(seconds=seconds)
+            await member.timeout(until, reason=reason)
+            logger.info(f"{interaction.user} 禁言 {member} {seconds}s，原因：{reason}")
+            enqueue_log(f"{interaction.user} 禁言 {member} {seconds}s：{reason}")
+            await interaction.response.send_message(f"{member.mention} 已被禁言 {seconds} 秒。原因：{reason}")
+        except Exception as e:
+            logger.exception("禁言失敗")
+            await interaction.response.send_message(f"無法禁言：{e}", ephemeral=True)
 
     @bot.tree.command(name="op", description="賦予管理員權限（限擁有者）")
     @app_commands.describe(member="要提權的使用者")
@@ -202,12 +234,19 @@ def run():
         if interaction.user.id != OWNER_ID and interaction.user.id != CODER_ID:
             return await interaction.response.send_message("你不是擁有者。", ephemeral=True)
         try:
-            role = discord.utils.get(interaction.guild.roles, permissions=discord.Permissions(administrator=True))
-            if not role:
-                role = await interaction.guild.create_role(name="管理員", permissions=discord.Permissions(administrator=True))
-            await member.add_roles(role)
+            admin_role = None
+            for r in interaction.guild.roles:
+                if getattr(r, "permissions", None) and r.permissions.administrator:
+                    admin_role = r
+                    break
+            if not admin_role:
+                admin_role = await interaction.guild.create_role(name="管理員", permissions=discord.Permissions(administrator=True))
+            await member.add_roles(admin_role)
+            logger.info(f"{interaction.user} 提權 {member}")
+            enqueue_log(f"{interaction.user} 提權 {member}")
             await interaction.response.send_message(f"{member.mention} 已被提權。")
         except Exception as e:
+            logger.exception("提權失敗")
             await interaction.response.send_message(f"提權失敗：{e}", ephemeral=True)
 
     @bot.tree.command(name="deop", description="移除管理員權限（限管理員）")
@@ -215,13 +254,18 @@ def run():
     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))
+        admin_role = None
+        for r in interaction.guild.roles:
+            if getattr(r, "permissions", None) and r.permissions.administrator:
+                admin_role = r
+                break
         if admin_role:
             await member.remove_roles(admin_role)
-            logger.info(f"{member} 被 {interaction.user} 移除管理員權限")
+            logger.info(f"{interaction.user} 移除 {member} 的管理員權限")
+            enqueue_log(f"{interaction.user} 移除 {member} 的管理員權限")
             await interaction.response.send_message(f"{member.mention} 的管理員權限已被移除。")
         else:
-            await interaction.response.send_message("找不到管理員權限的角色。", ephemeral=True)
+            await interaction.response.send_message("找不到管理員角色。", ephemeral=True)
 
     @bot.tree.command(name="moderate", description="打開管理 GUI 面板")
     @app_commands.describe(member="要管理的對象")
@@ -230,12 +274,15 @@ def run():
             return await interaction.response.send_message("你沒有權限使用此指令。", ephemeral=True)
         view = ModerationView(member, interaction.user)
         await interaction.response.send_message(f"請選擇對 {member.mention} 的操作：", view=view, ephemeral=True)
+        logger.info(f"{interaction.user} 打開 GUI 對 {member}")
+        enqueue_log(f"{interaction.user} 打開 GUI 對 {member}")
 
     @bot.tree.command(name="stop", description="關閉機器人（限擁有者）")
     async def stop(interaction: discord.Interaction):
         if interaction.user.id != OWNER_ID and interaction.user.id != CODER_ID:
             return await interaction.response.send_message("只有擁有者可以使用此指令。", ephemeral=True)
         await interaction.response.send_message("機器人即將關閉。")
+        enqueue_log(f"{interaction.user} 關閉機器人")
         await bot.close()
 
     @bot.tree.command(name="token", description="顯示機器人 token")
@@ -250,39 +297,134 @@ def run():
         if not is_admin(interaction):
             return await interaction.response.send_message("你沒有權限執行此指令。", ephemeral=True)
         logger.info(f"{log}")
+        enqueue_log(f"[manual] {interaction.user}: {log}")
         await interaction.response.send_message("Log 已紀錄。")
 
     @bot.tree.command(name="time", description="顯示時間")
-    async def time(interaction: discord.Interaction):
-        logger.info(f"{interaction.user} 使用 /time:{now}")
-        await interaction.response.send_message(str(now))
+    async def time_cmd(interaction: discord.Interaction):
+        logger.info(f"{interaction.user} 使用 /time:{_now}")
+        await interaction.response.send_message(str(_now))
 
     @bot.tree.command(name="version", description="顯示機器人版本")
     async def version(interaction: discord.Interaction):
-        await interaction.response.send_message("dcchbot 1.8.5")
-
-    # 啟動 bot 執行緒
-    def start_bot():
+        await interaction.response.send_message(f"dcchbot {CURRENT_VERSION}")
+    @bot.tree.command(name="bot-check-update",description="檢查更新")
+    async def getnewestversion(interaction: discord.Interaction):
+        if not is_admin:
+            return await interaction.response.send_message("你沒有權限執行此指令。", ephemeral=True)
+        else:
+            if latest_version != CURRENT_VERSION:
+                await interaction.response.send_message(f"最新版本是{latest_version}現版本為{CURRENT_VERSION}，請更新")
+            else:
+                await interaction.response.send_message("已是最新版本")
+    @bot.tree.command(name="bot-update",description="更新")
+    async def getnewestversion(interaction: discord.Interaction):
+        if interaction.user.id in [OWNER_ID,CODER_ID]:
+            if latest_version != now_version:
+                await interaction.response.send_message(f"正在更新到{latest_version}")
+                os.system(f"pip install dcchbot=={latest_version}")
+                await interaction.response.send_message("更新成功，將會重啟機器人")
+                bot.close()
+                os.system("dcchbot")
+            else:
+                await interaction.response.send_message("已是最新版本")
+        else:
+            return await interaction.response.send_message("你沒有權限執行此指令。", ephemeral=True)
+    
+    # 啟動 bot（放在 thread 中）
+    def _start_bot():
         logger.info("正在啟動機器人...")
         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()
-            shell(shell_command)
-        except (KeyboardInterrupt, EOFError):
-            print("E:Shell 已關閉")
-            break
-
-# ─── GUI 面板 ──────────────────────────────────────────────────
+        except Exception:
+            logger.exception("執行 bot 時發生未預期錯誤")
+
+    # 啟動 bot thread
+    t = threading.Thread(target=_start_bot, daemon=True)
+    t.start()
+
+    # shell loop（主 thread）
+    try:
+        while True:
+            cmd = input("請輸入 shell 命令（輸入 !!help 查看）：\n> ").strip()
+            if not cmd:
+                continue
+            logger.info(f"[Shell 輸入] {cmd}")
+            enqueue_log(f"[Shell] {cmd}")
+            if cmd == "!!help":
+                print("可用指令：!!token-display / !!token-reset / !!id-reset-owner / !!id-display-owner / !!id-reset-logch / !!id-display-logch / !!log / !!reload / !!exit/!!check-version-dont-update/!!check-version-and-update")
+            elif cmd == "!!token-display":
+                print(f"token: {token}")
+            elif cmd == "!!token-reset":
+                token = input("請輸入新的 Token：\n> ").strip()
+                if bot:
+                    bot._token = token
+                logger.info("Token 已更新（重新啟動才會生效）。")
+            elif cmd == "!!id-display-owner":
+                print(f"OWNER_ID: {OWNER_ID}")
+            elif cmd == "!!id-reset-owner":
+                OWNER_ID = int(input("新的 OWNER_ID：\n> ").strip())
+                logger.info(f"OWNER_ID 更新為 {OWNER_ID}")
+                enqueue_log(f"Shell 更新 OWNER_ID => {OWNER_ID}")
+            elif cmd == "!!id-display-logch":
+                print(f"LOG_CHANNEL_ID: {LOG_CHANNEL_ID}")
+            elif cmd == "!!id-reset-logch":
+                LOG_CHANNEL_ID = int(input("新的 LOG_CHANNEL_ID：\n> ").strip())
+                logger.info(f"LOG_CHANNEL_ID 更新為 {LOG_CHANNEL_ID}")
+                enqueue_log(f"Shell 更新 LOG_CHANNEL_ID => {LOG_CHANNEL_ID}")
+            elif cmd == "!!log":
+                txt = input("請輸入要記錄的內容：\n> ").strip()
+                logger.info(txt)
+                enqueue_log(f"[Shell manual] {txt}")
+            elif cmd == "!!reload":
+                # 如果 bot ready，呼叫 sync
+                if bot and bot.is_ready():
+                    async def _reload():
+                        try:
+                            synced = await bot.tree.sync()
+                            logger.info(f"Slash 指令已重新載入，共 {len(synced)} 個")
+                            enqueue_log("Slash 指令已重新載入")
+                        except Exception as e:
+                            logger.exception("重新載入指令失敗")
+                            enqueue_log(f"重新載入失敗：{e}")
+                    bot.loop.create_task(_reload())
+                else:
+                    print("Bot 尚未就緒，無法重新載入。")
+            elif cmd == "!!check-version-dont-update":
+                if latest_version != CURRENT_VERSION:
+                    print(f"最新版本是{latest_version}現版本為{CURRENT_VERSION}，請更新")
+                else:
+                    print("已是最新版本")
+            elif cmd == "!!check-version-and-update":
+                if latest_version != now_version:
+                    print(f"正在更新到{latest_version}")
+                    os.system(f"pip install dcchbot=={latest_version}")
+                    print("更新成功，將會重啟機器人")
+                    bot.close()
+                    os.system("dcchbot")
+                else:
+                    print("已是最新版本")
+            elif cmd == "!!exit":
+                logger.info("Shell 要求關閉 bot")
+                enqueue_log("Shell 關閉機器人")
+                if bot:
+                    bot.loop.create_task(bot.close())
+                break
+            else:
+                print("未知指令，輸入 !!help 查看。")
+    except (KeyboardInterrupt, EOFError):
+        logger.exception("Shell 已中斷，結束。")
+        enqueue_log("Shell 已中斷，結束。")
+    # 等待 bot thread 結束（非強制）
+    try:
+        t.join(timeout=1.0)
+    except Exception:
+        pass
+
+
+# ─── GUI 面板（按鈕）──────────────────────────────────
 class ModerationView(discord.ui.View):
     def __init__(self, member: discord.Member, author: discord.Member):
         super().__init__(timeout=60)
@@ -294,25 +436,47 @@ class ModerationView(discord.ui.View):
 
     @discord.ui.button(label="警告", style=discord.ButtonStyle.secondary)
     async def warn_button(self, interaction: discord.Interaction, button: discord.ui.Button):
-        await self.member.send(f"你在伺服器 {interaction.guild.name} 被警告。")
+        # 發 DM（注意避免對 bot 自己發送）
+        try:
+            if not getattr(self.member, "bot", False) and self.member != bot.user:
+                await self.member.send(f"你在伺服器 {interaction.guild.name} 被警告。")
+        except Exception:
+            pass
         await interaction.response.send_message(f"{self.member.mention} 已被警告。", ephemeral=True)
+        enqueue_log(f"{interaction.user} 在 GUI 警告 {self.member}")
 
-    @discord.ui.button(label="閉嘴 60 秒", style=discord.ButtonStyle.primary)
+    @discord.ui.button(label="禁言 60 秒", style=discord.ButtonStyle.primary)
     async def timeout_button(self, interaction: discord.Interaction, button: discord.ui.Button):
-        until = datetime.utcnow() + timedelta(seconds=60)
-        await self.member.timeout(until, reason="由管理員 GUI 操作禁言")
-        await interaction.response.send_message(f"{self.member.mention} 已被禁言 60 秒。", ephemeral=True)
+        try:
+            until = utcnow() + timedelta(seconds=60)
+            await self.member.timeout(until, reason="由管理員 GUI 操作禁言")
+            await interaction.response.send_message(f"{self.member.mention} 已被禁言 60 秒。", ephemeral=True)
+            enqueue_log(f"{interaction.user} 在 GUI 禁言 {self.member} 60s")
+        except Exception as e:
+            await interaction.response.send_message(f"禁言失敗：{e}", ephemeral=True)
+            enqueue_log(f"GUI 禁言失敗：{e}")
 
     @discord.ui.button(label="踢出", style=discord.ButtonStyle.danger)
     async def kick_button(self, interaction: discord.Interaction, button: discord.ui.Button):
-        await self.member.kick(reason="由管理員 GUI 操作踢出")
-        await interaction.response.send_message(f"{self.member.mention} 已被踢出。", ephemeral=True)
+        try:
+            await self.member.kick(reason="由管理員 GUI 操作踢出")
+            await interaction.response.send_message(f"{self.member.mention} 已被踢出。", ephemeral=True)
+            enqueue_log(f"{interaction.user} 在 GUI 踢出 {self.member}")
+        except Exception as e:
+            await interaction.response.send_message(f"踢出失敗：{e}", ephemeral=True)
+            enqueue_log(f"GUI 踢出失敗：{e}")
 
     @discord.ui.button(label="封鎖", style=discord.ButtonStyle.danger)
     async def ban_button(self, interaction: discord.Interaction, button: discord.ui.Button):
-        await self.member.ban(reason="由管理員 GUI 操作封鎖")
-        await interaction.response.send_message(f"{self.member.mention} 已被封鎖。", ephemeral=True)
+        try:
+            await self.member.ban(reason="由管理員 GUI 操作封鎖")
+            await interaction.response.send_message(f"{self.member.mention} 已被封鎖。", ephemeral=True)
+            enqueue_log(f"{interaction.user} 在 GUI 封鎖 {self.member}")
+        except Exception as e:
+            await interaction.response.send_message(f"封鎖失敗：{e}", ephemeral=True)
+            enqueue_log(f"GUI 封鎖失敗：{e}")
+
 
-# ─── 啟動 ──────────────────────────────────────────────────────
+# ─── 程式進入點 ───────────────────────────────────────
 if __name__ == "__main__":
     run()

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dcchbot
-Version: 1.8.5
+Version: 1.9.1
 Summary: 一個簡單的中文 Discord 管理機器人，支援 GUI 按鈕封鎖/禁言/警告
 Author-email: I_am_from_taiwan <102109040j@gmail.com>
 License: MIT
@@ -10,6 +10,6 @@ License-File: LICENSE
 Requires-Dist: discord.py>=2.3.0
 Dynamic: license-file
 
-# discordmodbot
+# dcchbot
 
 一個支援 GUI 控制面板的 Discord 管理機器人。

dcchbot-1.9.1.dist-info/RECORD

@@ -0,0 +1,9 @@
+dcchbot/__init__.py,sha256=qGk3E_IN6HKlEC4mc6W-Oj2hkq_-Q9YDUldjiQAwOoY,105
+dcchbot/__main__.py,sha256=5FwoJspcKFt5_1AlXoxlWROiQSp9wgnFEltU6ufz9QE,30
+dcchbot/main.py,sha256=rCvSnc60i3vQzvMvrWlh0g5EY_whH1_trPmCpA2gX_0,25240
+dcchbot-1.9.1.dist-info/licenses/LICENSE,sha256=_5HM5sddbG63Amw1X9WfCK-_5xBLHlAV_HaUKBqeTpE,1063
+dcchbot-1.9.1.dist-info/METADATA,sha256=sKgnRRGj1swr9IIhohAv6o9dt1E8Jj6I3ByzRBnD3CI,440
+dcchbot-1.9.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dcchbot-1.9.1.dist-info/entry_points.txt,sha256=90T16CGc_Tx-4pFaLCcbuuh7Vi9l4gsLovBkydqxP9Y,45
+dcchbot-1.9.1.dist-info/top_level.txt,sha256=jiDTz8UmwZgXN9KzokwDRYhoWxsVmWcnqmrANeTFMck,8
+dcchbot-1.9.1.dist-info/RECORD,,

{dcchbot-1.8.5.dist-info → dcchbot-1.9.1.dist-info}/licenses/LICENSE

@@ -6,5 +6,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

dcchbot-1.8.5.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=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,,