From: Felix Ableitner Date: Mon, 22 Aug 2022 20:55:10 +0000 (+0200) Subject: Add language tags for comments X-Git-Url: http://these/git/%7B%24%7B%60data:application/static/%7BfrontRss%7D?a=commitdiff_plain;h=3d0d8796ad8aa302a530593b48908c597c05e1d2;p=lemmy.git Add language tags for comments --- diff --git a/crates/apub/assets/lemmy/objects/note.json b/crates/apub/assets/lemmy/objects/note.json index 44a3b516..4fcb906a 100644 --- a/crates/apub/assets/lemmy/objects/note.json +++ b/crates/apub/assets/lemmy/objects/note.json @@ -22,6 +22,10 @@ } ], "distinguished": false, + "language": { + "identifier": "fr", + "name": "Français" + }, "published": "2021-03-01T13:42:43.966208+00:00", "updated": "2021-03-01T13:43:03.955787+00:00" } diff --git a/crates/apub/src/objects/comment.rs b/crates/apub/src/objects/comment.rs index 82601170..840d3a51 100644 --- a/crates/apub/src/objects/comment.rs +++ b/crates/apub/src/objects/comment.rs @@ -4,7 +4,10 @@ use crate::{ local_instance, mentions::collect_non_local_mentions, objects::{read_from_string_or_source, verify_is_remote_object}, - protocol::{objects::note::Note, Source}, + protocol::{ + objects::{note::Note, LanguageTag}, + Source, + }, PostOrComment, }; use activitypub_federation::{ @@ -20,6 +23,7 @@ use lemmy_db_schema::{ source::{ comment::{Comment, CommentForm}, community::Community, + language::Language, person::Person, post::Post, }, @@ -105,6 +109,11 @@ impl ApubObject for ApubComment { } else { ObjectId::::new(post.ap_id) }; + let language = self.language_id; + let language = blocking(context.pool(), move |conn| { + Language::read_from_id(conn, language) + }) + .await??; let maa = collect_non_local_mentions(&self, ObjectId::new(community.actor_id), context, &mut 0).await?; @@ -122,6 +131,7 @@ impl ApubObject for ApubComment { updated: self.updated.map(convert_datetime), tag: maa.tags, distinguished: Some(self.distinguished), + language: LanguageTag::new(language), }; Ok(note) @@ -176,6 +186,12 @@ impl ApubObject for ApubComment { let content = read_from_string_or_source(¬e.content, ¬e.media_type, ¬e.source); let content_slurs_removed = remove_slurs(&content, &context.settings().slur_regex()); + let language = note.language.map(|l| l.identifier); + let language = blocking(context.pool(), move |conn| { + Language::read_id_from_code_opt(conn, language.as_deref()) + }) + .await??; + let form = CommentForm { creator_id: creator.id, post_id: post.id, @@ -187,6 +203,7 @@ impl ApubObject for ApubComment { ap_id: Some(note.id.into()), distinguished: note.distinguished, local: Some(false), + language_id: language, }; let parent_comment_path = parent_comment.map(|t| t.0.path); let comment = blocking(context.pool(), move |conn| { diff --git a/crates/apub/src/objects/post.rs b/crates/apub/src/objects/post.rs index ea536e51..93273466 100644 --- a/crates/apub/src/objects/post.rs +++ b/crates/apub/src/objects/post.rs @@ -4,7 +4,10 @@ use crate::{ local_instance, objects::{read_from_string_or_source_opt, verify_is_remote_object}, protocol::{ - objects::page::{Attachment, AttributedTo, LanguageTag, Page, PageType}, + objects::{ + page::{Attachment, AttributedTo, Page, PageType}, + LanguageTag, + }, ImageObject, Source, }, diff --git a/crates/apub/src/protocol/objects/mod.rs b/crates/apub/src/protocol/objects/mod.rs index 8bacae95..1cfd923d 100644 --- a/crates/apub/src/protocol/objects/mod.rs +++ b/crates/apub/src/protocol/objects/mod.rs @@ -1,3 +1,4 @@ +use lemmy_db_schema::source::language::Language; use serde::{Deserialize, Serialize}; use url::Url; @@ -15,6 +16,27 @@ pub struct Endpoints { pub shared_inbox: Url, } +#[derive(Clone, Debug, Deserialize, Serialize)] +#[serde(rename_all = "camelCase")] +pub(crate) struct LanguageTag { + pub(crate) identifier: String, + pub(crate) name: String, +} + +impl LanguageTag { + pub(crate) fn new(lang: Language) -> Option { + // undetermined + if lang.code == "und" { + None + } else { + Some(LanguageTag { + identifier: lang.code, + name: lang.name, + }) + } + } +} + #[cfg(test)] mod tests { use crate::protocol::{ diff --git a/crates/apub/src/protocol/objects/note.rs b/crates/apub/src/protocol/objects/note.rs index 75fecac7..cdcec1a7 100644 --- a/crates/apub/src/protocol/objects/note.rs +++ b/crates/apub/src/protocol/objects/note.rs @@ -3,7 +3,7 @@ use crate::{ local_instance, mentions::MentionOrValue, objects::{comment::ApubComment, person::ApubPerson, post::ApubPost}, - protocol::Source, + protocol::{objects::LanguageTag, Source}, }; use activitypub_federation::{ core::object_id::ObjectId, @@ -46,6 +46,7 @@ pub struct Note { pub(crate) tag: Vec, // lemmy extension pub(crate) distinguished: Option, + pub(crate) language: Option, } impl Note { diff --git a/crates/apub/src/protocol/objects/page.rs b/crates/apub/src/protocol/objects/page.rs index 10e30a77..555a9899 100644 --- a/crates/apub/src/protocol/objects/page.rs +++ b/crates/apub/src/protocol/objects/page.rs @@ -2,7 +2,7 @@ use crate::{ fetcher::user_or_community::{PersonOrGroupType, UserOrCommunity}, local_instance, objects::{community::ApubCommunity, person::ApubPerson, post::ApubPost}, - protocol::{ImageObject, Source}, + protocol::{objects::LanguageTag, ImageObject, Source}, }; use activitypub_federation::{ core::object_id::ObjectId, @@ -16,7 +16,7 @@ use activitypub_federation::{ use activitystreams_kinds::{link::LinkType, object::ImageType}; use chrono::{DateTime, FixedOffset}; use itertools::Itertools; -use lemmy_db_schema::{newtypes::DbUrl, source::language::Language}; +use lemmy_db_schema::newtypes::DbUrl; use lemmy_utils::error::LemmyError; use lemmy_websocket::LemmyContext; use serde::{Deserialize, Serialize}; @@ -65,26 +65,6 @@ pub struct Page { pub(crate) language: Option, } -#[derive(Clone, Debug, Deserialize, Serialize)] -#[serde(rename_all = "camelCase")] -pub(crate) struct LanguageTag { - pub(crate) identifier: String, - pub(crate) name: String, -} - -impl LanguageTag { - pub(crate) fn new(lang: Language) -> Option { - // undetermined - if lang.code == "und" { - None - } else { - Some(LanguageTag { - identifier: lang.code, - name: lang.name, - }) - } - } -} #[derive(Clone, Debug, Deserialize, Serialize)] #[serde(rename_all = "camelCase")] pub(crate) struct Link { diff --git a/crates/db_schema/src/impls/comment.rs b/crates/db_schema/src/impls/comment.rs index bb6a928b..1a145809 100644 --- a/crates/db_schema/src/impls/comment.rs +++ b/crates/db_schema/src/impls/comment.rs @@ -278,6 +278,7 @@ impl DeleteableOrRemoveable for Comment { #[cfg(test)] mod tests { use crate::{ + newtypes::LanguageId, source::{ comment::*, community::{Community, CommunityForm}, @@ -343,6 +344,7 @@ mod tests { ap_id: inserted_comment.ap_id.to_owned(), distinguished: false, local: true, + language_id: LanguageId::default(), }; let child_comment_form = CommentForm { diff --git a/crates/db_schema/src/schema.rs b/crates/db_schema/src/schema.rs index fcd99c1b..4870ff7c 100644 --- a/crates/db_schema/src/schema.rs +++ b/crates/db_schema/src/schema.rs @@ -27,6 +27,7 @@ table! { local -> Bool, path -> Ltree, distinguished -> Bool, + language_id -> Int4, } } @@ -729,6 +730,7 @@ joinable!(registration_application -> person (admin_id)); joinable!(mod_hide_community -> person (mod_person_id)); joinable!(mod_hide_community -> community (community_id)); joinable!(post -> language (language_id)); +joinable!(comment -> language (language_id)); joinable!(local_user_language -> language (language_id)); joinable!(local_user_language -> local_user (local_user_id)); diff --git a/crates/db_schema/src/source/comment.rs b/crates/db_schema/src/source/comment.rs index 80a71053..81dba6e6 100644 --- a/crates/db_schema/src/source/comment.rs +++ b/crates/db_schema/src/source/comment.rs @@ -1,4 +1,4 @@ -use crate::newtypes::{CommentId, DbUrl, LtreeDef, PersonId, PostId}; +use crate::newtypes::{CommentId, DbUrl, LanguageId, LtreeDef, PersonId, PostId}; use diesel_ltree::Ltree; use serde::{Deserialize, Serialize}; @@ -23,6 +23,7 @@ pub struct Comment { #[serde(with = "LtreeDef")] pub path: Ltree, pub distinguished: bool, + pub language_id: LanguageId, } #[derive(Clone, Default)] @@ -39,6 +40,7 @@ pub struct CommentForm { pub ap_id: Option, pub local: Option, pub distinguished: Option, + pub language_id: Option, } #[derive(PartialEq, Debug, Clone)] diff --git a/crates/db_views/src/comment_view.rs b/crates/db_views/src/comment_view.rs index a7c96b17..d469b0c5 100644 --- a/crates/db_views/src/comment_view.rs +++ b/crates/db_views/src/comment_view.rs @@ -3,18 +3,10 @@ use diesel::{dsl::*, result::Error, *}; use diesel_ltree::{nlevel, subpath, Ltree, LtreeExtensions}; use lemmy_db_schema::{ aggregates::structs::CommentAggregates, - newtypes::{CommentId, CommunityId, DbUrl, PersonId, PostId}, + newtypes::{CommentId, CommunityId, DbUrl, LocalUserId, PersonId, PostId}, schema::{ - comment, - comment_aggregates, - comment_like, - comment_saved, - community, - community_block, - community_follower, - community_person_ban, - person, - person_block, + comment, comment_aggregates, comment_like, comment_saved, community, community_block, + community_follower, community_person_ban, language, local_user_language, person, person_block, post, }, source::{ @@ -27,8 +19,7 @@ use lemmy_db_schema::{ }, traits::{ToSafe, ViewToVec}, utils::{functions::hot_rank, fuzzy_search, limit_and_offset_unlimited}, - CommentSortType, - ListingType, + CommentSortType, ListingType, }; use typed_builder::TypedBuilder; @@ -174,6 +165,7 @@ impl<'a> CommentQuery<'a> { // The left join below will return None in this case let person_id_join = self.local_user.map(|l| l.person_id).unwrap_or(PersonId(-1)); + let local_user_id_join = self.local_user.map(|l| l.id).unwrap_or(LocalUserId(-1)); let mut query = comment::table .inner_join(person::table) @@ -227,6 +219,14 @@ impl<'a> CommentQuery<'a> { .and(comment_like::person_id.eq(person_id_join)), ), ) + .inner_join(language::table) + .left_join( + local_user_language::table.on( + post::language_id + .eq(local_user_language::language_id) + .and(local_user_language::local_user_id.eq(local_user_id_join)), + ), + ) .select(( comment::all_columns, Person::safe_columns_tuple(), @@ -295,8 +295,11 @@ impl<'a> CommentQuery<'a> { query = query.filter(person::bot_account.eq(false)); }; - // Don't show blocked communities or persons if self.local_user.is_some() { + // Filter out the rows with missing languages + query = query.filter(local_user_language::id.is_not_null()); + + // Don't show blocked communities or persons query = query.filter(community_block::person_id.is_null()); query = query.filter(person_block::person_id.is_null()); } @@ -373,13 +376,10 @@ mod tests { use crate::comment_view::*; use lemmy_db_schema::{ aggregates::structs::CommentAggregates, + newtypes::LanguageId, source::{ - comment::*, - community::*, - local_user::LocalUserForm, - person::*, - person_block::PersonBlockForm, - post::*, + comment::*, community::*, local_user::LocalUserForm, person::*, + person_block::PersonBlockForm, post::*, }, traits::{Blockable, Crud, Likeable}, utils::establish_unpooled_connection, @@ -387,11 +387,18 @@ mod tests { }; use serial_test::serial; - #[test] - #[serial] - fn test_crud() { - let conn = establish_unpooled_connection(); + struct Data { + inserted_comment_0: Comment, + inserted_comment_1: Comment, + inserted_comment_2: Comment, + inserted_post: Post, + inserted_person: Person, + inserted_local_user: LocalUser, + inserted_person_2: Person, + inserted_community: Community, + } + fn init_data(conn: &PgConnection) -> Data { let new_person = PersonForm { name: "timmy".into(), public_key: Some("pubkey".to_string()), @@ -510,117 +517,43 @@ mod tests { target_id: inserted_person_2.id, published: inserted_block.published, }; - assert_eq!(expected_block, inserted_block); + Data { + inserted_comment_0, + inserted_comment_1, + inserted_comment_2, + inserted_post, + inserted_person, + inserted_local_user, + inserted_person_2, + inserted_community, + } + } + + #[test] + #[serial] + fn test_crud() { + let conn = establish_unpooled_connection(); + let data = init_data(&conn); + let comment_like_form = CommentLikeForm { - comment_id: inserted_comment_0.id, - post_id: inserted_post.id, - person_id: inserted_person.id, + comment_id: data.inserted_comment_0.id, + post_id: data.inserted_post.id, + person_id: data.inserted_person.id, score: 1, }; let _inserted_comment_like = CommentLike::like(&conn, &comment_like_form).unwrap(); - let agg = CommentAggregates::read(&conn, inserted_comment_0.id).unwrap(); - - let top_path = inserted_comment_0.to_owned().path; - let expected_comment_view_no_person = CommentView { - creator_banned_from_community: false, - my_vote: None, - subscribed: SubscribedType::NotSubscribed, - saved: false, - creator_blocked: false, - comment: Comment { - id: inserted_comment_0.id, - content: "Comment 0".into(), - creator_id: inserted_person.id, - post_id: inserted_post.id, - removed: false, - deleted: false, - published: inserted_comment_0.published, - ap_id: inserted_comment_0.ap_id, - updated: None, - local: true, - distinguished: false, - path: top_path, - }, - creator: PersonSafe { - id: inserted_person.id, - name: "timmy".into(), - display_name: None, - published: inserted_person.published, - avatar: None, - actor_id: inserted_person.actor_id.to_owned(), - local: true, - banned: false, - deleted: false, - admin: false, - bot_account: false, - bio: None, - banner: None, - updated: None, - inbox_url: inserted_person.inbox_url.to_owned(), - shared_inbox_url: None, - matrix_user_id: None, - ban_expires: None, - }, - post: Post { - id: inserted_post.id, - name: inserted_post.name.to_owned(), - creator_id: inserted_person.id, - url: None, - body: None, - published: inserted_post.published, - updated: None, - community_id: inserted_community.id, - removed: false, - deleted: false, - locked: false, - stickied: false, - nsfw: false, - embed_title: None, - embed_description: None, - embed_video_url: None, - thumbnail_url: None, - ap_id: inserted_post.ap_id.to_owned(), - local: true, - language_id: Default::default(), - }, - community: CommunitySafe { - id: inserted_community.id, - name: "test community 5".to_string(), - icon: None, - removed: false, - deleted: false, - nsfw: false, - actor_id: inserted_community.actor_id.to_owned(), - local: true, - title: "nada".to_owned(), - description: None, - updated: None, - banner: None, - hidden: false, - posting_restricted_to_mods: false, - published: inserted_community.published, - }, - counts: CommentAggregates { - id: agg.id, - comment_id: inserted_comment_0.id, - score: 1, - upvotes: 1, - downvotes: 0, - published: agg.published, - child_count: 5, - }, - }; + let expected_comment_view_no_person = expected_comment_view(&data, &conn); let mut expected_comment_view_with_person = expected_comment_view_no_person.to_owned(); expected_comment_view_with_person.my_vote = Some(1); let read_comment_views_no_person = CommentQuery::builder() .conn(&conn) - .post_id(Some(inserted_post.id)) + .post_id(Some(data.inserted_post.id)) .build() .list() .unwrap(); @@ -632,8 +565,8 @@ mod tests { let read_comment_views_with_person = CommentQuery::builder() .conn(&conn) - .post_id(Some(inserted_post.id)) - .local_user(Some(&inserted_local_user)) + .post_id(Some(data.inserted_post.id)) + .local_user(Some(&data.inserted_local_user)) .build() .list() .unwrap(); @@ -646,25 +579,38 @@ mod tests { // Make sure its 1, not showing the blocked comment assert_eq!(5, read_comment_views_with_person.len()); - let read_comment_from_blocked_person = - CommentView::read(&conn, inserted_comment_1.id, Some(inserted_person.id)).unwrap(); + let read_comment_from_blocked_person = CommentView::read( + &conn, + data.inserted_comment_1.id, + Some(data.inserted_person.id), + ) + .unwrap(); // Make sure block set the creator blocked assert!(read_comment_from_blocked_person.creator_blocked); - let top_path = inserted_comment_0.path; + cleanup(data, &conn); + } + + #[test] + #[serial] + fn test_comment_tree() { + let conn = establish_unpooled_connection(); + let data = init_data(&conn); + + let top_path = data.inserted_comment_0.path.clone(); let read_comment_views_top_path = CommentQuery::builder() .conn(&conn) - .post_id(Some(inserted_post.id)) + .post_id(Some(data.inserted_post.id)) .parent_path(Some(top_path)) .build() .list() .unwrap(); - let child_path = inserted_comment_1.to_owned().path; + let child_path = data.inserted_comment_1.path.clone(); let read_comment_views_child_path = CommentQuery::builder() .conn(&conn) - .post_id(Some(inserted_post.id)) + .post_id(Some(data.inserted_post.id)) .parent_path(Some(child_path)) .build() .list() @@ -679,12 +625,12 @@ mod tests { .into_iter() .map(|c| c.comment) .collect::>(); - assert!(child_comments.contains(&inserted_comment_1)); - assert!(!child_comments.contains(&inserted_comment_2)); + assert!(child_comments.contains(&data.inserted_comment_1)); + assert!(!child_comments.contains(&data.inserted_comment_2)); let read_comment_views_top_max_depth = CommentQuery::builder() .conn(&conn) - .post_id(Some(inserted_post.id)) + .post_id(Some(data.inserted_post.id)) .max_depth(Some(1)) .build() .list() @@ -692,15 +638,15 @@ mod tests { // Make sure a depth limited one only has the top comment assert_eq!( - expected_comment_view_no_person, + expected_comment_view(&data, &conn), read_comment_views_top_max_depth[0] ); assert_eq!(1, read_comment_views_top_max_depth.len()); - let child_path = inserted_comment_1.path; + let child_path = data.inserted_comment_1.path.clone(); let read_comment_views_parent_max_depth = CommentQuery::builder() .conn(&conn) - .post_id(Some(inserted_post.id)) + .post_id(Some(data.inserted_post.id)) .parent_path(Some(child_path)) .max_depth(Some(1)) .sort(Some(CommentSortType::New)) @@ -715,17 +661,110 @@ mod tests { .eq("Comment 3")); assert_eq!(3, read_comment_views_parent_max_depth.len()); - // Delete everything - let like_removed = - CommentLike::remove(&conn, inserted_person.id, inserted_comment_0.id).unwrap(); - let num_deleted = Comment::delete(&conn, inserted_comment_0.id).unwrap(); - Comment::delete(&conn, inserted_comment_1.id).unwrap(); - Post::delete(&conn, inserted_post.id).unwrap(); - Community::delete(&conn, inserted_community.id).unwrap(); - Person::delete(&conn, inserted_person.id).unwrap(); - Person::delete(&conn, inserted_person_2.id).unwrap(); - - assert_eq!(1, num_deleted); - assert_eq!(1, like_removed); + cleanup(data, &conn); + } + + fn cleanup(data: Data, conn: &PgConnection) { + CommentLike::remove(&conn, data.inserted_person.id, data.inserted_comment_0.id).unwrap(); + Comment::delete(&conn, data.inserted_comment_0.id).unwrap(); + Comment::delete(&conn, data.inserted_comment_1.id).unwrap(); + Post::delete(&conn, data.inserted_post.id).unwrap(); + Community::delete(&conn, data.inserted_community.id).unwrap(); + Person::delete(&conn, data.inserted_person.id).unwrap(); + Person::delete(&conn, data.inserted_person_2.id).unwrap(); + } + + fn expected_comment_view(data: &Data, conn: &PgConnection) -> CommentView { + let agg = CommentAggregates::read(&conn, data.inserted_comment_0.id).unwrap(); + CommentView { + creator_banned_from_community: false, + my_vote: None, + subscribed: SubscribedType::NotSubscribed, + saved: false, + creator_blocked: false, + comment: Comment { + id: data.inserted_comment_0.id, + content: "Comment 0".into(), + creator_id: data.inserted_person.id, + post_id: data.inserted_post.id, + removed: false, + deleted: false, + published: data.inserted_comment_0.published, + ap_id: data.inserted_comment_0.ap_id.clone(), + updated: None, + local: true, + distinguished: false, + path: data.inserted_comment_0.to_owned().path, + language_id: LanguageId(0), + }, + creator: PersonSafe { + id: data.inserted_person.id, + name: "timmy".into(), + display_name: None, + published: data.inserted_person.published, + avatar: None, + actor_id: data.inserted_person.actor_id.to_owned(), + local: true, + banned: false, + deleted: false, + admin: false, + bot_account: false, + bio: None, + banner: None, + updated: None, + inbox_url: data.inserted_person.inbox_url.to_owned(), + shared_inbox_url: None, + matrix_user_id: None, + ban_expires: None, + }, + post: Post { + id: data.inserted_post.id, + name: data.inserted_post.name.to_owned(), + creator_id: data.inserted_person.id, + url: None, + body: None, + published: data.inserted_post.published, + updated: None, + community_id: data.inserted_community.id, + removed: false, + deleted: false, + locked: false, + stickied: false, + nsfw: false, + embed_title: None, + embed_description: None, + embed_video_url: None, + thumbnail_url: None, + ap_id: data.inserted_post.ap_id.to_owned(), + local: true, + language_id: Default::default(), + }, + community: CommunitySafe { + id: data.inserted_community.id, + name: "test community 5".to_string(), + icon: None, + removed: false, + deleted: false, + nsfw: false, + actor_id: data.inserted_community.actor_id.to_owned(), + local: true, + title: "nada".to_owned(), + description: None, + updated: None, + banner: None, + hidden: false, + posting_restricted_to_mods: false, + published: data.inserted_community.published, + }, + counts: CommentAggregates { + id: agg.id, + comment_id: data.inserted_comment_0.id, + score: 1, + upvotes: 1, + downvotes: 0, + published: agg.published, + child_count: 5, + }, + } } } diff --git a/crates/db_views/src/post_view.rs b/crates/db_views/src/post_view.rs index 6d0bcb5d..78229891 100644 --- a/crates/db_views/src/post_view.rs +++ b/crates/db_views/src/post_view.rs @@ -555,109 +555,6 @@ mod tests { } } - fn cleanup(data: Data, conn: &PgConnection) { - let num_deleted = Post::delete(conn, data.inserted_post.id).unwrap(); - Community::delete(conn, data.inserted_community.id).unwrap(); - Person::delete(conn, data.inserted_person.id).unwrap(); - Person::delete(conn, data.inserted_bot.id).unwrap(); - Person::delete(conn, data.inserted_blocked_person.id).unwrap(); - assert_eq!(1, num_deleted); - } - - fn expected_post_listing(data: &Data, conn: &PgConnection) -> PostView { - let (inserted_person, inserted_community, inserted_post) = ( - &data.inserted_person, - &data.inserted_community, - &data.inserted_post, - ); - let agg = PostAggregates::read(conn, inserted_post.id).unwrap(); - - PostView { - post: Post { - id: inserted_post.id, - name: inserted_post.name.clone(), - creator_id: inserted_person.id, - url: None, - body: None, - published: inserted_post.published, - updated: None, - community_id: inserted_community.id, - removed: false, - deleted: false, - locked: false, - stickied: false, - nsfw: false, - embed_title: None, - embed_description: None, - embed_video_url: None, - thumbnail_url: None, - ap_id: inserted_post.ap_id.to_owned(), - local: true, - language_id: LanguageId(47), - }, - my_vote: None, - creator: PersonSafe { - id: inserted_person.id, - name: inserted_person.name.clone(), - display_name: None, - published: inserted_person.published, - avatar: None, - actor_id: inserted_person.actor_id.to_owned(), - local: true, - admin: false, - bot_account: false, - banned: false, - deleted: false, - bio: None, - banner: None, - updated: None, - inbox_url: inserted_person.inbox_url.to_owned(), - shared_inbox_url: None, - matrix_user_id: None, - ban_expires: None, - }, - creator_banned_from_community: false, - community: CommunitySafe { - id: inserted_community.id, - name: inserted_community.name.clone(), - icon: None, - removed: false, - deleted: false, - nsfw: false, - actor_id: inserted_community.actor_id.to_owned(), - local: true, - title: "nada".to_owned(), - description: None, - updated: None, - banner: None, - hidden: false, - posting_restricted_to_mods: false, - published: inserted_community.published, - }, - counts: PostAggregates { - id: agg.id, - post_id: inserted_post.id, - comments: 0, - score: 0, - upvotes: 0, - downvotes: 0, - stickied: false, - published: agg.published, - newest_comment_time_necro: inserted_post.published, - newest_comment_time: inserted_post.published, - }, - subscribed: SubscribedType::NotSubscribed, - read: false, - saved: false, - creator_blocked: false, - language: Language { - id: LanguageId(47), - code: "fr".to_string(), - name: "Français".to_string(), - }, - } - } - #[test] #[serial] fn post_listing_with_person() { @@ -683,7 +580,7 @@ mod tests { let post_listing_single_with_person = PostView::read(&conn, data.inserted_post.id, Some(data.inserted_person.id)).unwrap(); - let mut expected_post_listing_with_user = expected_post_listing(&data, &conn); + let mut expected_post_listing_with_user = expected_post_view(&data, &conn); // Should be only one person, IE the bot post, and blocked should be missing assert_eq!(1, read_post_listing.len()); @@ -733,7 +630,7 @@ mod tests { let read_post_listing_single_no_person = PostView::read(&conn, data.inserted_post.id, None).unwrap(); - let expected_post_listing_no_person = expected_post_listing(&data, &conn); + let expected_post_listing_no_person = expected_post_view(&data, &conn); // Should be 2 posts, with the bot post, and the blocked assert_eq!(3, read_post_listing_multiple_no_person.len()); @@ -879,4 +776,107 @@ mod tests { cleanup(data, &conn); } + + fn cleanup(data: Data, conn: &PgConnection) { + let num_deleted = Post::delete(conn, data.inserted_post.id).unwrap(); + Community::delete(conn, data.inserted_community.id).unwrap(); + Person::delete(conn, data.inserted_person.id).unwrap(); + Person::delete(conn, data.inserted_bot.id).unwrap(); + Person::delete(conn, data.inserted_blocked_person.id).unwrap(); + assert_eq!(1, num_deleted); + } + + fn expected_post_view(data: &Data, conn: &PgConnection) -> PostView { + let (inserted_person, inserted_community, inserted_post) = ( + &data.inserted_person, + &data.inserted_community, + &data.inserted_post, + ); + let agg = PostAggregates::read(conn, inserted_post.id).unwrap(); + + PostView { + post: Post { + id: inserted_post.id, + name: inserted_post.name.clone(), + creator_id: inserted_person.id, + url: None, + body: None, + published: inserted_post.published, + updated: None, + community_id: inserted_community.id, + removed: false, + deleted: false, + locked: false, + stickied: false, + nsfw: false, + embed_title: None, + embed_description: None, + embed_video_url: None, + thumbnail_url: None, + ap_id: inserted_post.ap_id.to_owned(), + local: true, + language_id: LanguageId(47), + }, + my_vote: None, + creator: PersonSafe { + id: inserted_person.id, + name: inserted_person.name.clone(), + display_name: None, + published: inserted_person.published, + avatar: None, + actor_id: inserted_person.actor_id.to_owned(), + local: true, + admin: false, + bot_account: false, + banned: false, + deleted: false, + bio: None, + banner: None, + updated: None, + inbox_url: inserted_person.inbox_url.to_owned(), + shared_inbox_url: None, + matrix_user_id: None, + ban_expires: None, + }, + creator_banned_from_community: false, + community: CommunitySafe { + id: inserted_community.id, + name: inserted_community.name.clone(), + icon: None, + removed: false, + deleted: false, + nsfw: false, + actor_id: inserted_community.actor_id.to_owned(), + local: true, + title: "nada".to_owned(), + description: None, + updated: None, + banner: None, + hidden: false, + posting_restricted_to_mods: false, + published: inserted_community.published, + }, + counts: PostAggregates { + id: agg.id, + post_id: inserted_post.id, + comments: 0, + score: 0, + upvotes: 0, + downvotes: 0, + stickied: false, + published: agg.published, + newest_comment_time_necro: inserted_post.published, + newest_comment_time: inserted_post.published, + }, + subscribed: SubscribedType::NotSubscribed, + read: false, + saved: false, + creator_blocked: false, + language: Language { + id: LanguageId(47), + code: "fr".to_string(), + name: "Français".to_string(), + }, + } + } } diff --git a/migrations/2022-06-21-123144_language-tags/up.sql b/migrations/2022-06-21-123144_language-tags/up.sql index 0792d45b..e670a59d 100644 --- a/migrations/2022-06-21-123144_language-tags/up.sql +++ b/migrations/2022-06-21-123144_language-tags/up.sql @@ -12,9 +12,8 @@ create table local_user_language ( alter table local_user rename column lang to interface_language; -alter table post add column language_id integer references language not null default 0; - insert into language(id, code, name) values (0, 'und', 'Undetermined'); +alter table post add column language_id integer references language not null default 0; insert into language(code, name) values ('aa', 'Afaraf'); insert into language(code, name) values ('ab', 'аҧсуа бызшәа'); insert into language(code, name) values ('ae', 'avesta'); diff --git a/migrations/2022-08-22-193848_comment-language-tags/down.sql b/migrations/2022-08-22-193848_comment-language-tags/down.sql new file mode 100644 index 00000000..7c15bfdc --- /dev/null +++ b/migrations/2022-08-22-193848_comment-language-tags/down.sql @@ -0,0 +1 @@ +alter table comment drop column language_id; diff --git a/migrations/2022-08-22-193848_comment-language-tags/up.sql b/migrations/2022-08-22-193848_comment-language-tags/up.sql new file mode 100644 index 00000000..78fe0e95 --- /dev/null +++ b/migrations/2022-08-22-193848_comment-language-tags/up.sql @@ -0,0 +1 @@ +alter table comment add column language_id integer references language not null default 0;