Improve the background article fetching code

plume-models/src/posts.rs

@@ -222,7 +222,9 @@ impl Post {
 
 impl FromActivity<Article, PgConnection> for Post {
     fn from_activity(conn: &PgConnection, article: Article, _actor: Id) -> Post {
-        println!("Article: {:?}", article);
+        if let Some(post) = Post::find_by_ap_url(conn, article.object_props.id_string().unwrap_or(String::new())) {
+            post
+        } else {
             let (blog, authors) = article.object_props.attributed_to_link_vec::<Id>()
                 .expect("Post::from_activity: attributedTo error")
                 .into_iter()
@@ -266,6 +268,7 @@ impl FromActivity<Article, PgConnection> for Post {
             }
             post
         }
+    }
 }
 
 impl IntoId for Post {

plume-models/src/users.rs

@@ -159,11 +159,14 @@ impl User {
             .send();
         match req {
             Ok(mut res) => {
-                let text = &res.text().unwrap();
-                let ap_sign: ApSignature = serde_json::from_str(text).unwrap();
-                let mut json: CustomPerson = serde_json::from_str(text).unwrap();
+                if let Ok(text) = &res.text() {
+                    if let Ok(ap_sign) = serde_json::from_str::<ApSignature>(text) {
+                        if let Ok(mut json) = serde_json::from_str::<CustomPerson>(text) {
                             json.custom_props = ap_sign; // without this workaround, publicKey is not correctly deserialized
                             Some(User::from_activity(conn, json, Url::parse(url.as_ref()).unwrap().host_str().unwrap().to_string()))
+                        } else { None }
+                    } else { None }
+                } else { None }
             },
             Err(e) => {
                 println!("User fetch error: {:?}", e);

src/routes/user.rs

@@ -47,6 +47,7 @@ fn details<'r>(name: String, conn: DbConn, account: Option<User>, worker: State<
         let n_followers = user.get_followers(&*conn).len();
 
         // Fetch new articles
+        if !user.get_instance(&*conn).local {
             let user_clone = user.clone();
             worker.execute(Thunk::of(move || {
                 for create_act in user_clone.fetch_outbox::<Create>() {
@@ -59,6 +60,7 @@ fn details<'r>(name: String, conn: DbConn, account: Option<User>, worker: State<
                     }
                 }
             }));
+        }
 
         Template::render("users/details", json!({
             "user": user.to_json(&*conn),