aitzol/Plume
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

convert plume-common to rocket async

Browse Source 
it only took 3 hours of @jebrosen's patient help.
This commit is contained in:
Igor Galić 2020-01-22 22:35:31 +01:00
parent bb5c2b69a7
commit ec9b699c6e
No known key found for this signature in database
GPG Key ID: ACFEFF7F6A123A86
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plume-common/src/activity_pub/mod.rs
View File

@ -4,7 +4,7 @@ use reqwest::r#async::ClientBuilder;
use rocket::{ use rocket::{
http::Status, http::Status,
request::{FromRequest, Request}, request::{FromRequest, Request},
response::{Responder, Response}, response::{Responder, Response, ResultFuture},
Outcome, Outcome,
}; };
use serde_json; use serde_json;
@ -63,14 +63,21 @@ impl<T> ActivityStream<T> {
} }
} }
impl<'r, O: Object> Responder<'r> for ActivityStream<O> { impl<'r, O: Object + Send + 'r> Responder<'r> for ActivityStream<O> {
fn respond_to(self, request: &Request<'_>) -> Result<Response<'r>, Status> { fn respond_to(self, request: &'r Request<'_>) -> ResultFuture<'r> {
Box::pin(async move {
let mut json = serde_json::to_value(&self.0).map_err(|_| Status::InternalServerError)?; let mut json = serde_json::to_value(&self.0).map_err(|_| Status::InternalServerError)?;
json["@context"] = context(); json["@context"] = context();
serde_json::to_string(&json).respond_to(request).map(|r| { let result = serde_json::to_string(&json).map_err(rocket::response::Debug);
match result.respond_to(request).await {
Ok(r) => {
Response::build_from(r) Response::build_from(r)
.raw_header("Content-Type", "application/activity+json") .raw_header("Content-Type", "application/activity+json")
.finalize() .ok()
.await
}
Err(e) => Err(e),
}
}) })
} }
} }