From e99487eed94adc837258f00e7dbf7519a333f041 Mon Sep 17 00:00:00 2001
From: Nicolas Meienberger <github@thisprops.com>
Date: Sun, 23 Nov 2025 21:08:07 +0100
Subject: [PATCH] fix(notifications): multiple providers using the wrong params

---
 app/client/api-client/types.gen.ts            | 40 ++++++++++++---
 .../components/create-notification-form.tsx   | 50 +++++++++++++++++--
 app/schemas/notifications.ts                  |  2 +
 .../modules/notifications/builders/discord.ts |  5 +-
 .../modules/notifications/builders/gotify.ts  |  3 +-
 .../modules/notifications/builders/slack.ts   |  2 +-
 .../notifications/notifications.service.ts    |  4 +-
 7 files changed, 90 insertions(+), 16 deletions(-)

diff --git a/app/client/api-client/types.gen.ts b/app/client/api-client/types.gen.ts
index ffb49f5..8a983f9 100644
--- a/app/client/api-client/types.gen.ts
+++ b/app/client/api-client/types.gen.ts
@@ -1859,13 +1859,15 @@ export type GetScheduleNotificationsResponses = {
                 priority: 'default' | 'high' | 'low' | 'max' | 'min';
                 topic: string;
                 type: 'ntfy';
+                password?: string;
                 serverUrl?: string;
-                token?: string;
+                username?: string;
             } | {
                 priority: number;
                 serverUrl: string;
                 token: string;
                 type: 'gotify';
+                path?: string;
             } | {
                 shoutrrrUrl: string;
                 type: 'custom';
@@ -1873,6 +1875,7 @@ export type GetScheduleNotificationsResponses = {
                 type: 'discord';
                 webhookUrl: string;
                 avatarUrl?: string;
+                threadId?: string;
                 username?: string;
             } | {
                 type: 'slack';
@@ -1940,13 +1943,15 @@ export type UpdateScheduleNotificationsResponses = {
                 priority: 'default' | 'high' | 'low' | 'max' | 'min';
                 topic: string;
                 type: 'ntfy';
+                password?: string;
                 serverUrl?: string;
-                token?: string;
+                username?: string;
             } | {
                 priority: number;
                 serverUrl: string;
                 token: string;
                 type: 'gotify';
+                path?: string;
             } | {
                 shoutrrrUrl: string;
                 type: 'custom';
@@ -1954,6 +1959,7 @@ export type UpdateScheduleNotificationsResponses = {
                 type: 'discord';
                 webhookUrl: string;
                 avatarUrl?: string;
+                threadId?: string;
                 username?: string;
             } | {
                 type: 'slack';
@@ -2010,13 +2016,15 @@ export type ListNotificationDestinationsResponses = {
             priority: 'default' | 'high' | 'low' | 'max' | 'min';
             topic: string;
             type: 'ntfy';
+            password?: string;
             serverUrl?: string;
-            token?: string;
+            username?: string;
         } | {
             priority: number;
             serverUrl: string;
             token: string;
             type: 'gotify';
+            path?: string;
         } | {
             shoutrrrUrl: string;
             type: 'custom';
@@ -2024,6 +2032,7 @@ export type ListNotificationDestinationsResponses = {
             type: 'discord';
             webhookUrl: string;
             avatarUrl?: string;
+            threadId?: string;
             username?: string;
         } | {
             type: 'slack';
@@ -2064,13 +2073,15 @@ export type CreateNotificationDestinationData = {
             priority: 'default' | 'high' | 'low' | 'max' | 'min';
             topic: string;
             type: 'ntfy';
+            password?: string;
             serverUrl?: string;
-            token?: string;
+            username?: string;
         } | {
             priority: number;
             serverUrl: string;
             token: string;
             type: 'gotify';
+            path?: string;
         } | {
             shoutrrrUrl: string;
             type: 'custom';
@@ -2078,6 +2089,7 @@ export type CreateNotificationDestinationData = {
             type: 'discord';
             webhookUrl: string;
             avatarUrl?: string;
+            threadId?: string;
             username?: string;
         } | {
             type: 'slack';
@@ -2117,13 +2129,15 @@ export type CreateNotificationDestinationResponses = {
             priority: 'default' | 'high' | 'low' | 'max' | 'min';
             topic: string;
             type: 'ntfy';
+            password?: string;
             serverUrl?: string;
-            token?: string;
+            username?: string;
         } | {
             priority: number;
             serverUrl: string;
             token: string;
             type: 'gotify';
+            path?: string;
         } | {
             shoutrrrUrl: string;
             type: 'custom';
@@ -2131,6 +2145,7 @@ export type CreateNotificationDestinationResponses = {
             type: 'discord';
             webhookUrl: string;
             avatarUrl?: string;
+            threadId?: string;
             username?: string;
         } | {
             type: 'slack';
@@ -2217,13 +2232,15 @@ export type GetNotificationDestinationResponses = {
             priority: 'default' | 'high' | 'low' | 'max' | 'min';
             topic: string;
             type: 'ntfy';
+            password?: string;
             serverUrl?: string;
-            token?: string;
+            username?: string;
         } | {
             priority: number;
             serverUrl: string;
             token: string;
             type: 'gotify';
+            path?: string;
         } | {
             shoutrrrUrl: string;
             type: 'custom';
@@ -2231,6 +2248,7 @@ export type GetNotificationDestinationResponses = {
             type: 'discord';
             webhookUrl: string;
             avatarUrl?: string;
+            threadId?: string;
             username?: string;
         } | {
             type: 'slack';
@@ -2271,13 +2289,15 @@ export type UpdateNotificationDestinationData = {
             priority: 'default' | 'high' | 'low' | 'max' | 'min';
             topic: string;
             type: 'ntfy';
+            password?: string;
             serverUrl?: string;
-            token?: string;
+            username?: string;
         } | {
             priority: number;
             serverUrl: string;
             token: string;
             type: 'gotify';
+            path?: string;
         } | {
             shoutrrrUrl: string;
             type: 'custom';
@@ -2285,6 +2305,7 @@ export type UpdateNotificationDestinationData = {
             type: 'discord';
             webhookUrl: string;
             avatarUrl?: string;
+            threadId?: string;
             username?: string;
         } | {
             type: 'slack';
@@ -2334,13 +2355,15 @@ export type UpdateNotificationDestinationResponses = {
             priority: 'default' | 'high' | 'low' | 'max' | 'min';
             topic: string;
             type: 'ntfy';
+            password?: string;
             serverUrl?: string;
-            token?: string;
+            username?: string;
         } | {
             priority: number;
             serverUrl: string;
             token: string;
             type: 'gotify';
+            path?: string;
         } | {
             shoutrrrUrl: string;
             type: 'custom';
@@ -2348,6 +2371,7 @@ export type UpdateNotificationDestinationResponses = {
             type: 'discord';
             webhookUrl: string;
             avatarUrl?: string;
+            threadId?: string;
             username?: string;
         } | {
             type: 'slack';
diff --git a/app/client/modules/notifications/components/create-notification-form.tsx b/app/client/modules/notifications/components/create-notification-form.tsx
index 7d3c562..7f97e59 100644
--- a/app/client/modules/notifications/components/create-notification-form.tsx
+++ b/app/client/modules/notifications/components/create-notification-form.tsx
@@ -370,6 +370,22 @@ export const CreateNotificationForm = ({ onSubmit, mode = "create", initialValue
 								</FormItem>
 							)}
 						/>
+						<FormField
+							control={form.control}
+							name="threadId"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Thread ID (Optional)</FormLabel>
+									<FormControl>
+										<Input {...field} />
+									</FormControl>
+									<FormDescription>
+										ID of the thread to post messages in. Leave empty to post in the main channel.
+									</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
 					</>
 				)}
 
@@ -423,6 +439,20 @@ export const CreateNotificationForm = ({ onSubmit, mode = "create", initialValue
 								</FormItem>
 							)}
 						/>
+						<FormField
+							control={form.control}
+							name="path"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Path (Optional)</FormLabel>
+									<FormControl>
+										<Input {...field} placeholder="/custom/path" />
+									</FormControl>
+									<FormDescription>Custom path on the Gotify server, if applicable.</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
 					</>
 				)}
 
@@ -458,14 +488,28 @@ export const CreateNotificationForm = ({ onSubmit, mode = "create", initialValue
 						/>
 						<FormField
 							control={form.control}
-							name="token"
+							name="username"
 							render={({ field }) => (
 								<FormItem>
-									<FormLabel>Access Token (Optional)</FormLabel>
+									<FormLabel>Username (Optional)</FormLabel>
+									<FormControl>
+										<Input {...field} placeholder="username" />
+									</FormControl>
+									<FormDescription>Username for server authentication, if required.</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+						<FormField
+							control={form.control}
+							name="password"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Password (Optional)</FormLabel>
 									<FormControl>
 										<Input {...field} type="password" placeholder="••••••••" />
 									</FormControl>
-									<FormDescription>Required if the topic is protected.</FormDescription>
+									<FormDescription>Password for server authentication, if required.</FormDescription>
 									<FormMessage />
 								</FormItem>
 							)}
diff --git a/app/schemas/notifications.ts b/app/schemas/notifications.ts
index f85f3c4..09a4d98 100644
--- a/app/schemas/notifications.ts
+++ b/app/schemas/notifications.ts
@@ -36,12 +36,14 @@ export const discordNotificationConfigSchema = type({
 	webhookUrl: "string",
 	username: "string?",
 	avatarUrl: "string?",
+	threadId: "string?",
 });
 
 export const gotifyNotificationConfigSchema = type({
 	type: "'gotify'",
 	serverUrl: "string",
 	token: "string",
+	path: "string?",
 	priority: "0 <= number <= 10",
 });
 
diff --git a/app/server/modules/notifications/builders/discord.ts b/app/server/modules/notifications/builders/discord.ts
index 96c1520..5da0b49 100644
--- a/app/server/modules/notifications/builders/discord.ts
+++ b/app/server/modules/notifications/builders/discord.ts
@@ -17,7 +17,10 @@ export function buildDiscordShoutrrrUrl(config: Extract<NotificationConfig, { ty
 		params.append("username", config.username);
 	}
 	if (config.avatarUrl) {
-		params.append("avatar_url", config.avatarUrl);
+		params.append("avatarurl", config.avatarUrl);
+	}
+	if (config.threadId) {
+		params.append("thread_id", config.threadId);
 	}
 
 	if (params.toString()) {
diff --git a/app/server/modules/notifications/builders/gotify.ts b/app/server/modules/notifications/builders/gotify.ts
index d871ed9..6efca34 100644
--- a/app/server/modules/notifications/builders/gotify.ts
+++ b/app/server/modules/notifications/builders/gotify.ts
@@ -4,8 +4,9 @@ export function buildGotifyShoutrrrUrl(config: Extract<NotificationConfig, { typ
 	const url = new URL(config.serverUrl);
 	const hostname = url.hostname;
 	const port = url.port ? `:${url.port}` : "";
+	const path = config.path ? `/${config.path.replace(/^\/+|\/+$/g, "")}` : "";
 
-	let shoutrrrUrl = `gotify://${hostname}${port}/${config.token}`;
+	let shoutrrrUrl = `gotify://${hostname}${port}${path}/${config.token}`;
 
 	if (config.priority !== undefined) {
 		shoutrrrUrl += `?priority=${config.priority}`;
diff --git a/app/server/modules/notifications/builders/slack.ts b/app/server/modules/notifications/builders/slack.ts
index 37f1c61..d8ea49a 100644
--- a/app/server/modules/notifications/builders/slack.ts
+++ b/app/server/modules/notifications/builders/slack.ts
@@ -20,7 +20,7 @@ export function buildSlackShoutrrrUrl(config: Extract<NotificationConfig, { type
 		params.append("username", config.username);
 	}
 	if (config.iconEmoji) {
-		params.append("icon", config.iconEmoji);
+		params.append("icon_emoji", config.iconEmoji);
 	}
 
 	if (params.toString()) {
diff --git a/app/server/modules/notifications/notifications.service.ts b/app/server/modules/notifications/notifications.service.ts
index 8b7d311..7e7a8a4 100644
--- a/app/server/modules/notifications/notifications.service.ts
+++ b/app/server/modules/notifications/notifications.service.ts
@@ -58,7 +58,7 @@ async function encryptSensitiveFields(config: NotificationConfig): Promise<Notif
 		case "ntfy":
 			return {
 				...config,
-				token: config.token ? await cryptoUtils.encrypt(config.token) : undefined,
+				password: config.password ? await cryptoUtils.encrypt(config.password) : undefined,
 			};
 		case "pushover":
 			return {
@@ -100,7 +100,7 @@ async function decryptSensitiveFields(config: NotificationConfig): Promise<Notif
 		case "ntfy":
 			return {
 				...config,
-				token: config.token ? await cryptoUtils.decrypt(config.token) : undefined,
+				password: config.password ? await cryptoUtils.decrypt(config.password) : undefined,
 			};
 		case "pushover":
 			return {