From d7e12dc92dfd24eae2cc37a41d0bfa88d47fc304 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=80=A0xu=5Fzh?= <ngc7331@outlook.com>
Date: Thu, 20 Jul 2023 09:06:37 +0000
Subject: [PATCH 1/5] feat: allow the user to configure PushDeer Server URL

---
 server/notification-providers/pushdeer.js | 9 ++++++++-
 src/components/notifications/PushDeer.vue | 5 +++++
 src/lang/en.json                          | 2 ++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/server/notification-providers/pushdeer.js b/server/notification-providers/pushdeer.js
index bbd83f4bf..ff3fd7d9b 100644
--- a/server/notification-providers/pushdeer.js
+++ b/server/notification-providers/pushdeer.js
@@ -8,7 +8,14 @@ class PushDeer extends NotificationProvider {
 
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
         let okMsg = "Sent Successfully.";
-        let pushdeerlink = "https://api2.pushdeer.com/message/push";
+        let defaultServer = "https://api2.pushdeer.com";
+        let endpoint = "/message/push";
+        let pushdeerlink;
+        if (notification.pushdeerServer) {
+            pushdeerlink = `${notification.pushdeerServer}${endpoint}`;
+        } else {
+            pushdeerlink = `${defaultServer}${endpoint}`;
+        }
 
         let valid = msg != null && monitorJSON != null && heartbeatJSON != null;
 
diff --git a/src/components/notifications/PushDeer.vue b/src/components/notifications/PushDeer.vue
index f61849630..40970f15a 100644
--- a/src/components/notifications/PushDeer.vue
+++ b/src/components/notifications/PushDeer.vue
@@ -1,4 +1,9 @@
 <template>
+    <div class="mb-3">
+        <label for="pushdeer-server" class="form-label">{{ $t("PushDeer Server URL") }}</label>
+        <input id="pushdeer-server" v-model="$parent.notification.pushdeerServer" type="text" class="form-control" placeholder="https://api2.pushdeer.com">
+        <div class="form-text">{{ $t("Leave blank to use the official server.") }}</div>
+    </div>
     <div class="mb-3">
         <label for="pushdeer-key" class="form-label">{{ $t("PushDeer Key") }}</label>
         <HiddenInput id="pushdeer-key" v-model="$parent.notification.pushdeerKey" :required="true" autocomplete="new-password" placeholder="PDUxxxx"></HiddenInput>
diff --git a/src/lang/en.json b/src/lang/en.json
index e61f87528..9fd203e3e 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -697,6 +697,8 @@
     "onebotPrivateMessage": "Private",
     "onebotUserOrGroupId": "Group/User ID",
     "onebotSafetyTips": "For safety, must set access token",
+    "PushDeer Server": "PushDeer Server",
+    "Leave blank to use the official server": "Leave blank to use the official server",
     "PushDeer Key": "PushDeer Key",
     "wayToGetClickSendSMSToken": "You can get API Username and API Key from {0} .",
     "Custom Monitor Type": "Custom Monitor Type",

From 0684313ec9a461c8d25aaa2694ad0085dcdedaa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=80=A0xu=5Fzh?= <ngc7331@outlook.com>
Date: Thu, 20 Jul 2023 09:33:27 +0000
Subject: [PATCH 2/5] feat: remove blank characters and ending '/' first

---
 server/notification-providers/pushdeer.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/notification-providers/pushdeer.js b/server/notification-providers/pushdeer.js
index ff3fd7d9b..17139174f 100644
--- a/server/notification-providers/pushdeer.js
+++ b/server/notification-providers/pushdeer.js
@@ -12,7 +12,9 @@ class PushDeer extends NotificationProvider {
         let endpoint = "/message/push";
         let pushdeerlink;
         if (notification.pushdeerServer) {
-            pushdeerlink = `${notification.pushdeerServer}${endpoint}`;
+            // remove blank characters and ending '/'
+            let customServer = notification.pushdeerServer.trim().replace(/\/*$/, "");
+            pushdeerlink = `${customServer}${endpoint}`;
         } else {
             pushdeerlink = `${defaultServer}${endpoint}`;
         }

From f3562864eefa2b2ac46b66673ed39ca3333eea66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=80=A0xu=5Fzh?= <ngc7331@outlook.com>
Date: Fri, 21 Jul 2023 13:45:50 +0000
Subject: [PATCH 3/5] Apply suggestions from code review

Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
---
 src/components/notifications/PushDeer.vue | 2 +-
 src/lang/en.json                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/notifications/PushDeer.vue b/src/components/notifications/PushDeer.vue
index 40970f15a..4fff3befc 100644
--- a/src/components/notifications/PushDeer.vue
+++ b/src/components/notifications/PushDeer.vue
@@ -2,7 +2,7 @@
     <div class="mb-3">
         <label for="pushdeer-server" class="form-label">{{ $t("PushDeer Server URL") }}</label>
         <input id="pushdeer-server" v-model="$parent.notification.pushdeerServer" type="text" class="form-control" placeholder="https://api2.pushdeer.com">
-        <div class="form-text">{{ $t("Leave blank to use the official server.") }}</div>
+        <div class="form-text">{{ $t("pushDeerServerDescription") }}</div>
     </div>
     <div class="mb-3">
         <label for="pushdeer-key" class="form-label">{{ $t("PushDeer Key") }}</label>
diff --git a/src/lang/en.json b/src/lang/en.json
index 9fd203e3e..2e2190b8f 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -698,7 +698,7 @@
     "onebotUserOrGroupId": "Group/User ID",
     "onebotSafetyTips": "For safety, must set access token",
     "PushDeer Server": "PushDeer Server",
-    "Leave blank to use the official server": "Leave blank to use the official server",
+    "pushDeerServerDescription": "Leave blank to use the official server",
     "PushDeer Key": "PushDeer Key",
     "wayToGetClickSendSMSToken": "You can get API Username and API Key from {0} .",
     "Custom Monitor Type": "Custom Monitor Type",

From 6984596568d519651d31e6c4daae179b0a32d693 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=80=A0xu=5Fzh?= <ngc7331@outlook.com>
Date: Fri, 21 Jul 2023 22:01:20 +0800
Subject: [PATCH 4/5] Apply suggestions from code review

Co-authored-by: Frank Elsinga <frank@elsinga.de>
---
 server/notification-providers/pushdeer.js | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/server/notification-providers/pushdeer.js b/server/notification-providers/pushdeer.js
index 17139174f..cba3fce2f 100644
--- a/server/notification-providers/pushdeer.js
+++ b/server/notification-providers/pushdeer.js
@@ -8,16 +8,9 @@ class PushDeer extends NotificationProvider {
 
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
         let okMsg = "Sent Successfully.";
-        let defaultServer = "https://api2.pushdeer.com";
         let endpoint = "/message/push";
-        let pushdeerlink;
-        if (notification.pushdeerServer) {
-            // remove blank characters and ending '/'
-            let customServer = notification.pushdeerServer.trim().replace(/\/*$/, "");
-            pushdeerlink = `${customServer}${endpoint}`;
-        } else {
-            pushdeerlink = `${defaultServer}${endpoint}`;
-        }
+        let serverUrl = notification.pushdeerServer || "https://api2.pushdeer.com";
+        pushdeerlink = `${serverUrl.trim().replace(/\/*$/, "")}${endpoint}`;
 
         let valid = msg != null && monitorJSON != null && heartbeatJSON != null;
 

From bf68e0a7bccce3d5c0a2d46c872e7698fb13cc6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=80=A0xu=5Fzh?= <ngc7331@outlook.com>
Date: Fri, 21 Jul 2023 14:11:13 +0000
Subject: [PATCH 5/5] fix: define pushdeerlink

---
 server/notification-providers/pushdeer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/notification-providers/pushdeer.js b/server/notification-providers/pushdeer.js
index cba3fce2f..288137d18 100644
--- a/server/notification-providers/pushdeer.js
+++ b/server/notification-providers/pushdeer.js
@@ -10,7 +10,7 @@ class PushDeer extends NotificationProvider {
         let okMsg = "Sent Successfully.";
         let endpoint = "/message/push";
         let serverUrl = notification.pushdeerServer || "https://api2.pushdeer.com";
-        pushdeerlink = `${serverUrl.trim().replace(/\/*$/, "")}${endpoint}`;
+        let pushdeerlink = `${serverUrl.trim().replace(/\/*$/, "")}${endpoint}`;
 
         let valid = msg != null && monitorJSON != null && heartbeatJSON != null;