From 5865885e6a3b6d1d3787fe28dba5799897ca11cb Mon Sep 17 00:00:00 2001
From: Cp0204 <Cp0204@qq.com>
Date: Tue, 9 Apr 2024 01:38:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=9F=E8=BF=9B=20qinglong=20=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E6=A8=A1=E5=9D=97=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sendNotify.py | 57 +++++++++++++++++++++++++++++----------------------
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/sendNotify.py b/sendNotify.py
index 66fc5c1..ab07ae1 100644
--- a/sendNotify.py
+++ b/sendNotify.py
@@ -113,7 +113,6 @@ push_config = {
     'WEBHOOK_METHOD': '',               # 自定义通知 请求方法
     'WEBHOOK_CONTENT_TYPE': ''          # 自定义通知 content-type
 }
-notify_function = []
 # fmt: on
 
 # 首先读取 面板变量 或者 github action 运行变量
@@ -578,7 +577,9 @@ def aibotk(title: str, content: str) -> None:
         or not push_config.get("AIBOTK_TYPE")
         or not push_config.get("AIBOTK_NAME")
     ):
-        print("智能微秘书 的 AIBOTK_KEY 或者 AIBOTK_TYPE 或者 AIBOTK_NAME 未设置!!\n取消推送")
+        print(
+            "智能微秘书 的 AIBOTK_KEY 或者 AIBOTK_TYPE 或者 AIBOTK_NAME 未设置!!\n取消推送"
+        )
         return
     print("智能微秘书 服务启动")
 
@@ -748,32 +749,28 @@ def parse_headers(headers):
     return parsed
 
 
+def parse_string(input_string):
+    matches = {}
+    pattern = r"(\w+):\s*((?:(?!\n\w+:).)*)"
+    regex = re.compile(pattern)
+    for match in regex.finditer(input_string):
+        key, value = match.group(1).strip(), match.group(2).strip()
+        try:
+            json_value = json.loads(value)
+            matches[key] = json_value
+        except:
+            matches[key] = value
+    return matches
+
+
 def parse_body(body, content_type):
     if not body or content_type == "text/plain":
         return body
 
-    parsed = {}
-    lines = body.split("\n")
-
-    for line in lines:
-        i = line.find(":")
-        if i == -1:
-            continue
-
-        key = line[:i].strip()
-        val = line[i + 1 :].strip()
-
-        if not key or key in parsed:
-            continue
-
-        try:
-            json_value = json.loads(val)
-            parsed[key] = json_value
-        except:
-            parsed[key] = val
+    parsed = parse_string(body)
 
     if content_type == "application/x-www-form-urlencoded":
-        data = urlencode(parsed, doseq=True)
+        data = urllib.parse.urlencode(parsed, doseq=True)
         return data
 
     if content_type == "application/json":
@@ -842,6 +839,7 @@ def one() -> str:
 
 
 def add_notify_function():
+    notify_function = []
     if push_config.get("BARK_PUSH"):
         notify_function.append(bark)
     if push_config.get("CONSOLE"):
@@ -897,8 +895,19 @@ def add_notify_function():
     if push_config.get("WEBHOOK_URL") and push_config.get("WEBHOOK_METHOD"):
         notify_function.append(custom_notify)
 
+    if not notify_function:
+        print(f"无推送渠道，请检查通知变量是否正确")
+    return notify_function
+
+
+def send(title: str, content: str, ignore_default_config: bool = False, **kwargs):
+    if kwargs:
+        global push_config
+        if ignore_default_config:
+            push_config = kwargs  # 清空从环境变量获取的配置
+        else:
+            push_config.update(kwargs)
 
-def send(title: str, content: str) -> None:
     if not content:
         print(f"{title} 推送内容为空！")
         return
@@ -913,7 +922,7 @@ def send(title: str, content: str) -> None:
     hitokoto = push_config.get("HITOKOTO")
     content += "\n\n" + one() if hitokoto else ""
 
-    add_notify_function()
+    notify_function = add_notify_function()
     ts = [
         threading.Thread(target=mode, args=(title, content), name=mode.__name__)
         for mode in notify_function