From 98132cc00b045313ab9c4fec719b18e0f7c4a77b Mon Sep 17 00:00:00 2001
From: Joscha <joscha@plugh.de>
Date: Sun, 13 Aug 2023 21:22:57 +0200
Subject: [PATCH] Link without creating a Base

---
 src/server/web/admin/queue.rs |  4 ++--
 src/server/web/base.rs        | 16 ++++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/server/web/admin/queue.rs b/src/server/web/admin/queue.rs
index e0b18f1..2255f81 100644
--- a/src/server/web/admin/queue.rs
+++ b/src/server/web/admin/queue.rs
@@ -10,7 +10,7 @@ use time::OffsetDateTime;
 use crate::{
     config::Config,
     server::web::{
-        base::{Base, Tab},
+        base::Base,
         paths::{PathAdminQueueAdd, PathQueue},
     },
     somehow,
@@ -43,6 +43,6 @@ pub async fn post_admin_queue_add(
     .execute(&db)
     .await?;
 
-    let link = Base::new(config, Tab::None).link(PathQueue {});
+    let link = Base::link_with_config(config, PathQueue {});
     Ok(Redirect::to(&format!("{link}")))
 }
diff --git a/src/server/web/base.rs b/src/server/web/base.rs
index 79885bf..01eb655 100644
--- a/src/server/web/base.rs
+++ b/src/server/web/base.rs
@@ -32,25 +32,29 @@ impl Base {
             Tab::Queue => "queue",
         };
         Self {
-            link_logo_svg: Self::link_from_base(&config.web_base, LOGO_SVG),
-            link_base_css: Self::link_from_base(&config.web_base, BASE_CSS),
-            link_index: Self::link_from_base(&config.web_base, PathIndex {}),
-            link_queue: Self::link_from_base(&config.web_base, PathQueue {}),
+            link_logo_svg: Self::link_with_config(config, LOGO_SVG),
+            link_base_css: Self::link_with_config(config, BASE_CSS),
+            link_index: Self::link_with_config(config, PathIndex {}),
+            link_queue: Self::link_with_config(config, PathQueue {}),
             web_base: config.web_base.clone(),
             repo_name: config.repo_name.clone(),
             tab,
         }
     }
 
-    fn link_from_base<P: fmt::Display>(base: &str, to: P) -> Link {
+    fn link_with_base<P: fmt::Display>(base: &str, to: P) -> Link {
         let to = format!("{to}");
         assert!(!base.ends_with('/'));
         assert!(to.starts_with('/'));
         Link(format!("{base}{to}"))
     }
 
+    pub fn link_with_config<P: fmt::Display>(config: &Config, to: P) -> Link {
+        Self::link_with_base(&config.web_base, to)
+    }
+
     pub fn link<P: fmt::Display>(&self, to: P) -> Link {
-        Self::link_from_base(&self.web_base, to)
+        Self::link_with_base(&self.web_base, to)
     }
 }