X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fdb_schema%2Fsrc%2Fimpls%2Fpost.rs;h=f10d0cd2793ff515dc2ff24190d02cd87e8bbdba;hb=92568956353f21649ed9aff68b42699c9d036f30;hp=9018cdadfd4311773ea6329641ce5aed5377b251;hpb=63fff96275a612a72d3736e93d5913467da028cc;p=lemmy.git

diff --git a/crates/db_schema/src/impls/post.rs b/crates/db_schema/src/impls/post.rs
index 9018cdad..f10d0cd2 100644
--- a/crates/db_schema/src/impls/post.rs
+++ b/crates/db_schema/src/impls/post.rs
@@ -1,120 +1,135 @@
 use crate::{
   newtypes::{CommunityId, DbUrl, PersonId, PostId},
+  schema::post::dsl::{
+    ap_id,
+    body,
+    community_id,
+    creator_id,
+    deleted,
+    featured_community,
+    name,
+    post,
+    published,
+    removed,
+    thumbnail_url,
+    updated,
+    url,
+  },
   source::post::{
     Post,
-    PostForm,
+    PostInsertForm,
     PostLike,
     PostLikeForm,
     PostRead,
     PostReadForm,
     PostSaved,
     PostSavedForm,
+    PostUpdateForm,
   },
-  traits::{Crud, DeleteableOrRemoveable, Likeable, Readable, Saveable},
-  utils::{naive_now, FETCH_LIMIT_MAX},
+  traits::{Crud, Likeable, Readable, Saveable},
+  utils::{get_conn, naive_now, DbPool, DELETED_REPLACEMENT_TEXT, FETCH_LIMIT_MAX},
 };
-use diesel::{dsl::*, result::Error, ExpressionMethods, PgConnection, QueryDsl, RunQueryDsl, *};
-use url::Url;
+use ::url::Url;
+use diesel::{dsl::insert_into, result::Error, ExpressionMethods, QueryDsl, TextExpressionMethods};
+use diesel_async::RunQueryDsl;
 
+#[async_trait]
 impl Crud for Post {
-  type Form = PostForm;
+  type InsertForm = PostInsertForm;
+  type UpdateForm = PostUpdateForm;
   type IdType = PostId;
-  fn read(conn: &PgConnection, post_id: PostId) -> Result<Self, Error> {
-    use crate::schema::post::dsl::*;
-    post.find(post_id).first::<Self>(conn)
+  async fn read(pool: &mut DbPool<'_>, post_id: PostId) -> Result<Self, Error> {
+    let conn = &mut get_conn(pool).await?;
+    post.find(post_id).first::<Self>(conn).await
   }
 
-  fn delete(conn: &PgConnection, post_id: PostId) -> Result<usize, Error> {
-    use crate::schema::post::dsl::*;
-    diesel::delete(post.find(post_id)).execute(conn)
+  async fn delete(pool: &mut DbPool<'_>, post_id: PostId) -> Result<usize, Error> {
+    let conn = &mut get_conn(pool).await?;
+    diesel::delete(post.find(post_id)).execute(conn).await
   }
 
-  fn create(conn: &PgConnection, new_post: &PostForm) -> Result<Self, Error> {
-    use crate::schema::post::dsl::*;
-    insert_into(post).values(new_post).get_result::<Self>(conn)
+  async fn create(pool: &mut DbPool<'_>, form: &Self::InsertForm) -> Result<Self, Error> {
+    let conn = &mut get_conn(pool).await?;
+    insert_into(post)
+      .values(form)
+      .on_conflict(ap_id)
+      .do_update()
+      .set(form)
+      .get_result::<Self>(conn)
+      .await
   }
 
-  fn update(conn: &PgConnection, post_id: PostId, new_post: &PostForm) -> Result<Self, Error> {
-    use crate::schema::post::dsl::*;
+  async fn update(
+    pool: &mut DbPool<'_>,
+    post_id: PostId,
+    new_post: &Self::UpdateForm,
+  ) -> Result<Self, Error> {
+    let conn = &mut get_conn(pool).await?;
     diesel::update(post.find(post_id))
       .set(new_post)
       .get_result::<Self>(conn)
+      .await
   }
 }
 
 impl Post {
-  pub fn list_for_community(
-    conn: &PgConnection,
+  pub async fn list_for_community(
+    pool: &mut DbPool<'_>,
     the_community_id: CommunityId,
   ) -> Result<Vec<Self>, Error> {
-    use crate::schema::post::dsl::*;
+    let conn = &mut get_conn(pool).await?;
     post
       .filter(community_id.eq(the_community_id))
       .filter(deleted.eq(false))
       .filter(removed.eq(false))
+      .then_order_by(featured_community.desc())
       .then_order_by(published.desc())
-      .then_order_by(stickied.desc())
       .limit(FETCH_LIMIT_MAX)
       .load::<Self>(conn)
+      .await
   }
 
-  pub fn update_ap_id(conn: &PgConnection, post_id: PostId, apub_id: DbUrl) -> Result<Self, Error> {
-    use crate::schema::post::dsl::*;
-
-    diesel::update(post.find(post_id))
-      .set(ap_id.eq(apub_id))
-      .get_result::<Self>(conn)
+  pub async fn list_featured_for_community(
+    pool: &mut DbPool<'_>,
+    the_community_id: CommunityId,
+  ) -> Result<Vec<Self>, Error> {
+    let conn = &mut get_conn(pool).await?;
+    post
+      .filter(community_id.eq(the_community_id))
+      .filter(deleted.eq(false))
+      .filter(removed.eq(false))
+      .filter(featured_community.eq(true))
+      .then_order_by(published.desc())
+      .limit(FETCH_LIMIT_MAX)
+      .load::<Self>(conn)
+      .await
   }
 
-  pub fn permadelete_for_creator(
-    conn: &PgConnection,
+  pub async fn permadelete_for_creator(
+    pool: &mut DbPool<'_>,
     for_creator_id: PersonId,
   ) -> Result<Vec<Self>, Error> {
-    use crate::schema::post::dsl::*;
-
-    let perma_deleted = "*Permananently Deleted*";
-    let perma_deleted_url = "https://deleted.com";
+    let conn = &mut get_conn(pool).await?;
 
     diesel::update(post.filter(creator_id.eq(for_creator_id)))
       .set((
-        name.eq(perma_deleted),
-        url.eq(perma_deleted_url),
-        body.eq(perma_deleted),
+        name.eq(DELETED_REPLACEMENT_TEXT),
+        url.eq(Option::<&str>::None),
+        body.eq(DELETED_REPLACEMENT_TEXT),
         deleted.eq(true),
         updated.eq(naive_now()),
       ))
       .get_results::<Self>(conn)
+      .await
   }
 
-  pub fn update_deleted(
-    conn: &PgConnection,
-    post_id: PostId,
-    new_deleted: bool,
-  ) -> Result<Self, Error> {
-    use crate::schema::post::dsl::*;
-    diesel::update(post.find(post_id))
-      .set((deleted.eq(new_deleted), updated.eq(naive_now())))
-      .get_result::<Self>(conn)
-  }
-
-  pub fn update_removed(
-    conn: &PgConnection,
-    post_id: PostId,
-    new_removed: bool,
-  ) -> Result<Self, Error> {
-    use crate::schema::post::dsl::*;
-    diesel::update(post.find(post_id))
-      .set((removed.eq(new_removed), updated.eq(naive_now())))
-      .get_result::<Self>(conn)
-  }
-
-  pub fn update_removed_for_creator(
-    conn: &PgConnection,
+  pub async fn update_removed_for_creator(
+    pool: &mut DbPool<'_>,
     for_creator_id: PersonId,
     for_community_id: Option<CommunityId>,
     new_removed: bool,
   ) -> Result<Vec<Self>, Error> {
-    use crate::schema::post::dsl::*;
+    let conn = &mut get_conn(pool).await?;
 
     let mut update = diesel::update(post).into_boxed();
     update = update.filter(creator_id.eq(for_creator_id));
@@ -126,74 +141,49 @@ impl Post {
     update
       .set((removed.eq(new_removed), updated.eq(naive_now())))
       .get_results::<Self>(conn)
-  }
-
-  pub fn update_locked(
-    conn: &PgConnection,
-    post_id: PostId,
-    new_locked: bool,
-  ) -> Result<Self, Error> {
-    use crate::schema::post::dsl::*;
-    diesel::update(post.find(post_id))
-      .set(locked.eq(new_locked))
-      .get_result::<Self>(conn)
-  }
-
-  pub fn update_stickied(
-    conn: &PgConnection,
-    post_id: PostId,
-    new_stickied: bool,
-  ) -> Result<Self, Error> {
-    use crate::schema::post::dsl::*;
-    diesel::update(post.find(post_id))
-      .set(stickied.eq(new_stickied))
-      .get_result::<Self>(conn)
+      .await
   }
 
   pub fn is_post_creator(person_id: PersonId, post_creator_id: PersonId) -> bool {
     person_id == post_creator_id
   }
 
-  pub fn upsert(conn: &PgConnection, post_form: &PostForm) -> Result<Post, Error> {
-    use crate::schema::post::dsl::*;
-    insert_into(post)
-      .values(post_form)
-      .on_conflict(ap_id)
-      .do_update()
-      .set(post_form)
-      .get_result::<Self>(conn)
-  }
-  pub fn read_from_apub_id(conn: &PgConnection, object_id: Url) -> Result<Option<Self>, Error> {
-    use crate::schema::post::dsl::*;
+  pub async fn read_from_apub_id(
+    pool: &mut DbPool<'_>,
+    object_id: Url,
+  ) -> Result<Option<Self>, Error> {
+    let conn = &mut get_conn(pool).await?;
     let object_id: DbUrl = object_id.into();
     Ok(
       post
         .filter(ap_id.eq(object_id))
         .first::<Post>(conn)
+        .await
         .ok()
         .map(Into::into),
     )
   }
 
-  pub fn fetch_pictrs_posts_for_creator(
-    conn: &PgConnection,
+  pub async fn fetch_pictrs_posts_for_creator(
+    pool: &mut DbPool<'_>,
     for_creator_id: PersonId,
   ) -> Result<Vec<Self>, Error> {
-    use crate::schema::post::dsl::*;
+    let conn = &mut get_conn(pool).await?;
     let pictrs_search = "%pictrs/image%";
 
     post
       .filter(creator_id.eq(for_creator_id))
       .filter(url.like(pictrs_search))
       .load::<Self>(conn)
+      .await
   }
 
   /// Sets the url and thumbnails fields to None
-  pub fn remove_pictrs_post_images_and_thumbnails_for_creator(
-    conn: &PgConnection,
+  pub async fn remove_pictrs_post_images_and_thumbnails_for_creator(
+    pool: &mut DbPool<'_>,
     for_creator_id: PersonId,
   ) -> Result<Vec<Self>, Error> {
-    use crate::schema::post::dsl::*;
+    let conn = &mut get_conn(pool).await?;
     let pictrs_search = "%pictrs/image%";
 
     diesel::update(
@@ -206,26 +196,28 @@ impl Post {
       thumbnail_url.eq::<Option<String>>(None),
     ))
     .get_results::<Self>(conn)
+    .await
   }
 
-  pub fn fetch_pictrs_posts_for_community(
-    conn: &PgConnection,
+  pub async fn fetch_pictrs_posts_for_community(
+    pool: &mut DbPool<'_>,
     for_community_id: CommunityId,
   ) -> Result<Vec<Self>, Error> {
-    use crate::schema::post::dsl::*;
+    let conn = &mut get_conn(pool).await?;
     let pictrs_search = "%pictrs/image%";
     post
       .filter(community_id.eq(for_community_id))
       .filter(url.like(pictrs_search))
       .load::<Self>(conn)
+      .await
   }
 
   /// Sets the url and thumbnails fields to None
-  pub fn remove_pictrs_post_images_and_thumbnails_for_community(
-    conn: &PgConnection,
+  pub async fn remove_pictrs_post_images_and_thumbnails_for_community(
+    pool: &mut DbPool<'_>,
     for_community_id: CommunityId,
   ) -> Result<Vec<Self>, Error> {
-    use crate::schema::post::dsl::*;
+    let conn = &mut get_conn(pool).await?;
     let pictrs_search = "%pictrs/image%";
 
     diesel::update(
@@ -238,134 +230,164 @@ impl Post {
       thumbnail_url.eq::<Option<String>>(None),
     ))
     .get_results::<Self>(conn)
+    .await
   }
 }
 
+#[async_trait]
 impl Likeable for PostLike {
   type Form = PostLikeForm;
   type IdType = PostId;
-  fn like(conn: &PgConnection, post_like_form: &PostLikeForm) -> Result<Self, Error> {
-    use crate::schema::post_like::dsl::*;
+  async fn like(pool: &mut DbPool<'_>, post_like_form: &PostLikeForm) -> Result<Self, Error> {
+    use crate::schema::post_like::dsl::{person_id, post_id, post_like};
+    let conn = &mut get_conn(pool).await?;
     insert_into(post_like)
       .values(post_like_form)
       .on_conflict((post_id, person_id))
       .do_update()
       .set(post_like_form)
       .get_result::<Self>(conn)
+      .await
   }
-  fn remove(conn: &PgConnection, person_id: PersonId, post_id: PostId) -> Result<usize, Error> {
+  async fn remove(
+    pool: &mut DbPool<'_>,
+    person_id: PersonId,
+    post_id: PostId,
+  ) -> Result<usize, Error> {
     use crate::schema::post_like::dsl;
+    let conn = &mut get_conn(pool).await?;
     diesel::delete(
       dsl::post_like
         .filter(dsl::post_id.eq(post_id))
         .filter(dsl::person_id.eq(person_id)),
     )
     .execute(conn)
+    .await
   }
 }
 
+#[async_trait]
 impl Saveable for PostSaved {
   type Form = PostSavedForm;
-  fn save(conn: &PgConnection, post_saved_form: &PostSavedForm) -> Result<Self, Error> {
-    use crate::schema::post_saved::dsl::*;
+  async fn save(pool: &mut DbPool<'_>, post_saved_form: &PostSavedForm) -> Result<Self, Error> {
+    use crate::schema::post_saved::dsl::{person_id, post_id, post_saved};
+    let conn = &mut get_conn(pool).await?;
     insert_into(post_saved)
       .values(post_saved_form)
       .on_conflict((post_id, person_id))
       .do_update()
       .set(post_saved_form)
       .get_result::<Self>(conn)
+      .await
   }
-  fn unsave(conn: &PgConnection, post_saved_form: &PostSavedForm) -> Result<usize, Error> {
-    use crate::schema::post_saved::dsl::*;
+  async fn unsave(pool: &mut DbPool<'_>, post_saved_form: &PostSavedForm) -> Result<usize, Error> {
+    use crate::schema::post_saved::dsl::{person_id, post_id, post_saved};
+    let conn = &mut get_conn(pool).await?;
     diesel::delete(
       post_saved
         .filter(post_id.eq(post_saved_form.post_id))
         .filter(person_id.eq(post_saved_form.person_id)),
     )
     .execute(conn)
+    .await
   }
 }
 
+#[async_trait]
 impl Readable for PostRead {
   type Form = PostReadForm;
-  fn mark_as_read(conn: &PgConnection, post_read_form: &PostReadForm) -> Result<Self, Error> {
-    use crate::schema::post_read::dsl::*;
+  async fn mark_as_read(
+    pool: &mut DbPool<'_>,
+    post_read_form: &PostReadForm,
+  ) -> Result<Self, Error> {
+    use crate::schema::post_read::dsl::{person_id, post_id, post_read};
+    let conn = &mut get_conn(pool).await?;
     insert_into(post_read)
       .values(post_read_form)
       .on_conflict((post_id, person_id))
       .do_update()
       .set(post_read_form)
       .get_result::<Self>(conn)
+      .await
   }
 
-  fn mark_as_unread(conn: &PgConnection, post_read_form: &PostReadForm) -> Result<usize, Error> {
-    use crate::schema::post_read::dsl::*;
+  async fn mark_as_unread(
+    pool: &mut DbPool<'_>,
+    post_read_form: &PostReadForm,
+  ) -> Result<usize, Error> {
+    use crate::schema::post_read::dsl::{person_id, post_id, post_read};
+    let conn = &mut get_conn(pool).await?;
     diesel::delete(
       post_read
         .filter(post_id.eq(post_read_form.post_id))
         .filter(person_id.eq(post_read_form.person_id)),
     )
     .execute(conn)
-  }
-}
-
-impl DeleteableOrRemoveable for Post {
-  fn blank_out_deleted_or_removed_info(mut self) -> Self {
-    self.name = "".into();
-    self.url = None;
-    self.body = None;
-    self.embed_title = None;
-    self.embed_description = None;
-    self.embed_video_url = None;
-    self.thumbnail_url = None;
-
-    self
+    .await
   }
 }
 
 #[cfg(test)]
 mod tests {
+  #![allow(clippy::unwrap_used)]
+  #![allow(clippy::indexing_slicing)]
+
   use crate::{
     source::{
-      community::{Community, CommunityForm},
-      person::*,
-      post::*,
+      community::{Community, CommunityInsertForm},
+      instance::Instance,
+      person::{Person, PersonInsertForm},
+      post::{
+        Post,
+        PostInsertForm,
+        PostLike,
+        PostLikeForm,
+        PostRead,
+        PostReadForm,
+        PostSaved,
+        PostSavedForm,
+        PostUpdateForm,
+      },
     },
     traits::{Crud, Likeable, Readable, Saveable},
-    utils::establish_unpooled_connection,
+    utils::build_db_pool_for_tests,
   };
   use serial_test::serial;
 
-  #[test]
+  #[tokio::test]
   #[serial]
-  fn test_crud() {
-    let conn = establish_unpooled_connection();
+  async fn test_crud() {
+    let pool = &build_db_pool_for_tests().await;
+    let pool = &mut pool.into();
 
-    let new_person = PersonForm {
-      name: "jim".into(),
-      public_key: Some("pubkey".to_string()),
-      ..PersonForm::default()
-    };
+    let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string())
+      .await
+      .unwrap();
 
-    let inserted_person = Person::create(&conn, &new_person).unwrap();
+    let new_person = PersonInsertForm::builder()
+      .name("jim".into())
+      .public_key("pubkey".to_string())
+      .instance_id(inserted_instance.id)
+      .build();
 
-    let new_community = CommunityForm {
-      name: "test community_3".to_string(),
-      title: "nada".to_owned(),
-      public_key: Some("pubkey".to_string()),
-      ..CommunityForm::default()
-    };
+    let inserted_person = Person::create(pool, &new_person).await.unwrap();
 
-    let inserted_community = Community::create(&conn, &new_community).unwrap();
+    let new_community = CommunityInsertForm::builder()
+      .name("test community_3".to_string())
+      .title("nada".to_owned())
+      .public_key("pubkey".to_string())
+      .instance_id(inserted_instance.id)
+      .build();
 
-    let new_post = PostForm {
-      name: "A test post".into(),
-      creator_id: inserted_person.id,
-      community_id: inserted_community.id,
-      ..PostForm::default()
-    };
+    let inserted_community = Community::create(pool, &new_community).await.unwrap();
+
+    let new_post = PostInsertForm::builder()
+      .name("A test post".into())
+      .creator_id(inserted_person.id)
+      .community_id(inserted_community.id)
+      .build();
 
-    let inserted_post = Post::create(&conn, &new_post).unwrap();
+    let inserted_post = Post::create(pool, &new_post).await.unwrap();
 
     let expected_post = Post {
       id: inserted_post.id,
@@ -377,7 +399,6 @@ mod tests {
       published: inserted_post.published,
       removed: false,
       locked: false,
-      stickied: false,
       nsfw: false,
       deleted: false,
       updated: None,
@@ -385,8 +406,11 @@ mod tests {
       embed_description: None,
       embed_video_url: None,
       thumbnail_url: None,
-      ap_id: inserted_post.ap_id.to_owned(),
+      ap_id: inserted_post.ap_id.clone(),
       local: true,
+      language_id: Default::default(),
+      featured_community: false,
+      featured_local: false,
     };
 
     // Post Like
@@ -396,7 +420,7 @@ mod tests {
       score: 1,
     };
 
-    let inserted_post_like = PostLike::like(&conn, &post_like_form).unwrap();
+    let inserted_post_like = PostLike::like(pool, &post_like_form).await.unwrap();
 
     let expected_post_like = PostLike {
       id: inserted_post_like.id,
@@ -412,7 +436,7 @@ mod tests {
       person_id: inserted_person.id,
     };
 
-    let inserted_post_saved = PostSaved::save(&conn, &post_saved_form).unwrap();
+    let inserted_post_saved = PostSaved::save(pool, &post_saved_form).await.unwrap();
 
     let expected_post_saved = PostSaved {
       id: inserted_post_saved.id,
@@ -427,7 +451,7 @@ mod tests {
       person_id: inserted_person.id,
     };
 
-    let inserted_post_read = PostRead::mark_as_read(&conn, &post_read_form).unwrap();
+    let inserted_post_read = PostRead::mark_as_read(pool, &post_read_form).await.unwrap();
 
     let expected_post_read = PostRead {
       id: inserted_post_read.id,
@@ -436,14 +460,28 @@ mod tests {
       published: inserted_post_read.published,
     };
 
-    let read_post = Post::read(&conn, inserted_post.id).unwrap();
-    let updated_post = Post::update(&conn, inserted_post.id, &new_post).unwrap();
-    let like_removed = PostLike::remove(&conn, inserted_person.id, inserted_post.id).unwrap();
-    let saved_removed = PostSaved::unsave(&conn, &post_saved_form).unwrap();
-    let read_removed = PostRead::mark_as_unread(&conn, &post_read_form).unwrap();
-    let num_deleted = Post::delete(&conn, inserted_post.id).unwrap();
-    Community::delete(&conn, inserted_community.id).unwrap();
-    Person::delete(&conn, inserted_person.id).unwrap();
+    let read_post = Post::read(pool, inserted_post.id).await.unwrap();
+
+    let new_post_update = PostUpdateForm::builder()
+      .name(Some("A test post".into()))
+      .build();
+    let updated_post = Post::update(pool, inserted_post.id, &new_post_update)
+      .await
+      .unwrap();
+
+    let like_removed = PostLike::remove(pool, inserted_person.id, inserted_post.id)
+      .await
+      .unwrap();
+    let saved_removed = PostSaved::unsave(pool, &post_saved_form).await.unwrap();
+    let read_removed = PostRead::mark_as_unread(pool, &post_read_form)
+      .await
+      .unwrap();
+    let num_deleted = Post::delete(pool, inserted_post.id).await.unwrap();
+    Community::delete(pool, inserted_community.id)
+      .await
+      .unwrap();
+    Person::delete(pool, inserted_person.id).await.unwrap();
+    Instance::delete(pool, inserted_instance.id).await.unwrap();
 
     assert_eq!(expected_post, read_post);
     assert_eq!(expected_post, inserted_post);