From 33221d386ef6ed33599980581016e39242d905fa Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Wed, 24 Feb 2021 02:36:39 +0900 Subject: [PATCH] Upsert Post in from_activity() --- plume-models/src/posts.rs | 87 +++++++++++++++++++++++++++++---------- 1 file changed, 66 insertions(+), 21 deletions(-) diff --git a/plume-models/src/posts.rs b/plume-models/src/posts.rs index bace3945..de2d123e 100644 --- a/plume-models/src/posts.rs +++ b/plume-models/src/posts.rs @@ -641,27 +641,72 @@ impl FromId for Post { .and_then(|img| Media::from_activity(conn, &img).ok().map(|m| m.id)); let title = article.object_props.name_string()?; - // TODO: upsert - 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 ap_url = article + .object_props + .url_string() + .or_else(|_| article.object_props.id_string())?; + let post = Post::from_db(conn, &ap_url) + .and_then(|mut post| { + let mut updated = false; + + let slug = title.to_kebab_case(); + let content = SafeString::new(&article.object_props.content_string()?); + let subtitle = article.object_props.summary_string()?; + let source = article.ap_object_props.source_object::()?.content; + if post.slug != slug { + post.slug = slug; + updated = true; + } + if post.title != title { + post.title = title.clone(); + updated = true; + } + if post.content != content { + post.content = content; + updated = true; + } + if post.license != license { + post.license = license.clone(); + updated = true; + } + if post.subtitle != subtitle { + post.subtitle = subtitle; + updated = true; + } + if post.source != source { + post.source = source; + updated = true; + } + if post.cover_id != cover { + post.cover_id = cover; + updated = true; + } + + if updated { + post.update(conn)?; + } + + Ok(post) + }) + .or_else(|_| { + 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, + 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, + }, + ) + })?; for author in authors { PostAuthor::insert(