Some code cleanup

src/api/mod.rs

@@ -1,4 +1,4 @@
-use crate::{api::claims::Claims, websocket::handlers::Args, DbPool, LemmyContext};
+use crate::{api::claims::Claims, DbPool, LemmyContext};
 use actix_web::{web, web::Data};
 use lemmy_db::{
   community::Community,
@@ -106,26 +106,168 @@ pub(in crate::api) async fn check_community_ban(
   }
 }
 
-pub(super) async fn do_user_operation<'a, 'b, Data>(args: Args<'b>) -> Result<String, LemmyError>
+pub async fn match_websocket_operation(
-where
-  for<'de> Data: Deserialize<'de> + 'a,
-  Data: Perform,
-{
-  let Args {
-    context,
-    id,
-    op,
-    data,
-  } = args;
-
-  do_websocket_operation::<Data>(context, data, id, op).await
-}
-
-pub async fn do_websocket_operation<'a, 'b, Data>(
   context: LemmyContext,
-  data: &'a str,
   id: ConnectionId,
   op: UserOperation,
+  data: &str,
+) -> Result<String, LemmyError> {
+  match op {
+    // User ops
+    UserOperation::Login => do_websocket_operation::<Login>(context, id, op, data).await,
+    UserOperation::Register => do_websocket_operation::<Register>(context, id, op, data).await,
+    UserOperation::GetCaptcha => do_websocket_operation::<GetCaptcha>(context, id, op, data).await,
+    UserOperation::GetUserDetails => {
+      do_websocket_operation::<GetUserDetails>(context, id, op, data).await
+    }
+    UserOperation::GetReplies => do_websocket_operation::<GetReplies>(context, id, op, data).await,
+    UserOperation::AddAdmin => do_websocket_operation::<AddAdmin>(context, id, op, data).await,
+    UserOperation::BanUser => do_websocket_operation::<BanUser>(context, id, op, data).await,
+    UserOperation::GetUserMentions => {
+      do_websocket_operation::<GetUserMentions>(context, id, op, data).await
+    }
+    UserOperation::MarkUserMentionAsRead => {
+      do_websocket_operation::<MarkUserMentionAsRead>(context, id, op, data).await
+    }
+    UserOperation::MarkAllAsRead => {
+      do_websocket_operation::<MarkAllAsRead>(context, id, op, data).await
+    }
+    UserOperation::DeleteAccount => {
+      do_websocket_operation::<DeleteAccount>(context, id, op, data).await
+    }
+    UserOperation::PasswordReset => {
+      do_websocket_operation::<PasswordReset>(context, id, op, data).await
+    }
+    UserOperation::PasswordChange => {
+      do_websocket_operation::<PasswordChange>(context, id, op, data).await
+    }
+    UserOperation::UserJoin => do_websocket_operation::<UserJoin>(context, id, op, data).await,
+    UserOperation::PostJoin => do_websocket_operation::<PostJoin>(context, id, op, data).await,
+    UserOperation::CommunityJoin => {
+      do_websocket_operation::<CommunityJoin>(context, id, op, data).await
+    }
+    UserOperation::SaveUserSettings => {
+      do_websocket_operation::<SaveUserSettings>(context, id, op, data).await
+    }
+
+    // Private Message ops
+    UserOperation::CreatePrivateMessage => {
+      do_websocket_operation::<CreatePrivateMessage>(context, id, op, data).await
+    }
+    UserOperation::EditPrivateMessage => {
+      do_websocket_operation::<EditPrivateMessage>(context, id, op, data).await
+    }
+    UserOperation::DeletePrivateMessage => {
+      do_websocket_operation::<DeletePrivateMessage>(context, id, op, data).await
+    }
+    UserOperation::MarkPrivateMessageAsRead => {
+      do_websocket_operation::<MarkPrivateMessageAsRead>(context, id, op, data).await
+    }
+    UserOperation::GetPrivateMessages => {
+      do_websocket_operation::<GetPrivateMessages>(context, id, op, data).await
+    }
+
+    // Site ops
+    UserOperation::GetModlog => do_websocket_operation::<GetModlog>(context, id, op, data).await,
+    UserOperation::CreateSite => do_websocket_operation::<CreateSite>(context, id, op, data).await,
+    UserOperation::EditSite => do_websocket_operation::<EditSite>(context, id, op, data).await,
+    UserOperation::GetSite => do_websocket_operation::<GetSite>(context, id, op, data).await,
+    UserOperation::GetSiteConfig => {
+      do_websocket_operation::<GetSiteConfig>(context, id, op, data).await
+    }
+    UserOperation::SaveSiteConfig => {
+      do_websocket_operation::<SaveSiteConfig>(context, id, op, data).await
+    }
+    UserOperation::Search => do_websocket_operation::<Search>(context, id, op, data).await,
+    UserOperation::TransferCommunity => {
+      do_websocket_operation::<TransferCommunity>(context, id, op, data).await
+    }
+    UserOperation::TransferSite => {
+      do_websocket_operation::<TransferSite>(context, id, op, data).await
+    }
+    UserOperation::ListCategories => {
+      do_websocket_operation::<ListCategories>(context, id, op, data).await
+    }
+
+    // Community ops
+    UserOperation::GetCommunity => {
+      do_websocket_operation::<GetCommunity>(context, id, op, data).await
+    }
+    UserOperation::ListCommunities => {
+      do_websocket_operation::<ListCommunities>(context, id, op, data).await
+    }
+    UserOperation::CreateCommunity => {
+      do_websocket_operation::<CreateCommunity>(context, id, op, data).await
+    }
+    UserOperation::EditCommunity => {
+      do_websocket_operation::<EditCommunity>(context, id, op, data).await
+    }
+    UserOperation::DeleteCommunity => {
+      do_websocket_operation::<DeleteCommunity>(context, id, op, data).await
+    }
+    UserOperation::RemoveCommunity => {
+      do_websocket_operation::<RemoveCommunity>(context, id, op, data).await
+    }
+    UserOperation::FollowCommunity => {
+      do_websocket_operation::<FollowCommunity>(context, id, op, data).await
+    }
+    UserOperation::GetFollowedCommunities => {
+      do_websocket_operation::<GetFollowedCommunities>(context, id, op, data).await
+    }
+    UserOperation::BanFromCommunity => {
+      do_websocket_operation::<BanFromCommunity>(context, id, op, data).await
+    }
+    UserOperation::AddModToCommunity => {
+      do_websocket_operation::<AddModToCommunity>(context, id, op, data).await
+    }
+
+    // Post ops
+    UserOperation::CreatePost => do_websocket_operation::<CreatePost>(context, id, op, data).await,
+    UserOperation::GetPost => do_websocket_operation::<GetPost>(context, id, op, data).await,
+    UserOperation::GetPosts => do_websocket_operation::<GetPosts>(context, id, op, data).await,
+    UserOperation::EditPost => do_websocket_operation::<EditPost>(context, id, op, data).await,
+    UserOperation::DeletePost => do_websocket_operation::<DeletePost>(context, id, op, data).await,
+    UserOperation::RemovePost => do_websocket_operation::<RemovePost>(context, id, op, data).await,
+    UserOperation::LockPost => do_websocket_operation::<LockPost>(context, id, op, data).await,
+    UserOperation::StickyPost => do_websocket_operation::<StickyPost>(context, id, op, data).await,
+    UserOperation::CreatePostLike => {
+      do_websocket_operation::<CreatePostLike>(context, id, op, data).await
+    }
+    UserOperation::SavePost => do_websocket_operation::<SavePost>(context, id, op, data).await,
+
+    // Comment ops
+    UserOperation::CreateComment => {
+      do_websocket_operation::<CreateComment>(context, id, op, data).await
+    }
+    UserOperation::EditComment => {
+      do_websocket_operation::<EditComment>(context, id, op, data).await
+    }
+    UserOperation::DeleteComment => {
+      do_websocket_operation::<DeleteComment>(context, id, op, data).await
+    }
+    UserOperation::RemoveComment => {
+      do_websocket_operation::<RemoveComment>(context, id, op, data).await
+    }
+    UserOperation::MarkCommentAsRead => {
+      do_websocket_operation::<MarkCommentAsRead>(context, id, op, data).await
+    }
+    UserOperation::SaveComment => {
+      do_websocket_operation::<SaveComment>(context, id, op, data).await
+    }
+    UserOperation::GetComments => {
+      do_websocket_operation::<GetComments>(context, id, op, data).await
+    }
+    UserOperation::CreateCommentLike => {
+      do_websocket_operation::<CreateCommentLike>(context, id, op, data).await
+    }
+  }
+}
+
+async fn do_websocket_operation<'a, 'b, Data>(
+  context: LemmyContext,
+  id: ConnectionId,
+  op: UserOperation,
+  data: &str,
 ) -> Result<String, LemmyError>
 where
   for<'de> Data: Deserialize<'de> + 'a,
@@ -137,83 +279,3 @@ where
     .await?;
   serialize_websocket_message(&op, &res)
 }
-
-pub async fn xxx(args: Args<'_>) -> Result<String, LemmyError> {
-  match args.op {
-    // User ops
-    UserOperation::Login => do_user_operation::<Login>(args).await,
-    UserOperation::Register => do_user_operation::<Register>(args).await,
-    UserOperation::GetCaptcha => do_user_operation::<GetCaptcha>(args).await,
-    UserOperation::GetUserDetails => do_user_operation::<GetUserDetails>(args).await,
-    UserOperation::GetReplies => do_user_operation::<GetReplies>(args).await,
-    UserOperation::AddAdmin => do_user_operation::<AddAdmin>(args).await,
-    UserOperation::BanUser => do_user_operation::<BanUser>(args).await,
-    UserOperation::GetUserMentions => do_user_operation::<GetUserMentions>(args).await,
-    UserOperation::MarkUserMentionAsRead => do_user_operation::<MarkUserMentionAsRead>(args).await,
-    UserOperation::MarkAllAsRead => do_user_operation::<MarkAllAsRead>(args).await,
-    UserOperation::DeleteAccount => do_user_operation::<DeleteAccount>(args).await,
-    UserOperation::PasswordReset => do_user_operation::<PasswordReset>(args).await,
-    UserOperation::PasswordChange => do_user_operation::<PasswordChange>(args).await,
-    UserOperation::UserJoin => do_user_operation::<UserJoin>(args).await,
-    UserOperation::PostJoin => do_user_operation::<PostJoin>(args).await,
-    UserOperation::CommunityJoin => do_user_operation::<CommunityJoin>(args).await,
-    UserOperation::SaveUserSettings => do_user_operation::<SaveUserSettings>(args).await,
-
-    // Private Message ops
-    UserOperation::CreatePrivateMessage => do_user_operation::<CreatePrivateMessage>(args).await,
-    UserOperation::EditPrivateMessage => do_user_operation::<EditPrivateMessage>(args).await,
-    UserOperation::DeletePrivateMessage => do_user_operation::<DeletePrivateMessage>(args).await,
-    UserOperation::MarkPrivateMessageAsRead => {
-      do_user_operation::<MarkPrivateMessageAsRead>(args).await
-    }
-    UserOperation::GetPrivateMessages => do_user_operation::<GetPrivateMessages>(args).await,
-
-    // Site ops
-    UserOperation::GetModlog => do_user_operation::<GetModlog>(args).await,
-    UserOperation::CreateSite => do_user_operation::<CreateSite>(args).await,
-    UserOperation::EditSite => do_user_operation::<EditSite>(args).await,
-    UserOperation::GetSite => do_user_operation::<GetSite>(args).await,
-    UserOperation::GetSiteConfig => do_user_operation::<GetSiteConfig>(args).await,
-    UserOperation::SaveSiteConfig => do_user_operation::<SaveSiteConfig>(args).await,
-    UserOperation::Search => do_user_operation::<Search>(args).await,
-    UserOperation::TransferCommunity => do_user_operation::<TransferCommunity>(args).await,
-    UserOperation::TransferSite => do_user_operation::<TransferSite>(args).await,
-    UserOperation::ListCategories => do_user_operation::<ListCategories>(args).await,
-
-    // Community ops
-    UserOperation::GetCommunity => do_user_operation::<GetCommunity>(args).await,
-    UserOperation::ListCommunities => do_user_operation::<ListCommunities>(args).await,
-    UserOperation::CreateCommunity => do_user_operation::<CreateCommunity>(args).await,
-    UserOperation::EditCommunity => do_user_operation::<EditCommunity>(args).await,
-    UserOperation::DeleteCommunity => do_user_operation::<DeleteCommunity>(args).await,
-    UserOperation::RemoveCommunity => do_user_operation::<RemoveCommunity>(args).await,
-    UserOperation::FollowCommunity => do_user_operation::<FollowCommunity>(args).await,
-    UserOperation::GetFollowedCommunities => {
-      do_user_operation::<GetFollowedCommunities>(args).await
-    }
-    UserOperation::BanFromCommunity => do_user_operation::<BanFromCommunity>(args).await,
-    UserOperation::AddModToCommunity => do_user_operation::<AddModToCommunity>(args).await,
-
-    // Post ops
-    UserOperation::CreatePost => do_user_operation::<CreatePost>(args).await,
-    UserOperation::GetPost => do_user_operation::<GetPost>(args).await,
-    UserOperation::GetPosts => do_user_operation::<GetPosts>(args).await,
-    UserOperation::EditPost => do_user_operation::<EditPost>(args).await,
-    UserOperation::DeletePost => do_user_operation::<DeletePost>(args).await,
-    UserOperation::RemovePost => do_user_operation::<RemovePost>(args).await,
-    UserOperation::LockPost => do_user_operation::<LockPost>(args).await,
-    UserOperation::StickyPost => do_user_operation::<StickyPost>(args).await,
-    UserOperation::CreatePostLike => do_user_operation::<CreatePostLike>(args).await,
-    UserOperation::SavePost => do_user_operation::<SavePost>(args).await,
-
-    // Comment ops
-    UserOperation::CreateComment => do_user_operation::<CreateComment>(args).await,
-    UserOperation::EditComment => do_user_operation::<EditComment>(args).await,
-    UserOperation::DeleteComment => do_user_operation::<DeleteComment>(args).await,
-    UserOperation::RemoveComment => do_user_operation::<RemoveComment>(args).await,
-    UserOperation::MarkCommentAsRead => do_user_operation::<MarkCommentAsRead>(args).await,
-    UserOperation::SaveComment => do_user_operation::<SaveComment>(args).await,
-    UserOperation::GetComments => do_user_operation::<GetComments>(args).await,
-    UserOperation::CreateCommentLike => do_user_operation::<CreateCommentLike>(args).await,
-  }
-}

src/main.rs

@@ -19,7 +19,7 @@ use lazy_static::lazy_static;
 use lemmy_db::get_database_url_from_env;
 use lemmy_rate_limit::{rate_limiter::RateLimiter, RateLimit};
 use lemmy_server::{
-  api::xxx,
+  api::match_websocket_operation,
   apub::activity_queue::create_activity_queue,
   code_migrations::run_advanced_migrations,
   routes::*,
@@ -78,7 +78,7 @@ async fn main() -> Result<(), LemmyError> {
   let chat_server = ChatServer::startup(
     pool.clone(),
     rate_limiter.clone(),
-    |args| Box::pin(xxx(args)),
+    |c, i, o, d| Box::pin(match_websocket_operation(c, i, o, d)),
     Client::default(),
     activity_queue.clone(),
   )

src/websocket/chat_server.rs

@@ -1,4 +1,4 @@
-use crate::{websocket::handlers::Args, LemmyContext};
+use crate::LemmyContext;
 use actix::prelude::*;
 use anyhow::Context as acontext;
 use background_jobs::QueueHandle;
@@ -28,8 +28,12 @@ use std::{
 };
 use tokio::macros::support::Pin;
 
-type MessageHandlerType =
+type MessageHandlerType = fn(
-  fn(args: Args) -> Pin<Box<dyn Future<Output = Result<String, LemmyError>> + '_>>;
+  context: LemmyContext,
+  id: ConnectionId,
+  op: UserOperation,
+  data: &str,
+) -> Pin<Box<dyn Future<Output = Result<String, LemmyError>> + '_>>;
 
 /// `ChatServer` manages chat rooms and responsible for coordinating chat
 /// session.
@@ -373,14 +377,8 @@ impl ChatServer {
         client,
         activity_queue,
       };
-      let args = Args {
-        context,
-        id: msg.id,
-        op: user_operation.clone(),
-        data,
-      };
 
-      let fut = (message_handler)(args);
+      let fut = (message_handler)(context, msg.id, user_operation.clone(), data);
       match user_operation {
         UserOperation::Register => rate_limiter.register().wrap(ip, fut).await,
         UserOperation::CreatePost => rate_limiter.post().wrap(ip, fut).await,

src/websocket/handlers.rs

@@ -1,22 +1,11 @@
-use crate::{
+use crate::websocket::chat_server::{ChatServer, SessionInfo};
-  websocket::chat_server::{ChatServer, SessionInfo},
-  LemmyContext,
-};
 use actix::{Actor, Context, Handler, ResponseFuture};
 use lemmy_db::naive_now;
 use lemmy_structs::websocket::*;
-use lemmy_utils::ConnectionId;
 use log::{error, info};
 use rand::Rng;
 use serde::Serialize;
 
-pub struct Args<'a> {
-  pub context: LemmyContext,
-  pub id: ConnectionId,
-  pub op: UserOperation,
-  pub data: &'a str,
-}
-
 /// Make actor from `ChatServer`
 impl Actor for ChatServer {
   /// We are going to use simple Context, we just need ability to communicate