From 76bf43550886fc6e1eb6f36bbd5dc7703313649e Mon Sep 17 00:00:00 2001
From: Akimio521 <akimio2333@gmail.com>
Date: Sun, 25 Feb 2024 15:53:53 +0800
Subject: [PATCH] =?UTF-8?q?CHRONOCAT=E8=87=AA=E5=AE=9A=E4=B9=89=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sample/notify.py | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/sample/notify.py b/sample/notify.py
index 9560c773..bfba3db7 100644
--- a/sample/notify.py
+++ b/sample/notify.py
@@ -776,27 +776,42 @@ def pushme(title: str, content: str, **kwargs) -> None:
         print(f"PushMe 推送失败！{response.status_code} {response.text}")
 
 
-def chronocat(title: str, content: str) -> None:
+def chronocat(title: str, content: str, **kwargs) -> None:
     """
     使用 CHRONOCAT 推送消息。
     """
-    if (
-        not push_config.get("CHRONOCAT_URL")
-        or not push_config.get("CHRONOCAT_QQ")
-        or not push_config.get("CHRONOCAT_TOKEN")
-    ):
+    if not ((
+        push_config.get("CHRONOCAT_URL")
+        and push_config.get("CHRONOCAT_QQ")
+        and push_config.get("CHRONOCAT_TOKEN")
+    ) or (
+        push_config.get("CHRONOCAT_URL")
+        and push_config.get("CHRONOCAT_QQ")
+        and push_config.get("CHRONOCAT_TOKEN")
+    )):
         print("CHRONOCAT 服务的 CHRONOCAT_URL 或 CHRONOCAT_QQ 未设置!!\n取消推送")
         return
-
     print("CHRONOCAT 服务启动")
+    if (
+        kwargs.get("CHRONOCAT_URL")
+        and kwargs.get("CHRONOCAT_QQ")
+        and kwargs.get("CHRONOCAT_TOKEN")
+    ):
+        CHRONOCAT_URL = kwargs.get("CHRONOCAT_URL")
+        CHRONOCAT_QQ = kwargs.get("CHRONOCAT_QQ")
+        CHRONOCAT_TOKEN = kwargs.get("CHRONOCAT_TOKEN")
+    else:
+        CHRONOCAT_URL = push_config.get("CHRONOCAT_URL")
+        CHRONOCAT_QQ = push_config.get("CHRONOCAT_QQ")
+        CHRONOCAT_TOKEN = push_config.get("CHRONOCAT_TOKEN")
 
-    user_ids = re.findall(r"user_id=(\d+)", push_config.get("CHRONOCAT_QQ"))
-    group_ids = re.findall(r"group_id=(\d+)", push_config.get("CHRONOCAT_QQ"))
+    user_ids = re.findall(r"user_id=(\d+)", CHRONOCAT_QQ)
+    group_ids = re.findall(r"group_id=(\d+)", CHRONOCAT_QQ)
 
-    url = f'{push_config.get("CHRONOCAT_URL")}/api/message/send'
+    url = f'{CHRONOCAT_URL}/api/message/send'
     headers = {
         "Content-Type": "application/json",
-        "Authorization": f'Bearer {push_config.get("CHRONOCAT_TOKEN")}',
+        "Authorization": f'Bearer {CHRONOCAT_TOKEN}',
     }
 
     for chat_type, ids in [(1, user_ids), (2, group_ids)]: