Moving settings and secrets to context.

[lemmy.git] / crates / websocket / src / chat_server.rs

diff --git a/crates/websocket/src/chat_server.rs b/crates/websocket/src/chat_server.rs
index 2e4fda2e4c0c3f949a2d49852e1d5f52a5f429b5..7ab65aad23e20b4444040a7ca4e9148ea473ee3c 100644 (file)
--- a/crates/websocket/src/chat_server.rs
+++ b/crates/websocket/src/chat_server.rs
@@ -14,10 +14,11 @@ use diesel::{
   PgConnection,
 };
 use lemmy_api_common::{comment::*, post::*};
-use lemmy_db_schema::{CommunityId, LocalUserId, PostId};
+use lemmy_db_schema::{source::secret::Secret, CommunityId, LocalUserId, PostId};
 use lemmy_utils::{
   location_info,
   rate_limit::RateLimit,
+  settings::structs::Settings,
   ApiError,
   ConnectionId,
   IpAddr,
@@ -71,6 +72,12 @@ pub struct ChatServer {
   /// The DB Pool
   pub(super) pool: Pool<ConnectionManager<PgConnection>>,
 
+  /// The Settings
+  pub(super) settings: Settings,
+
+  /// The Secrets
+  pub(super) secret: Secret,
+
   /// Rate limiting based on rate type and IP addr
   pub(super) rate_limiter: RateLimit,
 
@@ -95,6 +102,7 @@ pub struct SessionInfo {
 /// And manages available rooms. Peers send messages to other peers in same
 /// room through `ChatServer`.
 impl ChatServer {
+  #![allow(clippy::too_many_arguments)]
   pub fn startup(
     pool: Pool<ConnectionManager<PgConnection>>,
     rate_limiter: RateLimit,
@@ -102,6 +110,8 @@ impl ChatServer {
     message_handler_crud: MessageHandlerCrudType,
     client: Client,
     activity_queue: QueueHandle,
+    settings: Settings,
+    secret: Secret,
   ) -> ChatServer {
     ChatServer {
       sessions: HashMap::new(),
@@ -117,6 +127,8 @@ impl ChatServer {
       message_handler_crud,
       client,
       activity_queue,
+      settings,
+      secret,
     }
   }
 
@@ -452,6 +464,8 @@ impl ChatServer {
       chat_server: ctx.address(),
       client: self.client.to_owned(),
       activity_queue: self.activity_queue.to_owned(),
+      settings: self.settings.to_owned(),
+      secret: self.secret.to_owned(),
     };
     let message_handler_crud = self.message_handler_crud;
     let message_handler = self.message_handler;