TyleoDvDelaware3217/Kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-07-18 23:34:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into feature/5934

Browse source
This commit is contained in:
Mário Garrido 2025-07-04 16:59:53 +01:00 • committed by GitHub
commit da6a13ed83
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CONTRIBUTING.md
View file

@ -86,7 +86,7 @@ to review the appropriate one for your contribution.
PR: PR:
- A text may not be currently localisable. In this case, **adding a new - A text may not be currently localisable. In this case, **adding a new
language key** via `$t("languageKey")` might be nessesary language key** via `$t("languageKey")` might be necessary
- language keys need to be **added to `en.json`** to be visible in weblate. If - language keys need to be **added to `en.json`** to be visible in weblate. If
this has not happened, a PR is appreciated. this has not happened, a PR is appreciated.
- **Adding a new language** requires a new file see - **Adding a new language** requires a new file see

2
extra/close-incorrect-issue.js
View file

@ -37,7 +37,7 @@ const github = require("@actions/github");
owner: issue.owner, owner: issue.owner,
repo: issue.repo, repo: issue.repo,
issue_number: issue.number, issue_number: issue.number,
body: `@${username}: Hello! :wave:\n\nThis issue is being automatically closed because it does not follow the issue template. Please **DO NOT open blank issues and use our [issue-templates](https://github.com/louislam/uptime-kuma/issues/new/choose) instead**.\nBlank Issues do not contain the context nessesary for a good discussions.` body: `@${username}: Hello! :wave:\n\nThis issue is being automatically closed because it does not follow the issue template. Please **DO NOT open blank issues and use our [issue-templates](https://github.com/louislam/uptime-kuma/issues/new/choose) instead**.\nBlank Issues do not contain the context necessary for a good discussions.`
}); });
// Close the issue // Close the issue

2
server/database.js
View file

@ -19,7 +19,7 @@ const KumaColumnCompiler = require("./utils/knex/lib/dialects/mysql2/schema/mysq
class Database { class Database {
/** /**
* Boostrap database for SQLite * Bootstrap database for SQLite
* @type {string} * @type {string}
*/ */
static templatePath = "./db/kuma.db"; static templatePath = "./db/kuma.db";

2
server/notification-providers/flashduty.js
View file

@ -38,7 +38,7 @@ class FlashDuty extends NotificationProvider {
} }
/** /**
* Generate a monitor url from the monitors infomation * Generate a monitor url from the monitors information
* @param {object} monitorInfo Monitor details * @param {object} monitorInfo Monitor details
* @returns {string|undefined} Monitor URL * @returns {string|undefined} Monitor URL
*/ */

2
server/notification-providers/pushdeer.js
View file

@ -11,7 +11,7 @@ class PushDeer extends NotificationProvider {
async send(notification, msg, monitorJSON = null, heartbeatJSON = null) { async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
const okMsg = "Sent Successfully."; const okMsg = "Sent Successfully.";
const serverUrl = notification.pushdeerServer || "https://api2.pushdeer.com"; const serverUrl = notification.pushdeerServer || "https://api2.pushdeer.com";
// capture group below is nessesary to prevent an ReDOS-attack // capture group below is necessary to prevent an ReDOS-attack
const url = `${serverUrl.trim().replace(/([^/])\/+$/, "$1")}/message/push`; const url = `${serverUrl.trim().replace(/([^/])\/+$/, "$1")}/message/push`;
let valid = msg != null && monitorJSON != null && heartbeatJSON != null; let valid = msg != null && monitorJSON != null && heartbeatJSON != null;

2
test/backend-test/test-mqtt.js
View file

@ -9,7 +9,7 @@ const { UP, PENDING } = require("../../src/util");
* Runs an MQTT test with the * Runs an MQTT test with the
* @param {string} mqttSuccessMessage the message that the monitor expects * @param {string} mqttSuccessMessage the message that the monitor expects
* @param {null|"keyword"|"json-query"} mqttCheckType the type of check we perform * @param {null|"keyword"|"json-query"} mqttCheckType the type of check we perform
* @param {string} receivedMessage what message is recieved from the mqtt channel * @param {string} receivedMessage what message is received from the mqtt channel
* @returns {Promise<Heartbeat>} the heartbeat produced by the check * @returns {Promise<Heartbeat>} the heartbeat produced by the check
*/ */
async function testMqtt(mqttSuccessMessage, mqttCheckType, receivedMessage) { async function testMqtt(mqttSuccessMessage, mqttCheckType, receivedMessage) {