mirrors/Plume
1
0
Fork 0
mirror of https://git.joinplu.me/Plume/Plume.git synced 2024-12-23 18:40:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix Post::from_activity07()

Browse source
This commit is contained in:
Kitaiti Makoto 2022-05-01 13:00:04 +09:00
parent 38ebc9ea41
commit de6e9c0e2e
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
plume-models/src/posts.rs
View file

@ -1031,20 +1031,27 @@ impl FromId07<DbConn> for Post {
let article = article.inner;
let (blog, authors) = article
.ap_object_ref()
.attributed_to()
.ok_or(Error::MissingApProperty)
.ok_or(Error::MissingApProperty)?
.iter()
.fold((None, vec![]), |(blog, mut authors), link| {
let url = link.to_as_uri().expect("Exists");
match User::from_id(conn, &url, None, CONFIG.proxy()) {
Ok(u) => {
authors.push(u);
(blog, authors)
if let Some(url) = link.id() {
match User::from_id07(conn, url.as_str(), None, CONFIG.proxy()) {
Ok(u) => {
authors.push(u);
(blog, authors)
}
Err(_) => (
blog.or_else(|| {
Blog::from_id07(conn, url.as_str(), None, CONFIG.proxy()).ok()
}),
authors,
),
}
Err(_) => (
blog.or_else(|| Blog::from_id(conn, &url, None, CONFIG.proxy()).ok()),
authors,
),
} else {
// logically, url possible to be an object without id proprty like {"type":"Person", "name":"Sally"} but we ignore the case
(blog, authors)
}
});