X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fdb_views_actor%2Fsrc%2Fstructs.rs;h=91d40e9627ee916940158f74be99fb83fbb133c1;hb=c9f140742925d6da20103124b49f2b58a35fc2b8;hp=43654c311d1352f6b363112af9e7d404d8d73202;hpb=4e6409f325bca5b2727b19c24d77ffa2b59109b1;p=lemmy.git diff --git a/crates/db_views_actor/src/structs.rs b/crates/db_views_actor/src/structs.rs index 43654c31..91d40e96 100644 --- a/crates/db_views_actor/src/structs.rs +++ b/crates/db_views_actor/src/structs.rs @@ -4,7 +4,7 @@ use lemmy_db_schema::{ comment::Comment, comment_reply::CommentReply, community::CommunitySafe, - person::{PersonSafe, PersonSafeAlias1}, + person::PersonSafe, person_mention::PersonMention, post::Post, }, @@ -47,17 +47,17 @@ pub struct CommunityView { #[derive(Debug, Serialize, Deserialize, Clone)] pub struct PersonBlockView { pub person: PersonSafe, - pub target: PersonSafeAlias1, + pub target: PersonSafe, } -#[derive(Debug, PartialEq, Serialize, Deserialize, Clone)] +#[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Clone)] pub struct PersonMentionView { pub person_mention: PersonMention, pub comment: Comment, pub creator: PersonSafe, pub post: Post, pub community: CommunitySafe, - pub recipient: PersonSafeAlias1, + pub recipient: PersonSafe, pub counts: CommentAggregates, pub creator_banned_from_community: bool, // Left Join to CommunityPersonBan pub subscribed: SubscribedType, // Left join to CommunityFollower @@ -66,14 +66,14 @@ pub struct PersonMentionView { pub my_vote: Option, // Left join to CommentLike } -#[derive(Debug, PartialEq, Serialize, Deserialize, Clone)] +#[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Clone)] pub struct CommentReplyView { pub comment_reply: CommentReply, pub comment: Comment, pub creator: PersonSafe, pub post: Post, pub community: CommunitySafe, - pub recipient: PersonSafeAlias1, + pub recipient: PersonSafe, pub counts: CommentAggregates, pub creator_banned_from_community: bool, // Left Join to CommunityPersonBan pub subscribed: SubscribedType, // Left join to CommunityFollower