From 314d0c68af241e659454f9d9c38aceae3a46cbaa Mon Sep 17 00:00:00 2001
From: kieran <kieran@harkin.me>
Date: Tue, 4 Feb 2025 13:09:02 +0000
Subject: [PATCH] feat: accept void-cat uuid

---
 src/routes/mod.rs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/routes/mod.rs b/src/routes/mod.rs
index d64d75d..976aeee 100644
--- a/src/routes/mod.rs
+++ b/src/routes/mod.rs
@@ -437,10 +437,15 @@ pub async fn void_cat_redirect(id: &str, settings: &State<Settings>) -> Option<N
         id
     };
     if let Some(base) = &settings.void_cat_files {
-        let uuid =
-            uuid::Uuid::from_slice_le(nostr::bitcoin::base58::decode(id).unwrap().as_slice())
-                .unwrap();
-        let f = base.join(VoidFile::map_to_path(&uuid));
+        let uuid = if let Ok(b58) = nostr::bitcoin::base58::decode(id) {
+            uuid::Uuid::from_slice_le(b58.as_slice())
+        } else {
+            uuid::Uuid::parse_str(id)
+        };
+        if uuid.is_err() {
+            return None;
+        }
+        let f = base.join(VoidFile::map_to_path(&uuid.unwrap()));
         debug!("Legacy file map: {} => {}", id, f.display());
         if let Ok(f) = NamedFile::open(f).await {
             Some(f)