Fix some errors by moving LemmyContext and Perform into lemmy_websocket

server/Cargo.lock

@@ -1918,6 +1918,8 @@ dependencies = [
  "actix",
  "actix-web",
  "anyhow",
+ "async-trait",
+ "background-jobs",
  "chrono",
  "diesel",
  "lemmy_api_structs",

server/lemmy_api_structs/src/lib.rs

@@ -9,8 +9,6 @@ pub mod site;
 pub mod user;
 
 use thiserror::Error;
-use actix_web::web::Data;
-use lemmy_utils::{ConnectionId, LemmyError};
 
 #[derive(Debug, Error)]
 #[error("{{\"error\":\"{message}\"}}")]
@@ -25,14 +23,3 @@ impl APIError {
     }
   }
 }
-
-#[async_trait::async_trait(?Send)]
-pub trait Perform {
-  type Response: serde::ser::Serialize + Send;
-
-  async fn perform(
-    &self,
-    context: &Data<LemmyContext>,
-    websocket_id: Option<ConnectionId>,
-  ) -> Result<Self::Response, LemmyError>;
-}

server/lemmy_db/src/lib.rs

@@ -40,6 +40,8 @@ pub mod user_mention;
 pub mod user_mention_view;
 pub mod user_view;
 
+pub type DbPool = diesel::r2d2::Pool<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+
 pub trait Crud<T> {
   fn create(conn: &PgConnection, form: &T) -> Result<Self, Error>
   where

server/lemmy_websocket/Cargo.toml

@@ -21,3 +21,5 @@ chrono = { version = "0.4.7", features = ["serde"] }
 reqwest = { version = "0.10", features = ["json"] }
 strum = "0.18.0"
 strum_macros = "0.18.0"
+async-trait = "0.1.36"
+background-jobs = " 0.8.0-alpha.2"

server/lemmy_websocket/src/handlers.rs

@@ -1,12 +1,8 @@
-use crate::{
+use crate::{ {
-  api::Perform,
-  {
   chat_server::{ChatServer, SessionInfo},
   messages::*,
   UserOperation,
-  },
+}, LemmyContext, Perform};
-  LemmyContext,
-};
 use actix::{Actor, Context, Handler, ResponseFuture};
 use actix_web::web;
 use lemmy_db::naive_now;

server/lemmy_websocket/src/lib.rs

@@ -10,6 +10,15 @@ pub extern crate reqwest;
 pub extern crate log;
 #[macro_use]
 pub extern crate strum_macros;
+pub extern crate background_jobs;
+
+use actix::Addr;
+use crate::chat_server::ChatServer;
+use reqwest::Client;
+use lemmy_db::DbPool;
+use background_jobs::QueueHandle;
+use actix_web::web::Data;
+use lemmy_utils::{ConnectionId, LemmyError};
 
 pub mod chat_server;
 pub mod handlers;
@@ -76,3 +85,60 @@ pub enum UserOperation {
   GetSiteConfig,
   SaveSiteConfig,
 }
+
+pub struct LemmyContext {
+  pub pool: DbPool,
+  pub chat_server: Addr<ChatServer>,
+  pub client: Client,
+  pub activity_queue: QueueHandle,
+}
+
+impl LemmyContext {
+  pub fn create(
+    pool: DbPool,
+    chat_server: Addr<ChatServer>,
+    client: Client,
+    activity_queue: QueueHandle,
+  ) -> LemmyContext {
+    LemmyContext {
+      pool,
+      chat_server,
+      client,
+      activity_queue,
+    }
+  }
+  pub fn pool(&self) -> &DbPool {
+    &self.pool
+  }
+  pub fn chat_server(&self) -> &Addr<ChatServer> {
+    &self.chat_server
+  }
+  pub fn client(&self) -> &Client {
+    &self.client
+  }
+  pub fn activity_queue(&self) -> &QueueHandle {
+    &self.activity_queue
+  }
+}
+
+impl Clone for LemmyContext {
+  fn clone(&self) -> Self {
+    LemmyContext {
+      pool: self.pool.clone(),
+      chat_server: self.chat_server.clone(),
+      client: self.client.clone(),
+      activity_queue: self.activity_queue.clone(),
+    }
+  }
+}
+
+#[async_trait::async_trait(?Send)]
+pub trait Perform {
+  type Response: serde::ser::Serialize + Send;
+
+  async fn perform(
+    &self,
+    context: &Data<LemmyContext>,
+    websocket_id: Option<ConnectionId>,
+  ) -> Result<Self::Response, LemmyError>;
+}

server/src/lib.rs

@@ -43,54 +43,6 @@ use reqwest::Client;
 use serde::Deserialize;
 use std::process::Command;
 
-pub type DbPool = diesel::r2d2::Pool<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
-
-pub struct LemmyContext {
-  pub pool: DbPool,
-  pub chat_server: Addr<ChatServer>,
-  pub client: Client,
-  pub activity_queue: QueueHandle,
-}
-
-impl LemmyContext {
-  pub fn create(
-    pool: DbPool,
-    chat_server: Addr<ChatServer>,
-    client: Client,
-    activity_queue: QueueHandle,
-  ) -> LemmyContext {
-    LemmyContext {
-      pool,
-      chat_server,
-      client,
-      activity_queue,
-    }
-  }
-  pub fn pool(&self) -> &DbPool {
-    &self.pool
-  }
-  pub fn chat_server(&self) -> &Addr<ChatServer> {
-    &self.chat_server
-  }
-  pub fn client(&self) -> &Client {
-    &self.client
-  }
-  pub fn activity_queue(&self) -> &QueueHandle {
-    &self.activity_queue
-  }
-}
-
-impl Clone for LemmyContext {
-  fn clone(&self) -> Self {
-    LemmyContext {
-      pool: self.pool.clone(),
-      chat_server: self.chat_server.clone(),
-      client: self.client.clone(),
-      activity_queue: self.activity_queue.clone(),
-    }
-  }
-}
-
 #[derive(Deserialize, Debug)]
 pub struct IframelyResponse {
   title: Option<String>,