Merge branch 'master' into websocket_test

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -16,7 +16,7 @@ body:
 
         - **Reason**: Our current focus is on addressing bugs, improving system performance, and implementing essential updates. This will help stabilize the project and ensure smoother management.
         - **Impact**: While no new feature requests or pull requests are being outright rejected, there may be significant delays in reviews. We encourage the community to help by reviewing PRs or assisting other users in the meantime.
-        - **What You Can Do**: If you're interested in contributing, reviewing open PRs by following our [Review Guidelines](../REVIEW_GUIDELINES.md) or offering help to other users is greatly appreciated. All feature requests and PRs will be revisited once the suspension period is lifted.
+        - **What You Can Do**: If you're interested in contributing, reviewing open PRs by following our [Review Guidelines](https://github.com/louislam/uptime-kuma/blob/master/.github/REVIEW_GUIDELINES.md) or offering help to other users is greatly appreciated. All feature requests and PRs will be revisited once the suspension period is lifted.
 
         We appreciate your patience and understanding as we continue to improve Uptime Kuma.
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
-**⚠️ Please Note: We do not accept all types of pull requests, and we want to ensure we don’t waste your time. Before submitting, make sure you have read our pull request guidelines: [Pull Request Rules](../CONTRIBUTING.md#can-i-create-a-pull-request-for-uptime-kuma)**
+**⚠️ Please Note: We do not accept all types of pull requests, and we want to ensure we don’t waste your time. Before submitting, make sure you have read our pull request guidelines: [Pull Request Rules](https://github.com/louislam/uptime-kuma/blob/master/CONTRIBUTING.md#can-i-create-a-pull-request-for-uptime-kuma)**
 
 ## ❗ Important Announcement
 
@@ -11,7 +11,7 @@
 
 - **Reason**: Our current focus is on addressing bugs, improving system performance, and implementing essential updates. This will help stabilize the project and ensure smoother management.
 - **Impact**: While no new feature requests or pull requests are being outright rejected, there may be significant delays in reviews. We encourage the community to help by reviewing PRs or assisting other users in the meantime.
-- **What You Can Do**: If you're interested in contributing, reviewing open PRs by following our [Review Guidelines](REVIEW_GUIDELINES.md) or offering support to other users is greatly appreciated. All feature requests and PRs will be revisited once the suspension period is lifted.
+- **What You Can Do**: If you're interested in contributing, reviewing open PRs by following our [Review Guidelines](https://github.com/louislam/uptime-kuma/blob/master/.github/REVIEW_GUIDELINES.md) or offering support to other users is greatly appreciated. All feature requests and PRs will be revisited once the suspension period is lifted.
 
 We appreciate your patience and understanding as we continue to improve Uptime Kuma.
 
@@ -77,7 +77,7 @@ Please link any GitHub issues or tasks that this pull request addresses. Use the
 - [ ] 📄 Documentation updates are included (if applicable).
 - [ ] 🔒 I have considered potential security impacts and mitigated risks.
 - [ ] 🧰 Dependency updates are listed and explained.
-- [ ] 📚 I have read and understood the [Pull Request guidelines](../CONTRIBUTING.md#recommended-pull-request-guideline).
+- [ ] 📚 I have read and understood the [Pull Request guidelines](https://github.com/louislam/uptime-kuma/blob/master/CONTRIBUTING.md#recommended-pull-request-guideline).
 
 ## 📷 Screenshots or Visual Changes
 

extra/reset-password.js

@@ -3,6 +3,7 @@ console.log("== Uptime Kuma Reset Password Tool ==");
 const Database = require("../server/database");
 const { R } = require("redbean-node");
 const readline = require("readline");
+const { passwordStrength } = require("check-password-strength");
 const { initJWTSecret } = require("../server/util-server");
 const User = require("../server/model/user");
 const { io } = require("socket.io-client");
@@ -42,8 +43,15 @@ const main = async () => {
                     console.log("Using password from argument");
                     console.warn("\x1b[31m%s\x1b[0m", "Warning: the password might be stored, in plain text, in your shell's history");
                     password = confirmPassword = args["new-password"] + "";
+                    if (passwordStrength(password).value === "Too weak") {
+                        throw new Error("Password is too weak, please use a stronger password.");
+                    }
                 } else {
                     password = await question("New Password: ");
+                    if (passwordStrength(password).value === "Too weak") {
+                        console.log("Password is too weak, please try again.");
+                        continue;
+                    }
                     confirmPassword = await question("Confirm New Password: ");
                 }
 

package.json

@@ -72,7 +72,7 @@
         "@louislam/sqlite3": "15.1.6",
         "@vvo/tzdb": "^6.125.0",
         "args-parser": "~1.3.0",
-        "axios": "~0.29.0",
+        "axios": "~0.30.0",
         "badge-maker": "~3.3.1",
         "bcryptjs": "~2.4.3",
         "chardet": "~1.4.0",
@@ -82,6 +82,7 @@
         "command-exists": "~1.2.9",
         "compare-versions": "~3.6.0",
         "compression": "~1.7.4",
+        "country-flag-emoji-polyfill": "^0.1.8",
         "croner": "~8.1.0",
         "dayjs": "~1.11.5",
         "dev-null": "^0.1.1",

server/monitor-types/dns.js

@@ -34,12 +34,16 @@ class DnsMonitorType extends MonitorType {
         switch (monitor.dns_resolve_type) {
             case "A":
             case "AAAA":
-            case "TXT":
             case "PTR":
                 dnsMessage = `Records: ${dnsRes.join(" | ")}`;
                 conditionsResult = dnsRes.some(record => handleConditions({ record }));
                 break;
 
+            case "TXT":
+                dnsMessage = `Records: ${dnsRes.join(" | ")}`;
+                conditionsResult = dnsRes.flat().some(record => handleConditions({ record }));
+                break;
+
             case "CNAME":
                 dnsMessage = dnsRes[0];
                 conditionsResult = handleConditions({ record: dnsRes[0] });

server/notification-providers/mattermost.js

@@ -79,11 +79,13 @@ class Mattermost extends NotificationProvider {
                         fallback:
                             "Your " +
                             monitorJSON.pathName +
+                            monitorJSON.name +
                             " service went " +
                             statusText,
                         color: color,
                         title:
                             monitorJSON.pathName +
+                            monitorJSON.name +
                             " service went " +
                             statusText,
                         title_link: monitorJSON.url,

src/App.vue

@@ -4,9 +4,11 @@
 
 <script>
 import { setPageLocale } from "./util-frontend";
+import { polyfillCountryFlagEmojis } from "country-flag-emoji-polyfill";
 export default {
     created() {
         setPageLocale();
     },
 };
+polyfillCountryFlagEmojis();
 </script>

src/assets/app.scss

@@ -3,7 +3,7 @@
 @import "node_modules/bootstrap/scss/bootstrap";
 
 #app {
-    font-family: BlinkMacSystemFont, segoe ui, Roboto, helvetica neue, Arial, noto sans, sans-serif, apple color emoji, segoe ui emoji, segoe ui symbol, noto color emoji;
+    font-family: "Twemoji Country Flags", BlinkMacSystemFont, segoe ui, Roboto, helvetica neue, Arial, noto sans, sans-serif, apple color emoji, segoe ui emoji, segoe ui symbol, noto color emoji;
 }
 
 h1 {

src/components/CreateGroupDialog.vue

@@ -42,6 +42,9 @@ export default {
     mounted() {
         this.modal = new Modal(this.$refs.modal);
     },
+    beforeUnmount() {
+        this.cleanupModal();
+    },
     methods: {
         /**
          * Show the confirm dialog
@@ -58,6 +61,19 @@ export default {
             this.$emit("added", this.groupName);
             this.modal.hide();
         },
+        /**
+         * Clean up modal and restore scroll behavior
+         * @returns {void}
+         */
+        cleanupModal() {
+            if (this.modal) {
+                try {
+                    this.modal.hide();
+                } catch (e) {
+                    console.warn("Modal hide failed:", e);
+                }
+            }
+        }
     },
 };
 </script>

src/components/MonitorListItem.vue

@@ -22,7 +22,7 @@
                             </span>
                             {{ monitor.name }}
                         </div>
-                        <div v-if="monitor.tags.length > 0" class="tags">
+                        <div v-if="monitor.tags.length > 0" class="tags gap-1">
                             <Tag v-for="tag in monitor.tags" :key="tag" :item="tag" :size="'sm'" />
                         </div>
                     </div>

src/components/NotificationDialog.vue

@@ -235,6 +235,9 @@ export default {
     mounted() {
         this.modal = new Modal(this.$refs.modal);
     },
+    beforeUnmount() {
+        this.cleanupModal();
+    },
     methods: {
 
         /**
@@ -339,6 +342,20 @@ export default {
                 });
             } while (this.$root.notificationList.find(it => it.name === name));
             return name;
+        },
+
+        /**
+         * Clean up modal and restore scroll behavior
+         * @returns {void}
+         */
+        cleanupModal() {
+            if (this.modal) {
+                try {
+                    this.modal.hide();
+                } catch (e) {
+                    console.warn("Modal hide failed:", e);
+                }
+            }
         }
     },
 };

src/components/ProxyDialog.vue

@@ -125,11 +125,12 @@ export default {
             }
         };
     },
-
     mounted() {
         this.modal = new Modal(this.$refs.modal);
     },
-
+    beforeUnmount() {
+        this.cleanupModal();
+    },
     methods: {
         /**
          * Show dialog to confirm deletion
@@ -209,6 +210,20 @@ export default {
                 }
             });
         },
+
+        /**
+         * Clean up modal and restore scroll behavior
+         * @returns {void}
+         */
+        cleanupModal() {
+            if (this.modal) {
+                try {
+                    this.modal.hide();
+                } catch (e) {
+                    console.warn("Modal hide failed:", e);
+                }
+            }
+        }
     },
 };
 </script>

src/components/Tag.vue

@@ -6,7 +6,6 @@
                   'm-2': size == 'normal',
                   'px-2': size == 'sm',
                   'py-0': size == 'sm',
-                  'mx-1': size == 'sm',
         }"
         :style="{ backgroundColor: item.color, fontSize: size == 'sm' ? '0.7em' : '1em' }"
     >
@@ -48,7 +47,7 @@ export default {
     },
     computed: {
         displayText() {
-            if (this.item.value === "" || this.item.value === undefined) {
+            if (this.item.value === "" || this.item.value === undefined || this.item.value === null) {
                 return this.item.name;
             } else {
                 return `${this.item.name}: ${this.item.value}`;

src/components/TagsManager.vue

@@ -248,6 +248,9 @@ export default {
         this.modal = new Modal(this.$refs.modal);
         this.getExistingTags();
     },
+    beforeUnmount() {
+        this.cleanupModal();
+    },
     methods: {
         /**
          * Show the add tag dialog
@@ -459,6 +462,19 @@ export default {
             this.newTags = [];
             this.deleteTags = [];
             this.processing = false;
+        },
+        /**
+         * Clean up modal and restore scroll behavior
+         * @returns {void}
+         */
+        cleanupModal() {
+            if (this.modal) {
+                try {
+                    this.modal.hide();
+                } catch (e) {
+                    console.warn("Modal hide failed:", e);
+                }
+            }
         }
     },
 };

src/components/notifications/Matrix.vue

@@ -18,7 +18,7 @@
             {{ $t("matrixDesc1") }}
         </p>
         <i18n-t tag="p" keypath="matrixDesc2" style="margin-top: 8px;">
-            <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>.
+            <code>curl -XPOST -d '{"type": "m.login.password", "identifier": {"user": "botusername", "type": "m.id.user"}, "password": "passwordforuser"}' "https://home.server/_matrix/client/v3/login"</code>.
         </i18n-t>
     </div>
 </template>

src/components/settings/About.vue

@@ -21,6 +21,9 @@
                     <label><input v-model="settings.checkBeta" type="checkbox" :disabled="!settings.checkUpdate" @change="saveSettings()" /> {{ $t("Also check beta release") }}</label>
                 </div>
             </div>
+            <div class="mt-5">
+                <p>{{ $t("Font Twemoji by Twitter licensed under") }} <a href="https://creativecommons.org/licenses/by/4.0/">CC-BY 4.0</a></p>
+            </div>
         </div>
     </div>
 </template>

src/lang/en.json

@@ -1101,5 +1101,6 @@
     "YZJ Robot Token": "YZJ Robot token",
     "Plain Text": "Plain Text",
     "Message Template": "Message Template",
-    "Template Format": "Template Format"
+    "Template Format": "Template Format",
+    "Font Twemoji by Twitter licensed under": "Font Twemoji by Twitter licensed under"
 }