Merge branch 'main' into move_views_to_diesel

[lemmy.git] / lemmy_db / src / source / user_mention.rs

diff --git a/lemmy_db/src/user_mention.rs b/lemmy_db/src/source/user_mention.rs
similarity index 97%
rename from lemmy_db/src/user_mention.rs
rename to lemmy_db/src/source/user_mention.rs
index b382a24e029f21f980a7ec546d0b20e5fbe52b1c..bf53cb4200504854fbdaecce9515158fe1eec54a 100644 (file)
--- a/lemmy_db/src/user_mention.rs
+++ b/lemmy_db/src/source/user_mention.rs
@@ -1,8 +1,9 @@
 use super::comment::Comment;
 use crate::{schema::user_mention, Crud};
 use diesel::{dsl::*, result::Error, *};
+use serde::Serialize;
 
-#[derive(Queryable, Associations, Identifiable, PartialEq, Debug)]
+#[derive(Clone, Queryable, Associations, Identifiable, PartialEq, Debug, Serialize)]
 #[belongs_to(Comment)]
 #[table_name = "user_mention"]
 pub struct UserMention {
@@ -78,12 +79,8 @@ impl UserMention {
 #[cfg(test)]
 mod tests {
   use crate::{
-    comment::*,
-    community::*,
-    post::*,
+    source::{comment::*, community::*, post::*, user::*, user_mention::*},
     tests::establish_unpooled_connection,
-    user::*,
-    user_mention::*,
     ListingType,
     SortType,
   };