Merge branch 'master' into fix/discord-empty-service-url

This commit is contained in:
Frank Elsinga
2026-01-02 06:48:45 +01:00
committed by GitHub
29 changed files with 842 additions and 741 deletions
+2 -2
View File
@@ -172,9 +172,9 @@ class DomainExpiry extends BeanModel {
}
/**
* @returns {(Date|null)} Expiry date from RDAP
* @returns {Promise<(Date|null)>} Expiry date from RDAP
*/
getExpiryDate() {
async getExpiryDate() {
return getRdapDomainExpiryDate(this.domain);
}
+3
View File
@@ -132,6 +132,9 @@ class StatusPage extends BeanModel {
let ogDescription = $("<meta property=\"og:description\" content=\"\" />").attr("content", description155);
head.append(ogDescription);
let ogType = $("<meta property=\"og:type\" content=\"website\" />");
head.append(ogType);
// Preload data
// Add jsesc, fix https://github.com/louislam/uptime-kuma/issues/2186
const escapedJSONObject = jsesc(await StatusPage.getStatusPageData(statusPage), {