mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-05-19 18:28:05 +00:00
* post_saved * fmt * remove unique and not null * put person_id first in primary key and remove index * use post_saved.find * change captcha_answer * remove removal of not null * comment_aggregates * comment_like * comment_saved * aggregates * remove "\" * deduplicate site_aggregates * person_post_aggregates * community_moderator * community_block * community_person_ban * custom_emoji_keyword * federation allow/block list * federation_queue_state * instance_block * local_site_rate_limit, local_user_language, login_token * person_ban, person_block, person_follower, post_like, post_read, received_activity * community_follower, community_language, site_language * fmt * image_upload * remove unused newtypes * remove more indexes * use .find * merge * fix site_aggregates_site function * fmt * Primary keys dess (#17) * Also order reports by oldest first (ref #4123) (#4129) * Support signed fetch for federation (fixes #868) (#4125) * Support signed fetch for federation (fixes #868) * taplo * add federation queue state to get_federated_instances api (#4104) * add federation queue state to get_federated_instances api * feature gate * move retry sleep function * move stuff around * Add UI setting for collapsing bot comments. Fixes #3838 (#4098) * Add UI setting for collapsing bot comments. Fixes #3838 * Fixing clippy check. * Only keep sent and received activities for 7 days (fixes #4113, fixes #4110) (#4131) * Only check auth secure on release mode. (#4127) * Only check auth secure on release mode. * Fixing wrong js-client. * Adding is_debug_mode var. * Fixing the desktop image on the README. (#4135) * Delete dupes and add possibly missing unique constraint on person_aggregates. * Fixing clippy lints. --------- Co-authored-by: Nutomic <me@nutomic.com> Co-authored-by: phiresky <phireskyde+git@gmail.com> * fmt * Update community_block.rs * Update instance_block.rs * Update person_block.rs * Update person_block.rs --------- Co-authored-by: Dessalines <dessalines@users.noreply.github.com> Co-authored-by: Nutomic <me@nutomic.com> Co-authored-by: phiresky <phireskyde+git@gmail.com>
510 lines
14 KiB
Rust
510 lines
14 KiB
Rust
use super::instance::coalesce;
|
|
use crate::{
|
|
newtypes::{CommunityId, DbUrl, PersonId, PostId},
|
|
schema::post::dsl::{
|
|
ap_id,
|
|
body,
|
|
community_id,
|
|
creator_id,
|
|
deleted,
|
|
featured_community,
|
|
local,
|
|
name,
|
|
post,
|
|
published,
|
|
removed,
|
|
thumbnail_url,
|
|
updated,
|
|
url,
|
|
},
|
|
source::post::{
|
|
Post,
|
|
PostInsertForm,
|
|
PostLike,
|
|
PostLikeForm,
|
|
PostRead,
|
|
PostReadForm,
|
|
PostSaved,
|
|
PostSavedForm,
|
|
PostUpdateForm,
|
|
},
|
|
traits::{Crud, Likeable, Saveable},
|
|
utils::{get_conn, naive_now, DbPool, DELETED_REPLACEMENT_TEXT, FETCH_LIMIT_MAX},
|
|
};
|
|
use ::url::Url;
|
|
use chrono::{Duration, Utc};
|
|
use diesel::{dsl::insert_into, result::Error, ExpressionMethods, QueryDsl, TextExpressionMethods};
|
|
use diesel_async::RunQueryDsl;
|
|
use std::collections::HashSet;
|
|
|
|
#[async_trait]
|
|
impl Crud for Post {
|
|
type InsertForm = PostInsertForm;
|
|
type UpdateForm = PostUpdateForm;
|
|
type IdType = PostId;
|
|
|
|
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
|
|
}
|
|
|
|
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 async fn list_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))
|
|
.then_order_by(featured_community.desc())
|
|
.then_order_by(published.desc())
|
|
.limit(FETCH_LIMIT_MAX)
|
|
.load::<Self>(conn)
|
|
.await
|
|
}
|
|
|
|
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 async fn list_for_sitemap(
|
|
pool: &mut DbPool<'_>,
|
|
) -> Result<Vec<(DbUrl, chrono::DateTime<Utc>)>, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
post
|
|
.select((ap_id, coalesce(updated, published)))
|
|
.filter(local.eq(true))
|
|
.filter(deleted.eq(false))
|
|
.filter(removed.eq(false))
|
|
.filter(published.ge(Utc::now().naive_utc() - Duration::days(1)))
|
|
.order(published.desc())
|
|
.load::<(DbUrl, chrono::DateTime<Utc>)>(conn)
|
|
.await
|
|
}
|
|
|
|
pub async fn permadelete_for_creator(
|
|
pool: &mut DbPool<'_>,
|
|
for_creator_id: PersonId,
|
|
) -> Result<Vec<Self>, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
|
|
diesel::update(post.filter(creator_id.eq(for_creator_id)))
|
|
.set((
|
|
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 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> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
|
|
let mut update = diesel::update(post).into_boxed();
|
|
update = update.filter(creator_id.eq(for_creator_id));
|
|
|
|
if let Some(for_community_id) = for_community_id {
|
|
update = update.filter(community_id.eq(for_community_id));
|
|
}
|
|
|
|
update
|
|
.set((removed.eq(new_removed), updated.eq(naive_now())))
|
|
.get_results::<Self>(conn)
|
|
.await
|
|
}
|
|
|
|
pub fn is_post_creator(person_id: PersonId, post_creator_id: PersonId) -> bool {
|
|
person_id == post_creator_id
|
|
}
|
|
|
|
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 async fn fetch_pictrs_posts_for_creator(
|
|
pool: &mut DbPool<'_>,
|
|
for_creator_id: PersonId,
|
|
) -> Result<Vec<Self>, Error> {
|
|
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 async fn remove_pictrs_post_images_and_thumbnails_for_creator(
|
|
pool: &mut DbPool<'_>,
|
|
for_creator_id: PersonId,
|
|
) -> Result<Vec<Self>, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
let pictrs_search = "%pictrs/image%";
|
|
|
|
diesel::update(
|
|
post
|
|
.filter(creator_id.eq(for_creator_id))
|
|
.filter(url.like(pictrs_search)),
|
|
)
|
|
.set((
|
|
url.eq::<Option<String>>(None),
|
|
thumbnail_url.eq::<Option<String>>(None),
|
|
))
|
|
.get_results::<Self>(conn)
|
|
.await
|
|
}
|
|
|
|
pub async fn fetch_pictrs_posts_for_community(
|
|
pool: &mut DbPool<'_>,
|
|
for_community_id: CommunityId,
|
|
) -> Result<Vec<Self>, Error> {
|
|
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 async fn remove_pictrs_post_images_and_thumbnails_for_community(
|
|
pool: &mut DbPool<'_>,
|
|
for_community_id: CommunityId,
|
|
) -> Result<Vec<Self>, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
let pictrs_search = "%pictrs/image%";
|
|
|
|
diesel::update(
|
|
post
|
|
.filter(community_id.eq(for_community_id))
|
|
.filter(url.like(pictrs_search)),
|
|
)
|
|
.set((
|
|
url.eq::<Option<String>>(None),
|
|
thumbnail_url.eq::<Option<String>>(None),
|
|
))
|
|
.get_results::<Self>(conn)
|
|
.await
|
|
}
|
|
}
|
|
|
|
#[async_trait]
|
|
impl Likeable for PostLike {
|
|
type Form = PostLikeForm;
|
|
type IdType = PostId;
|
|
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
|
|
}
|
|
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.find((person_id, post_id)))
|
|
.execute(conn)
|
|
.await
|
|
}
|
|
}
|
|
|
|
#[async_trait]
|
|
impl Saveable for PostSaved {
|
|
type Form = PostSavedForm;
|
|
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
|
|
}
|
|
async fn unsave(pool: &mut DbPool<'_>, post_saved_form: &PostSavedForm) -> Result<usize, Error> {
|
|
use crate::schema::post_saved::dsl::post_saved;
|
|
let conn = &mut get_conn(pool).await?;
|
|
diesel::delete(post_saved.find((post_saved_form.person_id, post_saved_form.post_id)))
|
|
.execute(conn)
|
|
.await
|
|
}
|
|
}
|
|
|
|
impl PostRead {
|
|
pub async fn mark_as_read(
|
|
pool: &mut DbPool<'_>,
|
|
post_ids: HashSet<PostId>,
|
|
person_id: PersonId,
|
|
) -> Result<usize, Error> {
|
|
use crate::schema::post_read::dsl::post_read;
|
|
let conn = &mut get_conn(pool).await?;
|
|
|
|
let forms = post_ids
|
|
.into_iter()
|
|
.map(|post_id| PostReadForm { post_id, person_id })
|
|
.collect::<Vec<PostReadForm>>();
|
|
insert_into(post_read)
|
|
.values(forms)
|
|
.on_conflict_do_nothing()
|
|
.execute(conn)
|
|
.await
|
|
}
|
|
|
|
pub async fn mark_as_unread(
|
|
pool: &mut DbPool<'_>,
|
|
post_id_: HashSet<PostId>,
|
|
person_id_: PersonId,
|
|
) -> 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_any(post_id_))
|
|
.filter(person_id.eq(person_id_)),
|
|
)
|
|
.execute(conn)
|
|
.await
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
#![allow(clippy::unwrap_used)]
|
|
#![allow(clippy::indexing_slicing)]
|
|
|
|
use crate::{
|
|
source::{
|
|
community::{Community, CommunityInsertForm},
|
|
instance::Instance,
|
|
person::{Person, PersonInsertForm},
|
|
post::{
|
|
Post,
|
|
PostInsertForm,
|
|
PostLike,
|
|
PostLikeForm,
|
|
PostRead,
|
|
PostSaved,
|
|
PostSavedForm,
|
|
PostUpdateForm,
|
|
},
|
|
},
|
|
traits::{Crud, Likeable, Saveable},
|
|
utils::build_db_pool_for_tests,
|
|
};
|
|
use serial_test::serial;
|
|
use std::collections::HashSet;
|
|
|
|
#[tokio::test]
|
|
#[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
|
|
.unwrap();
|
|
|
|
let new_person = PersonInsertForm::builder()
|
|
.name("jim".into())
|
|
.public_key("pubkey".to_string())
|
|
.instance_id(inserted_instance.id)
|
|
.build();
|
|
|
|
let inserted_person = Person::create(pool, &new_person).await.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 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(pool, &new_post).await.unwrap();
|
|
|
|
let new_post2 = PostInsertForm::builder()
|
|
.name("A test post 2".into())
|
|
.creator_id(inserted_person.id)
|
|
.community_id(inserted_community.id)
|
|
.build();
|
|
let inserted_post2 = Post::create(pool, &new_post2).await.unwrap();
|
|
|
|
let expected_post = Post {
|
|
id: inserted_post.id,
|
|
name: "A test post".into(),
|
|
url: None,
|
|
body: None,
|
|
creator_id: inserted_person.id,
|
|
community_id: inserted_community.id,
|
|
published: inserted_post.published,
|
|
removed: false,
|
|
locked: false,
|
|
nsfw: false,
|
|
deleted: false,
|
|
updated: None,
|
|
embed_title: None,
|
|
embed_description: None,
|
|
embed_video_url: None,
|
|
thumbnail_url: None,
|
|
ap_id: inserted_post.ap_id.clone(),
|
|
local: true,
|
|
language_id: Default::default(),
|
|
featured_community: false,
|
|
featured_local: false,
|
|
};
|
|
|
|
// Post Like
|
|
let post_like_form = PostLikeForm {
|
|
post_id: inserted_post.id,
|
|
person_id: inserted_person.id,
|
|
score: 1,
|
|
};
|
|
|
|
let inserted_post_like = PostLike::like(pool, &post_like_form).await.unwrap();
|
|
|
|
let expected_post_like = PostLike {
|
|
post_id: inserted_post.id,
|
|
person_id: inserted_person.id,
|
|
published: inserted_post_like.published,
|
|
score: 1,
|
|
};
|
|
|
|
// Post Save
|
|
let post_saved_form = PostSavedForm {
|
|
post_id: inserted_post.id,
|
|
person_id: inserted_person.id,
|
|
};
|
|
|
|
let inserted_post_saved = PostSaved::save(pool, &post_saved_form).await.unwrap();
|
|
|
|
let expected_post_saved = PostSaved {
|
|
post_id: inserted_post.id,
|
|
person_id: inserted_person.id,
|
|
published: inserted_post_saved.published,
|
|
};
|
|
|
|
// Post Read
|
|
let marked_as_read = PostRead::mark_as_read(
|
|
pool,
|
|
HashSet::from([inserted_post.id, inserted_post2.id]),
|
|
inserted_person.id,
|
|
)
|
|
.await
|
|
.unwrap();
|
|
assert_eq!(2, marked_as_read);
|
|
|
|
let read_post = Post::read(pool, inserted_post.id).await.unwrap();
|
|
|
|
let new_post_update = PostUpdateForm {
|
|
name: Some("A test post".into()),
|
|
..Default::default()
|
|
};
|
|
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();
|
|
assert_eq!(1, like_removed);
|
|
let saved_removed = PostSaved::unsave(pool, &post_saved_form).await.unwrap();
|
|
assert_eq!(1, saved_removed);
|
|
let read_removed = PostRead::mark_as_unread(
|
|
pool,
|
|
HashSet::from([inserted_post.id, inserted_post2.id]),
|
|
inserted_person.id,
|
|
)
|
|
.await
|
|
.unwrap();
|
|
assert_eq!(2, read_removed);
|
|
|
|
let num_deleted = Post::delete(pool, inserted_post.id).await.unwrap()
|
|
+ Post::delete(pool, inserted_post2.id).await.unwrap();
|
|
assert_eq!(2, num_deleted);
|
|
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);
|
|
assert_eq!(expected_post, updated_post);
|
|
assert_eq!(expected_post_like, inserted_post_like);
|
|
assert_eq!(expected_post_saved, inserted_post_saved);
|
|
}
|
|
}
|