aitzol
/
Plume
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use id() for reply_tos

This commit is contained in:
Kitaiti Makoto 2022-05-01 04:45:56 +09:00
parent 79b5d9a690
commit 036913a828
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plume-models/src/comments.rs
View File

@ -445,14 +445,14 @@ impl FromId07<DbConn> for Comment {
.iter() .iter()
.next() .next()
.ok_or(Error::MissingApProperty)? .ok_or(Error::MissingApProperty)?
.as_xsd_string() .id()
.ok_or(Error::MissingApProperty)?; .ok_or(Error::MissingApProperty)?;
let previous_comment = Comment::find_by_ap_url(conn, previous_url); let previous_comment = Comment::find_by_ap_url(conn, previous_url.as_str());
let is_public = |v: &Option<&OneOrMany<AnyBase>>| match v { let is_public = |v: &Option<&OneOrMany<AnyBase>>| match v {
Some(one_or_many) => one_or_many.iter().any(|any_base| { Some(one_or_many) => one_or_many.iter().any(|any_base| {
let xsd_string = any_base.as_xsd_string(); let id = any_base.id();
xsd_string.is_some() && xsd_string.unwrap() == PUBLIC_VISIBILITY id.is_some() && id.unwrap() == PUBLIC_VISIBILITY
}), }),
None => false, None => false,
}; };
@ -482,7 +482,7 @@ impl FromId07<DbConn> for Comment {
), ),
in_response_to_id: previous_comment.iter().map(|c| c.id).next(), in_response_to_id: previous_comment.iter().map(|c| c.id).next(),
post_id: previous_comment.map(|c| c.post_id).or_else(|_| { post_id: previous_comment.map(|c| c.post_id).or_else(|_| {
Ok(Post::find_by_ap_url(conn, previous_url)?.id) as Result<i32> Ok(Post::find_by_ap_url(conn, previous_url.as_str())?.id) as Result<i32>
})?, })?,
author_id: User::from_id( author_id: User::from_id(
conn, conn,