Benachrichtigungen: ntfy ersetzt durch Discord-Webhooks
User-Wunsch: Discord statt ntfy. notify.ts sendet jetzt einen JSON-Webhook-POST
({username, content} mit fettem Titel + Nachricht, auf Discords 2000-Zeichen-
Limit gekappt) statt ntfy-Headern. Emoji-Status im Titel (OK/Fehler/Ziel-
flagge) ersetzt Priority/Tags. Settings-UI: Label/Placeholder/Hinweis auf
Discord-Webhook umgestellt (Servereinstellungen -> Integrationen -> Webhooks).
Hooks, Dedup und Guards unveraendert. Tests auf das JSON-Format angepasst
(inkl. Discord-204-Antwort und 2000-Zeichen-Cap).
This commit is contained in:
@@ -10496,10 +10496,8 @@ export class DownloadManager extends EventEmitter {
|
||||
}
|
||||
this.notifiedPackages.add(pkg.id);
|
||||
void sendNotification(url, {
|
||||
title: kind === "completed" ? "Paket fertig" : "Paket fehlgeschlagen",
|
||||
message: `${pkg.name}\n${detail}`,
|
||||
priority: kind === "failed" ? "high" : "default",
|
||||
tags: kind === "completed" ? "white_check_mark" : "x"
|
||||
title: kind === "completed" ? "✅ Paket fertig" : "❌ Paket fehlgeschlagen",
|
||||
message: `${pkg.name}\n${detail}`
|
||||
});
|
||||
}
|
||||
|
||||
@@ -12122,10 +12120,8 @@ export class DownloadManager extends EventEmitter {
|
||||
this.session.summaryText = `Summary: Dauer ${duration}s, Ø Speed ${humanSize(avgSpeed)}/s, Erfolg ${success}/${total}`;
|
||||
if (this.settings.notifyOnRunFinished && total > 0) {
|
||||
void sendNotification(this.settings.notifyUrl, {
|
||||
title: "Durchlauf beendet",
|
||||
message: `${success}/${total} erfolgreich, ${failed} fehlgeschlagen, ${cancelled} abgebrochen\nDauer ${duration}s, Durchschnitt ${humanSize(avgSpeed)}/s`,
|
||||
priority: failed > 0 ? "high" : "default",
|
||||
tags: failed > 0 ? "warning" : "checkered_flag"
|
||||
title: failed > 0 ? "⚠️ Durchlauf beendet" : "🏁 Durchlauf beendet",
|
||||
message: `${success}/${total} erfolgreich, ${failed} fehlgeschlagen, ${cancelled} abgebrochen\nDauer ${duration}s, Durchschnitt ${humanSize(avgSpeed)}/s`
|
||||
});
|
||||
}
|
||||
this.runItemIds.clear();
|
||||
|
||||
+7
-13
@@ -3,30 +3,24 @@ import { logger } from "./logger";
|
||||
export interface NotifyPayload {
|
||||
title: string;
|
||||
message: string;
|
||||
priority?: "default" | "high";
|
||||
tags?: string;
|
||||
}
|
||||
|
||||
const NOTIFY_TIMEOUT_MS = 5000;
|
||||
const WEBHOOK_USERNAME = "Real-Debrid Downloader";
|
||||
|
||||
export function isNotifyUrlValid(url: string): boolean {
|
||||
return /^https?:\/\/\S+$/i.test(String(url || "").trim());
|
||||
}
|
||||
|
||||
export function buildNotifyRequest(url: string, payload: NotifyPayload): { url: string; init: RequestInit } {
|
||||
const headers: Record<string, string> = {
|
||||
"Title": payload.title,
|
||||
"Content-Type": "text/plain; charset=utf-8"
|
||||
};
|
||||
if (payload.priority && payload.priority !== "default") {
|
||||
headers["Priority"] = payload.priority;
|
||||
}
|
||||
if (payload.tags) {
|
||||
headers["Tags"] = payload.tags;
|
||||
}
|
||||
const content = `**${payload.title}**\n${payload.message}`.slice(0, 2000);
|
||||
return {
|
||||
url: String(url || "").trim(),
|
||||
init: { method: "POST", headers, body: payload.message }
|
||||
init: {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({ username: WEBHOOK_USERNAME, content })
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -4957,9 +4957,9 @@ export function App(): ReactElement {
|
||||
<label className="toggle-line"><input type="checkbox" checked={settingsDraft.minimizeToTray} onChange={(e) => setBool("minimizeToTray", e.target.checked)} /> In System Tray minimieren</label>
|
||||
<label className="toggle-line"><input type="checkbox" checked={settingsDraft.confirmDeleteSelection} onChange={(e) => setBool("confirmDeleteSelection", e.target.checked)} /> Vor dem Löschen bestätigen</label>
|
||||
<label className="toggle-line"><input type="checkbox" checked={settingsDraft.backupIncludeDownloads} onChange={(e) => setBool("backupIncludeDownloads", e.target.checked)} /> Download-Liste in Sicherung mitsichern (Standard: nur Einstellungen)</label>
|
||||
<label>Benachrichtigungs-URL (ntfy/Webhook)</label>
|
||||
<input value={settingsDraft.notifyUrl} placeholder="https://ntfy.sh/mein-topic" onChange={(e) => setText("notifyUrl", e.target.value)} />
|
||||
<div className="hint">POST an diese URL bei den unten gewählten Ereignissen. Mit der ntfy-App aufs Handy: Topic-URL eintragen, Topic in der App abonnieren — kein Account nötig.</div>
|
||||
<label>Webhook-URL (Discord)</label>
|
||||
<input value={settingsDraft.notifyUrl} placeholder="https://discord.com/api/webhooks/..." onChange={(e) => setText("notifyUrl", e.target.value)} />
|
||||
<div className="hint">In Discord: Servereinstellungen → Integrationen → Webhooks → Neuer Webhook → URL kopieren und hier eintragen. Die gewählten Ereignisse landen als Nachricht im Kanal.</div>
|
||||
<label className="toggle-line"><input type="checkbox" checked={settingsDraft.notifyOnPackageCompleted} onChange={(e) => setBool("notifyOnPackageCompleted", e.target.checked)} /> Benachrichtigen wenn ein Paket fertig ist</label>
|
||||
<label className="toggle-line"><input type="checkbox" checked={settingsDraft.notifyOnPackageFailed} onChange={(e) => setBool("notifyOnPackageFailed", e.target.checked)} /> Benachrichtigen wenn ein Paket fehlschlägt</label>
|
||||
<label className="toggle-line"><input type="checkbox" checked={settingsDraft.notifyOnRunFinished} onChange={(e) => setBool("notifyOnRunFinished", e.target.checked)} /> Benachrichtigen wenn der Durchlauf beendet ist</label>
|
||||
|
||||
Reference in New Issue
Block a user