Move websocket code into workspace (#107)

[lemmy.git] / lemmy_api / src / user.rs

diff --git a/src/api/user.rs b/lemmy_api/src/user.rs
similarity index 99%
rename from src/api/user.rs
rename to lemmy_api/src/user.rs
index 977250d34fdf2db8ff0847c7002b1601569dbb91..e2b73c53ed327ba9f8e48c72675dcfef1b26ea3e 100644 (file)
--- a/src/api/user.rs
+++ b/lemmy_api/src/user.rs
@@ -1,14 +1,17 @@
 use crate::{
-  api::{claims::Claims, get_user_from_jwt, get_user_from_jwt_opt, is_admin, Perform},
-  apub::ApubObjectType,
   captcha_espeak_wav_base64,
-  LemmyContext,
+  claims::Claims,
+  get_user_from_jwt,
+  get_user_from_jwt_opt,
+  is_admin,
+  Perform,
 };
 use actix_web::web::Data;
 use anyhow::Context;
 use bcrypt::verify;
 use captcha::{gen, Difficulty};
 use chrono::Duration;
+use lemmy_apub::ApubObjectType;
 use lemmy_db::{
   comment::*,
   comment_view::*,
@@ -34,18 +37,7 @@ use lemmy_db::{
   ListingType,
   SortType,
 };
-use lemmy_structs::{
-  blocking,
-  user::*,
-  websocket::{
-    CaptchaItem,
-    CheckCaptcha,
-    JoinUserRoom,
-    SendAllMessage,
-    SendUserRoomMessage,
-    UserOperation,
-  },
-};
+use lemmy_structs::{blocking, user::*};
 use lemmy_utils::{
   apub::{generate_actor_keypair, make_apub_endpoint, EndpointType},
   email::send_email,
@@ -63,6 +55,11 @@ use lemmy_utils::{
   ConnectionId,
   LemmyError,
 };
+use lemmy_websocket::{
+  messages::{CaptchaItem, CheckCaptcha, JoinUserRoom, SendAllMessage, SendUserRoomMessage},
+  LemmyContext,
+  UserOperation,
+};
 use log::error;
 use std::str::FromStr;