Merge branch 'master' into default-notification

server/notification.js

@@ -4,6 +4,8 @@ const FormData = require("form-data");
 const nodemailer = require("nodemailer");
 const child_process = require("child_process");
 
+const { UP, DOWN } = require("../src/util");
+
 class Notification {
 
     /**
@@ -80,7 +82,7 @@ class Notification {
             }
 
         } else if (notification.type === "smtp") {
-            return await Notification.smtp(notification, msg)
+            return await Notification.smtp(notification, msg, heartbeatJSON)
 
         } else if (notification.type === "discord") {
             try {
@@ -109,7 +111,7 @@ class Notification {
                 }
 
                 // If heartbeatJSON is not null, we go into the normal alerting loop.
-                if (heartbeatJSON["status"] == 0) {
+                if (heartbeatJSON["status"] == DOWN) {
                     let discorddowndata = {
                         username: discordDisplayName,
                         embeds: [{
@@ -139,7 +141,7 @@ class Notification {
                     await axios.post(notification.discordWebhookUrl, discorddowndata)
                     return okMsg;
 
-                } else if (heartbeatJSON["status"] == 1) {
+                } else if (heartbeatJSON["status"] == UP) {
                     let discordupdata = {
                         username: discordDisplayName,
                         embeds: [{
@@ -343,7 +345,7 @@ class Notification {
                 const mattermostIconEmoji = notification.mattermosticonemo;
                 const mattermostIconUrl = notification.mattermosticonurl;
 
-                if (heartbeatJSON["status"] == 0) {
+                if (heartbeatJSON["status"] == DOWN) {
                     let mattermostdowndata = {
                         username: mattermostUserName,
                         text: "Uptime Kuma Alert",
@@ -387,7 +389,7 @@ class Notification {
                         mattermostdowndata
                     );
                     return okMsg;
-                } else if (heartbeatJSON["status"] == 1) {
+                } else if (heartbeatJSON["status"] == UP) {
                     let mattermostupdata = {
                         username: mattermostUserName,
                         text: "Uptime Kuma Alert",
@@ -489,7 +491,7 @@ class Notification {
                     return okMsg;
                 }
 
-                if (heartbeatJSON["status"] == 0) {
+                if (heartbeatJSON["status"] == DOWN) {
                     let downdata = {
                         "title": "UptimeKuma Alert: " + monitorJSON["name"],
                         "body": "[🔴 Down] " + heartbeatJSON["msg"] + "\nTime (UTC): " + heartbeatJSON["time"],
@@ -498,7 +500,7 @@ class Notification {
                     return okMsg;
                 }
 
-                if (heartbeatJSON["status"] == 1) {
+                if (heartbeatJSON["status"] == UP) {
                     let updata = {
                         "title": "UptimeKuma Alert: " + monitorJSON["name"],
                         "body": "[✅ Up] " + heartbeatJSON["msg"] + "\nTime (UTC): " + heartbeatJSON["time"],
@@ -527,14 +529,14 @@ class Notification {
                         "body": "Testing Successful.",
                     }
                     await axios.post(pushbulletUrl, testdata, config)
-                } else if (heartbeatJSON["status"] == 0) {
+                } else if (heartbeatJSON["status"] == DOWN) {
                     let downdata = {
                         "type": "note",
                         "title": "UptimeKuma Alert: " + monitorJSON["name"],
                         "body": "[🔴 Down] " + heartbeatJSON["msg"] + "\nTime (UTC): " + heartbeatJSON["time"],
                     }
                     await axios.post(pushbulletUrl, downdata, config)
-                } else if (heartbeatJSON["status"] == 1) {
+                } else if (heartbeatJSON["status"] == UP) {
                     let updata = {
                         "type": "note",
                         "title": "UptimeKuma Alert: " + monitorJSON["name"],
@@ -566,7 +568,7 @@ class Notification {
                         ]
                     }
                     await axios.post(lineAPIUrl, testMessage, config)
-                } else if (heartbeatJSON["status"] == 0) {
+                } else if (heartbeatJSON["status"] == DOWN) {
                     let downMessage = {
                         "to": notification.lineUserID,
                         "messages": [
@@ -577,7 +579,7 @@ class Notification {
                         ]
                     }
                     await axios.post(lineAPIUrl, downMessage, config)
-                } else if (heartbeatJSON["status"] == 1) {
+                } else if (heartbeatJSON["status"] == UP) {
                     let upMessage = {
                         "to": notification.lineUserID,
                         "messages": [
@@ -639,7 +641,7 @@ class Notification {
         await R.trash(bean)
     }
 
-    static async smtp(notification, msg) {
+    static async smtp(notification, msg, heartbeatJSON = null) {
 
         const config = {
             host: notification.smtpHost,
@@ -657,12 +659,17 @@ class Notification {
 
         let transporter = nodemailer.createTransport(config);
 
+        let bodyTextContent = msg;
+        if(heartbeatJSON) {
+            bodyTextContent = `${msg}\nTime (UTC): ${heartbeatJSON["time"]}`;
+        }
+
         // send mail with defined transport object
         await transporter.sendMail({
             from: `"Uptime Kuma" <${notification.smtpFrom}>`,
             to: notification.smtpTo,
             subject: msg,
-            text: msg,
+            text: bodyTextContent,
         });
 
         return "Sent Successfully.";

src/components/HeartbeatBar.vue

@@ -31,7 +31,7 @@ export default {
             beatWidth: 10,
             beatHeight: 30,
             hoverScale: 1.5,
-            beatMargin: 3,      // Odd number only, even = blurry
+            beatMargin: 4,
             move: false,
             maxBeat: -1,
         }
@@ -122,11 +122,26 @@ export default {
             this.$root.heartbeatList[this.monitorId] = [];
         }
     },
+
     mounted() {
         if (this.size === "small") {
-            this.beatWidth = 5.6;
+            this.beatWidth = 5;
-            this.beatMargin = 2.4;
+            this.beatHeight = 16;
-            this.beatHeight = 16
+            this.beatMargin = 2;
+        }
+
+        // Suddenly, have an idea how to handle it universally.
+        // If the pixel * ratio != Integer, then it causes render issue, round it to solve it!!
+        const actualWidth = this.beatWidth * window.devicePixelRatio;
+        const actualMargin = this.beatMargin * window.devicePixelRatio;
+
+        if (! Number.isInteger(actualWidth)) {
+            this.beatWidth = Math.round(actualWidth) / window.devicePixelRatio;
+            console.log(this.beatWidth);
+        }
+
+        if (! Number.isInteger(actualMargin)) {
+            this.beatMargin = Math.round(actualMargin) / window.devicePixelRatio;
         }
 
         window.addEventListener("resize", this.resize);

src/languages/da-DK.js

@@ -108,5 +108,6 @@ export default {
     "Repeat Password": "Gentag adgangskoden",
     "Resource Record Type": "Resource Record Type",
     respTime: "Resp. Time (ms)",
-    notAvailableShort: "N/A"
+    notAvailableShort: "N/A",
+    Create: "Create"
 }

src/languages/de-DE.js

@@ -112,4 +112,5 @@ export default {
     "Default enabled": "Standardmäßig aktiviert",
     "Also apply to existing monitors": "Auch für alle existierenden Monitore aktivieren",
     enableDefaultNotificationDescription: "Für jeden neuen Monitor wird diese Benachrichtigung standardmäßig aktiviert. Die Benachrichtigung kann weiterhin für jeden Monitor separat deaktiviert werden.",
+    Create: "Erstellen",
 }

src/languages/en.js

@@ -112,4 +112,5 @@ export default {
     notAvailableShort: "N/A",
     "Default enabled": "Default enabled",
     "Also apply to existing monitors": "Also apply to existing monitors",
+    Create: "Create",
 }

src/languages/es-ES.js

@@ -108,5 +108,6 @@ export default {
     "Create your admin account": "Crea tu cuenta de administrador",
     "Repeat Password": "Repetir contraseña",
     respTime: "Tiempo de resp. (ms)",
-    notAvailableShort: "N/A"
+    notAvailableShort: "N/A",
+    Create: "Create"
 }

src/languages/fr.js

@@ -108,5 +108,6 @@ export default {
     "Create your admin account": "Créez votre compte administrateur",
     "Repeat Password": "Répéter le mot de passe",
     respTime: "Temps de réponse (ms)",
-    notAvailableShort: "N/A"
+    notAvailableShort: "N/A",
+    Create: "Create"
 }

src/languages/ja.js

@@ -108,5 +108,6 @@ export default {
     "Create your admin account": "Create your admin account",
     "Repeat Password": "Repeat Password",
     respTime: "Resp. Time (ms)",
-    notAvailableShort: "N/A"
+    notAvailableShort: "N/A",
+    Create: "Create"
 }

src/languages/ko-KR.js

@@ -108,5 +108,6 @@ export default {
     "Create your admin account": "관리자 계정 만들기",
     "Repeat Password": "비밀번호 재입력",
     respTime: "응답 시간 (ms)",
-    notAvailableShort: "N/A"
+    notAvailableShort: "N/A",
+    Create: "Create"
 }

src/languages/nl-NL.js

@@ -108,5 +108,6 @@ export default {
     "Create your admin account": "Maak uw beheerdersaccount aan",
     "Repeat Password": "Herhaal wachtwoord",
     respTime: "resp. tijd (ms)",
-    notAvailableShort: "N.v.t."
+    notAvailableShort: "N.v.t.",
+    Create: "Create"
 }

src/languages/pl.js

@@ -0,0 +1,113 @@
+export default {
+    languageName: "Polski",
+    checkEverySecond: "sprawdzaj co {0} sekund.",
+    "Avg.": "Średnia. ",
+    retriesDescription: "Maksymalna liczba ponownych prób, zanim usługa zostanie oznaczona jako offline i zostanie wysłane powiadomienie.",
+    ignoreTLSError: "Ignoruj błąd TLS/SSL dla stron HTTPS.",
+    upsideDownModeDescription: "Odwróć status do góry nogami. Jeśli usługa jest osiągalna, to jest niedostępna.",
+    maxRedirectDescription: "Maksymalna liczba przekierowań do naśladowania. Ustaw na 0, aby wyłączyć przekierowania.",
+    acceptedStatusCodesDescription: "Wybierz kody stanu, które są uważane za udaną odpowiedź.",
+    passwordNotMatchMsg: "Powtórzone hasło nie jest takie samo.",
+    notificationDescription: "Dodaj powiadomienie do monitorów, aby one działały.",
+    keywordDescription: "Wyszukaj słowo kluczowe w html lub JSON i wielkość liter ma znaczenie.",
+    pauseDashboardHome: "pauza",
+    deleteMonitorMsg: "Czy na pewno chcesz usunąć ten monitor?",
+    deleteNotificationMsg: "Czy na pewno chcesz usunąć to powiadomienie ze wszystkich monitorów?",
+    resoverserverDescription: "Cloudflare jest domyślnym serwerem, możesz zmienić serwer resolver w dowolnym momencie.",
+    rrtypeDescription: "Wybierz typ RR-Type który chcesz monitorować.",
+    pauseMonitorMsg: "Czy na pewno chcesz wstrzymać?",
+    Settings: "Ustawienia",
+    Dashboard: "Panel",
+    "New Update": "Nowa aktualizacja",
+    Language: "Język",
+    Appearance: "Wygląd",
+    Theme: "Motyw",
+    General: "Ogólne",
+    Version: "Versja",
+    "Check Update On GitHub": "Sprawdź aktualizację na GitHub.",
+    List: "Lista",
+    Add: "Dodaj",
+    "Add New Monitor": "Dodaj Nowy Monitor",
+    "Quick Stats": "Szybkie statystyki",
+    Up: "Online",
+    Down: "Offline",
+    Pending: "Oczekujący",
+    Unknown: "Nieznane",
+    Pause: "Pauza",
+    Name: "Nazwa",
+    Status: "Status",
+    DateTime: "Data i godzina",
+    Message: "Wiadomość",
+    "No important events": "Brak ważnych wydarzeń.",
+    Resume: "Wznów",
+    Edit: "Edytuj",
+    Delete: "Usuń",
+    Current: "aktualny",
+    Uptime: "czas pracy",
+    "Cert Exp.": "Wygaśnięcie certyfikatu.",
+    days: "dni",
+    day: "dzień",
+    "-day": "-dzień",
+    hour: "godzina",
+    "-hour": "-godzina",
+    Response: "odpowiedź",
+    Ping: "Ping",
+    "Monitor Type": "Typ monitora",
+    Keyword: "słowo kluczowe",
+    "Friendly Name": "Przyjazne imię",
+    URL: "URL",
+    Hostname: "Hostname",
+    Port: "Port",
+    "Heartbeat Interval": "Interwał bicia serca",
+    Retries: "Prób",
+    Advanced: "Zaawansowane",
+    "Upside Down Mode": "Tryb do góry nogami",
+    "Max. Redirects": "Maks. Przekierowania",
+    "Accepted Status Codes": "Akceptowane kody statusu",
+    Save: "Zapisz",
+    Notifications: "Powiadomienia",
+    "Not available, please setup.": "Niedostępne, proszę skonfigurować.",
+    "Setup Notification": "Powiadomienie konfiguracji",
+    Light: "Jasny",
+    Dark: "Ciemny",
+    Auto: "Automatyczny",
+    "Theme - Heartbeat Bar": "Motyw - pasek bicia serca",
+    Normal: "Normalne",
+    Bottom: "Na dole",
+    None: "Nic",
+    Timezone: "Strefa czasowa",
+    "Search Engine Visibility": "Widoczność w wyszukiwarce",
+    "Allow indexing": "Zezwól na indeksowanie",
+    "Discourage search engines from indexing site": "Zniechęcaj wyszukiwarki do indeksowania strony",
+    "Change Password": "Zmień hasło",
+    "Current Password": "Aktualne hasło",
+    "New Password": "Nowe hasło",
+    "Repeat New Password": "Powtórz nowe hasło",
+    "Update Password": "Zaktualizuj hasło",
+    "Disable Auth": "Wyłącz autoryzację",
+    "Enable Auth": "Włącz autoryzację ",
+    Logout: "Wyloguj się",
+    Leave: "Opuść",
+    "I understand, please disable": "Rozumiem, proszę wyłączyć",
+    Confirm: "Potwierdź",
+    Yes: "Tak",
+    No: "Nie",
+    Username: "Nazwa użytkownika",
+    Password: "Hasło",
+    "Remember me": "Zapamiętaj mnie",
+    Login: "Zaloguj sie",
+    "No Monitors, please": "Proszę bez monitorów",
+    "add one": "dodaj jeden",
+    "Notification Type": "Typ powiadomienia",
+    Email: "Email",
+    Test: "Test",
+    "Certificate Info": "Informacje o certyfikacie",
+    "Resolver Server": "Server resolver",
+    "Resource Record Type": "Typ rekordu zasobów",
+    "Last Result": "Ostatni rekord",
+    "Create your admin account": "Utwórz swoje konto administratora",
+    "Repeat Password": "Powtórz hasło",
+    respTime: "Odp. Czas (ms)",
+    notAvailableShort: "N/A",
+    Create: "Create"
+}

src/languages/ru-RU.js

@@ -108,5 +108,6 @@ export default {
     "Create your admin account": "Создайте аккаунт администратора",
     "Repeat Password": "Повторите пароль",
     respTime: "Resp. Time (ms)",
-    notAvailableShort: "N/A"
+    notAvailableShort: "N/A",
+    Create: "Create"
 }

src/languages/sr-latn.js

@@ -108,5 +108,6 @@ export default {
     "Create your admin account": "Naprivi administratorski nalog",
     "Repeat Password": "Ponovite lozinku",
     respTime: "Vreme odg. (ms)",
-    notAvailableShort: "N/A"
+    notAvailableShort: "N/A",
+    Create: "Create"
 }

src/languages/sr.js

@@ -108,5 +108,6 @@ export default {
     "Create your admin account": "Наприви администраторски налог",
     "Repeat Password": "Поновите лозинку",
     respTime: "Време одг. (мс)",
-    notAvailableShort: "N/A"
+    notAvailableShort: "N/A",
+    Create: "Create"
 }

src/languages/sv-SE.js

@@ -1,14 +1,14 @@
 export default {
-    languageName: "Swedish",
+    languageName: "Svenska",
     checkEverySecond: "Uppdatera var {0} sekund.",
-    "Avg.": "Genomsnitt ",
+    "Avg.": "Genomsnittligt ",
     retriesDescription: "Max antal försök innan tjänsten markeras som nere och en notis skickas",
     ignoreTLSError: "Ignorera TLS/SSL-fel för webbsidor med HTTPS",
     upsideDownModeDescription: "Vänd upp och ner på statusen. Om tjänsten är nåbar visas den som NERE.",
     maxRedirectDescription: "Max antal omdirigeringar att följa. Välj 0 för att avaktivera omdirigeringar.",
     acceptedStatusCodesDescription: "Välj statuskoder som räknas som lyckade.",
     passwordNotMatchMsg: "Det bekräftade lösenordet stämmer ej överens.",
-    notificationDescription: "Vänligen lägg till en notistjänst till övervakaren.",
+    notificationDescription: "Vänligen lägg till en notistjänst till dina övervakare.",
     keywordDescription: "Sök efter nyckelord i ren HTML eller JSON-svar. Sökningen är skiftkänslig.",
     pauseDashboardHome: "Pausa",
     deleteMonitorMsg: "Är du säker på att du vill ta bort den här övervakningen?",
@@ -33,10 +33,10 @@ export default {
     Down: "Nere",
     Pending: "Pågående",
     Unknown: "Okänt",
-    Pause: "Paus",
+    Pause: "Pausa",
     Name: "Namn",
     Status: "Status",
-    DateTime: "DatumTid",
+    DateTime: "Datum & Tid",
     Message: "Meddelande",
     "No important events": "Inga viktiga händelser",
     Resume: "Återuppta",
@@ -44,17 +44,17 @@ export default {
     Delete: "Ta bort",
     Current: "Nuvarande",
     Uptime: "Drifttid",
-    "Cert Exp.": "Certifikatsutgång",
+    "Cert Exp.": "Certifikat utgår",
     days: "dagar",
     day: "dag",
-    "-day": "-dag",
+    "-day": " dagar",
     hour: "timme",
-    "-hour": "-timme",
+    "-hour": " timmar",
     Response: "Svar",
     Ping: "Ping",
     "Monitor Type": "Övervakningstyp",
     Keyword: "Nyckelord",
-    "Friendly Name": "Vänligt Namn",
+    "Friendly Name": "Namn",
     URL: "URL",
     Hostname: "Värdnamn",
     Port: "Port",
@@ -67,14 +67,14 @@ export default {
     Save: "Spara",
     Notifications: "Notiser",
     "Not available, please setup.": "Ej tillgänglig, vänligen konfigurera.",
-    "Setup Notification": "Konfigurera Notis",
+    "Setup Notification": "Ny Notistjänst",
     Light: "Ljust",
     Dark: "Mörkt",
-    Auto: "Automatisk",
+    Auto: "Automatiskt",
     "Theme - Heartbeat Bar": "Tema - Heartbeat Bar",
     Normal: "Normal",
     Bottom: "Botten",
-    None: "Ingen",
+    None: "Tomt",
     Timezone: "Tidszon",
     "Search Engine Visibility": "Synlighet på Sökmotorer",
     "Allow indexing": "Tillåt indexering",
@@ -107,6 +107,7 @@ export default {
     "Last Result": "Senaste resultat",
     "Create your admin account": "Skapa ditt administratörskonto",
     "Repeat Password": "Upprepa Lösenord",
-    respTime: "Resp. Time (ms)",
+    respTime: "Svarstid (ms)",
-    notAvailableShort: "N/A"
+    notAvailableShort: "Ej Tillg.",
+    Create: "Create"
 }

src/languages/zh-CN.js

@@ -108,5 +108,6 @@ export default {
     "Create your admin account": "创建管理员账号",
     "Repeat Password": "重复密码",
     respTime: "Resp. Time (ms)",
-    notAvailableShort: "N/A"
+    notAvailableShort: "N/A",
+    Create: "Create"
 }

src/languages/zh-HK.js

@@ -108,5 +108,6 @@ export default {
     "Create your admin account": "製作你的管理員帳號",
     "Repeat Password": "重複密碼",
     respTime: "反應時間 (ms)",
-    notAvailableShort: "N/A"
+    notAvailableShort: "N/A",
+    Create: "建立"
 }

src/main.js

@@ -37,6 +37,7 @@ import svSE from "./languages/sv-SE";
 import koKR from "./languages/ko-KR";
 import ruRU from "./languages/ru-RU";
 import zhCN from "./languages/zh-CN";
+import pl from "./languages/pl"
 
 const routes = [
     {
@@ -114,6 +115,7 @@ const languageList = {
     "ko-KR": koKR,
     "ru-RU": ruRU,
     "zh-CN": zhCN,
+    "pl": pl,
 };
 
 const i18n = createI18n({

src/mixins/theme.js

@@ -11,7 +11,7 @@ export default {
     mounted() {
         // Default Light
         if (! this.userTheme) {
-            this.userTheme = "light";
+            this.userTheme = "auto";
         }
 
         // Default Heartbeat Bar

src/pages/Settings.vue

@@ -213,6 +213,11 @@
                     <p>이 기능은 <strong>Cloudflare Access와 같은 서드파티 인증</strong>을 Uptime Kuma 앞에 둔 사용자를 위한 기능이에요.</p>
                     <p>신중하게 사용하세요.</p>
                 </template>
+                <template v-if="$i18n.locale === 'pl' ">
+                    <p>Czy na pewno chcesz <strong>wyłączyć autoryzację</strong>?</p>
+                    <p>Jest przeznaczony dla <strong>kogoś, kto ma autoryzację zewnętrzną</strong> przed Uptime Kuma, taką jak Cloudflare Access.</p>
+                    <p>Proszę używać ostrożnie.</p>
+                </template>
             </Confirm>
         </div>
     </transition>

src/pages/Setup.vue

@@ -14,6 +14,15 @@
                 </p>
 
                 <div class="form-floating">
+                    <select id="language" v-model="$i18n.locale" class="form-select">
+                        <option v-for="(lang, i) in $i18n.availableLocales" :key="`Lang${i}`" :value="lang">
+                            {{ $i18n.messages[lang].languageName }}
+                        </option>
+                    </select>
+                    <label for="language" class="form-label">{{ $t("Language") }}</label>
+                </div>
+
+                <div class="form-floating mt-3">
                     <input id="floatingInput" v-model="username" type="text" class="form-control" placeholder="Username" required>
                     <label for="floatingInput">{{ $t("Username") }}</label>
                 </div>
@@ -29,7 +38,7 @@
                 </div>
 
                 <button class="w-100 btn btn-primary mt-3" type="submit" :disabled="processing">
-                    Create
+                    {{ $t("Create") }}
                 </button>
             </form>
         </div>
@@ -49,6 +58,11 @@ export default {
             repeatPassword: "",
         }
     },
+    watch: {
+        "$i18n.locale"() {
+            localStorage.locale = this.$i18n.locale;
+        },
+    },
     mounted() {
         this.$root.getSocket().emit("needSetup", (needSetup) => {
             if (! needSetup) {