kristoferssolo/tg-relay-rs
1
0
Fork 0
mirror of https://github.com/kristoferssolo/tg-relay-rs.git synced 2025-12-20 11:04:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "feat: add handler env variables"

Browse Source 
This reverts commit 47ab326e06.
This commit is contained in:
Kristofers Solo 2025-10-27 10:03:16 +02:00
parent a276585b25
commit a61bbf694f
Signed by: kristoferssolo
GPG Key ID: 74FF8144483D82C8
2 changed files with 8 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -7,7 +7,7 @@ edition = "2024"
[dependencies] [dependencies]
async-trait = "0.1" async-trait = "0.1"
capitalize = "0.3" capitalize = "0.3.4"
color-eyre = "0.6" color-eyre = "0.6"
dotenv = "0.15" dotenv = "0.15"
futures = "0.3" futures = "0.3"

39
src/main.rs
View File

@ -1,5 +1,5 @@
use dotenv::dotenv; use dotenv::dotenv;
use std::{env, sync::Arc}; use std::sync::Arc;
use teloxide::{Bot, prelude::Requester, respond, types::Message}; use teloxide::{Bot, prelude::Requester, respond, types::Message};
use tg_relay_rs::{ use tg_relay_rs::{
comments::{Comments, init_global_comments}, comments::{Comments, init_global_comments},
@ -8,17 +8,6 @@ use tg_relay_rs::{
}; };
use tracing::{error, info, warn}; 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] #[tokio::main]
async fn main() -> color_eyre::Result<()> { async fn main() -> color_eyre::Result<()> {
dotenv().ok(); dotenv().ok();
@ -38,18 +27,12 @@ async fn main() -> color_eyre::Result<()> {
let bot = Bot::from_env(); let bot = Bot::from_env();
info!("bot starting"); info!("bot starting");
let mut handlers: Vec<Arc<dyn SocialHandler>> = Vec::new(); let handlers: Vec<Arc<dyn SocialHandler>> = vec![
#[cfg(feature = "instagram")]
add_handler_if_enabled!( Arc::new(tg_relay_rs::handlers::InstagramHandler),
handlers, #[cfg(feature = "youtube")]
"instagram", Arc::new(tg_relay_rs::handlers::YouTubeShortsHandler),
tg_relay_rs::handlers::InstagramHandler ];
);
add_handler_if_enabled!(
handlers,
"youtube",
tg_relay_rs::handlers::YouTubeShortsHandler
);
teloxide::repl(bot.clone(), move |bot: Bot, msg: Message| { teloxide::repl(bot.clone(), move |bot: Bot, msg: Message| {
// clone the handlers vector into the closure // clone the handlers vector into the closure
@ -83,11 +66,3 @@ async fn main() -> color_eyre::Result<()> {
Ok(()) 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())
}