Merge 3e0d48690f into 8a432ac937

Adds a description that group id can be used

server/notification-providers/serwersms.js

@@ -17,6 +17,8 @@ class SerwerSMS extends NotificationProvider {
                     "Content-Type": "application/json",
                 }
             };
+
+            // Use phone as first option
             let data = {
                 "username": notification.serwersmsUsername,
                 "password": notification.serwersmsPassword,
@@ -27,6 +29,13 @@ class SerwerSMS extends NotificationProvider {
 
             let resp = await axios.post(url, data, config);
 
+            if (!resp.data.success) {
+                // If unsuccessful, try using group_id
+                data.phone = null; // Clear phone number
+                data.group_id = notification.serwersmsPhoneNumber;
+                resp = await axios.post(url, data, config);
+            }
+
             if (!resp.data.success) {
                 if (resp.data.error) {
                     let error = `SerwerSMS.pl API returned error code ${resp.data.error.code} (${resp.data.error.type}) with error message: ${resp.data.error.message}`;

server/socket-handlers/status-page-socket-handler.js

@@ -220,13 +220,17 @@ module.exports.statusPageSocketHandler = (socket) => {
 
             // Delete groups that are not in the list
             log.debug("socket", "Delete groups that are not in the list");
-            const slots = groupIDList.map(() => "?").join(",");
+            if (groupIDList.length === 0) {
+                await R.exec("DELETE FROM `group` WHERE status_page_id = ?", [ statusPage.id ]);
+            } else {
+                const slots = groupIDList.map(() => "?").join(",");
 
-            const data = [
+                const data = [
-                ...groupIDList,
+                    ...groupIDList,
-                statusPage.id
+                    statusPage.id
-            ];
+                ];
-            await R.exec(`DELETE FROM \`group\` WHERE id NOT IN (${slots}) AND status_page_id = ?`, data);
+                await R.exec(`DELETE FROM \`group\` WHERE id NOT IN (${slots}) AND status_page_id = ?`, data);
+            }
 
             const server = UptimeKumaServer.getInstance();
 

src/components/notifications/SerwerSMS.vue

@@ -8,7 +8,7 @@
         <HiddenInput id="serwersms-key" v-model="$parent.notification.serwersmsPassword" :required="true" autocomplete="new-password"></HiddenInput>
     </div>
     <div class="mb-3">
-        <label for="serwersms-phone-number" class="form-label">{{ $t("serwersmsPhoneNumber") }}</label>
+        <label for="serwersms-phone-number" class="form-label">{{ $t("serwersmsPhoneNumberGroupId") }}</label>
         <input id="serwersms-phone-number" v-model="$parent.notification.serwersmsPhoneNumber" type="text" class="form-control" required>
     </div>
     <div class="mb-3">

src/lang/pl.json

@@ -360,6 +360,7 @@
     "serwersmsAPIUser": "Nazwa użytkownika API (z prefiksem webapi_)",
     "serwersmsAPIPassword": "Hasło API",
     "serwersmsPhoneNumber": "Numer telefonu",
+    "serwersmsPhoneNumberGroupId": "Numer telefonu lub ID Grupy",
     "serwersmsSenderName": "Nazwa nadawcy (zatwierdzona w panelu klienta)",
     "smseagle": "SMSEagle",
     "smseagleTo": "Numer/y telefonu",