From ee167f5c76d4b2ae09bfd1b23aeca35a9c6e3ab1 Mon Sep 17 00:00:00 2001
From: HelionSmoker <82761116+HelionSmoker@users.noreply.github.com>
Date: Fri, 3 Mar 2023 15:56:47 +0200
Subject: [PATCH] Use `dmenuhandler` in `st-urlhandler`

---
 st-urlhandler | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/st-urlhandler b/st-urlhandler
index 0eb4586..f5dfd3b 100755
--- a/st-urlhandler
+++ b/st-urlhandler
@@ -5,15 +5,12 @@ urlregex="(((http|https|gopher|gemini|ftp|ftps|git)://|www\\.)[a-zA-Z0-9.]*[:;a-
 urls="$(sed 's/.*│//g' | tr -d '\n' | # First remove linebreaks and mutt sidebars:
 	grep -aEo "$urlregex" | # grep only urls as defined above.
 	uniq | # Ignore neighboring duplicates.
-	sed "s/\(\.\|,\|;\|\!\\|\?\)$//;
-	s/^www./http:\/\/www\./")" # xdg-open will not detect url without http
+	sed "s/\(\.\|,\|;\|\!\\|\?\)$//")"
 
 [ -z "$urls" ] && exit 1
 
-while getopts "hoc" o; do case "${o}" in
-	h) printf "Optional arguments for custom use:\\n  -c: copy\\n  -o: xdg-open\\n  -h: Show this message\\n" && exit 1 ;;
-	o) chosen="$(echo "$urls" | dmenu -i -p 'Follow which url?' -l 10)"
-	setsid xdg-open "$chosen" >/dev/null 2>&1 & ;;
-	c) echo "$urls" | dmenu -i -p 'Copy which url?' -l 10 | tr -d '\n' | xclip -selection clipboard ;;
-	*) printf "Invalid option: -%s\\n" "$OPTARG" && exit 1 ;;
-esac done
+urlchoice="$(echo "$urls" | dmenu -i -l 10 -p 'Select a URL')"
+
+[ -z "$urlchoice" ] && exit 1
+
+dmenuhandler "$urlchoice"