Merge remote-tracking branch 'origin/split-db-workspace' into move_views_to_diesel_split

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

diff --git a/lemmy_api/src/user.rs b/lemmy_api/src/user.rs
index cca8dffb8909225d06ecb23c12ce5f9fef75ea60..34ef5022e17f470ed1ceada4a1dc81de2ea52e18 100644 (file)
--- a/lemmy_api/src/user.rs
+++ b/lemmy_api/src/user.rs
@@ -16,17 +16,15 @@ use chrono::Duration;
 use lemmy_apub::ApubObjectType;
 use lemmy_db::{
   diesel_option_overwrite,
-  naive_now,
   source::{
-    comment::*,
-    community::*,
-    moderator::*,
-    password_reset_request::*,
-    post::*,
-    private_message::*,
-    site::*,
-    user::*,
-    user_mention::*,
+    comment::Comment_,
+    community::Community_,
+    password_reset_request::PasswordResetRequest_,
+    post::Post_,
+    private_message::PrivateMessage_,
+    site::Site_,
+    user::User,
+    user_mention::UserMention_,
   },
   views::{
     comment_report_view::CommentReportView,
@@ -47,6 +45,20 @@ use lemmy_db::{
   ListingType,
   SortType,
 };
+use lemmy_db_schema::{
+  naive_now,
+  source::{
+    comment::Comment,
+    community::*,
+    moderator::*,
+    password_reset_request::*,
+    post::Post,
+    private_message::*,
+    site::*,
+    user::*,
+    user_mention::*,
+  },
+};
 use lemmy_structs::{blocking, send_email_to_user, user::*};
 use lemmy_utils::{
   apub::{generate_actor_keypair, make_apub_endpoint, EndpointType},