From c01879e6f33d6754e4939d00014280e8a31a03b4 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <me@steffo.eu>
Date: Thu, 26 Sep 2024 06:32:21 +0200
Subject: [PATCH] Update ntfy script

---
 functions/ntfy.fish | 70 ++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 63 insertions(+), 7 deletions(-)

diff --git a/functions/ntfy.fish b/functions/ntfy.fish
index ab5a837..fc9eef7 100644
--- a/functions/ntfy.fish
+++ b/functions/ntfy.fish
@@ -1,14 +1,70 @@
 which curl --skip-functions >/dev/null 2>/dev/null
 if [ $status -eq 0 ]
 	function ntfy
-		set topic $argv[1]
-		set data $argv[2..-1]
+		argparse --name='ntfy' --min-args=1 \
+			(fish_opt --short="d" --long="topic" --required-val) \
+			(fish_opt --short="t" --long="title" --optional-val) \
+			(fish_opt --short="p" --long="priority" --optional-val) \
+			(fish_opt --short="x" --long="tag" --multiple-vals) \
+			-- $argv
 
-		log-t "Sending notification to" "$topic" "..."
+		if [ $status -ne 0 ]
+			log-f "Invalid" "syntax" "."
+			return 1
+		end
 
-		curl \
-			"https://ntfy.steffo.eu/$topic" \
-			--header "Authorization: Bearer $NTFY_TOKEN" \
-			--data "$data"
+		log-t "Token is:" "$NTFY_TOKEN"
+		log-t "Topic is:" "$_flag_topic"
+		log-t "Title is:" "$_flag_title"
+		log-t "Priority is:" "$_flag_priority"
+		log-t "Tags are:" "$_flag_tag"
+		log-t "Message is:" "$argv"
+
+		if [ -z "$_flag_topic" ]
+			log-f "Missing" "topic" "."
+			return 2
+		end
+
+		if [ -z "$_flag_priority" ]
+			log-d "Missing" "priority" ", defaulting to 'default'."
+			set _flag_priority "default"
+		end
+
+		if [ -n "$_flag_title" ]
+			set header_title "X-Title: $_flag_title"
+			log-t "Created header:" "$header_title"
+		end
+
+		if [ -n "$_flag_priority" ]
+			set header_priority "X-Priority: $_flag_priority"
+			log-t "Created header:" "$header_priority"
+		end
+
+		if [ -n "$_flag_tag" ]
+			set header_tags "X-Tags: $_flag_tag"
+			log-t "Created header:" "$header_tags"
+		end
+		
+
+		log-i "Sending $_flag_priority notification to" "$_flag_topic" " with tags [$_flag_tag]..."
+
+		set curl_response \
+			(curl "https://ntfy.steffo.eu/$_flag_topic" \
+				--header "Authorization: Bearer $NTFY_TOKEN" \
+				--header "$header_title" \
+				--header "$header_priority" \
+				--header "$header_tags" \
+				--data "$argv" \
+				--silent
+			)
+		
+		set curl_error (echo "$curl_response" | jq --raw-output '.error')
+
+		if [ "$curl_error" != "null" ]
+			log-f "Failed to send notification:" "$curl_error"
+			return 3
+		end
+
+		log-s "Sent notification to" "$_flag_topic" "!"
 	end
 end