From 0060b2be60906bb7e7db7e9eb2a453a313d26dcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Pluta?= Date: Wed, 11 Jun 2025 13:33:53 +0200 Subject: [PATCH] Improve handling tags + improve combine bullets in ntfy backend --- grammar/task.pegjs | 2 +- src/backend/ntfy.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/grammar/task.pegjs b/grammar/task.pegjs index 75c7dea..77d17e7 100644 --- a/grammar/task.pegjs +++ b/grammar/task.pegjs @@ -42,7 +42,7 @@ labelWhitespace = whitespace:[ \t\r]+ { } } -tag = "#" tag:[a-zA-Z0-9-]+ { +tag = "#" tag:[a-zA-Z0-9-/]+ { return { span: "tag", value: tag.join("") diff --git a/src/backend/ntfy.ts b/src/backend/ntfy.ts index f14200b..b3fe19e 100644 --- a/src/backend/ntfy.ts +++ b/src/backend/ntfy.ts @@ -164,10 +164,10 @@ function defaultMapper(task: Task): NtfyDTO { } } -function defaultCombineMapper(tasks: Task[], bullet = "-"): NtfyDTO { +function defaultCombineMapper(tasks: Task[], bullet = (index: number) => "-"): NtfyDTO { const text = tasks .toSorted((a, b) => b.priority - a.priority) - .map(t => `${bullet} ${t.label}`) + .map((t, i) => `${bullet(i)} ${t.label}`) .join("\n"); const priority = mapPriority(Math.max(...tasks.map(t => t.priority)));