grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Move check for locked post into Comment::from_apub()

Browse source
This commit is contained in:
Felix Ableitner 2020-12-01 17:41:01 +01:00
parent 9629f8140b
commit 6cf4e39406
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lemmy_apub/src/activities/receive/comment.rs
View file

@ -3,7 +3,7 @@ use activitystreams::{
activity::{ActorAndObjectRefExt, Create, Dislike, Like, Remove, Update},
base::ExtendsExt,
};
use anyhow::{anyhow, Context};
use anyhow::Context;
use lemmy_db::{
comment::{Comment, CommentLike, CommentLikeForm},
comment_view::CommentView,
@ -23,14 +23,10 @@ pub(crate) async fn receive_create_comment(
let note = NoteExt::from_any_base(create.object().to_owned().one().context(location_info!())?)?
.context(location_info!())?;
// TODO: need to do the check for locked post before calling this
let comment = Comment::from_apub(&note, context, Some(user.actor_id()?), request_counter).await?;
let post_id = comment.post_id;
let post = blocking(context.pool(), move |conn| Post::read(conn, post_id)).await??;
if post.locked {
return Err(anyhow!("Post is locked").into());
}
// Note:
// Although mentions could be gotten from the post tags (they are included there), or the ccs,

8
lemmy_apub/src/objects/comment.rs
View file

@ -20,7 +20,7 @@ use activitystreams::{
object::{kind::NoteType, ApObject, Note, Tombstone},
prelude::*,
};
use anyhow::Context;
use anyhow::{anyhow, Context};
use lemmy_db::{
comment::{Comment, CommentForm},
community::Community,
@ -114,6 +114,12 @@ impl FromApub for Comment {
} else {
let comment_form =
CommentForm::from_apub(note, context, expected_domain, request_counter).await?;
let post_id = comment_form.post_id;
let post = blocking(context.pool(), move |conn| Post::read(conn, post_id)).await??;
if post.locked {
return Err(anyhow!("Post is locked").into());
}
let comment = blocking(context.pool(), move |conn| {
Comment::upsert(conn, &comment_form)
})