dcchbot 1.9.5__tar.gz → 1.9.6__tar.gz

{dcchbot-1.9.5 → dcchbot-1.9.6}/PKG-INFO

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

dcchbot-1.9.6/dcchbot/__init__.py

@@ -0,0 +1,6 @@
+#init
+from .main import run
+cu_ver = "1.9.6 "
+print(f"Discord chinese bot v.{cu_ver} ok")
+print("by I_am_from_taiwan")
+run()

{dcchbot-1.9.5 → dcchbot-1.9.6}/dcchbot/main.py

@@ -12,14 +12,16 @@ from discord import app_commands
 from discord.ext import commands
 from discord.utils import utcnow
 import random as rd
+global latest_version
 package = "dcchbot"
-CURRENT_VERSION = "1.9.5"
+CURRENT_VERSION = "1.9.6"
 API_PYPI_URL = f"https://pypi.org/pypi/{package}/json"
 API_MY_URL = "10.112.101.32:194/dcchbot.json"
 API_URL = None
 test = rd.random()
 ttt = time.time()
 tb = tb
+now_version = latest_version
 def choose_api_url():
     """優先使用內網 API，失敗則 fallback 到 PyPI"""
     try:
@@ -32,6 +34,7 @@ def choose_api_url():
     return API_PYPI_URL
 
 def check_update():
+    global latest_version
     """檢查是否有新版本"""
     api_url = choose_api_url()
     try:
@@ -62,10 +65,10 @@ token = None
 bot: commands.Bot | None = None
 CODER_ID = 1317800611441283139
 _now = datetime.now()
-latest_version = "1.9.4"
+
 # thread-safe queue 用於在任意 thread 放 log，並由 bot loop 背景 worker 傳送到 Discord
 _log_queue: "queue.Queue[str]" = queue.Queue()
-now_version = "1.9.4"
+
 # ─── Logging 設定 ────────────────────────────────────
 os.makedirs("logs", exist_ok=True)
 logging.basicConfig(
@@ -291,35 +294,35 @@ def run():
             await interaction.response.send_message(f"提權失敗：{e}", ephemeral=True)
 
 
-@bot.tree.command(name="deop", description="移除管理員權限(admin 身分組）")
-@app_commands.describe(member="要移除管理員權限的使用者")
-async def deop(interaction: discord.Interaction, member: discord.Member):
+    @bot.tree.command(name="deop", description="移除管理員權限(admin 身分組）")
+    @app_commands.describe(member="要移除管理員權限的使用者")
+    async def deop(interaction: discord.Interaction, member: discord.Member):
     # 僅管理員或擁有者可用
-    def is_admin(interaction: discord.Interaction) -> bool:
-        return interaction.user.guild_permissions.administrator
+        def is_admin(interaction: discord.Interaction) -> bool:
+            return interaction.user.guild_permissions.administrator
 
-    if not is_admin(interaction) and interaction.user.id not in [OWNER_ID, CODER_ID]:
-        return await interaction.response.send_message("你沒有權限執行此指令。", ephemeral=True)
+        if not is_admin(interaction) and interaction.user.id not in [OWNER_ID, CODER_ID]:
+            return await interaction.response.send_message("你沒有權限執行此指令。", ephemeral=True)
 
     # 嘗試找到 admin 角色
-    admin_role = discord.utils.get(interaction.guild.roles, name="admin")
+        admin_role = discord.utils.get(interaction.guild.roles, name="admin")
     
-    if not admin_role:
-        return await interaction.response.send_message("找不到 admin 身分組，無法移除。", ephemeral=True)
+        if not admin_role:
+            return await interaction.response.send_message("找不到 admin 身分組，無法移除。", ephemeral=True)
 
     # 檢查使用者是否有此角色
-    if admin_role not in member.roles:
-        return await interaction.response.send_message(f"{member.mention} 並沒有 admin 身分組。", ephemeral=True)
+        if admin_role not in member.roles:
+            return await interaction.response.send_message(f"{member.mention} 並沒有 admin 身分組。", ephemeral=True)
 
     # 嘗試移除角色
-    try:
-        await member.remove_roles(admin_role, reason=f"{interaction.user} 使用 /deop 移除權限")
-        logger.info(f"{interaction.user} 移除 {member} admin 身分組")
-        enqueue_log(f"{interaction.user} 移除 {member} admin 身分組")
-        await interaction.response.send_message(f"{member.mention} 的 admin 身分組已被移除。")
-    except Exception as e:
-        logger.exception("移除 admin 角色失敗")
-        await interaction.response.send_message(f"移除失敗：{e}", ephemeral=True)
+        try:
+            await member.remove_roles(admin_role, reason=f"{interaction.user} 使用 /deop 移除權限")
+            logger.info(f"{interaction.user} 移除 {member} admin 身分組")
+            enqueue_log(f"{interaction.user} 移除 {member} admin 身分組")
+            await interaction.response.send_message(f"{member.mention} 的 admin 身分組已被移除。")
+        except Exception as e:
+            logger.exception("移除 admin 角色失敗")
+            await interaction.response.send_message(f"移除失敗：{e}", ephemeral=True)
 
 
     @bot.tree.command(name="moderate", description="打開管理 GUI 面板")
@@ -386,31 +389,31 @@ async def deop(interaction: discord.Interaction, member: discord.Member):
         else:
             return await interaction.response.send_message("你沒有權限執行此指令。", ephemeral=True)
 
-@bot.tree.command(name="unban", description="解除封鎖指定成員")
-@app_commands.describe(user="要解除封鎖的用戶 ID", reason="解除封鎖原因 (選填)")
-async def unban(interaction: discord.Interaction, user: str, reason: str = "未提供原因"):
-    guild = interaction.guild
-    log_channel = guild.get_channel(LOG_CHANNEL_ID)
+    @bot.tree.command(name="unban", description="解除封鎖指定成員")
+    @app_commands.describe(user="要解除封鎖的用戶 ID", reason="解除封鎖原因 (選填)")
+    async def unban(interaction: discord.Interaction, user: str, reason: str = "未提供原因"):
+        guild = interaction.guild
+        log_channel = guild.get_channel(LOG_CHANNEL_ID)
 
-    try:
+        try:
         # 取得被封鎖用戶列表
-        bans = await guild.bans()
-        user_id = int(user)
-        banned_user = next((entry.user for entry in bans if entry.user.id == user_id), None)
+            bans = await guild.bans()
+            user_id = int(user)
+            banned_user = next((entry.user for entry in bans if entry.user.id == user_id), None)
 
-        if banned_user is None:
-            await interaction.response.send_message(f"❌ 找不到被封鎖的用戶 ID `{user}`", ephemeral=True)
-            return
+            if banned_user is None:
+                await interaction.response.send_message(f"❌ 找不到被封鎖的用戶 ID `{user}`", ephemeral=True)
+                return
 
         # 解除封鎖
-        await guild.unban(banned_user, reason=reason)
-        await interaction.response.send_message(f"✅ 已解除封鎖 {banned_user}，原因: {reason}", ephemeral=True)
+            await guild.unban(banned_user, reason=reason)
+            await interaction.response.send_message(f"✅ 已解除封鎖 {banned_user}，原因: {reason}", ephemeral=True)
 
         # 發送 log
-        if log_channel:
-            await log_channel.send(f"🔓 {banned_user} 已被解除封鎖\n原因: {reason}\n操作人: {interaction.user}")
-    except Exception as e:
-        await interaction.response.send_message(f"❌ 解除封鎖失敗: {e}", ephemeral=True)
+            if log_channel:
+                await log_channel.send(f"🔓 {banned_user} 已被解除封鎖\n原因: {reason}\n操作人: {interaction.user}")
+        except Exception as e:
+            await interaction.response.send_message(f"❌ 解除封鎖失敗: {e}", ephemeral=True)
     
     # 啟動 bot（放在 thread 中）
     def _start_bot():

{dcchbot-1.9.5 → dcchbot-1.9.6}/dcchbot.egg-info/PKG-INFO

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

{dcchbot-1.9.5 → dcchbot-1.9.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dcchbot"
-version = "1.9.5"
+version = "1.9.6"
 description = "一個簡單的中文 Discord 管理機器人，支援 GUI 按鈕封鎖/禁言/警告        "
 readme = "README.md"
 license = {text = "MIT"}

dcchbot-1.9.5/dcchbot/__init__.py

@@ -1,6 +0,0 @@
-#init
-from .main import run
-cu_ver = "1.9.4"
-print(f"Discord chinese bot v{cu_ver} ok")
-print("by I_am_from_taiwan")
-run()