diff --git a/backend/src/api/switch.rs b/backend/src/api/switch.rs index 60d98c2..7da24b9 100644 --- a/backend/src/api/switch.rs +++ b/backend/src/api/switch.rs @@ -1,5 +1,9 @@ use super::{Error, Result, StringBody}; -use crate::{models, paseto, schema, web, MainDatabase}; +use crate::{ + models, paseto, schema, + web::{PluralKit, SwitchCounter}, + MainDatabase, +}; use chrono::prelude::*; use diesel::prelude::*; use rocket::State; @@ -82,8 +86,8 @@ pub fn current_front(conn: MainDatabase, tok: paseto::Token) -> Result, - pk: State, + sc: State, + pk: State, tok: paseto::Token, ) -> Result { use schema::{members, switches}; diff --git a/backend/src/main.rs b/backend/src/main.rs index adf88f4..b0cd013 100644 --- a/backend/src/main.rs +++ b/backend/src/main.rs @@ -43,11 +43,11 @@ fn main() -> Result<()> { .attach(MainDatabase::fairing()) .attach(SpaceHelmet::default()) .attach(paseto::ed25519_keypair()) - .attach(discord_webhook::Client::fairing()) - .attach(mastodon::Client::fairing()) - .attach(pluralkit::Client::fairing()) - .attach(switchcounter::Client::fairing()) - .attach(twitter::Client::fairing()) + .attach(DiscordWebhook::fairing()) + .attach(Mastodon::fairing()) + .attach(PluralKit::fairing()) + .attach(SwitchCounter::fairing()) + .attach(Twitter::fairing()) .mount("/metrics", prometheus) .mount("/", routes![botinfo]) .mount( diff --git a/backend/src/web/mod.rs b/backend/src/web/mod.rs index d8472e9..091cb9f 100644 --- a/backend/src/web/mod.rs +++ b/backend/src/web/mod.rs @@ -4,6 +4,12 @@ pub mod pluralkit; pub mod switchcounter; pub mod twitter; +pub use discord_webhook::Client as DiscordWebhook; +pub use mastodon::Client as Mastodon; +pub use pluralkit::Client as PluralKit; +pub use switchcounter::Client as SwitchCounter; +pub use twitter::Client as Twitter; + pub type Result = std::result::Result; #[derive(thiserror::Error, Debug)]