Feature: Discord-Ping in Benachrichtigungen (optionale Erwaehnung)
Neues Settings-Feld "Discord-Ping" unter der Webhook-URL: User-ID, @everyone oder @here. Wird jeder Webhook-Nachricht vorangestellt, damit Discord wirklich pingt statt nur still in den Kanal zu schreiben. Eine nackte Zahl wird als <@id> verpackt (nur so pingt eine User-Erwaehnung); @everyone/@here und fertige <@...>-Mentions gehen unveraendert durch. Default leer = Verhalten wie bisher. 5 neue Tests (Normalisierung + Content-Prefix).
This commit is contained in:
@@ -108,6 +108,7 @@ export function defaultSettings(): AppSettings {
|
||||
confirmDeleteSelection: true,
|
||||
backupIncludeDownloads: false,
|
||||
notifyUrl: "",
|
||||
notifyMention: "",
|
||||
notifyOnPackageCompleted: false,
|
||||
notifyOnPackageFailed: false,
|
||||
notifyOnRunFinished: false,
|
||||
|
||||
@@ -10497,7 +10497,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}`
|
||||
message: `${pkg.name}\n${detail}`,
|
||||
mention: this.settings.notifyMention
|
||||
});
|
||||
}
|
||||
|
||||
@@ -12121,7 +12122,8 @@ export class DownloadManager extends EventEmitter {
|
||||
if (this.settings.notifyOnRunFinished && total > 0) {
|
||||
void sendNotification(this.settings.notifyUrl, {
|
||||
title: failed > 0 ? "⚠️ Durchlauf beendet" : "🏁 Durchlauf beendet",
|
||||
message: `${success}/${total} erfolgreich, ${failed} fehlgeschlagen, ${cancelled} abgebrochen\nDauer ${duration}s, Durchschnitt ${humanSize(avgSpeed)}/s`
|
||||
message: `${success}/${total} erfolgreich, ${failed} fehlgeschlagen, ${cancelled} abgebrochen\nDauer ${duration}s, Durchschnitt ${humanSize(avgSpeed)}/s`,
|
||||
mention: this.settings.notifyMention
|
||||
});
|
||||
}
|
||||
this.runItemIds.clear();
|
||||
|
||||
+16
-1
@@ -3,6 +3,7 @@ import { logger } from "./logger";
|
||||
export interface NotifyPayload {
|
||||
title: string;
|
||||
message: string;
|
||||
mention?: string;
|
||||
}
|
||||
|
||||
const NOTIFY_TIMEOUT_MS = 5000;
|
||||
@@ -12,8 +13,22 @@ export function isNotifyUrlValid(url: string): boolean {
|
||||
return /^https?:\/\/\S+$/i.test(String(url || "").trim());
|
||||
}
|
||||
|
||||
// Accepts a bare Discord user ID (wrapped as <@id> so it actually pings),
|
||||
// @everyone/@here, or an already-formed <@...>/<@&...> mention as-is.
|
||||
export function normalizeDiscordMention(raw: string): string {
|
||||
const text = String(raw || "").trim();
|
||||
if (!text) {
|
||||
return "";
|
||||
}
|
||||
if (/^\d{5,}$/.test(text)) {
|
||||
return `<@${text}>`;
|
||||
}
|
||||
return text;
|
||||
}
|
||||
|
||||
export function buildNotifyRequest(url: string, payload: NotifyPayload): { url: string; init: RequestInit } {
|
||||
const content = `**${payload.title}**\n${payload.message}`.slice(0, 2000);
|
||||
const mention = normalizeDiscordMention(payload.mention || "");
|
||||
const content = `${mention ? `${mention} ` : ""}**${payload.title}**\n${payload.message}`.slice(0, 2000);
|
||||
return {
|
||||
url: String(url || "").trim(),
|
||||
init: {
|
||||
|
||||
@@ -460,6 +460,7 @@ export function normalizeSettings(settings: AppSettings): AppSettings {
|
||||
confirmDeleteSelection: settings.confirmDeleteSelection !== undefined ? Boolean(settings.confirmDeleteSelection) : defaults.confirmDeleteSelection,
|
||||
backupIncludeDownloads: settings.backupIncludeDownloads !== undefined ? Boolean(settings.backupIncludeDownloads) : defaults.backupIncludeDownloads,
|
||||
notifyUrl: asText(settings.notifyUrl) || defaults.notifyUrl,
|
||||
notifyMention: asText(settings.notifyMention) || defaults.notifyMention,
|
||||
notifyOnPackageCompleted: settings.notifyOnPackageCompleted !== undefined ? Boolean(settings.notifyOnPackageCompleted) : defaults.notifyOnPackageCompleted,
|
||||
notifyOnPackageFailed: settings.notifyOnPackageFailed !== undefined ? Boolean(settings.notifyOnPackageFailed) : defaults.notifyOnPackageFailed,
|
||||
notifyOnRunFinished: settings.notifyOnRunFinished !== undefined ? Boolean(settings.notifyOnRunFinished) : defaults.notifyOnRunFinished,
|
||||
|
||||
Reference in New Issue
Block a user