dcchbot 1.9__tar.gz → 1.9.3__tar.gz

{dcchbot-1.9 → dcchbot-1.9.3}/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.9 → dcchbot-1.9.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dcchbot
-Version: 1.9
+Version: 1.9.3
 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.3/README.md

@@ -0,0 +1,3 @@
+# dcchbot
+
+一個支援 GUI 控制面板的 Discord 管理機器人。

dcchbot-1.9.3/dcchbot/__init__.py

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

{dcchbot-1.9 → dcchbot-1.9.3}/dcchbot/main.py

@@ -1,23 +1,37 @@
-# v1.9 main.py
+# v1.9.1 main.py
 import logging
 import os
 import queue
 import threading
 import time
-import traceback
+import traceback as tb
 from datetime import datetime, timedelta
 import requests
 import discord
 from discord import app_commands
 from discord.ext import commands
 from discord.utils import utcnow
-
-"""v1.9"""
+import random as rd
 package = "dcchbot"
-url = "https://evan0708.rf.gd/pypi-backup/json"
-data = requests.get(url).json()
-API_URL = "https://evan0708.rf.gd/pypi-backup/json"
-latest_version = data["info"]["version"]
+CURRENT_VERSION = "1.9.3"
+API_URL = f"https://pypi.org/pypi/{package}/json"
+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}")
 # ─── 全域參數 ─────────────────────────────────────────
 OWNER_ID = None
 LOG_CHANNEL_ID = None
@@ -25,11 +39,9 @@ token = None
 bot: commands.Bot | None = None
 CODER_ID = 1317800611441283139
 _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"
+now_version = "1.9.1"
 # ─── Logging 設定 ────────────────────────────────────
 os.makedirs("logs", exist_ok=True)
 logging.basicConfig(
@@ -96,23 +108,25 @@ async def _discord_log_worker(bot_instance: commands.Bot, channel_id: int):
 
 # ─── Bot 程式主體與指令 ─────────────────────────────────
 def run():
-    global OWNER_ID, LOG_CHANNEL_ID, token, bot,tmp_owner_id,tmp_log_channel_id
+    global OWNER_ID, LOG_CHANNEL_ID, token, bot
 
     # 互動式輸入（你也可以改成從環境變數讀取）
-    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")
+    while True:
+        OWNER_ID = input("請輸入你的 Discord User ID：\n> ").strip()
+        if not OWNER_ID or not str(OWNER_ID).isdigit():
+           print("格式錯誤，請重新輸入")
+           logger.error("E:vError ownerid")
+        else:
+          OWNER_ID=int(OWNER_ID)
+          break
+    while True:
+        LOG_CHANNEL_ID = input("請輸入你的 Log 頻道 ID：\n> ").strip()
+        if not LOG_CHANNEL_ID or not str(LOG_CHANNEL_ID).isdigit():
+            print("格式錯誤，請重新輸入")
+            logger.error("E:vError channelid")
+        else:
+            LOG_CHANNEL_ID = int(LOG_CHANNEL_ID)
+            break
     token = input("請輸入你的 Discord Bot Token：\n> ").strip()
 
     intents = discord.Intents.all()
@@ -293,14 +307,14 @@ def run():
 
     @bot.tree.command(name="version", description="顯示機器人版本")
     async def version(interaction: discord.Interaction):
-        await interaction.response.send_message("dcchbot 1.9")
+        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 != now_version:
-                await interaction.response.send_message(f"最新版本是{latest_version}現版本為{now_version}，請更新")
+            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="更新")
@@ -340,7 +354,7 @@ def run():
             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")
+                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":
@@ -378,6 +392,20 @@ def run():
                     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 關閉機器人")

{dcchbot-1.9 → dcchbot-1.9.3}/dcchbot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dcchbot
-Version: 1.9
+Version: 1.9.3
 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 → dcchbot-1.9.3}/pyproject.toml

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

dcchbot-1.9/README.md

@@ -1,3 +0,0 @@
-# discordmodbot
-
-一個支援 GUI 控制面板的 Discord 管理機器人。

dcchbot-1.9/dcchbot/__init__.py

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