Merge branch 'main' into feature-frontend

1 files changed, 10 insertions, 8 deletions

diff --git a/src/app.rs b/src/app.rs
index 245feb1..c13f52f 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -2,33 +2,35 @@ use sqlx::sqlite::SqlitePool;
 
 use crate::{
     channel::app::Channels,
-    events::{app::Events, broadcaster::Broadcaster},
-    login::app::Logins,
+    events::{app::Events, broadcaster::Broadcaster as EventBroadcaster},
+    login::{app::Logins, broadcaster::Broadcaster as LoginBroadcaster},
 };
 
 #[derive(Clone)]
 pub struct App {
     db: SqlitePool,
-    broadcaster: Broadcaster,
+    events: EventBroadcaster,
+    logins: LoginBroadcaster,
 }
 
 impl App {
     pub fn from(db: SqlitePool) -> Self {
-        let broadcaster = Broadcaster::default();
-        Self { db, broadcaster }
+        let events = EventBroadcaster::default();
+        let logins = LoginBroadcaster::default();
+        Self { db, events, logins }
     }
 }
 
 impl App {
     pub const fn logins(&self) -> Logins {
-        Logins::new(&self.db)
+        Logins::new(&self.db, &self.logins)
     }
 
     pub const fn events(&self) -> Events {
-        Events::new(&self.db, &self.broadcaster)
+        Events::new(&self.db, &self.events)
     }
 
     pub const fn channels(&self) -> Channels {
-        Channels::new(&self.db, &self.broadcaster)
+        Channels::new(&self.db, &self.events)
     }
 }