From 29d0db805d82e7d01239aead2cb87e75fddf30be Mon Sep 17 00:00:00 2001
From: DeeJayPee <jp@guiot.name>
Date: Mon, 13 Sep 2021 10:22:05 +0200
Subject: [PATCH 01/17] Add legacy octopush (Octopush-DM from 2011 to 2020
 accounts) version

---
 server/notification-providers/octopush.js | 64 ++++++++++++++++-------
 src/components/NotificationDialog.vue     | 10 ++++
 2 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/server/notification-providers/octopush.js b/server/notification-providers/octopush.js
index 40273f9b..228e1b2a 100644
--- a/server/notification-providers/octopush.js
+++ b/server/notification-providers/octopush.js
@@ -9,27 +9,53 @@ class Octopush extends NotificationProvider {
         let okMsg = "Sent Successfully. ";
 
         try {
-            let config = {
-                headers: {
-                    "api-key": notification.octopushAPIKey,
-                    "api-login": notification.octopushLogin,
-                    "cache-control": "no-cache"
-                }
-            };
-            let data = {
-                "recipients": [
-                    {
-                        "phone_number": notification.octopushPhoneNumber
+	    // Default - V2
+	    if (notification.octopushVersion == 2 || !notification.octopushVersion)
+	    {
+		let config = {
+                    headers: {
+			"api-key": notification.octopushAPIKey,
+			"api-login": notification.octopushLogin,
+			"cache-control": "no-cache"
                     }
-                ],
-                //octopush not supporting non ascii char
-                "text": msg.replace(/[^\x00-\x7F]/g, ""),
-                "type": notification.octopushSMSType,
-                "purpose": "alert",
-                "sender": notification.octopushSenderName
-            };
+		};
+		let data = {
+                    "recipients": [
+			{
+                            "phone_number": notification.octopushPhoneNumber
+			}
+                    ],
+                    //octopush not supporting non ascii char
+                    "text": msg.replace(/[^\x00-\x7F]/g, ""),
+                    "type": notification.octopushSMSType,
+                    "purpose": "alert",
+                    "sender": notification.octopushSenderName
+		};
+		await axios.post("https://api.octopush.com/v1/public/sms-campaign/send", data, config)
+	    }
+	    else if (notification.octopushVersion == 1)
+	    {
+		let data = {
+                    "user_login": notification.octopushDMLogin,
+		    "api_key": notification.octopushDMAPIKey,
+		    "sms_recipients" : notification.octopushDMPhoneNumber,
+		    "sms_sender": notification.octopushDMSenderName,
+		    "sms_type": (notification.octopushDMSMSType == 'sms_premium')?'FR':'XXX',
+		    "transactional": '1',
+		    //octopush not supporting non ascii char
+		    "sms_text": msg.replace(/[^\x00-\x7F]/g, ""),
+		};
+
+		let config = {
+		    headers: {
+		        "cache-control": "no-cache"
+		    },
+		    params: data
+		};
+		await axios.post("https://www.octopush-dm.com/api/sms/json", {}, config)
+	    } else
+		throw new Error('Unknown Octopush version !');
 
-            await axios.post("https://api.octopush.com/v1/public/sms-campaign/send", data, config)
             return okMsg;
         } catch (error) {
             this.throwGeneralAxiosError(error);
diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue
index d689b0c9..10765600 100644
--- a/src/components/NotificationDialog.vue
+++ b/src/components/NotificationDialog.vue
@@ -244,6 +244,16 @@
                         </template>
 
                         <template v-if="notification.type === 'octopush'">
+			    <div class="mb-3">
+			    	 <label for="octopush-version" class="form-label">Octopush API Version</label>
+				 <select id="octopush-version" v-model="notification.octopushVersion" class="form-select">
+                                     <option value="2">V2</option>
+                                     <option value="1">V1 (Legacy Octopush-DM)</option>
+                                 </select>
+                                 <div class="form-text">
+                                    Do you use the legacy version of Octopush (2011-2020) or the new version ?
+                                 </div>
+			    </div>
                             <div class="mb-3">
                                 <label for="octopush-key" class="form-label">API KEY</label>
                                 <HiddenInput id="octopush-key" v-model="notification.octopushAPIKey" :required="true" autocomplete="one-time-code"></HiddenInput>

From f14a798b2cc1d4c37b17ff8b615001b7720f5b18 Mon Sep 17 00:00:00 2001
From: DeeJayPee <jp@guiot.name>
Date: Tue, 5 Oct 2021 19:43:04 +0200
Subject: [PATCH 02/17] Fix indentation + typo

---
 server/notification-providers/octopush.js | 66 +++++++++++------------
 src/components/NotificationDialog.vue     | 18 +++----
 2 files changed, 41 insertions(+), 43 deletions(-)

diff --git a/server/notification-providers/octopush.js b/server/notification-providers/octopush.js
index 228e1b2a..9d77d50c 100644
--- a/server/notification-providers/octopush.js
+++ b/server/notification-providers/octopush.js
@@ -9,52 +9,50 @@ class Octopush extends NotificationProvider {
         let okMsg = "Sent Successfully. ";
 
         try {
-	    // Default - V2
-	    if (notification.octopushVersion == 2 || !notification.octopushVersion)
-	    {
-		let config = {
+        // Default - V2
+            if (notification.octopushVersion == 2 || !notification.octopushVersion) {
+                let config = {
                     headers: {
-			"api-key": notification.octopushAPIKey,
-			"api-login": notification.octopushLogin,
-			"cache-control": "no-cache"
+                        "api-key": notification.octopushAPIKey,
+                        "api-login": notification.octopushLogin,
+                        "cache-control": "no-cache"
                     }
-		};
-		let data = {
+                };
+                let data = {
                     "recipients": [
-			{
+                        {
                             "phone_number": notification.octopushPhoneNumber
-			}
+                        }
                     ],
                     //octopush not supporting non ascii char
                     "text": msg.replace(/[^\x00-\x7F]/g, ""),
                     "type": notification.octopushSMSType,
                     "purpose": "alert",
                     "sender": notification.octopushSenderName
-		};
-		await axios.post("https://api.octopush.com/v1/public/sms-campaign/send", data, config)
-	    }
-	    else if (notification.octopushVersion == 1)
-	    {
-		let data = {
+                };
+                await axios.post("https://api.octopush.com/v1/public/sms-campaign/send", data, config)
+            } else if (notification.octopushVersion == 1) {
+                let data = {
                     "user_login": notification.octopushDMLogin,
-		    "api_key": notification.octopushDMAPIKey,
-		    "sms_recipients" : notification.octopushDMPhoneNumber,
-		    "sms_sender": notification.octopushDMSenderName,
-		    "sms_type": (notification.octopushDMSMSType == 'sms_premium')?'FR':'XXX',
-		    "transactional": '1',
-		    //octopush not supporting non ascii char
-		    "sms_text": msg.replace(/[^\x00-\x7F]/g, ""),
-		};
+                    "api_key": notification.octopushDMAPIKey,
+                    "sms_recipients": notification.octopushDMPhoneNumber,
+                    "sms_sender": notification.octopushDMSenderName,
+                    "sms_type": (notification.octopushDMSMSType == "sms_premium") ? "FR" : "XXX",
+                    "transactional": "1",
+                    //octopush not supporting non ascii char
+                    "sms_text": msg.replace(/[^\x00-\x7F]/g, ""),
+                };
 
-		let config = {
-		    headers: {
-		        "cache-control": "no-cache"
-		    },
-		    params: data
-		};
-		await axios.post("https://www.octopush-dm.com/api/sms/json", {}, config)
-	    } else
-		throw new Error('Unknown Octopush version !');
+                let config = {
+                    headers: {
+                        "cache-control": "no-cache"
+                    },
+                    params: data
+                };
+                await axios.post("https://www.octopush-dm.com/api/sms/json", {}, config)
+            } else {
+                throw new Error("Unknown Octopush version!");
+            }
 
             return okMsg;
         } catch (error) {
diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue
index 10765600..f988ee20 100644
--- a/src/components/NotificationDialog.vue
+++ b/src/components/NotificationDialog.vue
@@ -244,16 +244,16 @@
                         </template>
 
                         <template v-if="notification.type === 'octopush'">
-			    <div class="mb-3">
-			    	 <label for="octopush-version" class="form-label">Octopush API Version</label>
-				 <select id="octopush-version" v-model="notification.octopushVersion" class="form-select">
-                                     <option value="2">V2</option>
-                                     <option value="1">V1 (Legacy Octopush-DM)</option>
-                                 </select>
-                                 <div class="form-text">
+                            <div class="mb-3">
+                                <label for="octopush-version" class="form-label">Octopush API Version</label>
+                                <select id="octopush-version" v-model="notification.octopushVersion" class="form-select">
+                                    <option value="2">V2</option>
+                                    <option value="1">V1 (Legacy Octopush-DM)</option>
+                                </select>
+                                <div class="form-text">
                                     Do you use the legacy version of Octopush (2011-2020) or the new version ?
-                                 </div>
-			    </div>
+                                </div>
+                            </div>
                             <div class="mb-3">
                                 <label for="octopush-key" class="form-label">API KEY</label>
                                 <HiddenInput id="octopush-key" v-model="notification.octopushAPIKey" :required="true" autocomplete="one-time-code"></HiddenInput>

From f9d7b993678ca1d272cfc77d83570db87d137647 Mon Sep 17 00:00:00 2001
From: DeeJayPee <jp@guiot.name>
Date: Tue, 5 Oct 2021 20:01:07 +0200
Subject: [PATCH 03/17] Add legacy version back on refactored master branch

---
 src/components/notifications/Octopush.vue | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/components/notifications/Octopush.vue b/src/components/notifications/Octopush.vue
index 10fb6df7..fdd0464e 100644
--- a/src/components/notifications/Octopush.vue
+++ b/src/components/notifications/Octopush.vue
@@ -1,4 +1,14 @@
 <template>
+    <div class="mb-3">
+        <label for="octopush-version" class="form-label">Octopush API Version</label>
+        <select id="octopush-version" v-model="$parent.notification.octopushVersion" class="form-select">
+            <option value="2">V2</option>
+            <option value="1">V1 (Legacy Octopush-DM)</option>
+        </select>
+        <div class="form-text">
+            Do you use the legacy version of Octopush (2011-2020) or the new version ?
+        </div>
+    </div>
     <div class="mb-3">
         <label for="octopush-key" class="form-label">API KEY</label>
         <HiddenInput id="octopush-key" v-model="$parent.notification.octopushAPIKey" :required="true" autocomplete="one-time-code"></HiddenInput>

From 5decfb9fadc71f2099809aff69b4e45fb7e3330f Mon Sep 17 00:00:00 2001
From: Gero Gerke <hello@gerogerke.de>
Date: Tue, 5 Oct 2021 20:03:56 +0200
Subject: [PATCH 04/17] Matrix Notifications

---
 server/notification-providers/matrix.js | 37 +++++++++++++++++++++++++
 server/notification.js                  |  2 ++
 src/components/notifications/Matrix.vue | 25 +++++++++++++++++
 src/components/notifications/index.js   |  4 ++-
 src/languages/en.js                     |  1 +
 5 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 server/notification-providers/matrix.js
 create mode 100644 src/components/notifications/Matrix.vue

diff --git a/server/notification-providers/matrix.js b/server/notification-providers/matrix.js
new file mode 100644
index 00000000..4593be6a
--- /dev/null
+++ b/server/notification-providers/matrix.js
@@ -0,0 +1,37 @@
+const NotificationProvider = require("./notification-provider");
+const axios = require("axios");
+const Crypto = require('crypto')
+
+class Matrix extends NotificationProvider {
+
+    name = "matrix";
+
+    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        let okMsg = "Sent Successfully. ";
+
+        const size = 20;
+        const randomString = Crypto
+            .randomBytes(size)
+            .toString('base64')
+            .slice(0, size);    
+
+        try {
+            let config = {
+                headers: {
+                    "Authorization": `Bearer ${notification.accessToken}`,
+                }
+            };
+            let data = {
+                "msgtype": "m.text",
+                "body": msg
+            };
+
+            await axios.put(`${notification.homeserverUrl}/_matrix/client/r0/rooms/${notification.internalRoomId}/send/m.room.message/${randomString}`, data, config)
+            return okMsg;
+        } catch (error) {
+            this.throwGeneralAxiosError(error);
+        }
+    }
+}
+
+module.exports = Matrix;
diff --git a/server/notification.js b/server/notification.js
index 13447241..207e0a37 100644
--- a/server/notification.js
+++ b/server/notification.js
@@ -5,6 +5,7 @@ const Gotify = require("./notification-providers/gotify");
 const Line = require("./notification-providers/line");
 const LunaSea = require("./notification-providers/lunasea");
 const Mattermost = require("./notification-providers/mattermost");
+const Matrix = require("./notification-providers/matrix");
 const Octopush = require("./notification-providers/octopush");
 const Pushbullet = require("./notification-providers/pushbullet");
 const Pushover = require("./notification-providers/pushover");
@@ -34,6 +35,7 @@ class Notification {
             new Line(),
             new LunaSea(),
             new Mattermost(),
+            new Matrix(),
             new Octopush(),
             new Pushbullet(),
             new Pushover(),
diff --git a/src/components/notifications/Matrix.vue b/src/components/notifications/Matrix.vue
new file mode 100644
index 00000000..12c7dad8
--- /dev/null
+++ b/src/components/notifications/Matrix.vue
@@ -0,0 +1,25 @@
+<template>
+    <div class="mb-3">
+        <label for="homeserver-url" class="form-label">Homeserver URL (with http(s):// and optionally port)</label>
+        <input id="homeserver-url" v-model="$parent.notification.homeserverUrl" type="text" class="form-control" :required="true">
+        <label for="internal-room-id" class="form-label">Internal Room Id</label>
+        <input id="internal-room-id" v-model="$parent.notification.internalRoomId" type="text" class="form-control" required="true">
+        <label for="access-token" class="form-label">Access Token</label>
+        <HiddenInput id="access-token" v-model="$parent.notification.accessToken" :required="true" autocomplete="one-time-code" :maxlength="500"></HiddenInput>
+    </div>
+
+    <p style="margin-top: 8px;">
+        You can find the internal room ID by looking in the advanced section if your Matrix client. It should look like !QMdRCpUIfLwsfjxye6:home.server.<br/>
+        It is highly recommended you create a new user and do not use your Matrix user's access token as it will allow full access to the matrix user. You can get the access token by running curl -XPOST -d '{"type":"m.login.password", "identifier": {"user":"botusername", "type": "m.id.user"}, "password":"passwordforuser"}' "https://home.server.url/_matrix/client/r0/login".
+    </p>
+</template>
+
+<script>
+import HiddenInput from "../HiddenInput.vue";
+
+export default {
+    components: {
+        HiddenInput,
+    },
+}
+</script>
diff --git a/src/components/notifications/index.js b/src/components/notifications/index.js
index e377803e..6dd9ed92 100644
--- a/src/components/notifications/index.js
+++ b/src/components/notifications/index.js
@@ -15,6 +15,7 @@ import Apprise from "./Apprise.vue";
 import Pushbullet from "./Pushbullet.vue";
 import Line from "./Line.vue";
 import Mattermost from "./Mattermost.vue";
+import Matrix from "./Matrix.vue";
 
 /**
  * Manage all notification form.
@@ -38,7 +39,8 @@ const NotificationFormList = {
     "apprise": Apprise,
     "pushbullet": Pushbullet,
     "line": Line,
-    "mattermost": Mattermost
+    "mattermost": Mattermost,
+    "matrix": Matrix
 }
 
 export default NotificationFormList
diff --git a/src/languages/en.js b/src/languages/en.js
index 46298b01..ccc7290d 100644
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -195,4 +195,5 @@ export default {
     "pushbullet": "Pushbullet",
     "line": "Line Messenger",
     "mattermost": "Mattermost",
+    "matrix": "Matrix",
 };

From 215cc079073fbea73b2de793e4d461430f016a95 Mon Sep 17 00:00:00 2001
From: DeeJayPee <jp@guiot.name>
Date: Tue, 5 Oct 2021 20:12:36 +0200
Subject: [PATCH 05/17] Rename versions

---
 src/components/notifications/Octopush.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/notifications/Octopush.vue b/src/components/notifications/Octopush.vue
index fdd0464e..e9a21ccf 100644
--- a/src/components/notifications/Octopush.vue
+++ b/src/components/notifications/Octopush.vue
@@ -2,8 +2,8 @@
     <div class="mb-3">
         <label for="octopush-version" class="form-label">Octopush API Version</label>
         <select id="octopush-version" v-model="$parent.notification.octopushVersion" class="form-select">
-            <option value="2">V2</option>
-            <option value="1">V1 (Legacy Octopush-DM)</option>
+            <option value="2">Octopush (endpoint : api.octopush.com)</option>
+            <option value="1">Legacy Octopush-DM (endpoint : www.octopush-dm.com)</option>
         </select>
         <div class="form-text">
             Do you use the legacy version of Octopush (2011-2020) or the new version ?

From 49eaa1a1661e00d0241c394d7335b10d7b2bde2f Mon Sep 17 00:00:00 2001
From: DeeJayPee <jp@guiot.name>
Date: Tue, 5 Oct 2021 20:13:24 +0200
Subject: [PATCH 06/17] Typo fix

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

diff --git a/src/components/notifications/Octopush.vue b/src/components/notifications/Octopush.vue
index e9a21ccf..af823e79 100644
--- a/src/components/notifications/Octopush.vue
+++ b/src/components/notifications/Octopush.vue
@@ -6,7 +6,7 @@
             <option value="1">Legacy Octopush-DM (endpoint : www.octopush-dm.com)</option>
         </select>
         <div class="form-text">
-            Do you use the legacy version of Octopush (2011-2020) or the new version ?
+            Do you use the legacy version of Octopush (2011-2020) or the new version?
         </div>
     </div>
     <div class="mb-3">

From 044c78aa2dceb1fa726e621e01e96c083e4a1f91 Mon Sep 17 00:00:00 2001
From: DeeJayPee <jp@guiot.name>
Date: Tue, 5 Oct 2021 20:16:16 +0200
Subject: [PATCH 07/17] Typo \o/

---
 src/components/notifications/Octopush.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/notifications/Octopush.vue b/src/components/notifications/Octopush.vue
index af823e79..8c0bd25f 100644
--- a/src/components/notifications/Octopush.vue
+++ b/src/components/notifications/Octopush.vue
@@ -2,8 +2,8 @@
     <div class="mb-3">
         <label for="octopush-version" class="form-label">Octopush API Version</label>
         <select id="octopush-version" v-model="$parent.notification.octopushVersion" class="form-select">
-            <option value="2">Octopush (endpoint : api.octopush.com)</option>
-            <option value="1">Legacy Octopush-DM (endpoint : www.octopush-dm.com)</option>
+            <option value="2">Octopush (endpoint: api.octopush.com)</option>
+            <option value="1">Legacy Octopush-DM (endpoint: www.octopush-dm.com)</option>
         </select>
         <div class="form-text">
             Do you use the legacy version of Octopush (2011-2020) or the new version?

From 8c357a04bfdf824741e870006e28c773ef08414d Mon Sep 17 00:00:00 2001
From: Gero Gerke <11deutron11@gmail.com>
Date: Tue, 5 Oct 2021 20:42:36 +0200
Subject: [PATCH 08/17] Update src/components/notifications/index.js

Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
---
 src/components/notifications/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/notifications/index.js b/src/components/notifications/index.js
index 6dd9ed92..fab4075e 100644
--- a/src/components/notifications/index.js
+++ b/src/components/notifications/index.js
@@ -40,7 +40,7 @@ const NotificationFormList = {
     "pushbullet": Pushbullet,
     "line": Line,
     "mattermost": Mattermost,
-    "matrix": Matrix
+    "matrix": Matrix,
 }
 
 export default NotificationFormList

From d7cc58510183240c41b3abc31d3ca97367aaee1e Mon Sep 17 00:00:00 2001
From: Gero Gerke <11deutron11@gmail.com>
Date: Tue, 5 Oct 2021 20:42:44 +0200
Subject: [PATCH 09/17] Update server/notification-providers/matrix.js

Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
---
 server/notification-providers/matrix.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/notification-providers/matrix.js b/server/notification-providers/matrix.js
index 4593be6a..581218ea 100644
--- a/server/notification-providers/matrix.js
+++ b/server/notification-providers/matrix.js
@@ -3,7 +3,6 @@ const axios = require("axios");
 const Crypto = require('crypto')
 
 class Matrix extends NotificationProvider {
-
     name = "matrix";
 
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {

From 99e8a331184e0dffdf70e500fe729dc133e04768 Mon Sep 17 00:00:00 2001
From: Gero Gerke <hello@gerogerke.de>
Date: Tue, 5 Oct 2021 21:36:01 +0200
Subject: [PATCH 10/17] escape room characters

---
 server/notification-providers/matrix.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/server/notification-providers/matrix.js b/server/notification-providers/matrix.js
index 581218ea..24d45239 100644
--- a/server/notification-providers/matrix.js
+++ b/server/notification-providers/matrix.js
@@ -13,6 +13,10 @@ class Matrix extends NotificationProvider {
             .randomBytes(size)
             .toString('base64')
             .slice(0, size);    
+        const roomId = notification
+            .internalRoomId
+            .replaceALl(":", "%3A")
+            .replaceAll("!", "%21");
 
         try {
             let config = {
@@ -25,7 +29,7 @@ class Matrix extends NotificationProvider {
                 "body": msg
             };
 
-            await axios.put(`${notification.homeserverUrl}/_matrix/client/r0/rooms/${notification.internalRoomId}/send/m.room.message/${randomString}`, data, config)
+            await axios.put(`${notification.homeserverUrl}/_matrix/client/r0/rooms/${roomId}/send/m.room.message/${randomString}`, data, config)
             return okMsg;
         } catch (error) {
             this.throwGeneralAxiosError(error);

From 34b86352f24bf36084e58f96bf7a8149c2b63414 Mon Sep 17 00:00:00 2001
From: Gero Gerke <hello@gerogerke.de>
Date: Tue, 5 Oct 2021 21:40:59 +0200
Subject: [PATCH 11/17] remove double spaces

---
 server/notification-providers/discord.js     | 2 +-
 server/notification-providers/gotify.js      | 2 +-
 server/notification-providers/line.js        | 2 +-
 server/notification-providers/lunasea.js     | 2 +-
 server/notification-providers/matrix.js      | 2 +-
 server/notification-providers/mattermost.js  | 2 +-
 server/notification-providers/octopush.js    | 2 +-
 server/notification-providers/pushbullet.js  | 2 +-
 server/notification-providers/pushover.js    | 2 +-
 server/notification-providers/pushy.js       | 2 +-
 server/notification-providers/rocket-chat.js | 2 +-
 server/notification-providers/signal.js      | 2 +-
 server/notification-providers/slack.js       | 2 +-
 server/notification-providers/teams.js       | 2 +-
 server/notification-providers/telegram.js    | 2 +-
 server/notification-providers/webhook.js     | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/server/notification-providers/discord.js b/server/notification-providers/discord.js
index 971c26e5..881ad211 100644
--- a/server/notification-providers/discord.js
+++ b/server/notification-providers/discord.js
@@ -7,7 +7,7 @@ class Discord extends NotificationProvider {
     name = "discord";
 
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully. ";
+        let okMsg = "Sent Successfully.";
 
         try {
             const discordDisplayName = notification.discordUsername || "Uptime Kuma";
diff --git a/server/notification-providers/gotify.js b/server/notification-providers/gotify.js
index 9d2d55aa..08526189 100644
--- a/server/notification-providers/gotify.js
+++ b/server/notification-providers/gotify.js
@@ -6,7 +6,7 @@ class Gotify extends NotificationProvider {
     name = "gotify";
 
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully. ";
+        let okMsg = "Sent Successfully.";
         try {
             if (notification.gotifyserverurl && notification.gotifyserverurl.endsWith("/")) {
                 notification.gotifyserverurl = notification.gotifyserverurl.slice(0, -1);
diff --git a/server/notification-providers/line.js b/server/notification-providers/line.js
index 83096903..327696ed 100644
--- a/server/notification-providers/line.js
+++ b/server/notification-providers/line.js
@@ -7,7 +7,7 @@ class Line extends NotificationProvider {
     name = "line";
 
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully. ";
+        let okMsg = "Sent Successfully.";
         try {
             let lineAPIUrl = "https://api.line.me/v2/bot/message/push";
             let config = {
diff --git a/server/notification-providers/lunasea.js b/server/notification-providers/lunasea.js
index fb6cd236..c41f400e 100644
--- a/server/notification-providers/lunasea.js
+++ b/server/notification-providers/lunasea.js
@@ -7,7 +7,7 @@ class LunaSea extends NotificationProvider {
     name = "lunasea";
 
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully. ";
+        let okMsg = "Sent Successfully.";
         let lunaseadevice = "https://notify.lunasea.app/v1/custom/device/" + notification.lunaseaDevice
 
         try {
diff --git a/server/notification-providers/matrix.js b/server/notification-providers/matrix.js
index 24d45239..cd5c2426 100644
--- a/server/notification-providers/matrix.js
+++ b/server/notification-providers/matrix.js
@@ -6,7 +6,7 @@ class Matrix extends NotificationProvider {
     name = "matrix";
 
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully. ";
+        let okMsg = "Sent Successfully.";
 
         const size = 20;
         const randomString = Crypto
diff --git a/server/notification-providers/mattermost.js b/server/notification-providers/mattermost.js
index 97779435..d776284b 100644
--- a/server/notification-providers/mattermost.js
+++ b/server/notification-providers/mattermost.js
@@ -7,7 +7,7 @@ class Mattermost extends NotificationProvider {
     name = "mattermost";
 
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully. ";
+        let okMsg = "Sent Successfully.";
         try {
             const mattermostUserName = notification.mattermostusername || "Uptime Kuma";
             // If heartbeatJSON is null, assume we're testing.
diff --git a/server/notification-providers/octopush.js b/server/notification-providers/octopush.js
index 40273f9b..76c3e498 100644
--- a/server/notification-providers/octopush.js
+++ b/server/notification-providers/octopush.js
@@ -6,7 +6,7 @@ class Octopush extends NotificationProvider {
     name = "octopush";
 
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully. ";
+        let okMsg = "Sent Successfully.";
 
         try {
             let config = {
diff --git a/server/notification-providers/pushbullet.js b/server/notification-providers/pushbullet.js
index 0ed6f0fd..c7b824a2 100644
--- a/server/notification-providers/pushbullet.js
+++ b/server/notification-providers/pushbullet.js
@@ -8,7 +8,7 @@ class Pushbullet extends NotificationProvider {
     name = "pushbullet";
 
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully. ";
+        let okMsg = "Sent Successfully.";
 
         try {
             let pushbulletUrl = "https://api.pushbullet.com/v2/pushes";
diff --git a/server/notification-providers/pushover.js b/server/notification-providers/pushover.js
index 2133ca1c..77ef1a3f 100644
--- a/server/notification-providers/pushover.js
+++ b/server/notification-providers/pushover.js
@@ -6,7 +6,7 @@ class Pushover extends NotificationProvider {
     name = "pushover";
 
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully. ";
+        let okMsg = "Sent Successfully.";
         let pushoverlink = "https://api.pushover.net/1/messages.json"
 
         try {
diff --git a/server/notification-providers/pushy.js b/server/notification-providers/pushy.js
index 431cf8c3..2bb89934 100644
--- a/server/notification-providers/pushy.js
+++ b/server/notification-providers/pushy.js
@@ -6,7 +6,7 @@ class Pushy extends NotificationProvider {
     name = "pushy";
 
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully. ";
+        let okMsg = "Sent Successfully.";
 
         try {
             await axios.post(`https://api.pushy.me/push?api_key=${notification.pushyAPIKey}`, {
diff --git a/server/notification-providers/rocket-chat.js b/server/notification-providers/rocket-chat.js
index 14918965..d6105848 100644
--- a/server/notification-providers/rocket-chat.js
+++ b/server/notification-providers/rocket-chat.js
@@ -6,7 +6,7 @@ class RocketChat extends NotificationProvider {
     name = "rocket.chat";
 
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully. ";
+        let okMsg = "Sent Successfully.";
         try {
             if (heartbeatJSON == null) {
                 let data = {
diff --git a/server/notification-providers/signal.js b/server/notification-providers/signal.js
index ba5f87f9..fee65754 100644
--- a/server/notification-providers/signal.js
+++ b/server/notification-providers/signal.js
@@ -6,7 +6,7 @@ class Signal extends NotificationProvider {
     name = "signal";
 
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully. ";
+        let okMsg = "Sent Successfully.";
 
         try {
             let data = {
diff --git a/server/notification-providers/slack.js b/server/notification-providers/slack.js
index 661df5a0..3d5a3bed 100644
--- a/server/notification-providers/slack.js
+++ b/server/notification-providers/slack.js
@@ -6,7 +6,7 @@ class Slack extends NotificationProvider {
     name = "slack";
 
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully. ";
+        let okMsg = "Sent Successfully.";
         try {
             if (heartbeatJSON == null) {
                 let data = {
diff --git a/server/notification-providers/teams.js b/server/notification-providers/teams.js
index 72409ffc..859af569 100644
--- a/server/notification-providers/teams.js
+++ b/server/notification-providers/teams.js
@@ -87,7 +87,7 @@ class Teams extends NotificationProvider {
     };
 
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully. ";
+        let okMsg = "Sent Successfully.";
 
         try {
             if (heartbeatJSON == null) {
diff --git a/server/notification-providers/telegram.js b/server/notification-providers/telegram.js
index f88dcf5d..54d33bfb 100644
--- a/server/notification-providers/telegram.js
+++ b/server/notification-providers/telegram.js
@@ -6,7 +6,7 @@ class Telegram extends NotificationProvider {
     name = "telegram";
 
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully. ";
+        let okMsg = "Sent Successfully.";
 
         try {
             await axios.get(`https://api.telegram.org/bot${notification.telegramBotToken}/sendMessage`, {
diff --git a/server/notification-providers/webhook.js b/server/notification-providers/webhook.js
index 197e9f9f..9cb361f3 100644
--- a/server/notification-providers/webhook.js
+++ b/server/notification-providers/webhook.js
@@ -7,7 +7,7 @@ class Webhook extends NotificationProvider {
     name = "webhook";
 
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully. ";
+        let okMsg = "Sent Successfully.";
 
         try {
             let data = {

From 6bebc623f98bc2e67f4d7a6d3ea8746081a41692 Mon Sep 17 00:00:00 2001
From: Gero Gerke <hello@gerogerke.de>
Date: Tue, 5 Oct 2021 21:59:58 +0200
Subject: [PATCH 12/17] UI polish

---
 server/notification-providers/matrix.js |  2 +-
 src/components/notifications/Matrix.vue | 23 ++++++++++++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/server/notification-providers/matrix.js b/server/notification-providers/matrix.js
index cd5c2426..eeaa9eb9 100644
--- a/server/notification-providers/matrix.js
+++ b/server/notification-providers/matrix.js
@@ -15,7 +15,7 @@ class Matrix extends NotificationProvider {
             .slice(0, size);    
         const roomId = notification
             .internalRoomId
-            .replaceALl(":", "%3A")
+            .replaceAll(":", "%3A")
             .replaceAll("!", "%21");
 
         try {
diff --git a/src/components/notifications/Matrix.vue b/src/components/notifications/Matrix.vue
index 12c7dad8..acce9466 100644
--- a/src/components/notifications/Matrix.vue
+++ b/src/components/notifications/Matrix.vue
@@ -1,17 +1,26 @@
 <template>
     <div class="mb-3">
-        <label for="homeserver-url" class="form-label">Homeserver URL (with http(s):// and optionally port)</label>
+        <label for="homeserver-url" class="form-label">Homeserver URL (with http(s):// and optionally port)</label><span style="color: red;"><sup>*</sup></span>
         <input id="homeserver-url" v-model="$parent.notification.homeserverUrl" type="text" class="form-control" :required="true">
-        <label for="internal-room-id" class="form-label">Internal Room Id</label>
+    </div>
+    <div class="mb-3">
+        <label for="internal-room-id" class="form-label">Internal Room Id</label><span style="color: red;"><sup>*</sup></span>
         <input id="internal-room-id" v-model="$parent.notification.internalRoomId" type="text" class="form-control" required="true">
-        <label for="access-token" class="form-label">Access Token</label>
+    </div>
+    <div class="mb-3">
+        <label for="access-token" class="form-label">Access Token</label><span style="color: red;"><sup>*</sup></span>
         <HiddenInput id="access-token" v-model="$parent.notification.accessToken" :required="true" autocomplete="one-time-code" :maxlength="500"></HiddenInput>
     </div>
 
-    <p style="margin-top: 8px;">
-        You can find the internal room ID by looking in the advanced section if your Matrix client. It should look like !QMdRCpUIfLwsfjxye6:home.server.<br/>
-        It is highly recommended you create a new user and do not use your Matrix user's access token as it will allow full access to the matrix user. You can get the access token by running curl -XPOST -d '{"type":"m.login.password", "identifier": {"user":"botusername", "type": "m.id.user"}, "password":"passwordforuser"}' "https://home.server.url/_matrix/client/r0/login".
-    </p>
+    <div class="form-text">
+        <span style="color: red;"><sup>*</sup></span>Required
+        <p style="margin-top: 8px;">
+            You can find the internal room ID by looking in the advanced section if your Matrix client. It should look like !QMdRCpUIfLwsfjxye6:home.server.
+        </p>
+        <p style="margin-top: 8px;">
+            It is highly recommended you create a new user and do not use your Matrix user's access token as it will allow full access to the matrix user. You can get the access token by running <code>curl -XPOST -d '{"type":"m.login.password", "identifier": {"user":"botusername", "type": "m.id.user"}, "password":"passwordforuser"}' "https://home.server/_matrix/client/r0/login"</code>.
+        </p>
+    </div>
 </template>
 
 <script>

From fbd4d54812eb6a26e23c4e98d68e3a403efd4ea6 Mon Sep 17 00:00:00 2001
From: Gero Gerke <11deutron11@gmail.com>
Date: Wed, 6 Oct 2021 10:55:21 +0200
Subject: [PATCH 13/17] Update src/components/notifications/Matrix.vue

Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
---
 src/components/notifications/Matrix.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/notifications/Matrix.vue b/src/components/notifications/Matrix.vue
index acce9466..4d34c98f 100644
--- a/src/components/notifications/Matrix.vue
+++ b/src/components/notifications/Matrix.vue
@@ -18,7 +18,7 @@
             You can find the internal room ID by looking in the advanced section if your Matrix client. It should look like !QMdRCpUIfLwsfjxye6:home.server.
         </p>
         <p style="margin-top: 8px;">
-            It is highly recommended you create a new user and do not use your Matrix user's access token as it will allow full access to the matrix user. You can get the access token by running <code>curl -XPOST -d '{"type":"m.login.password", "identifier": {"user":"botusername", "type": "m.id.user"}, "password":"passwordforuser"}' "https://home.server/_matrix/client/r0/login"</code>.
+            It is highly recommended you create a new user and do not use your Matrix user's access token as it will allow full access to the matrix user. You can get the access token by running <code>curl -XPOST -d '{"type": "m.login.password", "identifier": {"user": "botusername", "type": "m.id.user"}, "password": "passwordforuser"}' "https://home.server/_matrix/client/r0/login"</code>.
         </p>
     </div>
 </template>

From d184733af9e9f75732e9522b62b5c9468cc54e46 Mon Sep 17 00:00:00 2001
From: Gero Gerke <hello@gerogerke.de>
Date: Wed, 6 Oct 2021 13:44:36 +0200
Subject: [PATCH 14/17] update text

---
 src/components/notifications/Matrix.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/notifications/Matrix.vue b/src/components/notifications/Matrix.vue
index 4d34c98f..d1e973cd 100644
--- a/src/components/notifications/Matrix.vue
+++ b/src/components/notifications/Matrix.vue
@@ -15,10 +15,10 @@
     <div class="form-text">
         <span style="color: red;"><sup>*</sup></span>Required
         <p style="margin-top: 8px;">
-            You can find the internal room ID by looking in the advanced section if your Matrix client. It should look like !QMdRCpUIfLwsfjxye6:home.server.
+            You can find the internal room ID by looking in the advanced section of the room settings in your Matrix client. It should look like !QMdRCpUIfLwsfjxye6:home.server.
         </p>
         <p style="margin-top: 8px;">
-            It is highly recommended you create a new user and do not use your Matrix user's access token as it will allow full access to the matrix user. You can get the access token by running <code>curl -XPOST -d '{"type": "m.login.password", "identifier": {"user": "botusername", "type": "m.id.user"}, "password": "passwordforuser"}' "https://home.server/_matrix/client/r0/login"</code>.
+            It is highly recommended you create a new user and do not use your own Matrix user's access token as it will allow full access to your account and all the rooms you joined. Instead, create a new user and only invite it to the room that you want to receive the notification in. You can get the access token by running <code>curl -XPOST -d '{"type": "m.login.password", "identifier": {"user": "botusername", "type": "m.id.user"}, "password": "passwordforuser"}' "https://home.server/_matrix/client/r0/login"</code>.
         </p>
     </div>
 </template>

From 3a0143ac46ab5e22c08a667fbb00532990b3a7b1 Mon Sep 17 00:00:00 2001
From: LouisLam <louislam@users.noreply.github.com>
Date: Fri, 8 Oct 2021 01:11:33 +0800
Subject: [PATCH 15/17] [matrix] use encodeURIComponent to handle the url
 encode

---
 server/notification-providers/matrix.js | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/server/notification-providers/matrix.js b/server/notification-providers/matrix.js
index eeaa9eb9..c1054fce 100644
--- a/server/notification-providers/matrix.js
+++ b/server/notification-providers/matrix.js
@@ -1,6 +1,7 @@
 const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
-const Crypto = require('crypto')
+const Crypto = require("crypto");
+const { debug } = require("../../src/util");
 
 class Matrix extends NotificationProvider {
     name = "matrix";
@@ -9,14 +10,18 @@ class Matrix extends NotificationProvider {
         let okMsg = "Sent Successfully.";
 
         const size = 20;
-        const randomString = Crypto
-            .randomBytes(size)
-            .toString('base64')
-            .slice(0, size);    
-        const roomId = notification
-            .internalRoomId
-            .replaceAll(":", "%3A")
-            .replaceAll("!", "%21");
+        const randomString = encodeURIComponent(
+            Crypto
+                .randomBytes(size)
+                .toString("base64")
+                .slice(0, size)
+        );
+
+        debug("Random String: " + randomString);
+
+        const roomId = encodeURIComponent(notification.internalRoomId);
+
+        debug("Matrix Room ID: " + roomId);
 
         try {
             let config = {
@@ -29,7 +34,7 @@ class Matrix extends NotificationProvider {
                 "body": msg
             };
 
-            await axios.put(`${notification.homeserverUrl}/_matrix/client/r0/rooms/${roomId}/send/m.room.message/${randomString}`, data, config)
+            await axios.put(`${notification.homeserverUrl}/_matrix/client/r0/rooms/${roomId}/send/m.room.message/${randomString}`, data, config);
             return okMsg;
         } catch (error) {
             this.throwGeneralAxiosError(error);

From e96121f69aea2866d31767c60f202325f44039c2 Mon Sep 17 00:00:00 2001
From: LouisLam <louislam@users.noreply.github.com>
Date: Fri, 8 Oct 2021 01:39:14 +0800
Subject: [PATCH 16/17] fix merging mistake

---
 src/languages/en.js | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/src/languages/en.js b/src/languages/en.js
index 3395bb30..1955997d 100644
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -240,5 +240,38 @@ export default {
     pushbullet: "Pushbullet",
     line: "Line Messenger",
     mattermost: "Mattermost",
+
+    "User Key": "User Key",
+    "Device": "Device",
+    "Message Title": "Message Title",
+    "Notification Sound": "Notification Sound",
+    "More info on:": "More info on: {0}",
+    pushoverDesc1: "Emergency priority (2) has default 30 second timeout between retries and will expire after 1 hour.",
+    pushoverDesc2: "If you want to send notifications to different devices, fill out Device field.",
+    "SMS Type": "SMS Type",
+    octopushTypePremium: "Premium (Fast - recommended for alerting)",
+    octopushTypeLowCost: "Low Cost (Slow, sometimes blocked by operator)",
+    "Check octopush prices": "Check octopush prices {0}.",
+    octopushPhoneNumber: "Phone number (intl format, eg : +33612345678) ",
+    octopushSMSSender: "SMS Sender Name : 3-11 alphanumeric characters and space (a-zA-Z0-9)",
+    "LunaSea Device ID": "LunaSea Device ID",
+    "Apprise URL": "Apprise URL",
+    "Example:": "Example: {0}",
+    "Read more:": "Read more: {0}",
+    "Status:": "Status: {0}",
+    "Read more": "Read more",
+    appriseInstalled: "Apprise is installed.",
+    appriseNotInstalled: "Apprise is not installed. {0}",
+    "Access Token": "Access Token",
+    "Channel access token": "Channel access token",
+    "Line Developers Console": "Line Developers Console",
+    lineDevConsoleTo: "Line Developers Console - {0}",
+    "Basic Settings": "Basic Settings",
+    "User ID": "User ID",
+    "Messaging API": "Messaging API",
+    wayToGetLineChannelToken: "First access the {0}, create a provider and channel (Messaging API), then you can get the channel access token and user id from the above mentioned menu items.",
+    "Icon URL": "Icon URL",
+    aboutIconURL: "You can provide a link to a picture in \"Icon URL\" to override the default profile picture. Will not be used if Icon Emoji is set.",
+    aboutMattermostChannelName: "You can override the default channel that webhook posts to by entering the channel name into \"Channel Name\" field. This needs to be enabled in Mattermost webhook settings. Ex: #other-channel",
     // End notification form
 };

From 8ae79ab9bf7511c7cf063fc98a6b6979c5399372 Mon Sep 17 00:00:00 2001
From: LouisLam <louislam@users.noreply.github.com>
Date: Fri, 8 Oct 2021 10:51:03 +0800
Subject: [PATCH 17/17] improve #560

---
 src/components/Status.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/Status.vue b/src/components/Status.vue
index a4436e22..a3916adc 100644
--- a/src/components/Status.vue
+++ b/src/components/Status.vue
@@ -11,18 +11,18 @@ export default {
     computed: {
         color() {
             if (this.status === 0) {
-                return "danger"
+                return "danger";
             }
 
             if (this.status === 1) {
-                return "primary"
+                return "primary";
             }
 
             if (this.status === 2) {
-                return "warning"
+                return "warning";
             }
 
-            return "secondary"
+            return "secondary";
         },
 
         text() {
@@ -41,11 +41,11 @@ export default {
             return this.$t("Unknown");
         },
     },
-}
+};
 </script>
 
 <style scoped>
     span {
-        width: 64px;
+        min-width: 64px;
     }
 </style>