refactor: code readability

app/client/modules/notifications/components/create-notification-form.tsx

@@ -527,7 +527,9 @@ export const CreateNotificationForm = ({ onSubmit, mode = "create", initialValue
 									<FormControl>
 										<SecretInput {...field} placeholder="••••••••" />
 									</FormControl>
-									<FormDescription>Access token for server authentication, if required.</FormDescription>
+									<FormDescription>
+										Access token for server authentication. Will take precedence over username/password if set.
+									</FormDescription>
 									<FormMessage />
 								</FormItem>
 							)}

app/server/modules/notifications/builders/ntfy.ts

@@ -4,13 +4,17 @@ export function buildNtfyShoutrrrUrl(config: Extract<NotificationConfig, { type:
 	let shoutrrrUrl: string;
 
 	const params = new URLSearchParams();
+	const { username, password, accessToken } = config;
 
-	const auth =
+	let auth = "";
-		config.accessToken
+
-			? `:${encodeURIComponent(config.accessToken)}@`
+	if (username && password) {
-			: config.username && config.password
+		auth = `${encodeURIComponent(username)}:${encodeURIComponent(password)}@`;
-				? `${encodeURIComponent(config.username)}:${encodeURIComponent(config.password)}@`
+	}
-				: "";
+
+	if (accessToken) {
+		auth = `:${encodeURIComponent(accessToken)}@`;
+	}
 
 	if (config.serverUrl) {
 		const url = new URL(config.serverUrl);