mirror of
https://github.com/LemmyNet/lemmy.git
synced 2025-01-22 06:48:17 +00:00
7d7cd8ded4
* Dont show replies / mentions from blocked users. Fixes #4227 * Adding unit tests for reply and mention views. - Also cleaned up some unwraps in the tests. * Add allow deprecated to pass clippy for deprecated wav crate. --------- Co-authored-by: SleeplessOne1917 <28871516+SleeplessOne1917@users.noreply.github.com>
89 lines
2.5 KiB
Rust
89 lines
2.5 KiB
Rust
use crate::{
|
|
diesel::OptionalExtension,
|
|
newtypes::{CommentId, CommentReplyId, PersonId},
|
|
schema::comment_reply,
|
|
source::comment_reply::{CommentReply, CommentReplyInsertForm, CommentReplyUpdateForm},
|
|
traits::Crud,
|
|
utils::{get_conn, DbPool},
|
|
};
|
|
use diesel::{dsl::insert_into, result::Error, ExpressionMethods, QueryDsl};
|
|
use diesel_async::RunQueryDsl;
|
|
|
|
#[async_trait]
|
|
impl Crud for CommentReply {
|
|
type InsertForm = CommentReplyInsertForm;
|
|
type UpdateForm = CommentReplyUpdateForm;
|
|
type IdType = CommentReplyId;
|
|
|
|
async fn create(
|
|
pool: &mut DbPool<'_>,
|
|
comment_reply_form: &Self::InsertForm,
|
|
) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
|
|
// since the return here isnt utilized, we dont need to do an update
|
|
// but get_result doesn't return the existing row here
|
|
insert_into(comment_reply::table)
|
|
.values(comment_reply_form)
|
|
.on_conflict((comment_reply::recipient_id, comment_reply::comment_id))
|
|
.do_update()
|
|
.set(comment_reply_form)
|
|
.get_result::<Self>(conn)
|
|
.await
|
|
}
|
|
|
|
async fn update(
|
|
pool: &mut DbPool<'_>,
|
|
comment_reply_id: CommentReplyId,
|
|
comment_reply_form: &Self::UpdateForm,
|
|
) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
diesel::update(comment_reply::table.find(comment_reply_id))
|
|
.set(comment_reply_form)
|
|
.get_result::<Self>(conn)
|
|
.await
|
|
}
|
|
}
|
|
|
|
impl CommentReply {
|
|
pub async fn mark_all_as_read(
|
|
pool: &mut DbPool<'_>,
|
|
for_recipient_id: PersonId,
|
|
) -> Result<Vec<CommentReply>, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
diesel::update(
|
|
comment_reply::table
|
|
.filter(comment_reply::recipient_id.eq(for_recipient_id))
|
|
.filter(comment_reply::read.eq(false)),
|
|
)
|
|
.set(comment_reply::read.eq(true))
|
|
.get_results::<Self>(conn)
|
|
.await
|
|
}
|
|
|
|
pub async fn read_by_comment(
|
|
pool: &mut DbPool<'_>,
|
|
for_comment_id: CommentId,
|
|
) -> Result<Option<Self>, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
comment_reply::table
|
|
.filter(comment_reply::comment_id.eq(for_comment_id))
|
|
.first(conn)
|
|
.await
|
|
.optional()
|
|
}
|
|
|
|
pub async fn read_by_comment_and_person(
|
|
pool: &mut DbPool<'_>,
|
|
for_comment_id: CommentId,
|
|
for_recipient_id: PersonId,
|
|
) -> Result<Option<Self>, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
comment_reply::table
|
|
.filter(comment_reply::comment_id.eq(for_comment_id))
|
|
.filter(comment_reply::recipient_id.eq(for_recipient_id))
|
|
.first(conn)
|
|
.await
|
|
.optional()
|
|
}
|
|
}
|