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

Update webfinger and reqwest

Browse Source 
Update webfinger to 0.3.1
Update reqwest to 0.9
Fix #257
This commit is contained in:
Trinity Pointard
2018-10-11 13:51:45 +02:00
parent 8fdb55a501
commit ed5bafbbc4
9 changed files with 623 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plume-models/src/blogs.rs
+3 -5
View File
@@ -1,9 +1,7 @@
use activitypub::{Actor, Object, CustomObject, actor::Group, collection::OrderedCollection};
use chrono::NaiveDateTime;
use reqwest::{
Client,
header::{Accept, qitem},
mime::Mime
use reqwest::{Client,
header::{ACCEPT, HeaderValue}
};
use serde_json;
use url::Url;
@@ -120,7 +118,7 @@ impl Blog {
fn fetch_from_url(conn: &Connection, url: String) -> Option<Blog> {
let req = Client::new()
.get(&url[..])
.header(Accept(ap_accept_header().into_iter().map(|h| qitem(h.parse::<Mime>().expect("Invalid Content-Type"))).collect()))
.header(ACCEPT, HeaderValue::from_str(&ap_accept_header().into_iter().collect::<Vec<_>>().join(", ")).unwrap())
.send();
match req {
Ok(mut res) => {
plume-models/src/users.rs
+4 -5
View File
@@ -20,8 +20,7 @@ use plume_common::activity_pub::{
};
use reqwest::{
Client,
header::{Accept, qitem},
mime::Mime
header::{ACCEPT, HeaderValue}
};
use rocket::{
request::{self, FromRequest, Request},
@@ -192,7 +191,7 @@ impl User {
fn fetch(url: String) -> Option<CustomPerson> {
let req = Client::new()
.get(&url[..])
.header(Accept(ap_accept_header().into_iter().map(|h| qitem(h.parse::<Mime>().expect("Invalid Content-Type"))).collect()))
.header(ACCEPT, HeaderValue::from_str(&ap_accept_header().into_iter().collect::<Vec<_>>().join(", ")).unwrap())
.send();
match req {
Ok(mut res) => {
@@ -348,7 +347,7 @@ impl User {
pub fn fetch_outbox<T: Activity>(&self) -> Vec<T> {
let req = Client::new()
.get(&self.outbox_url[..])
.header(Accept(ap_accept_header().into_iter().map(|h| qitem(h.parse::<Mime>().expect("Invalid Content-Type"))).collect()))
.header(ACCEPT, HeaderValue::from_str(&ap_accept_header().into_iter().collect::<Vec<_>>().join(", ")).unwrap())
.send();
match req {
Ok(mut res) => {
@@ -370,7 +369,7 @@ impl User {
pub fn fetch_followers_ids(&self) -> Vec<String> {
let req = Client::new()
.get(&self.followers_endpoint[..])
.header(Accept(ap_accept_header().into_iter().map(|h| qitem(h.parse::<Mime>().expect("Invalid Content-Type"))).collect()))
.header(ACCEPT, HeaderValue::from_str(&ap_accept_header().into_iter().collect::<Vec<_>>().join(", ")).unwrap())
.send();
match req {
Ok(mut res) => {