Merge branch 'master' into federation_merge_from_master_2

[lemmy.git] / server / src / apub / fetcher.rs

diff --git a/server/src/apub/fetcher.rs b/server/src/apub/fetcher.rs
index 7f7a3f971751821ee3e6de66ac2120ac92ebdbff..20bab4e2636648f84f493a30fa7b6201f32fa424 100644 (file)
--- a/server/src/apub/fetcher.rs
+++ b/server/src/apub/fetcher.rs
@@ -2,7 +2,6 @@ use activitystreams::object::Note;
 use actix_web::Result;
 use diesel::{result::Error::NotFound, PgConnection};
 use failure::{Error, _core::fmt::Debug};
-use isahc::prelude::*;
 use log::debug;
 use serde::Deserialize;
 use std::time::Duration;
@@ -64,11 +63,11 @@ where
   }
   // TODO: this function should return a future
   let timeout = Duration::from_secs(60);
-  let text = Request::get(url.as_str())
+  let text: String = attohttpc::get(url.as_str())
     .header("Accept", APUB_JSON_CONTENT_TYPE)
     .connect_timeout(timeout)
     .timeout(timeout)
-    .body(())?
+    // .body(())
     .send()?
     .text()?;
   let res: Response = serde_json::from_str(&text)?;