Merge branch 'update-deps'

CHANGELOG.md

@@ -1,3 +1,8 @@
+## Unreleased - fixes in fork
+
+- Update dependencies
+- Code cleanup and fixes to work with Pleroma
+
 <a name="v0.18.0"></a>
 ## v0.18.0 (2019-01-05)
 

Cargo.toml

@@ -13,24 +13,23 @@ edition = "2018"
 [dependencies]
 doc-comment = "0.3"
 hyper-old-types = "0.11.0" # Used to parse the link header
-isolang = { version = "1.0", features = ["serde_serialize"] }
+isolang = { version = "2.4.0", features = ["serde"] }
 log = "^0.4"
-reqwest = { version = "0.11.4", default-features = false, features = ["json", "blocking", "multipart", "rustls-tls", "stream"] }
+reqwest = { version = "0.12.18", default-features = false, features = ["json", "blocking", "multipart", "rustls-tls", "stream"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-serde_urlencoded = "0.6.1"
+serde_urlencoded = "0.7.1"
-serde_qs = "0.8.4"
+serde_qs = "0.15.0"
-url = "2.1.1"
+url = "2.5.4"
-toml = { version = "^0.5.0" }
+toml = { version = "0.8", features = ["parse"] }
-tokio-tungstenite = { version = "0.15.0", features = ["rustls-tls"] }
+tokio-tungstenite = { version = "0.27", features = ["rustls-tls-webpki-roots"] }
 tokio = { version = "1", features = ["fs"] }
-tokio-util = { version = "0.6", features = [ "io" ] }
+tokio-util = { version = "0.7", features = ["io"] }
-tokio-stream = "0.1.7"
+tokio-stream = "0.1.17"
 chrono = { version = "0.4", features = ["serde"] }
-thiserror = "1"
+thiserror = "2"
-futures-util = "0.3.16"
+futures-util = "0.3.31"
 
 [dev-dependencies]
-tempfile = "3.0.3"
+tempfile = "3.20.0"
-indoc = "1.0.2"
+indoc = "2.0.6"
-pretty_env_logger = "0.4.0"

src/debug.rs

@@ -1,7 +1,7 @@
+use crate::entities::event::Event;
 use crate::entities::notification::{Notification, NotificationType};
 use crate::entities::status::Status;
 use std::fmt::{Display, Formatter};
-use crate::entities::event::Event;
 
 pub struct NotificationDisplay<'a>(pub &'a Notification);
 
@@ -14,28 +14,38 @@ impl<'a> Display for NotificationDisplay<'a> {
             }
             NotificationType::Favourite => {
                 if let Some(ref s) = n.status {
-                    write!(f, "Favourite {{ #{}, acct: @{}, status: «{}» }}", n.id, n.account.acct, s.content )
+                    write!(
+                        f,
+                        "Favourite {{ #{}, acct: @{}, status: «{}» }}",
+                        n.id, n.account.acct, s.content
+                    )
                 } else {
                     write!(f, "Favourite {{ #{}, acct: @{}, status: -- }}", n.id, n.account.acct)
                 }
             }
             NotificationType::Mention => {
                 if let Some(ref s) = n.status {
-                    write!(f, "Mention {{ #{}, acct: @{}, status: «{}» }}", n.id, n.account.acct, s.content )
+                    write!(
+                        f,
+                        "Mention {{ #{}, acct: @{}, status: «{}» }}",
+                        n.id, n.account.acct, s.content
+                    )
                 } else {
                     write!(f, "Mention {{ #{}, acct: @{}, status: -- }}", n.id, n.account.acct)
                 }
             }
             NotificationType::Reblog => {
                 if let Some(ref s) = n.status {
-                    write!(f, "Reblog {{ #{}, acct: @{}, status: «{}» }}", n.id, n.account.acct, s.content )
+                    write!(
+                        f,
+                        "Reblog {{ #{}, acct: @{}, status: «{}» }}",
+                        n.id, n.account.acct, s.content
+                    )
                 } else {
                     write!(f, "Reblog {{ #{}, acct: @{}, status: -- }}", n.id, n.account.acct)
                 }
             }
-            NotificationType::Other(other) => {
+            NotificationType::Other(other) => f.write_str(&other),
-                f.write_str(&other)
-            }
         }
     }
 }
@@ -46,9 +56,7 @@ impl<'a> Display for EventDisplay<'a> {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         let n = self.0;
         match n {
-            Event::Notification(n) => {
+            Event::Notification(n) => NotificationDisplay(n).fmt(f),
-                NotificationDisplay(n).fmt(f)
-            }
             Event::Delete(id) => {
                 write!(f, "Delete {{ #{} }}", id)
             }
@@ -58,9 +66,7 @@ impl<'a> Display for EventDisplay<'a> {
             Event::Heartbeat => {
                 write!(f, "Heartbeat")
             }
-            Event::Update(s) => {
+            Event::Update(s) => StatusDisplay(s).fmt(f),
-                StatusDisplay(s).fmt(f)
-            }
         }
     }
 }
@@ -69,6 +75,10 @@ pub struct StatusDisplay<'a>(pub &'a Status);
 
 impl<'a> Display for StatusDisplay<'a> {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        write!(f, "Status {{ #{}, acct: @{}, status: «{}», vis: {:?} }}", self.0.id, self.0.account.acct, self.0.content, self.0.visibility )
+        write!(
+            f,
+            "Status {{ #{}, acct: @{}, status: «{}», vis: {:?} }}",
+            self.0.id, self.0.account.acct, self.0.content, self.0.visibility
+        )
     }
 }

src/entities/attachment.rs

@@ -71,8 +71,8 @@ pub enum MediaType {
     Other(String),
 }
 
-use std::str::FromStr;
 use serde::de::{value, Deserializer, IntoDeserializer};
+use std::str::FromStr;
 
 impl FromStr for MediaType {
     type Err = value::Error;
@@ -84,12 +84,11 @@ impl FromStr for MediaType {
 
 impl<'de> Deserialize<'de> for MediaType {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-        where D: Deserializer<'de>
+    where
+        D: Deserializer<'de>,
     {
         let s = String::deserialize(deserializer)?;
-        let deserialized = Self::from_str(&s).unwrap_or_else(|_| {
+        let deserialized = Self::from_str(&s).unwrap_or_else(|_| Self::Other(s));
-            Self::Other(s)
-        });
         Ok(deserialized)
     }
 }
@@ -101,8 +100,17 @@ mod tests {
 
     #[test]
     fn test_deserialize_media_type() {
-        assert_eq!(MediaType::Image, serde_json::from_value(Value::String("image".to_owned())).unwrap());
+        assert_eq!(
-        assert_eq!(MediaType::Audio, serde_json::from_value(Value::String("audio".to_owned())).unwrap());
+            MediaType::Image,
-        assert_eq!(MediaType::Other("pleroma_weird_thing".to_string()), serde_json::from_value(Value::String("pleroma_weird_thing".to_owned())).unwrap());
+            serde_json::from_value(Value::String("image".to_owned())).unwrap()
+        );
+        assert_eq!(
+            MediaType::Audio,
+            serde_json::from_value(Value::String("audio".to_owned())).unwrap()
+        );
+        assert_eq!(
+            MediaType::Other("pleroma_weird_thing".to_string()),
+            serde_json::from_value(Value::String("pleroma_weird_thing".to_owned())).unwrap()
+        );
     }
 }

src/entities/notification.rs

@@ -39,8 +39,8 @@ pub enum NotificationType {
     Other(String),
 }
 
-use std::str::FromStr;
 use serde::de::{value, Deserializer, IntoDeserializer};
+use std::str::FromStr;
 
 impl FromStr for NotificationType {
     type Err = value::Error;
@@ -52,12 +52,11 @@ impl FromStr for NotificationType {
 
 impl<'de> Deserialize<'de> for NotificationType {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-        where D: Deserializer<'de>
+    where
+        D: Deserializer<'de>,
     {
         let s = String::deserialize(deserializer)?;
-        let deserialized = Self::from_str(&s).unwrap_or_else(|_| {
+        let deserialized = Self::from_str(&s).unwrap_or_else(|_| Self::Other(s));
-            Self::Other(s)
-        });
         Ok(deserialized)
     }
 }

src/helpers/mod.rs

@@ -23,11 +23,12 @@ pub mod json;
 /// Helpers for working with the command line
 pub mod cli;
 
-
 /// # Low-level API for extending
 // Convert the HTTP response body from JSON. Pass up deserialization errors
 // transparently.
-pub async fn deserialise_response<T: for<'de> serde::Deserialize<'de>>(response: reqwest::Response) -> crate::Result<T> {
+pub async fn deserialise_response<T: for<'de> serde::Deserialize<'de>>(
+    response: reqwest::Response,
+) -> crate::Result<T> {
     let bytes = response.bytes().await?;
     match serde_json::from_slice(&bytes) {
         Ok(t) => {

src/helpers/toml.rs

@@ -1,8 +1,8 @@
 use crate::data::AppData;
 use crate::Result;
-use std::io::{Read, Write, BufWriter};
-use std::path::Path;
 use std::fs::{File, OpenOptions};
+use std::io::{BufWriter, Read, Write};
+use std::path::Path;
 
 /// Attempts to deserialize a Data struct from a string
 pub fn from_str(s: &str) -> Result<AppData> {
@@ -11,7 +11,7 @@ pub fn from_str(s: &str) -> Result<AppData> {
 
 /// Attempts to deserialize a Data struct from a slice of bytes
 pub fn from_slice(s: &[u8]) -> Result<AppData> {
-    Ok(toml::from_slice(s)?)
+    Ok(from_str(&String::from_utf8_lossy(s))?)
 }
 
 /// Attempts to deserialize a Data struct from something that implements
@@ -36,7 +36,7 @@ pub fn to_string(data: &AppData) -> Result<String> {
 
 /// Attempts to serialize a Data struct to a Vec of bytes
 pub fn to_vec(data: &AppData) -> Result<Vec<u8>> {
-    Ok(toml::to_vec(data)?)
+    Ok(toml::to_string(data)?.as_bytes().to_vec())
 }
 
 /// Attempts to serialize a Data struct to something that implements the

src/lib.rs

@@ -19,25 +19,14 @@ use reqwest::multipart;
 use entities::prelude::*;
 pub use errors::{Error, Result};
 use helpers::deserialise_response;
-use serde::{Serialize,Deserialize};
+use requests::{AddFilterRequest, AddPushRequest, StatusesRequest, UpdateCredsRequest, UpdatePushRequest};
-use requests::{
+use serde::{Deserialize, Serialize};
-    AddFilterRequest,
-    AddPushRequest,
-    StatusesRequest,
-    UpdateCredsRequest,
-    UpdatePushRequest,
-};
 use streaming::EventReader;
 pub use streaming::StreamKind;
 
 pub use crate::{
-    data::AppData,
+    data::AppData, media_builder::MediaBuilder, page::Page, registration::Registration, scopes::Scopes,
-    media_builder::MediaBuilder,
+    status_builder::NewStatus, status_builder::StatusBuilder,
-    page::Page,
-    registration::Registration,
-    scopes::Scopes,
-    status_builder::NewStatus,
-    status_builder::StatusBuilder,
 };
 
 #[macro_use]
@@ -64,10 +53,10 @@ pub mod requests;
 pub mod scopes;
 /// Constructing a status
 pub mod status_builder;
-/// Client that doesn't need auth
-pub mod unauth;
 /// Streaming API
 pub mod streaming;
+/// Client that doesn't need auth
+pub mod unauth;
 
 pub mod debug;
 
@@ -93,7 +82,7 @@ impl From<AppData> for FediClient {
 pub enum SearchType {
     Accounts,
     Hashtags,
-    Statuses
+    Statuses,
 }
 
 impl FediClient {
@@ -246,7 +235,9 @@ impl FediClient {
 
     /// Post a new status to the account.
     pub async fn new_status(&self, status: NewStatus) -> Result<Status> {
-        let response = self.send(self.http_client.post(&self.route("/api/v1/statuses")).json(&status)).await?;
+        let response = self
+            .send(self.http_client.post(&self.route("/api/v1/statuses")).json(&status))
+            .await?;
 
         deserialise_response(response).await
     }
@@ -306,7 +297,9 @@ impl FediClient {
     /// Add a push notifications subscription
     pub async fn add_push_subscription(&self, request: &AddPushRequest) -> Result<Subscription> {
         let request = request.build()?;
-        let response = self.send(self.http_client.post(&self.route("/api/v1/push/subscription")).json(&request)).await?;
+        let response = self
+            .send(self.http_client.post(&self.route("/api/v1/push/subscription")).json(&request))
+            .await?;
 
         deserialise_response(response).await
     }
@@ -315,7 +308,9 @@ impl FediClient {
     /// access token
     pub async fn update_push_data(&self, request: &UpdatePushRequest) -> Result<Subscription> {
         let request = request.build();
-        let response = self.send(self.http_client.put(&self.route("/api/v1/push/subscription")).json(&request)).await?;
+        let response = self
+            .send(self.http_client.put(&self.route("/api/v1/push/subscription")).json(&request))
+            .await?;
 
         deserialise_response(response).await
     }
@@ -332,7 +327,6 @@ impl FediClient {
         self.following(&me.id).await
     }
 
-
     /// returns events that are relevant to the authorized user, i.e. home
     /// timeline & notifications
     pub async fn streaming_user(&self) -> Result<EventReader> {
@@ -380,7 +374,8 @@ impl FediClient {
         let mut form = multipart::Form::new();
         form = match media.data {
             MediaBuilderData::Reader(reader) => {
-                let mut part = multipart::Part::stream(reqwest::Body::wrap_stream(tokio_util::io::ReaderStream::new(reader)));
+                let mut part =
+                    multipart::Part::stream(reqwest::Body::wrap_stream(tokio_util::io::ReaderStream::new(reader)));
                 if let Some(filename) = media.filename {
                     part = part.file_name(filename);
                 }
@@ -406,7 +401,9 @@ impl FediClient {
             form = form.text("focus", format!("{},{}", x, y));
         }
 
-        let response = self.send(self.http_client.post(&self.route("/api/v1/media")).multipart(form)).await?;
+        let response = self
+            .send(self.http_client.post(&self.route("/api/v1/media")).multipart(form))
+            .await?;
 
         deserialise_response(response).await
     }
@@ -454,4 +451,3 @@ impl ClientBuilder {
         })
     }
 }
-

src/macros.rs

@@ -215,7 +215,7 @@ macro_rules! route_v1_id {
                 self.$method(self.route(&format!(concat!("/api/v1/", $url), id))).await
             }
         }
-    }
+    };
 }
 macro_rules! route_v1_paged_id {
     (($method:ident) $name:ident: $url:expr => $ret:ty) => {

src/media_builder.rs

@@ -1,7 +1,7 @@
 use std::fmt;
 use std::path::{Path, PathBuf};
-use tokio::io::AsyncRead;
 use std::pin::Pin;
+use tokio::io::AsyncRead;
 
 #[derive(Debug)]
 /// A builder pattern struct for preparing a single attachment for upload.

src/page.rs

@@ -1,7 +1,7 @@
 use super::{deserialise_response, FediClient, Result};
 use crate::entities::itemsiter::ItemsIter;
 use hyper_old_types::header::{parsing, Link, RelationType};
-use reqwest::{Response, header::LINK};
+use reqwest::{header::LINK, Response};
 use serde::Deserialize;
 use url::Url;
 
@@ -82,7 +82,7 @@ impl<'a, T: for<'de> Deserialize<'de>> Page<'a, T> {
             initial_items: deserialise_response(response).await?,
             next,
             prev,
-            api_client: api_client,
+            api_client,
         })
     }
 }

src/registration.rs

@@ -1,11 +1,11 @@
 use std::borrow::Cow;
 
+use crate::apps::{App, AppBuilder};
+use crate::data::AppData;
+use crate::scopes::Scopes;
+use crate::{ClientBuilder, Error, FediClient, Result};
 use serde::Deserialize;
 use std::convert::TryInto;
-use crate::apps::{AppBuilder, App};
-use crate::scopes::Scopes;
-use crate::{Result, Error, FediClient, ClientBuilder};
-use crate::data::AppData;
 
 const DEFAULT_REDIRECT_URI: &str = "urn:ietf:wg:oauth:2.0:oob";
 
@@ -127,8 +127,7 @@ impl<'a> Registration<'a> {
 
     async fn send_app(&self, app: &App) -> Result<OAuth> {
         let url = format!("{}/api/v1/apps", self.base);
-        Ok(self.send(self.http_client.post(url).json(&app)).await?
+        Ok(self.send(self.http_client.post(url).json(&app)).await?.json().await?)
-            .json().await?)
     }
 }
 

src/streaming.rs

@@ -1,14 +1,14 @@
-use crate::{Error, Result};
-use tokio_tungstenite::{WebSocketStream, MaybeTlsStream};
-use tokio::net::TcpStream;
-use tokio_stream::Stream;
 use crate::entities::event::Event;
-use std::pin::Pin;
-use std::task::Poll;
-use tokio_tungstenite::tungstenite::Message;
 use crate::entities::notification::Notification;
 use crate::entities::status::Status;
+use crate::{Error, Result};
 use futures_util::sink::SinkExt;
+use std::pin::Pin;
+use std::task::Poll;
+use tokio::net::TcpStream;
+use tokio_stream::Stream;
+use tokio_tungstenite::tungstenite::Message;
+use tokio_tungstenite::{MaybeTlsStream, WebSocketStream};
 
 #[derive(Clone, Debug)]
 pub enum StreamKind<'a> {
@@ -53,8 +53,7 @@ impl<'a> StreamKind<'a> {
             StreamKind::Public => vec![],
             StreamKind::PublicLocal => vec![],
             StreamKind::Direct => vec![],
-            StreamKind::Hashtag(tag)
+            StreamKind::Hashtag(tag) | StreamKind::HashtagLocal(tag) => vec![("tag", tag)],
-            | StreamKind::HashtagLocal(tag) => vec![("tag", tag)],
             StreamKind::List(list) => vec![("tag", list)],
         }
     }
@@ -84,15 +83,12 @@ pub struct EventReader {
 
 impl EventReader {
     fn new(stream: WebSocketStream<MaybeTlsStream<TcpStream>>) -> Self {
-        Self {
+        Self { stream, lines: vec![] }
-            stream,
-            lines: vec![]
-        }
     }
 
     pub async fn send_ping(&mut self) -> std::result::Result<(), tokio_tungstenite::tungstenite::Error> {
         trace!("Sending ping");
-        self.stream.send(Message::Ping("pleroma groups".as_bytes().to_vec())).await
+        self.stream.send(Message::Ping("pleroma groups".as_bytes().into())).await
     }
 }
 
@@ -143,8 +139,9 @@ impl Stream for EventReader {
                 // Stream is closed
                 Poll::Ready(None)
             }
-            Poll::Pending => {
+            Poll::Pending => Poll::Pending,
-                Poll::Pending
+            Poll::Ready(Some(Ok(Message::Frame(_)))) => {
+                unreachable!();
             }
         }
     }

src/unauth.rs

@@ -1,9 +1,9 @@
-use crate::{Result, streaming};
 use crate::entities::card::Card;
 use crate::entities::context::Context;
 use crate::entities::status::Status;
 use crate::helpers::deserialise_response;
 use crate::streaming::EventReader;
+use crate::{streaming, Result};
 
 /// Client that can make unauthenticated calls to a mastodon instance
 #[derive(Clone, Debug)]