From cd8244faa4543ba7b6cb0cc08a77907eb700e7bc Mon Sep 17 00:00:00 2001
From: tastytea <tastytea@tastytea.de>
Date: Tue, 26 Apr 2022 23:43:43 +0200
Subject: [PATCH] Support all pastebin.TLD services in readwwwlog

---
 .config/zsh/functions/readwwwlog | 8 ++++----
 .local/bin/urlhandler            | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.config/zsh/functions/readwwwlog b/.config/zsh/functions/readwwwlog
index b5ed24c..82b9bfb 100755
--- a/.config/zsh/functions/readwwwlog
+++ b/.config/zsh/functions/readwwwlog
@@ -25,8 +25,10 @@ for url in ${urls}; do
 
     if [[ ${url} =~ 'dpaste\.com' && ! ${url[-4,-1]} == ".txt" ]]; then
         url+=".txt"
-    elif [[ ${url} =~ 'pastebin\.com' && ! ${url} =~ '/raw/' ]]; then
-        url="https://pastebin.com/raw/${id}"
+    elif [[ ${url} =~ '(//|\.)(pastebin\.|paste\.centos\.org)' ]] && \
+             [[ ! ${url} =~ '/raw/' ]]; then
+        local host=${${(@s:/:)url}[2]}
+        url="https://${host}/view/raw/${id}"
     elif [[ ${url} =~ 'irccloud\.com' && ! ${url} =~ '/raw/' ]]; then
         id=${${(@s:/:)url}[4]}
         url="https://www.irccloud.com/pastebin/raw/${id}"
@@ -34,8 +36,6 @@ for url in ${urls}; do
         url="https://bpa.st/download-archive/${id}"
     elif [[ ${url} =~ 'paste\.debian\.net' && ! ${url} =~ '/plain/' ]]; then
         url="https://paste.debian.net/plain/${id}"
-    elif [[ ${url} =~ 'paste\.centos\.org' && ! ${url} =~ '/raw/' ]]; then
-        url="https://paste.centos.org/view/raw/${id}"
     fi
 
     if [[ ${TERMINAL} =~ "alacritty|xfce4-terminal" ]]; then
diff --git a/.local/bin/urlhandler b/.local/bin/urlhandler
index 53c3650..5a1b048 100755
--- a/.local/bin/urlhandler
+++ b/.local/bin/urlhandler
@@ -28,11 +28,12 @@ local -A assignments=(
     '^https?://(www\.)?youtu(\.be|be\.com)/'                            "${mpv}"
     '^(gemini|gopher)://'                                             "kristall"
     '\.(log|txt)$'                                                  "readwwwlog"
-    '^https?://(www\.)?(dpaste|pastebin|irccloud)\.com/'            "readwwwlog"
+    '^https?://(www\.)?(dpaste|irccloud)\.com/'                     "readwwwlog"
+    '^https?://(www\.)?pastebin\.[^/]+/view/'                       "readwwwlog"
     '^https?://bpa\.st/'                                            "readwwwlog"
     '^https?://sprunge\.us/'                                        "readwwwlog"
     '^https?://paste\.debian\.net/'                                 "readwwwlog"
-    '^https://paste\.centos\.org/'                                  "readwwwlog"
+    '^https?://paste\.centos\.org/'                                 "readwwwlog"
     '\.(webm|png|jpe?g|gif|svg|bmp|xcf)(\?.+)?$'                    "openwwwimg"
     '(^magnet:|\.torrent$)'                            "transmission-remote-gtk"
 )