From 7f86743f4af97a4b3bed3bca0cdb8cba5dcfbc04 Mon Sep 17 00:00:00 2001 From: lew Date: Thu, 9 Apr 2026 18:08:37 +0100 Subject: [PATCH] refactor: clean-up of some unused options after the template rework --- .env.example | 3 --- LICENSE | 2 +- module.nix | 7 +------ src/config.rs | 10 ++-------- src/render.rs | 2 +- src/web.rs | 2 +- 6 files changed, 6 insertions(+), 20 deletions(-) diff --git a/.env.example b/.env.example index 50a6c05..35fddc1 100644 --- a/.env.example +++ b/.env.example @@ -7,9 +7,6 @@ BOOK_DATA_DIR=./data # Site title shown in nav and page title. BOOK_SITE_TITLE=guestbook -# Base URL of the main site (for absolute nav links). -BOOK_SITE_URL=https://example.com - # Telegram bot token. BOOK_TELEGRAM_BOT_TOKEN=your-bot-token-here diff --git a/LICENSE b/LICENSE index 5e8a6c2..e9c6128 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2026 Llywelwyn +Copyright (c) 2026 Lewis Wynne Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/module.nix b/module.nix index 1bbe6ef..e1defbe 100644 --- a/module.nix +++ b/module.nix @@ -30,11 +30,6 @@ in description = "Site title shown in nav and page title."; }; - siteUrl = mkOption { - type = types.str; - description = "Base URL of the main site (for absolute nav links)."; - }; - telegramChatId = mkOption { type = types.int; description = "Telegram chat ID for moderation messages."; @@ -174,7 +169,7 @@ in BOOK_PORT = toString cfg.port; BOOK_DATA_DIR = cfg.dataDir; BOOK_SITE_TITLE = cfg.siteTitle; - BOOK_SITE_URL = cfg.siteUrl; + BOOK_TELEGRAM_CHAT_ID = toString cfg.telegramChatId; BOOK_HONEYPOT = if cfg.honeypot then "true" else "false"; BOOK_MAX_NAME_LENGTH = toString cfg.maxNameLength; diff --git a/src/config.rs b/src/config.rs index 75e93bd..b86eced 100644 --- a/src/config.rs +++ b/src/config.rs @@ -6,7 +6,7 @@ pub struct Config { pub port: u16, pub data_dir: PathBuf, pub site_title: String, - pub site_url: String, + pub telegram_bot_token: String, pub telegram_chat_id: i64, pub honeypot: bool, @@ -41,7 +41,7 @@ impl Config { .map(PathBuf::from) .unwrap_or_else(|_| PathBuf::from("./data")), site_title: env::var("BOOK_SITE_TITLE").unwrap_or_else(|_| "guestbook".into()), - site_url: env::var("BOOK_SITE_URL").map_err(|_| "BOOK_SITE_URL is required")?, + telegram_bot_token: env::var("BOOK_TELEGRAM_BOT_TOKEN") .map_err(|_| "BOOK_TELEGRAM_BOT_TOKEN is required")?, telegram_chat_id: env::var("BOOK_TELEGRAM_CHAT_ID") @@ -115,7 +115,6 @@ mod tests { env::set_var("BOOK_PORT", "9999"); env::set_var("BOOK_DATA_DIR", "/tmp/gb"); env::set_var("BOOK_SITE_TITLE", "test.rs"); - env::set_var("BOOK_SITE_URL", "https://test.rs"); env::set_var("BOOK_TELEGRAM_BOT_TOKEN", "123:ABC"); env::set_var("BOOK_TELEGRAM_CHAT_ID", "12345"); @@ -124,14 +123,12 @@ mod tests { assert_eq!(config.listen_addr(), "127.0.0.1:9999"); assert_eq!(config.data_dir, PathBuf::from("/tmp/gb")); assert_eq!(config.site_title, "test.rs"); - assert_eq!(config.site_url, "https://test.rs"); assert_eq!(config.telegram_chat_id, 12345); // Clean up env::remove_var("BOOK_PORT"); env::remove_var("BOOK_DATA_DIR"); env::remove_var("BOOK_SITE_TITLE"); - env::remove_var("BOOK_SITE_URL"); env::remove_var("BOOK_TELEGRAM_BOT_TOKEN"); env::remove_var("BOOK_TELEGRAM_CHAT_ID"); } @@ -139,7 +136,6 @@ mod tests { #[test] fn test_defaults() { let _lock = ENV_LOCK.lock().unwrap(); - env::set_var("BOOK_SITE_URL", "https://test.rs"); env::set_var("BOOK_TELEGRAM_BOT_TOKEN", "123:ABC"); env::set_var("BOOK_TELEGRAM_CHAT_ID", "12345"); @@ -148,7 +144,6 @@ mod tests { assert_eq!(config.data_dir, PathBuf::from("./data")); assert_eq!(config.site_title, "guestbook"); - env::remove_var("BOOK_SITE_URL"); env::remove_var("BOOK_TELEGRAM_BOT_TOKEN"); env::remove_var("BOOK_TELEGRAM_CHAT_ID"); } @@ -156,7 +151,6 @@ mod tests { #[test] fn test_missing_required() { let _lock = ENV_LOCK.lock().unwrap(); - env::remove_var("BOOK_SITE_URL"); env::remove_var("BOOK_TELEGRAM_BOT_TOKEN"); env::remove_var("BOOK_TELEGRAM_CHAT_ID"); diff --git a/src/render.rs b/src/render.rs index 514317b..9fcf179 100644 --- a/src/render.rs +++ b/src/render.rs @@ -81,7 +81,7 @@ mod tests { port: 0, data_dir: PathBuf::from("./data"), site_title: "test".into(), - site_url: "https://test.rs".into(), + telegram_bot_token: "fake".into(), telegram_chat_id: 0, honeypot: true, diff --git a/src/web.rs b/src/web.rs index 2c38b17..5fd7bab 100644 --- a/src/web.rs +++ b/src/web.rs @@ -129,7 +129,7 @@ mod tests { port: 0, data_dir: dir.to_path_buf(), site_title: "test".into(), - site_url: "https://test.rs".into(), + telegram_bot_token: "fake".into(), telegram_chat_id: 0, honeypot: true,