ondra/ironmount
1
1
Fork 0
mirror of https://github.com/nicotsx/ironmount.git synced 2025-12-10 12:10:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(ntfy): wrong usage of token

Browse Source
This commit is contained in:
Nicolas Meienberger
2025-11-23 20:49:44 +01:00
parent daea3e64e4
commit 8d4e5d2d4e
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/schemas/notifications.ts
View File

@@ -49,8 +49,9 @@ export const ntfyNotificationConfigSchema = type({
type: "'ntfy'", type: "'ntfy'",
serverUrl: "string?", serverUrl: "string?",
topic: "string", topic: "string",
token: "string?",
priority: "'max' | 'high' | 'default' | 'low' | 'min'", priority: "'max' | 'high' | 'default' | 'low' | 'min'",
username: "string?",
password: "string?",
}); });
export const pushoverNotificationConfigSchema = type({ export const pushoverNotificationConfigSchema = type({

19
app/server/modules/notifications/builders/ntfy.ts
View File

@@ -3,19 +3,26 @@ import type { NotificationConfig } from "~/schemas/notifications";
export function buildNtfyShoutrrrUrl(config: Extract<NotificationConfig, { type: "ntfy" }>): string { export function buildNtfyShoutrrrUrl(config: Extract<NotificationConfig, { type: "ntfy" }>): string {
let shoutrrrUrl: string; let shoutrrrUrl: string;
const params = new URLSearchParams();
const auth =
config.username && config.password
? `${encodeURIComponent(config.username)}:${encodeURIComponent(config.password)}@`
: "";
if (config.serverUrl) { if (config.serverUrl) {
const url = new URL(config.serverUrl); const url = new URL(config.serverUrl);
const hostname = url.hostname; const hostname = url.hostname;
const port = url.port ? `:${url.port}` : ""; const port = url.port ? `:${url.port}` : "";
shoutrrrUrl = `ntfy://${hostname}${port}/${config.topic}`; const scheme = url.protocol === "https:" ? "https" : "http";
params.append("scheme", scheme);
shoutrrrUrl = `ntfy://${auth}${hostname}${port}/${config.topic}`;
} else { } else {
shoutrrrUrl = `ntfy://ntfy.sh/${config.topic}`; shoutrrrUrl = `ntfy://${auth}ntfy.sh/${config.topic}`;
} }
const params = new URLSearchParams();
if (config.token) {
params.append("token", config.token);
}
if (config.priority) { if (config.priority) {
params.append("priority", config.priority); params.append("priority", config.priority);
} }