Revert "Save remote post only when it doesn't exist on local"

This reverts commit 37cbf537bb.
This commit is contained in:
Kitaiti Makoto 2021-02-18 11:08:40 +09:00
parent 28380021a7
commit af5674074d
2 changed files with 31 additions and 31 deletions

View File

@ -11,7 +11,7 @@ use plume_common::{
utils::MediaProcessor,
};
use std::{
fs,
fs::{self, DirBuilder},
path::{Path, PathBuf},
};
use tracing::warn;
@ -206,6 +206,10 @@ impl Media {
pub fn from_activity(conn: &DbConn, image: &Image) -> Result<Media> {
let remote_url = image.object_props.url_string().ok()?;
let path = determine_mirror_file_path(&remote_url);
let parent = path.parent()?;
if !parent.is_dir() {
DirBuilder::new().recursive(true).create(parent)?;
}
let mut dest = fs::File::create(path.clone()).ok()?;
if let Some(proxy) = CONFIG.proxy() {

View File

@ -637,37 +637,33 @@ impl FromId<DbConn> for Post {
}
});
let post = Self::from_db(conn, &article.object_props.id_string()?).or_else(|_| {
let cover = article
.object_props
.icon_object::<Image>()
.ok()
.and_then(|img| Media::from_activity(conn, &img).ok().map(|m| m.id));
let cover = article
.object_props
.icon_object::<Image>()
.ok()
.and_then(|img| Media::from_activity(conn, &img).ok().map(|m| m.id));
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::<Source>()?.content,
cover_id: cover,
},
)
})?;
// TODO: Update cover image if post's cover changes
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::<Source>()?.content,
cover_id: cover,
},
)?;
for author in authors {
PostAuthor::insert(