From 8725e5daf91399fd59a5d016fcb3ae7ac98b9e25 Mon Sep 17 00:00:00 2001
From: Bobby Ore <bobby.ore@while1.us>
Date: Wed, 8 Feb 2023 14:08:25 -0600
Subject: [PATCH 1/5] Add ability to use User ID for LunaSea notifications

---
 server/notification-providers/lunasea.js | 15 ++++++++++-----
 src/components/notifications/LunaSea.vue | 13 +++++++++++--
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/server/notification-providers/lunasea.js b/server/notification-providers/lunasea.js
index 2985425e..48f7b4f2 100644
--- a/server/notification-providers/lunasea.js
+++ b/server/notification-providers/lunasea.js
@@ -8,15 +8,20 @@ class LunaSea extends NotificationProvider {
 
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
         let okMsg = "Sent Successfully.";
-        let lunaseadevice = "https://notify.lunasea.app/v1/custom/device/" + notification.lunaseaDevice;
-
+        let lunaseaurl = "";
+        if(notification.lunaseaNotificationType === "device") {
+            lunaseaurl = "https://notify.lunasea.app/v1/custom/device/" + notification.lunaseaId;
+        } else {
+            lunaseaurl = "https://notify.lunasea.app/v1/custom/user/" + notification.lunaseaId;
+        }
+        
         try {
             if (heartbeatJSON == null) {
                 let testdata = {
                     "title": "Uptime Kuma Alert",
                     "body": msg,
                 };
-                await axios.post(lunaseadevice, testdata);
+                await axios.post(lunaseaurl, testdata);
                 return okMsg;
             }
 
@@ -25,7 +30,7 @@ class LunaSea extends NotificationProvider {
                     "title": "UptimeKuma Alert: " + monitorJSON["name"],
                     "body": "[🔴 Down] " + heartbeatJSON["msg"] + "\nTime (UTC): " + heartbeatJSON["time"],
                 };
-                await axios.post(lunaseadevice, downdata);
+                await axios.post(lunaseaurl, downdata);
                 return okMsg;
             }
 
@@ -34,7 +39,7 @@ class LunaSea extends NotificationProvider {
                     "title": "UptimeKuma Alert: " + monitorJSON["name"],
                     "body": "[✅ Up] " + heartbeatJSON["msg"] + "\nTime (UTC): " + heartbeatJSON["time"],
                 };
-                await axios.post(lunaseadevice, updata);
+                await axios.post(lunaseaurl, updata);
                 return okMsg;
             }
 
diff --git a/src/components/notifications/LunaSea.vue b/src/components/notifications/LunaSea.vue
index 34a98688..6367af7e 100644
--- a/src/components/notifications/LunaSea.vue
+++ b/src/components/notifications/LunaSea.vue
@@ -1,7 +1,16 @@
 <template>
     <div class="mb-3">
-        <label for="lunasea-device" class="form-label">{{ $t("LunaSea Device ID") }}<span style="color: red;"><sup>*</sup></span></label>
-        <input id="lunasea-device" v-model="$parent.notification.lunaseaDevice" type="text" class="form-control" required>
+        <label for="lunasea-notification-type" class="form-label">{{ $t("Device ID or User ID") }}<span style="color: red;"><sup>*</sup></span></label>
+        <div class="form-text">
+            <p>
+                <select class="form-select" id="lunasea-notification-type" v-model="$parent.notification.lunaseaNotificationType">
+                    <option value="device">Device</option>
+                    <option value="user">User</option>
+                </select>
+            </p>
+        </div>
+        <label for="lunasea-device" class="form-label">{{ $t("LunaSea ID") }}<span style="color: red;"><sup>*</sup></span></label>
+        <input id="lunasea-device" v-model="$parent.notification.lunaseaId" type="text" class="form-control" required>
         <div class="form-text">
             <p><span style="color: red;"><sup>*</sup></span>{{ $t("Required") }}</p>
         </div>

From 53d9e98e47d3f3619d6159d91189a3789af83a75 Mon Sep 17 00:00:00 2001
From: Bobby Ore <bobby.ore@while1.us>
Date: Wed, 8 Feb 2023 14:13:41 -0600
Subject: [PATCH 2/5] Added required to LunaSea notification type select field

---
 src/components/notifications/LunaSea.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/notifications/LunaSea.vue b/src/components/notifications/LunaSea.vue
index 6367af7e..57947183 100644
--- a/src/components/notifications/LunaSea.vue
+++ b/src/components/notifications/LunaSea.vue
@@ -3,7 +3,7 @@
         <label for="lunasea-notification-type" class="form-label">{{ $t("Device ID or User ID") }}<span style="color: red;"><sup>*</sup></span></label>
         <div class="form-text">
             <p>
-                <select class="form-select" id="lunasea-notification-type" v-model="$parent.notification.lunaseaNotificationType">
+                <select id="lunasea-notification-type" v-model="$parent.notification.lunaseaNotificationType" class="form-select" required>
                     <option value="device">Device</option>
                     <option value="user">User</option>
                 </select>

From 3a361d26210b6db8dc27d0e67956bbfa58bd87c5 Mon Sep 17 00:00:00 2001
From: Bobby Ore <bobby.ore@while1.us>
Date: Wed, 8 Feb 2023 14:16:02 -0600
Subject: [PATCH 3/5] lint fix

---
 server/notification-providers/lunasea.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/notification-providers/lunasea.js b/server/notification-providers/lunasea.js
index 48f7b4f2..0d9bb26a 100644
--- a/server/notification-providers/lunasea.js
+++ b/server/notification-providers/lunasea.js
@@ -9,12 +9,12 @@ class LunaSea extends NotificationProvider {
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
         let okMsg = "Sent Successfully.";
         let lunaseaurl = "";
-        if(notification.lunaseaNotificationType === "device") {
+        if (notification.lunaseaNotificationType === "device") {
             lunaseaurl = "https://notify.lunasea.app/v1/custom/device/" + notification.lunaseaId;
         } else {
             lunaseaurl = "https://notify.lunasea.app/v1/custom/user/" + notification.lunaseaId;
         }
-        
+
         try {
             if (heartbeatJSON == null) {
                 let testdata = {

From 48b637d4c8c70ef1f55521bb34ec42037820c81a Mon Sep 17 00:00:00 2001
From: Bobby Ore <bobby.ore@while1.us>
Date: Thu, 9 Feb 2023 08:49:19 -0600
Subject: [PATCH 4/5] Refactor to not introduce a breaking change

---
 server/notification-providers/lunasea.js | 6 +++---
 src/components/notifications/LunaSea.vue | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/notification-providers/lunasea.js b/server/notification-providers/lunasea.js
index 0d9bb26a..3df6fe1a 100644
--- a/server/notification-providers/lunasea.js
+++ b/server/notification-providers/lunasea.js
@@ -9,10 +9,10 @@ class LunaSea extends NotificationProvider {
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
         let okMsg = "Sent Successfully.";
         let lunaseaurl = "";
-        if (notification.lunaseaNotificationType === "device") {
-            lunaseaurl = "https://notify.lunasea.app/v1/custom/device/" + notification.lunaseaId;
+        if (notification.lunaseaNotificationType === "user") {
+            lunaseaurl = "https://notify.lunasea.app/v1/custom/user/" + notification.lunaseaDevice;
         } else {
-            lunaseaurl = "https://notify.lunasea.app/v1/custom/user/" + notification.lunaseaId;
+            lunaseaurl = "https://notify.lunasea.app/v1/custom/device/" + notification.lunaseaDevice;
         }
 
         try {
diff --git a/src/components/notifications/LunaSea.vue b/src/components/notifications/LunaSea.vue
index 57947183..230e3b0d 100644
--- a/src/components/notifications/LunaSea.vue
+++ b/src/components/notifications/LunaSea.vue
@@ -10,7 +10,7 @@
             </p>
         </div>
         <label for="lunasea-device" class="form-label">{{ $t("LunaSea ID") }}<span style="color: red;"><sup>*</sup></span></label>
-        <input id="lunasea-device" v-model="$parent.notification.lunaseaId" type="text" class="form-control" required>
+        <input id="lunasea-device" v-model="$parent.notification.lunaseaDevice" type="text" class="form-control" required>
         <div class="form-text">
             <p><span style="color: red;"><sup>*</sup></span>{{ $t("Required") }}</p>
         </div>

From b21c2adcc2ec7808e0e8688ef6f25702f0af5c6a Mon Sep 17 00:00:00 2001
From: Bobby Ore <bobby.ore@while1.us>
Date: Tue, 28 Feb 2023 09:47:35 -0600
Subject: [PATCH 5/5] Rework lunasea notification to allow for device id and
 user id

---
 server/notification-providers/lunasea.js |  4 ++--
 src/components/notifications/LunaSea.vue | 27 ++++++++++++++++++------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/server/notification-providers/lunasea.js b/server/notification-providers/lunasea.js
index 3df6fe1a..4d7136f7 100644
--- a/server/notification-providers/lunasea.js
+++ b/server/notification-providers/lunasea.js
@@ -9,8 +9,8 @@ class LunaSea extends NotificationProvider {
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
         let okMsg = "Sent Successfully.";
         let lunaseaurl = "";
-        if (notification.lunaseaNotificationType === "user") {
-            lunaseaurl = "https://notify.lunasea.app/v1/custom/user/" + notification.lunaseaDevice;
+        if (notification.lunaseaTarget === "user") {
+            lunaseaurl = "https://notify.lunasea.app/v1/custom/user/" + notification.lunaseaUserID;
         } else {
             lunaseaurl = "https://notify.lunasea.app/v1/custom/device/" + notification.lunaseaDevice;
         }
diff --git a/src/components/notifications/LunaSea.vue b/src/components/notifications/LunaSea.vue
index 230e3b0d..1ee4a8a5 100644
--- a/src/components/notifications/LunaSea.vue
+++ b/src/components/notifications/LunaSea.vue
@@ -1,18 +1,33 @@
 <template>
     <div class="mb-3">
-        <label for="lunasea-notification-type" class="form-label">{{ $t("Device ID or User ID") }}<span style="color: red;"><sup>*</sup></span></label>
+        <label for="lunasea-notification-target" class="form-label">{{ $t("Target") }}<span style="color: red;"><sup>*</sup></span></label>
         <div class="form-text">
             <p>
-                <select id="lunasea-notification-type" v-model="$parent.notification.lunaseaNotificationType" class="form-select" required>
+                <select id="lunasea-notification-target" v-model="$parent.notification.lunaseaTarget" class="form-select" required>
                     <option value="device">Device</option>
                     <option value="user">User</option>
                 </select>
             </p>
         </div>
-        <label for="lunasea-device" class="form-label">{{ $t("LunaSea ID") }}<span style="color: red;"><sup>*</sup></span></label>
-        <input id="lunasea-device" v-model="$parent.notification.lunaseaDevice" type="text" class="form-control" required>
-        <div class="form-text">
-            <p><span style="color: red;"><sup>*</sup></span>{{ $t("Required") }}</p>
+        <div v-if="$parent.notification.lunaseaTarget === 'device'">
+            <label for="lunasea-device" class="form-label">{{ $t("Device ID") }}<span style="color: red;"><sup>*</sup></span></label>
+            <input id="lunasea-device" v-model="$parent.notification.lunaseaDevice" type="text" class="form-control">
+        </div>
+        <div v-if="$parent.notification.lunaseaTarget === 'user'">
+            <label for="lunasea-device" class="form-label">{{ $t("User ID") }}<span style="color: red;"><sup>*</sup></span></label>
+            <input id="lunasea-device" v-model="$parent.notification.lunaseaUserID" type="text" class="form-control">
         </div>
     </div>
 </template>
+
+<script lang="ts">
+
+export default {
+    mounted() {
+        if (typeof this.$parent.notification.lunaseaTarget === "undefined") {
+            this.$parent.notification.lunaseaTarget = "device";
+        }
+    }
+};
+
+</script>