PostUpdateForm,
},
traits::{Crud, Likeable, Readable, Saveable},
- utils::{get_conn, naive_now, DbPool, FETCH_LIMIT_MAX},
+ utils::{get_conn, naive_now, DbPool, DELETED_REPLACEMENT_TEXT, FETCH_LIMIT_MAX},
};
use ::url::Url;
use diesel::{dsl::insert_into, result::Error, ExpressionMethods, QueryDsl, TextExpressionMethods};
type InsertForm = PostInsertForm;
type UpdateForm = PostUpdateForm;
type IdType = PostId;
- async fn read(pool: &DbPool, post_id: PostId) -> Result<Self, Error> {
+ 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
}
- async fn delete(pool: &DbPool, post_id: PostId) -> Result<usize, Error> {
+ 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
}
- async fn create(pool: &DbPool, form: &Self::InsertForm) -> Result<Self, Error> {
+ async fn create(pool: &mut DbPool<'_>, form: &Self::InsertForm) -> Result<Self, Error> {
let conn = &mut get_conn(pool).await?;
insert_into(post)
.values(form)
}
async fn update(
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
post_id: PostId,
new_post: &Self::UpdateForm,
) -> Result<Self, Error> {
impl Post {
pub async fn list_for_community(
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
the_community_id: CommunityId,
) -> Result<Vec<Self>, Error> {
let conn = &mut get_conn(pool).await?;
}
pub async fn list_featured_for_community(
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
the_community_id: CommunityId,
) -> Result<Vec<Self>, Error> {
let conn = &mut get_conn(pool).await?;
}
pub async fn permadelete_for_creator(
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
for_creator_id: PersonId,
) -> Result<Vec<Self>, Error> {
let conn = &mut get_conn(pool).await?;
- let perma_deleted = "*Permananently Deleted*";
- let perma_deleted_url = "https://deleted.com";
-
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()),
))
}
pub async fn update_removed_for_creator(
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
for_creator_id: PersonId,
for_community_id: Option<CommunityId>,
new_removed: bool,
person_id == post_creator_id
}
- pub async fn read_from_apub_id(pool: &DbPool, object_id: Url) -> Result<Option<Self>, Error> {
+ 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(
}
pub async fn fetch_pictrs_posts_for_creator(
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
for_creator_id: PersonId,
) -> Result<Vec<Self>, Error> {
let conn = &mut get_conn(pool).await?;
/// Sets the url and thumbnails fields to None
pub async fn remove_pictrs_post_images_and_thumbnails_for_creator(
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
for_creator_id: PersonId,
) -> Result<Vec<Self>, Error> {
let conn = &mut get_conn(pool).await?;
}
pub async fn fetch_pictrs_posts_for_community(
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
for_community_id: CommunityId,
) -> Result<Vec<Self>, Error> {
let conn = &mut get_conn(pool).await?;
/// Sets the url and thumbnails fields to None
pub async fn remove_pictrs_post_images_and_thumbnails_for_community(
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
for_community_id: CommunityId,
) -> Result<Vec<Self>, Error> {
let conn = &mut get_conn(pool).await?;
impl Likeable for PostLike {
type Form = PostLikeForm;
type IdType = PostId;
- async fn like(pool: &DbPool, post_like_form: &PostLikeForm) -> Result<Self, Error> {
+ 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)
.get_result::<Self>(conn)
.await
}
- async fn remove(pool: &DbPool, 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(
#[async_trait]
impl Saveable for PostSaved {
type Form = PostSavedForm;
- async fn save(pool: &DbPool, post_saved_form: &PostSavedForm) -> Result<Self, Error> {
+ 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)
.get_result::<Self>(conn)
.await
}
- async fn unsave(pool: &DbPool, post_saved_form: &PostSavedForm) -> Result<usize, Error> {
+ 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(
#[async_trait]
impl Readable for PostRead {
type Form = PostReadForm;
- async fn mark_as_read(pool: &DbPool, post_read_form: &PostReadForm) -> Result<Self, Error> {
+ 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)
.await
}
- async fn mark_as_unread(pool: &DbPool, post_read_form: &PostReadForm) -> Result<usize, Error> {
+ 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(
#[cfg(test)]
mod tests {
+ #![allow(clippy::unwrap_used)]
+ #![allow(clippy::indexing_slicing)]
+
use crate::{
source::{
community::{Community, CommunityInsertForm},
#[serial]
async fn test_crud() {
let pool = &build_db_pool_for_tests().await;
+ let pool = &mut pool.into();
let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string())
.await
projects / lemmy.git / blobdiff