From 0b52e05af8c51fe4e07fccfdfab77f5fcc241868 Mon Sep 17 00:00:00 2001
From: whyour <imwhyour@gmail.com>
Date: Sun, 5 May 2024 20:10:57 +0800
Subject: [PATCH] =?UTF-8?q?bark=20=E6=8E=A8=E9=80=81=E5=A2=9E=E5=8A=A0=20a?=
 =?UTF-8?q?rchive=20=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/data/notify.ts     |  1 +
 back/services/notify.ts | 14 ++++++++++----
 shell/share.sh          |  8 ++++----
 src/locales/en-US.json  |  1 +
 src/locales/zh-CN.json  |  1 +
 src/utils/config.ts     |  4 ++++
 6 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/back/data/notify.ts b/back/data/notify.ts
index f2f3a3e9..dcb317bd 100644
--- a/back/data/notify.ts
+++ b/back/data/notify.ts
@@ -58,6 +58,7 @@ export class BarkNotification extends NotificationBaseInfo {
   public barkGroup = 'qinglong';
   public barkLevel = 'active';
   public barkUrl = '';
+  public barkArchive=""
 }
 
 export class TelegramBotNotification extends NotificationBaseInfo {
diff --git a/back/services/notify.ts b/back/services/notify.ts
index 2f01ab62..35f40d47 100644
--- a/back/services/notify.ts
+++ b/back/services/notify.ts
@@ -196,8 +196,15 @@ export default class NotificationService {
   }
 
   private async bark() {
-    let { barkPush, barkIcon, barkSound, barkGroup, barkLevel, barkUrl } =
-      this.params;
+    let {
+      barkPush,
+      barkIcon = '',
+      barkSound = '',
+      barkGroup = '',
+      barkLevel = '',
+      barkUrl = '',
+      barkArchive = '',
+    } = this.params;
     if (!barkPush.startsWith('http')) {
       barkPush = `https://api.day.app/${barkPush}`;
     }
@@ -205,8 +212,7 @@ export default class NotificationService {
       this.title,
     )}/${encodeURIComponent(
       this.content,
-    )}?icon=${barkIcon}&sound=${barkSound}&group=${barkGroup}&level=${barkLevel}&url=${barkUrl}`;
-
+    )}?icon=${barkIcon}&sound=${barkSound}&group=${barkGroup}&level=${barkLevel}&url=${barkUrl}&isArchive=${barkArchive}`;
     try {
       const res: any = await got
         .get(url, {
diff --git a/shell/share.sh b/shell/share.sh
index 96569004..c435d232 100755
--- a/shell/share.sh
+++ b/shell/share.sh
@@ -33,12 +33,12 @@ file_task_sample=$dir_sample/task.sample.sh
 file_extra_sample=$dir_sample/extra.sample.sh
 file_notify_js_sample=$dir_sample/notify.js
 file_notify_py_sample=$dir_sample/notify.py
-file_test_js_sample=$dir_sample/test.js
-file_test_py_sample=$dir_sample/test.py
+file_test_js_sample=$dir_sample/ql_sample.js
+file_test_py_sample=$dir_sample/ql_sample.py
 file_notify_py=$dir_scripts/notify.py
 file_notify_js=$dir_scripts/sendNotify.js
-file_test_js=$dir_scripts/test.js
-file_test_py=$dir_scripts/test.py
+file_test_js=$dir_scripts/ql_sample.js
+file_test_py=$dir_scripts/ql_sample.py
 nginx_app_conf=$dir_root/docker/front.conf
 nginx_conf=$dir_root/docker/nginx.conf
 dep_notify_py=$dir_dep/notify.py
diff --git a/src/locales/en-US.json b/src/locales/en-US.json
index 6fe2eda8..f8ca6308 100644
--- a/src/locales/en-US.json
+++ b/src/locales/en-US.json
@@ -357,6 +357,7 @@
   "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",
+  "BARK是否保存推送消息": "Does BARK save push messages",
   "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 7d5dd17b..283ed674 100644
--- a/src/locales/zh-CN.json
+++ b/src/locales/zh-CN.json
@@ -357,6 +357,7 @@
   "BARK推送消息的分组，默认为qinglong": "BARK推送消息的分组，默认为qinglong",
   "BARK推送消息的时效性，默认为active": "BARK推送消息的时效性，默认为active",
   "BARK推送消息的跳转URL": "BARK推送消息的跳转URL",
+  "BARK是否保存推送消息": "BARK是否保存推送消息",
   "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 2104082d..06e40920 100644
--- a/src/utils/config.ts
+++ b/src/utils/config.ts
@@ -190,6 +190,10 @@ export default {
         label: 'barkUrl',
         tip: intl.get('BARK推送消息的跳转URL'),
       },
+      {
+        label: 'barkArchive',
+        tip: intl.get('BARK是否保存推送消息'),
+      },
     ],
     telegramBot: [
       {