LemmyNet/lemmy
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-06 04:25:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve error handling

Browse source
This commit is contained in:
Felix Ableitner 2020-04-08 13:23:59 +02:00
parent d3138f1dc9
commit 2c7d1caee6
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
server/src/apub/puller.rs
View file

@ -8,6 +8,7 @@ use crate::settings::Settings;
use activitystreams::collection::{OrderedCollection, UnorderedCollection}; use activitystreams::collection::{OrderedCollection, UnorderedCollection};
use activitystreams::object::Page; use activitystreams::object::Page;
use activitystreams::BaseBox; use activitystreams::BaseBox;
use diesel::result::Error::NotFound;
use diesel::PgConnection; use diesel::PgConnection;
use failure::Error; use failure::Error;
use isahc::prelude::*; use isahc::prelude::*;
@ -99,9 +100,9 @@ pub fn fetch_remote_user(apub_id: &str, conn: &PgConnection) -> Result<User_, Er
let uf = UserForm::from_person(&person)?; let uf = UserForm::from_person(&person)?;
let existing = User_::read_from_apub_id(conn, &uf.actor_id); let existing = User_::read_from_apub_id(conn, &uf.actor_id);
Ok(match existing { Ok(match existing {
// TODO: should make sure that this is actually a `NotFound` error Err(NotFound {}) => User_::create(conn, &uf)?,
Err(_) => User_::create(conn, &uf)?,
Ok(u) => User_::update(conn, u.id, &uf)?, Ok(u) => User_::update(conn, u.id, &uf)?,
Err(e) => return Err(Error::from(e)),
}) })
} }
@ -114,18 +115,18 @@ pub fn fetch_all(conn: &PgConnection) -> Result<(), Error> {
for community in &communities { for community in &communities {
let existing = Community::read_from_actor_id(conn, &community.actor_id); let existing = Community::read_from_actor_id(conn, &community.actor_id);
let community_id = match existing { let community_id = match existing {
// TODO: should make sure that this is actually a `NotFound` error Err(NotFound {}) => Community::create(conn, community)?.id,
Err(_) => Community::create(conn, community)?.id,
Ok(c) => Community::update(conn, c.id, community)?.id, Ok(c) => Community::update(conn, c.id, community)?.id,
Err(e) => return Err(Error::from(e)),
}; };
let mut posts = fetch_remote_community_posts(instance, &community.name, conn)?; let mut posts = fetch_remote_community_posts(instance, &community.name, conn)?;
for post_ in &mut posts { for post_ in &mut posts {
post_.community_id = community_id; post_.community_id = community_id;
let existing = Post::read_from_apub_id(conn, &post_.ap_id); let existing = Post::read_from_apub_id(conn, &post_.ap_id);
match existing { match existing {
// TODO: should make sure that this is actually a `NotFound` error Err(NotFound {}) => Post::create(conn, post_)?,
Err(_) => Post::create(conn, post_)?,
Ok(p) => Post::update(conn, p.id, post_)?, Ok(p) => Post::update(conn, p.id, post_)?,
Err(e) => return Err(Error::from(e)),
}; };
} }
} }