Meik/Pickup-Config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ntfy fix

Browse Source
This commit is contained in:
Meik
2025-11-11 09:35:19 +01:00
parent 2125d545f2
commit 88c546bf87
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/notificationService.js
View File

@@ -28,8 +28,7 @@ async function sendNtfyNotification(adminNtfy, userNtfy, payload) {
const server = (userNtfy.serverUrl || adminNtfy.serverUrl || 'https://ntfy.sh').replace(/\/+$/, ''); const server = (userNtfy.serverUrl || adminNtfy.serverUrl || 'https://ntfy.sh').replace(/\/+$/, '');
const sanitizedPrefix = (adminNtfy.topicPrefix || '').replace(/^-+|-+$/g, ''); const sanitizedPrefix = (adminNtfy.topicPrefix || '').replace(/^-+|-+$/g, '');
const sanitizedTopic = (userNtfy.topic || '').replace(/^-+|-+$/g, ''); const sanitizedTopic = (userNtfy.topic || '').replace(/^-+|-+$/g, '');
const separator = sanitizedPrefix && sanitizedTopic ? '_' : ''; const topic = `${sanitizedPrefix}${sanitizedTopic}` || sanitizedPrefix || sanitizedTopic;
const topic = `${sanitizedPrefix}${separator}${sanitizedTopic}` || sanitizedPrefix || sanitizedTopic;
let url = `${server}/${topic}`; let url = `${server}/${topic}`;
if (payload.title) { if (payload.title) {
const delimiter = url.includes('?') ? '&' : '?'; const delimiter = url.includes('?') ? '&' : '?';

3
src/App.js
View File

@@ -575,8 +575,7 @@ function App() {
return null; return null;
} }
const prefix = (notificationCapabilities.ntfy.topicPrefix || '').replace(/^-+|-+$/g, ''); const prefix = (notificationCapabilities.ntfy.topicPrefix || '').replace(/^-+|-+$/g, '');
const separator = prefix && sanitizedTopic ? '_' : ''; const slug = `${prefix}${sanitizedTopic}` || sanitizedTopic || prefix;
const slug = `${prefix}${separator}${sanitizedTopic}` || sanitizedTopic || prefix;
if (!slug) { if (!slug) {
return null; return null;
} }

10
src/components/NotificationPanel.js
View File

@@ -72,6 +72,16 @@ const NotificationPanel = ({
disabled={!settings.ntfy.enabled} disabled={!settings.ntfy.enabled}
/> />
</div> </div>
{capabilities.ntfy.serverUrl && (
<p className="text-xs text-gray-500">
Server: {capabilities.ntfy.serverUrl} (vom Admin festgelegt)
</p>
)}
{capabilities.ntfy.topicPrefix && (
<p className="text-xs text-gray-500">
Präfix: {capabilities.ntfy.topicPrefix} (Topic wird direkt angehängt)
</p>
)}
{ntfyPreviewUrl && ( {ntfyPreviewUrl && (
<div className="flex items-center gap-2 text-xs text-gray-600"> <div className="flex items-center gap-2 text-xs text-gray-600">
<a <a