Merge branch 'master' into federation_merge_from_master_2

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

diff --git a/server/src/apub/activities.rs b/server/src/apub/activities.rs
index b5bb9d76c7dffff589c05e65186f0e3514d1c05a..3c4034c96979718254f147b51395cb3a44b1c937 100644 (file)
--- a/server/src/apub/activities.rs
+++ b/server/src/apub/activities.rs
@@ -5,7 +5,6 @@ use crate::{
 use activitystreams::{context, object::properties::ObjectProperties, public, Activity, Base};
 use diesel::PgConnection;
 use failure::{Error, _core::fmt::Debug};
-use isahc::prelude::*;
 use log::debug;
 use serde::Serialize;
 use url::Url;
@@ -57,16 +56,18 @@ where
   for t in to {
     let to_url = Url::parse(&t)?;
     if !is_apub_id_valid(&to_url) {
-      debug!("Not sending activity to {} (invalid or blocklisted)", t);
+      debug!("Not sending activity to {} (invalid or blacklisted)", t);
       continue;
     }
-    let request = Request::post(t).header("Host", to_url.domain().unwrap());
-    let signature = sign(&request, actor)?;
+    let mut request = attohttpc::post(t).header("Host", to_url.domain().unwrap());
+    let signature = sign(&mut request, actor)?;
     let res = request
       .header("Signature", signature)
       .header("Content-Type", "application/json")
-      .body(json.to_owned())?
-      .send()?;
+      .text(json.to_owned())
+      .send()?
+      .text()?;
+
     debug!("Result for activity send: {:?}", res);
   }
   Ok(())