205hlab-mirrors/dockhand
2
0
Fork 0
mirror of https://github.com/Finsys/dockhand.git synced 2026-06-17 19:09:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Gotify, ntfy, Pushover, and webhook notifications missing environment name (#943)

Browse Source
This commit is contained in:
jarek
2026-04-19 09:39:03 +02:00
parent ac19a67cce
commit 0af1ee6eb2
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/server/notifications.ts
+10 -5
View File
@@ -291,7 +291,7 @@ async function sendTelegram(appriseUrl: string, payload: NotificationPayload): P
const escapedMessage = escapeTelegramMarkdown(payload.message); const escapedMessage = escapeTelegramMarkdown(payload.message);
const envTag = payload.environmentName ? ` \\[${escapeTelegramMarkdown(payload.environmentName)}\\]` : ''; const envTag = payload.environmentName ? ` \\[${escapeTelegramMarkdown(payload.environmentName)}\\]` : '';
const topicId = Number.parseInt(topicIdStr, 10) const topicId = topicIdStr ? parseInt(topicIdStr, 10) : undefined;
try { try {
const response = await fetch(url, { const response = await fetch(url, {
@@ -300,7 +300,7 @@ async function sendTelegram(appriseUrl: string, payload: NotificationPayload): P
body: JSON.stringify({ body: JSON.stringify({
chat_id: chatId, chat_id: chatId,
text: `*${escapedTitle}*${envTag}\n${escapedMessage}`, text: `*${escapedTitle}*${envTag}\n${escapedMessage}`,
message_thread_id: Number.isNaN(topicId) ? undefined : topicId, ...(topicId ? { message_thread_id: topicId } : {}),
parse_mode: 'Markdown' parse_mode: 'Markdown'
}) })
}); });
@@ -334,12 +334,14 @@ async function sendGotify(appriseUrl: string, payload: NotificationPayload): Pro
const token = lastSlash >= 0 ? pathPart.substring(lastSlash + 1) : pathPart; const token = lastSlash >= 0 ? pathPart.substring(lastSlash + 1) : pathPart;
const url = `${protocol}://${hostname}${subpath ? '/' + subpath : ''}/message?token=${token}`; const url = `${protocol}://${hostname}${subpath ? '/' + subpath : ''}/message?token=${token}`;
const titleWithEnv = payload.environmentName ? `${payload.title} [${payload.environmentName}]` : payload.title;
try { try {
const response = await fetch(url, { const response = await fetch(url, {
method: 'POST', method: 'POST',
headers: { 'Content-Type': 'application/json' }, headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ body: JSON.stringify({
title: payload.title, title: titleWithEnv,
message: payload.message, message: payload.message,
priority: payload.type === 'error' ? 8 : payload.type === 'warning' ? 5 : 2 priority: payload.type === 'error' ? 8 : payload.type === 'warning' ? 5 : 2
}) })
@@ -395,8 +397,9 @@ async function sendNtfy(appriseUrl: string, payload: NotificationPayload): Promi
url = `https://ntfy.sh/${path}`; url = `https://ntfy.sh/${path}`;
} }
const titleWithEnv = payload.environmentName ? `${payload.title} [${payload.environmentName}]` : payload.title;
const headers: Record<string, string> = { const headers: Record<string, string> = {
'Title': payload.title, 'Title': titleWithEnv,
'Priority': payload.type === 'error' ? '5' : payload.type === 'warning' ? '4' : '3', 'Priority': payload.type === 'error' ? '5' : payload.type === 'warning' ? '4' : '3',
'Tags': payload.type || 'info' 'Tags': payload.type || 'info'
}; };
@@ -433,6 +436,7 @@ async function sendPushover(appriseUrl: string, payload: NotificationPayload): P
const [, userKey, apiToken] = match; const [, userKey, apiToken] = match;
const url = 'https://api.pushover.net/1/messages.json'; const url = 'https://api.pushover.net/1/messages.json';
const titleWithEnv = payload.environmentName ? `${payload.title} [${payload.environmentName}]` : payload.title;
try { try {
const response = await fetch(url, { const response = await fetch(url, {
@@ -441,7 +445,7 @@ async function sendPushover(appriseUrl: string, payload: NotificationPayload): P
body: JSON.stringify({ body: JSON.stringify({
token: apiToken, token: apiToken,
user: userKey, user: userKey,
title: payload.title, title: titleWithEnv,
message: payload.message, message: payload.message,
priority: payload.type === 'error' ? 1 : 0 priority: payload.type === 'error' ? 1 : 0
}) })
@@ -471,6 +475,7 @@ async function sendGenericWebhook(appriseUrl: string, payload: NotificationPaylo
title: payload.title, title: payload.title,
message: payload.message, message: payload.message,
type: payload.type || 'info', type: payload.type || 'info',
environment: payload.environmentName || null,
timestamp: new Date().toISOString() timestamp: new Date().toISOString()
}) })
}); });