LemmyNet/lemmy
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-12 15:34:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding creator_is_moderator to CommentReplyView and PersonMentionView. (#4126)

Browse source
This commit is contained in:
Dessalines 2023-11-03 09:41:00 -04:00 committed by GitHub
parent 1e59e7ab47
commit eeec56c22d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crates/db_views_actor/src/comment_reply_view.rs
View file

@ -20,6 +20,7 @@ use lemmy_db_schema::{
comment_saved, comment_saved,
community, community,
community_follower, community_follower,
community_moderator,
community_person_ban, community_person_ban,
person, person,
person_block, person_block,
@ -80,6 +81,13 @@ fn queries<'a>() -> Queries<
.and(comment_like::person_id.eq(person_id_join)), .and(comment_like::person_id.eq(person_id_join)),
), ),
) )
.left_join(
community_moderator::table.on(
community::id
.eq(community_moderator::community_id)
.and(community_moderator::person_id.eq(comment::creator_id)),
),
)
.select(( .select((
comment_reply::all_columns, comment_reply::all_columns,
comment::all_columns, comment::all_columns,
@ -89,6 +97,7 @@ fn queries<'a>() -> Queries<
aliases::person1.fields(person::all_columns), aliases::person1.fields(person::all_columns),
comment_aggregates::all_columns, comment_aggregates::all_columns,
community_person_ban::id.nullable().is_not_null(), community_person_ban::id.nullable().is_not_null(),
community_moderator::id.nullable().is_not_null(),
CommunityFollower::select_subscribed_type(), CommunityFollower::select_subscribed_type(),
comment_saved::id.nullable().is_not_null(), comment_saved::id.nullable().is_not_null(),
person_block::id.nullable().is_not_null(), person_block::id.nullable().is_not_null(),

16
crates/db_views_actor/src/person_mention_view.rs
View file

@ -20,6 +20,7 @@ use lemmy_db_schema::{
comment_saved, comment_saved,
community, community,
community_follower, community_follower,
community_moderator,
community_person_ban, community_person_ban,
person, person,
person_block, person_block,
@ -85,6 +86,7 @@ fn queries<'a>() -> Queries<
aliases::person1.fields(person::all_columns), aliases::person1.fields(person::all_columns),
comment_aggregates::all_columns, comment_aggregates::all_columns,
community_person_ban::id.nullable().is_not_null(), community_person_ban::id.nullable().is_not_null(),
community_moderator::id.nullable().is_not_null(),
CommunityFollower::select_subscribed_type(), CommunityFollower::select_subscribed_type(),
comment_saved::id.nullable().is_not_null(), comment_saved::id.nullable().is_not_null(),
person_block::id.nullable().is_not_null(), person_block::id.nullable().is_not_null(),
@ -105,6 +107,13 @@ fn queries<'a>() -> Queries<
.and(community_person_ban::person_id.eq(comment::creator_id)), .and(community_person_ban::person_id.eq(comment::creator_id)),
), ),
) )
.left_join(
community_moderator::table.on(
community::id
.eq(community_moderator::community_id)
.and(community_moderator::person_id.eq(comment::creator_id)),
),
)
.select(selection) .select(selection)
.first::<PersonMentionView>(&mut conn) .first::<PersonMentionView>(&mut conn)
.await .await
@ -124,6 +133,13 @@ fn queries<'a>() -> Queries<
), ),
), ),
) )
.left_join(
community_moderator::table.on(
community::id
.eq(community_moderator::community_id)
.and(community_moderator::person_id.eq(comment::creator_id)),
),
)
.select(selection); .select(selection);
if let Some(recipient_id) = options.recipient_id { if let Some(recipient_id) = options.recipient_id {

12
crates/db_views_actor/src/structs.rs
View file

@ -99,6 +99,7 @@ pub struct PersonMentionView {
pub recipient: Person, pub recipient: Person,
pub counts: CommentAggregates, pub counts: CommentAggregates,
pub creator_banned_from_community: bool, pub creator_banned_from_community: bool,
pub creator_is_moderator: bool,
pub subscribed: SubscribedType, pub subscribed: SubscribedType,
pub saved: bool, pub saved: bool,
pub creator_blocked: bool, pub creator_blocked: bool,
@ -118,11 +119,12 @@ pub struct CommentReplyView {
pub community: Community, pub community: Community,
pub recipient: Person, pub recipient: Person,
pub counts: CommentAggregates, pub counts: CommentAggregates,
pub creator_banned_from_community: bool, // Left Join to CommunityPersonBan pub creator_banned_from_community: bool,
pub subscribed: SubscribedType, // Left join to CommunityFollower pub creator_is_moderator: bool,
pub saved: bool, // Left join to CommentSaved pub subscribed: SubscribedType,
pub creator_blocked: bool, // Left join to PersonBlock pub saved: bool,
pub my_vote: Option<i16>, // Left join to CommentLike pub creator_blocked: bool,
pub my_vote: Option<i16>,
} }
#[derive(Debug, Serialize, Deserialize, Clone)] #[derive(Debug, Serialize, Deserialize, Clone)]