From aab096843cecc362fed033af9396f55d17b0830b Mon Sep 17 00:00:00 2001 From: zui-lang <77880495+zui-lang@users.noreply.github.com> Date: Sun, 17 Sep 2023 01:01:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=20Bark=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A2=9D=E5=A4=96=E5=8F=82=E6=95=B0=EF=BC=9A?= =?UTF-8?q?=E6=97=B6=E6=95=88=E6=80=A7=E9=80=9A=E7=9F=A5=E3=80=81=E8=B7=B3?= =?UTF-8?q?=E8=BD=ACUrl=20(#2112)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/data/notify.ts | 2 ++ back/services/notify.ts | 4 ++-- sample/notify.js | 12 +++++++++++- sample/notify.py | 4 ++++ src/locales/en-US.json | 2 ++ src/locales/zh-CN.json | 2 ++ src/utils/config.ts | 8 ++++++++ 7 files changed, 31 insertions(+), 3 deletions(-) diff --git a/back/data/notify.ts b/back/data/notify.ts index 0bbe9c82..10ee8558 100644 --- a/back/data/notify.ts +++ b/back/data/notify.ts @@ -55,6 +55,8 @@ export class BarkNotification extends NotificationBaseInfo { public barkIcon = 'https://qn.whyour.cn/logo.png'; public barkSound = ''; public barkGroup = 'qinglong'; + public barkLevel = 'active'; + public barkUrl = ''; } export class TelegramBotNotification extends NotificationBaseInfo { diff --git a/back/services/notify.ts b/back/services/notify.ts index 0edaacf2..c4ea67f0 100644 --- a/back/services/notify.ts +++ b/back/services/notify.ts @@ -195,7 +195,7 @@ export default class NotificationService { } private async bark() { - let { barkPush, barkIcon, barkSound, barkGroup } = this.params; + let { barkPush, barkIcon, barkSound, barkGroup, barkLevel, barkUrl } = this.params; if (!barkPush.startsWith('http')) { barkPush = `https://api.day.app/${barkPush}`; } @@ -203,7 +203,7 @@ export default class NotificationService { this.title, )}/${encodeURIComponent( this.content, - )}?icon=${barkIcon}&sound=${barkSound}&group=${barkGroup}`; + )}?icon=${barkIcon}&sound=${barkSound}&group=${barkGroup}&level=${barkLevel}&url=${barkUrl}`; try { const res: any = await got diff --git a/sample/notify.js b/sample/notify.js index 7f759401..19a8ff5e 100644 --- a/sample/notify.js +++ b/sample/notify.js @@ -55,6 +55,10 @@ let BARK_ICON = 'https://qn.whyour.cn/logo.png'; let BARK_SOUND = ''; //BARK app推送消息的分组, 默认为"QingLong" let BARK_GROUP = 'QingLong'; +//BARK app推送消息的时效性, 默认为"active" +let BARK_LEVEL = 'active'; +//BARK app推送消息的跳转URL +let BARK_URL = ''; // =======================================telegram机器人通知设置区域=========================================== //此处填你telegram bot 的Token，telegram机器人通知推送必填项.例如：1077xxx4424:AAFjv0FcqxxxxxxgEMGfi22B4yh15R5uw @@ -211,6 +215,12 @@ if (process.env.BARK_PUSH) { if (process.env.BARK_GROUP) { BARK_GROUP = process.env.BARK_GROUP; } + if (process.env.BARK_LEVEL) { + BARK_LEVEL = process.env.BARK_LEVEL; + } + if (process.env.BARK_URL) { + BARK_URL = process.env.BARK_URL; + } } else { if ( BARK_PUSH && @@ -552,7 +562,7 @@ function BarkNotify(text, desp, params = {}) { const options = { url: `${BARK_PUSH}/${encodeURIComponent(text)}/${encodeURIComponent( desp, - )}?icon=${BARK_ICON}&sound=${BARK_SOUND}&group=${BARK_GROUP}&${querystring.stringify( + )}?icon=${BARK_ICON}&sound=${BARK_SOUND}&group=${BARK_GROUP}&level=${BARK_LEVEL}&url=${BARK_URL}&${querystring.stringify( params, )}`, headers: { diff --git a/sample/notify.py b/sample/notify.py index 27d817bd..1d43b609 100644 --- a/sample/notify.py +++ b/sample/notify.py @@ -40,6 +40,8 @@ push_config = { 'BARK_GROUP': '', # bark 推送分组 'BARK_SOUND': '', # bark 推送声音 'BARK_ICON': '', # bark 推送图标 + 'BARK_LEVEL': '', # bark 推送时效性 + 'BARK_URL': '', # bark 推送跳转URL 'CONSOLE': True, # 控制台输出 @@ -130,6 +132,8 @@ def bark(title: str, content: str) -> None: "BARK_GROUP": "group", "BARK_SOUND": "sound", "BARK_ICON": "icon", + "BARK_LEVEL": "level", + "BARK_URL": "url", } params = "" for pair in filter( diff --git a/src/locales/en-US.json b/src/locales/en-US.json index f19a672c..ad3352ca 100644 --- a/src/locales/en-US.json +++ b/src/locales/en-US.json @@ -352,6 +352,8 @@ "BARK推送图标，自定义推送图标 (需iOS15或以上才能显示)": "BARK push icon, custom push icon (requires iOS 15 or above to display)", "BARK推送铃声，铃声列表去APP查看复制填写": "BARK push ringtone, check and copy from the APP's ringtone list", "BARK推送消息的分组，默认为qinglong": "BARK push message grouping, default is qinglong", + "BARK推送消息的时效性，默认为active": "BARK push message redirecting URL", + "BARK推送消息的跳转URL": "BARK push message grouping, default is qinglong", "telegram机器人的token，例如：1077xxx4424:AAFjv0FcqxxxxxxgEMGfi22B4yh15R5uw": "Telegram Bot token, e.g., 1077xxx4424:AAFjv0FcqxxxxxxgEMGfi22B4yh15R5uw", "telegram用户的id，例如：129xxx206": "Telegram user ID, e.g., 129xxx206", "代理IP": "Proxy IP", diff --git a/src/locales/zh-CN.json b/src/locales/zh-CN.json index a6ca3bee..d59b8bbd 100644 --- a/src/locales/zh-CN.json +++ b/src/locales/zh-CN.json @@ -352,6 +352,8 @@ "BARK推送图标，自定义推送图标 (需iOS15或以上才能显示)": "BARK推送图标，自定义推送图标 (需iOS15或以上才能显示)", "BARK推送铃声，铃声列表去APP查看复制填写": "BARK推送铃声，铃声列表去APP查看复制填写", "BARK推送消息的分组，默认为qinglong": "BARK推送消息的分组，默认为qinglong", + "BARK推送消息的时效性，默认为active": "BARK推送消息的时效性，默认为active", + "BARK推送消息的跳转URL": "BARK推送消息的跳转URL", "telegram机器人的token，例如：1077xxx4424:AAFjv0FcqxxxxxxgEMGfi22B4yh15R5uw": "telegram机器人的token，例如：1077xxx4424:AAFjv0FcqxxxxxxgEMGfi22B4yh15R5uw", "telegram用户的id，例如：129xxx206": "telegram用户的id，例如：129xxx206", "代理IP": "代理IP", diff --git a/src/utils/config.ts b/src/utils/config.ts index 91032823..a7282093 100644 --- a/src/utils/config.ts +++ b/src/utils/config.ts @@ -176,6 +176,14 @@ export default { label: 'barkGroup', tip: intl.get('BARK推送消息的分组，默认为qinglong'), }, + { + label: 'barkLevel', + tip: intl.get('BARK推送消息的时效性，默认为active'), + }, + { + label: 'barkUrl', + tip: intl.get('BARK推送消息的跳转URL'), + }, ], telegramBot: [ {