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

dcchbot/__init__.py

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

dcchbot/main.py

@@ -13,25 +13,54 @@ 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"
+CURRENT_VERSION = "1.9.4"
+API_PYPI_URL = f"https://pypi.org/pypi/{package}/json"
+API_MY_URL = "10.112.101.32:194/dcchbot.json"
+API_URL = None
+if API_PYPI_URL <= API_MY_URL:
+    API_URL = API_MY_URL
+elif API_PYPI_URL >= API_MY_URL:
+    API_URL = API_PYPI_URL
+else:
+    API_URL = API_MY_URL
 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}")
+tb = tb
+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,11 +68,10 @@ token = None
 bot: commands.Bot | None = None
 CODER_ID = 1317800611441283139
 _now = datetime.now()
-tmp_owner_id = None
-tmp_log_channel_id = None
+latest_version = "1.9.3"
 # 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.3"
 # ─── Logging 設定 ────────────────────────────────────
 os.makedirs("logs", exist_ok=True)
 logging.basicConfig(
@@ -110,23 +138,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()
@@ -480,3 +510,4 @@ class ModerationView(discord.ui.View):
 # ─── 程式進入點 ───────────────────────────────────────
 if __name__ == "__main__":
     run()
+    check_update()

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

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

dcchbot-1.9.4.dist-info/RECORD

@@ -0,0 +1,9 @@
+dcchbot/__init__.py,sha256=TuQRGtSD8Z8WeNCtlvqz-fVxh2ZS87QSmN4VCJent0s,127
+dcchbot/__main__.py,sha256=5FwoJspcKFt5_1AlXoxlWROiQSp9wgnFEltU6ufz9QE,30
+dcchbot/main.py,sha256=k-3M5NdSnd5jeGxFCs_QrTiem5hIxD91uHvz_0zwrCY,26150
+dcchbot-1.9.4.dist-info/licenses/LICENSE,sha256=_5HM5sddbG63Amw1X9WfCK-_5xBLHlAV_HaUKBqeTpE,1063
+dcchbot-1.9.4.dist-info/METADATA,sha256=GVqWpKsSokVweXEL5JTmR2FZrTbkV3lAKCFriNuyXYY,440
+dcchbot-1.9.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dcchbot-1.9.4.dist-info/entry_points.txt,sha256=90T16CGc_Tx-4pFaLCcbuuh7Vi9l4gsLovBkydqxP9Y,45
+dcchbot-1.9.4.dist-info/top_level.txt,sha256=jiDTz8UmwZgXN9KzokwDRYhoWxsVmWcnqmrANeTFMck,8
+dcchbot-1.9.4.dist-info/RECORD,,

dcchbot-1.9.1.dist-info/RECORD

@@ -1,9 +0,0 @@
-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,,