Merge branch 'main' into wip/path-routing-for-channels

1 files changed, 13 insertions, 9 deletions

diff --git a/src/app.rs b/src/app.rs
index 6d007a9..177c134 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -3,9 +3,9 @@ use sqlx::sqlite::SqlitePool;
 use crate::{
     boot::app::Boot,
     channel::app::Channels,
-    event::{app::Events, broadcaster::Broadcaster as EventBroadcaster},
+    event::{self, app::Events},
     message::app::Messages,
-    token::{app::Tokens, broadcaster::Broadcaster as TokenBroadcaster},
+    token::{self, app::Tokens},
 };
 
 #[cfg(test)]
@@ -14,15 +14,19 @@ use crate::login::app::Logins;
 #[derive(Clone)]
 pub struct App {
     db: SqlitePool,
-    events: EventBroadcaster,
-    tokens: TokenBroadcaster,
+    events: event::Broadcaster,
+    token_events: token::Broadcaster,
 }
 
 impl App {
     pub fn from(db: SqlitePool) -> Self {
-        let events = EventBroadcaster::default();
-        let tokens = TokenBroadcaster::default();
-        Self { db, events, tokens }
+        let events = event::Broadcaster::default();
+        let token_events = token::Broadcaster::default();
+        Self {
+            db,
+            events,
+            token_events,
+        }
     }
 }
 
@@ -41,7 +45,7 @@ impl App {
 
     #[cfg(test)]
     pub const fn logins(&self) -> Logins {
-        Logins::new(&self.db)
+        Logins::new(&self.db, &self.events)
     }
 
     pub const fn messages(&self) -> Messages {
@@ -49,6 +53,6 @@ impl App {
     }
 
     pub const fn tokens(&self) -> Tokens {
-        Tokens::new(&self.db, &self.tokens)
+        Tokens::new(&self.db, &self.events, &self.token_events)
     }
 }