Move websocket code into workspace (#107)

[lemmy.git] / lemmy_websocket / src / handlers.rs

diff --git a/src/websocket/handlers.rs b/lemmy_websocket/src/handlers.rs
similarity index 76%
rename from src/websocket/handlers.rs
rename to lemmy_websocket/src/handlers.rs
index 75e638f94e34786ff8c7fd531a962d896ebd839f..258098d6276a298b919cb63b8d6139a265067692 100644 (file)
--- a/src/websocket/handlers.rs
+++ b/lemmy_websocket/src/handlers.rs
@@ -1,59 +1,12 @@
 use crate::{
-  api::Perform,
-  websocket::chat_server::{ChatServer, SessionInfo},
-  LemmyContext,
+  chat_server::{ChatServer, SessionInfo},
+  messages::*,
 };
 use actix::{Actor, Context, Handler, ResponseFuture};
-use actix_web::web;
 use lemmy_db::naive_now;
-use lemmy_rate_limit::RateLimit;
-use lemmy_structs::websocket::*;
-use lemmy_utils::{ConnectionId, IPAddr, LemmyError};
 use log::{error, info};
 use rand::Rng;
-use serde::{Deserialize, Serialize};
-
-pub(super) struct Args<'a> {
-  pub(super) context: LemmyContext,
-  pub(super) rate_limiter: RateLimit,
-  pub(super) id: ConnectionId,
-  pub(super) ip: IPAddr,
-  pub(super) op: UserOperation,
-  pub(super) data: &'a str,
-}
-
-pub(super) async fn do_user_operation<'a, 'b, Data>(args: Args<'b>) -> Result<String, LemmyError>
-where
-  for<'de> Data: Deserialize<'de> + 'a,
-  Data: Perform,
-{
-  let Args {
-    context,
-    rate_limiter,
-    id,
-    ip,
-    op,
-    data,
-  } = args;
-
-  let data = data.to_string();
-  let op2 = op.clone();
-
-  let fut = async move {
-    let parsed_data: Data = serde_json::from_str(&data)?;
-    let res = parsed_data
-      .perform(&web::Data::new(context), Some(id))
-      .await?;
-    to_json_string(&op, &res)
-  };
-
-  match op2 {
-    UserOperation::Register => rate_limiter.register().wrap(ip, fut).await,
-    UserOperation::CreatePost => rate_limiter.post().wrap(ip, fut).await,
-    UserOperation::CreateCommunity => rate_limiter.register().wrap(ip, fut).await,
-    _ => rate_limiter.message().wrap(ip, fut).await,
-  }
-}
+use serde::Serialize;
 
 /// Make actor from `ChatServer`
 impl Actor for ChatServer {
@@ -241,26 +194,6 @@ impl Handler<GetCommunityUsersOnline> for ChatServer {
   }
 }
 
-#[derive(Serialize)]
-struct WebsocketResponse<T> {
-  op: String,
-  data: T,
-}
-
-pub(super) fn to_json_string<Response>(
-  op: &UserOperation,
-  data: &Response,
-) -> Result<String, LemmyError>
-where
-  Response: Serialize,
-{
-  let response = WebsocketResponse {
-    op: op.to_string(),
-    data,
-  };
-  Ok(serde_json::to_string(&response)?)
-}
-
 impl Handler<CaptchaItem> for ChatServer {
   type Result = ();