grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

in fetcher, replace post/comment::create with upsert

Browse source
This commit is contained in:
Felix Ableitner 2020-08-24 16:57:14 +02:00
parent 934f83dbe4
commit 14381fdc52
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
server/src/apub/fetcher.rs
View file

@ -342,7 +342,7 @@ async fn fetch_remote_community(
.await?; .await?;
match existing { match existing {
Ok(e) => blocking(context.pool(), move |conn| Post::update(conn, e.id, &post)).await??, Ok(e) => blocking(context.pool(), move |conn| Post::update(conn, e.id, &post)).await??,
Err(_) => blocking(context.pool(), move |conn| Post::create(conn, &post)).await??, Err(_) => blocking(context.pool(), move |conn| Post::upsert(conn, &post)).await??,
}; };
// TODO: we need to send a websocket update here // TODO: we need to send a websocket update here
} }
@ -367,7 +367,7 @@ pub async fn get_or_fetch_and_insert_post(
let post = fetch_remote_object::<PageExt>(context.client(), post_ap_id).await?; let post = fetch_remote_object::<PageExt>(context.client(), post_ap_id).await?;
let post_form = PostForm::from_apub(&post, context, Some(post_ap_id.to_owned())).await?; let post_form = PostForm::from_apub(&post, context, Some(post_ap_id.to_owned())).await?;
let post = blocking(context.pool(), move |conn| Post::create(conn, &post_form)).await??; let post = blocking(context.pool(), move |conn| Post::upsert(conn, &post_form)).await??;
Ok(post) Ok(post)
} }
@ -397,7 +397,7 @@ pub async fn get_or_fetch_and_insert_comment(
CommentForm::from_apub(&comment, context, Some(comment_ap_id.to_owned())).await?; CommentForm::from_apub(&comment, context, Some(comment_ap_id.to_owned())).await?;
let comment = blocking(context.pool(), move |conn| { let comment = blocking(context.pool(), move |conn| {
Comment::create(conn, &comment_form) Comment::upsert(conn, &comment_form)
}) })
.await??; .await??;