From 37cbf537bbf772570e0a466f4615af3381d1cc50 Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Tue, 16 Feb 2021 22:42:04 +0900 Subject: [PATCH] Save remote post only when it doesn't exist on local --- plume-models/src/posts.rs | 56 +++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/plume-models/src/posts.rs b/plume-models/src/posts.rs index 8f1df2fe..27eadcdb 100644 --- a/plume-models/src/posts.rs +++ b/plume-models/src/posts.rs @@ -637,33 +637,37 @@ impl FromId for Post { } }); - let cover = article - .object_props - .icon_object::() - .ok() - .and_then(|img| Media::from_activity(conn, &img).ok().map(|m| m.id)); + let post = Self::from_db(conn, &article.object_props.id_string()?).or_else(|_| { + let cover = article + .object_props + .icon_object::() + .ok() + .and_then(|img| Media::from_activity(conn, &img).ok().map(|m| m.id)); - let title = article.object_props.name_string()?; - let post = Post::insert( - conn, - NewPost { - blog_id: blog?.id, - slug: title.to_kebab_case(), - title, - content: SafeString::new(&article.object_props.content_string()?), - published: true, - license, - // FIXME: This is wrong: with this logic, we may use the display URL as the AP ID. We need two different fields - ap_url: article - .object_props - .url_string() - .or_else(|_| article.object_props.id_string())?, - creation_date: Some(article.object_props.published_utctime()?.naive_utc()), - subtitle: article.object_props.summary_string()?, - source: article.ap_object_props.source_object::()?.content, - cover_id: cover, - }, - )?; + let title = article.object_props.name_string()?; + Self::insert( + conn, + NewPost { + blog_id: blog?.id, + slug: title.to_kebab_case(), + title, + content: SafeString::new(&article.object_props.content_string()?), + published: true, + license, + // FIXME: This is wrong: with this logic, we may use the display URL as the AP ID. We need two different fields + ap_url: article + .object_props + .url_string() + .or_else(|_| article.object_props.id_string())?, + creation_date: Some(article.object_props.published_utctime()?.naive_utc()), + subtitle: article.object_props.summary_string()?, + source: article.ap_object_props.source_object::()?.content, + cover_id: cover, + }, + ) + })?; + + // TODO: Update cover image if post's cover changes for author in authors { PostAuthor::insert(