use crate::structs::CommentReplyView;
-use diesel::{dsl::*, result::Error, *};
+use diesel::{
+ result::Error,
+ BoolExpressionMethods,
+ ExpressionMethods,
+ JoinOnDsl,
+ NullableExpressionMethods,
+ QueryDsl,
+};
+use diesel_async::RunQueryDsl;
use lemmy_db_schema::{
aggregates::structs::CommentAggregates,
newtypes::{CommentReplyId, PersonId},
source::{
comment::{Comment, CommentSaved},
comment_reply::CommentReply,
- community::{Community, CommunityFollower, CommunityPersonBan, CommunitySafe},
- person::{Person, PersonSafe},
+ community::{Community, CommunityFollower, CommunityPersonBan},
+ person::Person,
person_block::PersonBlock,
post::Post,
},
- traits::{ToSafe, ViewToVec},
- utils::{functions::hot_rank, limit_and_offset},
+ traits::JoinView,
+ utils::{get_conn, limit_and_offset, DbPool},
CommentSortType,
};
use typed_builder::TypedBuilder;
type CommentReplyViewTuple = (
CommentReply,
Comment,
- PersonSafe,
+ Person,
Post,
- CommunitySafe,
- PersonSafe,
+ Community,
+ Person,
CommentAggregates,
Option<CommunityPersonBan>,
Option<CommunityFollower>,
);
impl CommentReplyView {
- pub fn read(
- conn: &mut PgConnection,
+ pub async fn read(
+ pool: &mut DbPool<'_>,
comment_reply_id: CommentReplyId,
my_person_id: Option<PersonId>,
) -> Result<Self, Error> {
+ let conn = &mut get_conn(pool).await?;
let person_alias_1 = diesel::alias!(person as person1);
// The left join below will return None in this case
community_person_ban::table.on(
community::id
.eq(community_person_ban::community_id)
- .and(community_person_ban::person_id.eq(comment::creator_id))
- .and(
- community_person_ban::expires
- .is_null()
- .or(community_person_ban::expires.gt(now)),
- ),
+ .and(community_person_ban::person_id.eq(comment::creator_id)),
),
)
.left_join(
.select((
comment_reply::all_columns,
comment::all_columns,
- Person::safe_columns_tuple(),
+ person::all_columns,
post::all_columns,
- Community::safe_columns_tuple(),
- person_alias_1.fields(Person::safe_columns_tuple()),
+ community::all_columns,
+ person_alias_1.fields(person::all_columns),
comment_aggregates::all_columns,
community_person_ban::all_columns.nullable(),
community_follower::all_columns.nullable(),
person_block::all_columns.nullable(),
comment_like::score.nullable(),
))
- .first::<CommentReplyViewTuple>(conn)?;
+ .first::<CommentReplyViewTuple>(conn)
+ .await?;
Ok(CommentReplyView {
comment_reply,
}
/// Gets the number of unread replies
- pub fn get_unread_replies(conn: &mut PgConnection, my_person_id: PersonId) -> Result<i64, Error> {
- use diesel::dsl::*;
+ pub async fn get_unread_replies(
+ pool: &mut DbPool<'_>,
+ my_person_id: PersonId,
+ ) -> Result<i64, Error> {
+ use diesel::dsl::count;
+
+ let conn = &mut get_conn(pool).await?;
comment_reply::table
.inner_join(comment::table)
.filter(comment::removed.eq(false))
.select(count(comment_reply::id))
.first::<i64>(conn)
+ .await
}
}
#[derive(TypedBuilder)]
#[builder(field_defaults(default))]
-pub struct CommentReplyQuery<'a> {
+pub struct CommentReplyQuery<'a, 'b: 'a> {
#[builder(!default)]
- conn: &'a mut PgConnection,
+ pool: &'a mut DbPool<'b>,
my_person_id: Option<PersonId>,
recipient_id: Option<PersonId>,
sort: Option<CommentSortType>,
limit: Option<i64>,
}
-impl<'a> CommentReplyQuery<'a> {
- pub fn list(self) -> Result<Vec<CommentReplyView>, Error> {
- use diesel::dsl::*;
+impl<'a, 'b: 'a> CommentReplyQuery<'a, 'b> {
+ pub async fn list(self) -> Result<Vec<CommentReplyView>, Error> {
+ let conn = &mut get_conn(self.pool).await?;
let person_alias_1 = diesel::alias!(person as person1);
community_person_ban::table.on(
community::id
.eq(community_person_ban::community_id)
- .and(community_person_ban::person_id.eq(comment::creator_id))
- .and(
- community_person_ban::expires
- .is_null()
- .or(community_person_ban::expires.gt(now)),
- ),
+ .and(community_person_ban::person_id.eq(comment::creator_id)),
),
)
.left_join(
.select((
comment_reply::all_columns,
comment::all_columns,
- Person::safe_columns_tuple(),
+ person::all_columns,
post::all_columns,
- Community::safe_columns_tuple(),
- person_alias_1.fields(Person::safe_columns_tuple()),
+ community::all_columns,
+ person_alias_1.fields(person::all_columns),
comment_aggregates::all_columns,
community_person_ban::all_columns.nullable(),
community_follower::all_columns.nullable(),
query = query.filter(person::bot_account.eq(false));
};
- query = match self.sort.unwrap_or(CommentSortType::Hot) {
- CommentSortType::Hot => query
- .then_order_by(hot_rank(comment_aggregates::score, comment_aggregates::published).desc())
- .then_order_by(comment_aggregates::published.desc()),
- CommentSortType::New => query.then_order_by(comment::published.desc()),
- CommentSortType::Old => query.then_order_by(comment::published.asc()),
+ query = match self.sort.unwrap_or(CommentSortType::New) {
+ CommentSortType::Hot => query.then_order_by(comment_aggregates::hot_rank.desc()),
+ CommentSortType::New => query.then_order_by(comment_reply::published.desc()),
+ CommentSortType::Old => query.then_order_by(comment_reply::published.asc()),
CommentSortType::Top => query.order_by(comment_aggregates::score.desc()),
};
let res = query
.limit(limit)
.offset(offset)
- .load::<CommentReplyViewTuple>(self.conn)?;
+ .load::<CommentReplyViewTuple>(conn)
+ .await?;
- Ok(CommentReplyView::from_tuple_to_vec(res))
+ Ok(res.into_iter().map(CommentReplyView::from_tuple).collect())
}
}
-impl ViewToVec for CommentReplyView {
- type DbTuple = CommentReplyViewTuple;
- fn from_tuple_to_vec(items: Vec<Self::DbTuple>) -> Vec<Self> {
- items
- .into_iter()
- .map(|a| Self {
- comment_reply: a.0,
- comment: a.1,
- creator: a.2,
- post: a.3,
- community: a.4,
- recipient: a.5,
- counts: a.6,
- creator_banned_from_community: a.7.is_some(),
- subscribed: CommunityFollower::to_subscribed_type(&a.8),
- saved: a.9.is_some(),
- creator_blocked: a.10.is_some(),
- my_vote: a.11,
- })
- .collect::<Vec<Self>>()
+impl JoinView for CommentReplyView {
+ type JoinTuple = CommentReplyViewTuple;
+ fn from_tuple(a: Self::JoinTuple) -> Self {
+ Self {
+ comment_reply: a.0,
+ comment: a.1,
+ creator: a.2,
+ post: a.3,
+ community: a.4,
+ recipient: a.5,
+ counts: a.6,
+ creator_banned_from_community: a.7.is_some(),
+ subscribed: CommunityFollower::to_subscribed_type(&a.8),
+ saved: a.9.is_some(),
+ creator_blocked: a.10.is_some(),
+ my_vote: a.11,
+ }
}
}
projects / lemmy.git / blobdiff