From a61bbf694fc1c85cf27872fff20cfe50e6577f4e Mon Sep 17 00:00:00 2001
From: Kristofers Solo <dev@kristofers.xyz>
Date: Mon, 27 Oct 2025 10:03:16 +0200
Subject: [PATCH] Revert "feat: add handler env variables"

This reverts commit 47ab326e06b2634de78ee1c1cf53bceacac1ec5d.
---
 Cargo.toml  |  2 +-
 src/main.rs | 39 +++++++--------------------------------
 2 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 19f62ef..ff3feec 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2024"
 
 [dependencies]
 async-trait = "0.1"
-capitalize = "0.3"
+capitalize = "0.3.4"
 color-eyre = "0.6"
 dotenv = "0.15"
 futures = "0.3"
diff --git a/src/main.rs b/src/main.rs
index fd3e7a8..18b2145 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,5 @@
 use dotenv::dotenv;
-use std::{env, sync::Arc};
+use std::sync::Arc;
 use teloxide::{Bot, prelude::Requester, respond, types::Message};
 use tg_relay_rs::{
     comments::{Comments, init_global_comments},
@@ -8,17 +8,6 @@ use tg_relay_rs::{
 };
 use tracing::{error, info, warn};
 
-macro_rules! add_handler_if_enabled {
-    ($handlers:expr, $feature:expr, $handler:expr) => {
-        #[cfg(feature = $feature)]
-        {
-            if is_handler_enabled($feature) {
-                $handlers.push(Arc::new($handler));
-            }
-        }
-    };
-}
-
 #[tokio::main]
 async fn main() -> color_eyre::Result<()> {
     dotenv().ok();
@@ -38,18 +27,12 @@ async fn main() -> color_eyre::Result<()> {
     let bot = Bot::from_env();
     info!("bot starting");
 
-    let mut handlers: Vec<Arc<dyn SocialHandler>> = Vec::new();
-
-    add_handler_if_enabled!(
-        handlers,
-        "instagram",
-        tg_relay_rs::handlers::InstagramHandler
-    );
-    add_handler_if_enabled!(
-        handlers,
-        "youtube",
-        tg_relay_rs::handlers::YouTubeShortsHandler
-    );
+    let handlers: Vec<Arc<dyn SocialHandler>> = vec![
+        #[cfg(feature = "instagram")]
+        Arc::new(tg_relay_rs::handlers::InstagramHandler),
+        #[cfg(feature = "youtube")]
+        Arc::new(tg_relay_rs::handlers::YouTubeShortsHandler),
+    ];
 
     teloxide::repl(bot.clone(), move |bot: Bot, msg: Message| {
         // clone the handlers vector into the closure
@@ -83,11 +66,3 @@ async fn main() -> color_eyre::Result<()> {
 
     Ok(())
 }
-
-fn has_env(key: &str) -> bool {
-    !matches!(env::var(key), Ok(val) if val.trim().eq_ignore_ascii_case("false"))
-}
-
-fn is_handler_enabled(handler_key: &str) -> bool {
-    has_env(&handler_key.to_uppercase())
-}