Merge branch 'main' into feature-frontend

1 files changed, 19 insertions, 9 deletions

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