Merge 0563bbca8b into 9a708df324

ntfy和gotify增加聚合推送
增加配置文档
2024-11-17 13:48:03 +08:00 · 2024-10-23 09:16:53 +00:00 · 2024-10-23 09:16:19 +00:00 · 2024-10-23 09:14:16 +00:00
15 changed files with 247 additions and 2 deletions
--- a/dailycheckin/utils/message.py
+++ b/dailycheckin/utils/message.py
@ -300,6 +300,8 @@ def push_message(content_list: list, notice_info: dict):
            or qywx_agentid
            or bark_url
            or pushplus_token
+            or ntfy_topic
+            or (gotify_url and gotify_token)
        ):
            merge_push = False
        else:
--- a/docs/pages/settings/notify/_meta.json
+++ b/docs/pages/settings/notify/_meta.json
@ -9,5 +9,7 @@
  "qywxrobot": "企业微信群机器人",
  "telegram": "Telegram",
  "server": "Server 酱",
-  "turbo": "Server 酱 Turbo"
+  "turbo": "Server 酱 Turbo",
+  "ntfy": "Ntfy",
+  "gotify": "Gotify"
 }
--- a/docs/pages/settings/notify/bark.mdx
+++ b/docs/pages/settings/notify/bark.mdx
@ -46,6 +46,14 @@ import { Callout } from 'nextra/components'
    title="Server 酱 TURBO"
    href="/settings/notify/turbo"
  />
+  <Card
+    title="Ntfy"
+    href="/settings/notify/ntfy"
+  />
+  <Card
+    title="Gotify"
+    href="/settings/notify/gotify"
+  />
 </Cards>

 # BARK
--- a/docs/pages/settings/notify/coolpush.mdx
+++ b/docs/pages/settings/notify/coolpush.mdx
@ -45,6 +45,14 @@ import { Cards, Card } from 'nextra/components'
    title="Server 酱 TURBO"
    href="/settings/notify/turbo"
  />
+  <Card
+    title="Ntfy"
+    href="/settings/notify/ntfy"
+  />
+  <Card
+    title="Gotify"
+    href="/settings/notify/gotify"
+  />
 </Cards>

 # CoolPush
--- a/docs/pages/settings/notify/dingtalk.mdx
+++ b/docs/pages/settings/notify/dingtalk.mdx
@ -45,6 +45,14 @@ import { Cards, Card } from 'nextra/components'
    title="Server 酱 TURBO"
    href="/settings/notify/turbo"
  />
+  <Card
+    title="Ntfy"
+    href="/settings/notify/ntfy"
+  />
+  <Card
+    title="Gotify"
+    href="/settings/notify/gotify"
+  />
 </Cards>

 # 钉钉
--- a/docs/pages/settings/notify/feishu.mdx
+++ b/docs/pages/settings/notify/feishu.mdx
@ -45,8 +45,15 @@ import { Cards, Card } from 'nextra/components'
    title="Server 酱 TURBO"
    href="/settings/notify/turbo"
  />
+  <Card
+    title="Ntfy"
+    href="/settings/notify/ntfy"
+  />
+  <Card
+    title="Gotify"
+    href="/settings/notify/gotify"
+  />
 </Cards>
-
 # 飞书

 ### 配置示例
--- a/docs/pages/settings/notify/gotify.mdx
+++ b/docs/pages/settings/notify/gotify.mdx
@ -0,0 +1,77 @@
+import { Cards, Card } from 'nextra/components'
+import { Callout } from 'nextra/components'
+
+<Cards>
+  <Card
+    title="BARK"
+    href="/settings/notify/bark"
+  />
+  <Card
+    title="CoolPush"
+    href="/settings/notify/coolpush"
+  />
+  <Card
+    title="钉钉"
+    href="/settings/notify/dingtalk"
+  />
+  <Card
+    title="飞书"
+    href="/settings/notify/feishu"
+  />
+  <Card
+    title="PushPlus"
+    href="/settings/notify/pushplus"
+  />
+  <Card
+    title="Qmsg 酱"
+    href="/settings/notify/qmsg"
+  />
+  <Card
+    title="企业微信应用消息"
+    href="/settings/notify/qywx"
+  />
+  <Card
+    title="企业微信群机器人"
+    href="/settings/notify/qywxrobot"
+  />
+  <Card
+    title="Server 酱"
+    href="/settings/notify/server"
+  />
+  <Card
+    title="Telegram"
+    href="/settings/notify/telegram"
+  />
+  <Card
+    title="Server 酱 TURBO"
+    href="/settings/notify/turbo"
+  />
+  <Card
+    title="Ntfy"
+    href="/settings/notify/ntfy"
+  />
+  <Card
+    title="Gotify"
+    href="/settings/notify/gotify"
+  />
+</Cards>
+
+# GOTIFY
+
+
+### 配置示例
+
+```json filename="config.json" copy
+{
+  "GOTIFY_URL": "",
+  "GOTIFY_TOKEN": "",
+  "GOTIFY_PRIORITY": "",
+}
+```
+
+|       参数       |                                              说明                                              |
+| :--------------: | :--------------------------------------------------------------------------------------------: |
+|  _**GOTIFY_URL**_  | [GOTIFY] ,填写 `GOTIFY_URL`                                                                  |
+|  _**GOTIFY_TOKEN**_|                           填写 `GOTIFY_TOKEN`                                                |
+| _**GOTIFY_PRIORITY**_|                          填写 `GOTIFY_PRIORITY`                                            |
+| _**MERGE_PUSH**_ |                         **true**: 将推送消息合并；**false**: 分开推送                            |
--- a/docs/pages/settings/notify/ntfy.mdx
+++ b/docs/pages/settings/notify/ntfy.mdx
@ -0,0 +1,77 @@
+import { Cards, Card } from 'nextra/components'
+import { Callout } from 'nextra/components'
+
+<Cards>
+  <Card
+    title="BARK"
+    href="/settings/notify/bark"
+  />
+  <Card
+    title="CoolPush"
+    href="/settings/notify/coolpush"
+  />
+  <Card
+    title="钉钉"
+    href="/settings/notify/dingtalk"
+  />
+  <Card
+    title="飞书"
+    href="/settings/notify/feishu"
+  />
+  <Card
+    title="PushPlus"
+    href="/settings/notify/pushplus"
+  />
+  <Card
+    title="Qmsg 酱"
+    href="/settings/notify/qmsg"
+  />
+  <Card
+    title="企业微信应用消息"
+    href="/settings/notify/qywx"
+  />
+  <Card
+    title="企业微信群机器人"
+    href="/settings/notify/qywxrobot"
+  />
+  <Card
+    title="Server 酱"
+    href="/settings/notify/server"
+  />
+  <Card
+    title="Telegram"
+    href="/settings/notify/telegram"
+  />
+  <Card
+    title="Server 酱 TURBO"
+    href="/settings/notify/turbo"
+  />
+  <Card
+    title="Ntfy"
+    href="/settings/notify/ntfy"
+  />
+  <Card
+    title="Gotify"
+    href="/settings/notify/gotify"
+  />
+</Cards>
+
+# NTFY
+
+
+### 配置示例
+
+```json filename="config.json" copy
+{
+  "NTFY_URL": "",
+  "NTFY_TOPIC": "",
+  "NTFY_PRIORITY": "",
+}
+```
+
+|       参数       |                                              说明                                              |
+| :--------------: | :--------------------------------------------------------------------------------------------: |
+|  _**NTFY_URL**_  | [NTFY](https://ntfy.sh) ,填写 `NTFY_URL` 例: `https://ntfy.sh` 也可以自建服务端                  |
+|  _**NTFY_TOPIC**_|                           填写 `NTFY_TOPIC` 例: `dailycheckin`                                 |
+| _**NTFY_PRIORITY**_|                          填写 `NTFY_PRIORITY` 例: `3`, 默认为3                               |
+| _**MERGE_PUSH**_ |                         **true**: 将推送消息合并；**false**: 分开推送                            |
--- a/docs/pages/settings/notify/pushplus.mdx
+++ b/docs/pages/settings/notify/pushplus.mdx
@ -45,6 +45,14 @@ import { Cards, Card } from 'nextra/components'
    title="Server 酱 TURBO"
    href="/settings/notify/turbo"
  />
+  <Card
+    title="Ntfy"
+    href="/settings/notify/ntfy"
+  />
+  <Card
+    title="Gotify"
+    href="/settings/notify/gotify"
+  />
 </Cards>

 # PushPlus
--- a/docs/pages/settings/notify/qmsg.mdx
+++ b/docs/pages/settings/notify/qmsg.mdx
@ -46,6 +46,14 @@ import { Callout } from 'nextra/components'
    title="Server 酱 TURBO"
    href="/settings/notify/turbo"
  />
+  <Card
+    title="Ntfy"
+    href="/settings/notify/ntfy"
+  />
+  <Card
+    title="Gotify"
+    href="/settings/notify/gotify"
+  />
 </Cards>

 # Qmsg 酱
--- a/docs/pages/settings/notify/qywx.mdx
+++ b/docs/pages/settings/notify/qywx.mdx
@ -45,6 +45,14 @@ import { Cards, Card } from 'nextra/components'
    title="Server 酱 TURBO"
    href="/settings/notify/turbo"
  />
+  <Card
+    title="Ntfy"
+    href="/settings/notify/ntfy"
+  />
+  <Card
+    title="Gotify"
+    href="/settings/notify/gotify"
+  />
 </Cards>

 # 企业微信应用消息
--- a/docs/pages/settings/notify/qywxrobot.mdx
+++ b/docs/pages/settings/notify/qywxrobot.mdx
@ -45,6 +45,14 @@ import { Cards, Card } from 'nextra/components'
    title="Server 酱 TURBO"
    href="/settings/notify/turbo"
  />
+  <Card
+    title="Ntfy"
+    href="/settings/notify/ntfy"
+  />
+  <Card
+    title="Gotify"
+    href="/settings/notify/gotify"
+  />
 </Cards>

 # 企业微信群机器人
--- a/docs/pages/settings/notify/server.mdx
+++ b/docs/pages/settings/notify/server.mdx
@ -45,6 +45,14 @@ import { Cards, Card } from 'nextra/components'
    title="Server 酱 TURBO"
    href="/settings/notify/turbo"
  />
+  <Card
+    title="Ntfy"
+    href="/settings/notify/ntfy"
+  />
+  <Card
+    title="Gotify"
+    href="/settings/notify/gotify"
+  />
 </Cards>

 # Server 酱
--- a/docs/pages/settings/notify/telegram.mdx
+++ b/docs/pages/settings/notify/telegram.mdx
@ -45,6 +45,14 @@ import { Cards, Card } from 'nextra/components'
    title="Server 酱 TURBO"
    href="/settings/notify/turbo"
  />
+  <Card
+    title="Ntfy"
+    href="/settings/notify/ntfy"
+  />
+  <Card
+    title="Gotify"
+    href="/settings/notify/gotify"
+  />
 </Cards>

 # Telegram
--- a/docs/pages/settings/notify/turbo.mdx
+++ b/docs/pages/settings/notify/turbo.mdx
@ -45,6 +45,14 @@ import { Cards, Card } from 'nextra/components'
    title="Server 酱 TURBO"
    href="/settings/notify/turbo"
  />
+  <Card
+    title="Ntfy"
+    href="/settings/notify/ntfy"
+  />
+  <Card
+    title="Gotify"
+    href="/settings/notify/gotify"
+  />
 </Cards>

 # Server 酱 TURBO
Author	SHA1	Message	Date
qiaoyun680	d984dad9e7	Merge `0563bbca8b` into `9a708df324`	2024-10-23 09:16:53 +00:00
qiaoyun680	0563bbca8b	ntfy和gotify增加聚合推送	2024-10-23 09:16:19 +00:00
qiaoyun680	a87c9eb7e6	增加配置文档	2024-10-23 09:14:16 +00:00