mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-11-22 06:36:14 +00:00
Make use of variables less redundant and inconsistent in distinguish.rs (#3932)
* Make use of variables less redundant and inconsistent in distinguish.rs * fmt
This commit is contained in:
parent
5b5ac0f37d
commit
a1a9c3e4c0
|
@ -18,8 +18,7 @@ pub async fn distinguish_comment(
|
||||||
) -> Result<Json<CommentResponse>, LemmyError> {
|
) -> Result<Json<CommentResponse>, LemmyError> {
|
||||||
let local_user_view = local_user_view_from_jwt(&data.auth, &context).await?;
|
let local_user_view = local_user_view_from_jwt(&data.auth, &context).await?;
|
||||||
|
|
||||||
let comment_id = data.comment_id;
|
let orig_comment = CommentView::read(&mut context.pool(), data.comment_id, None).await?;
|
||||||
let orig_comment = CommentView::read(&mut context.pool(), comment_id, None).await?;
|
|
||||||
|
|
||||||
check_community_ban(
|
check_community_ban(
|
||||||
local_user_view.person.id,
|
local_user_view.person.id,
|
||||||
|
@ -37,18 +36,20 @@ pub async fn distinguish_comment(
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
// Update the Comment
|
// Update the Comment
|
||||||
let comment_id = data.comment_id;
|
|
||||||
let form = CommentUpdateForm {
|
let form = CommentUpdateForm {
|
||||||
distinguished: Some(data.distinguished),
|
distinguished: Some(data.distinguished),
|
||||||
..Default::default()
|
..Default::default()
|
||||||
};
|
};
|
||||||
Comment::update(&mut context.pool(), comment_id, &form)
|
Comment::update(&mut context.pool(), data.comment_id, &form)
|
||||||
.await
|
.await
|
||||||
.with_lemmy_type(LemmyErrorType::CouldntUpdateComment)?;
|
.with_lemmy_type(LemmyErrorType::CouldntUpdateComment)?;
|
||||||
|
|
||||||
let comment_id = data.comment_id;
|
let comment_view = CommentView::read(
|
||||||
let person_id = local_user_view.person.id;
|
&mut context.pool(),
|
||||||
let comment_view = CommentView::read(&mut context.pool(), comment_id, Some(person_id)).await?;
|
data.comment_id,
|
||||||
|
Some(local_user_view.person.id),
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
|
||||||
Ok(Json(CommentResponse {
|
Ok(Json(CommentResponse {
|
||||||
comment_view,
|
comment_view,
|
||||||
|
|
Loading…
Reference in a new issue