diff --git a/kordophone/src/api/http_client.rs b/kordophone/src/api/http_client.rs index 8d58724..e0f4249 100644 --- a/kordophone/src/api/http_client.rs +++ b/kordophone/src/api/http_client.rs @@ -16,7 +16,7 @@ use tokio::net::TcpStream; use futures_util::stream::{BoxStream, Stream}; use futures_util::task::Context; -use futures_util::{SinkExt, StreamExt, TryStreamExt}; +use futures_util::{StreamExt, TryStreamExt}; use tokio_tungstenite::connect_async; use tokio_tungstenite::{MaybeTlsStream, WebSocketStream}; diff --git a/kordophone/src/api/mod.rs b/kordophone/src/api/mod.rs index b0326db..0f63308 100644 --- a/kordophone/src/api/mod.rs +++ b/kordophone/src/api/mod.rs @@ -16,8 +16,7 @@ pub mod event_socket; pub use event_socket::EventSocket; use self::http_client::Credentials; -use core::error::Error as StdError; -use std::{fmt::Debug, io::BufRead}; +use std::fmt::Debug; #[async_trait] pub trait APIInterface { diff --git a/kordophone/src/tests/test_client.rs b/kordophone/src/tests/test_client.rs index a9f548e..a8ca377 100644 --- a/kordophone/src/tests/test_client.rs +++ b/kordophone/src/tests/test_client.rs @@ -16,6 +16,7 @@ use crate::{ use futures_util::stream::BoxStream; use futures_util::StreamExt; +use bytes::Bytes; pub struct TestClient { pub version: &'static str, @@ -67,6 +68,7 @@ impl EventSocket for TestEventSocket { #[async_trait] impl APIInterface for TestClient { type Error = TestError; + type ResponseStream = BoxStream<'static, Result>; async fn authenticate(&mut self, _credentials: Credentials) -> Result { Ok(JwtToken::dummy()) @@ -118,7 +120,7 @@ impl APIInterface for TestClient { Ok(TestEventSocket::new()) } - async fn fetch_attachment_data(&mut self, guid: &String) -> Result, Self::Error> { - Ok(vec![]) + async fn fetch_attachment_data(&mut self, guid: &String, preview: bool) -> Result { + Ok(futures_util::stream::iter(vec![Ok(Bytes::from_static(b"test"))]).boxed()) } } diff --git a/kordophoned/src/daemon/attachment_store.rs b/kordophoned/src/daemon/attachment_store.rs index e0cd3a7..6395ea0 100644 --- a/kordophoned/src/daemon/attachment_store.rs +++ b/kordophoned/src/daemon/attachment_store.rs @@ -9,7 +9,6 @@ use kordophone::APIInterface; use thiserror::Error; use kordophone_db::database::Database; -use kordophone_db::database::DatabaseAccess; use crate::daemon::events::Event; use crate::daemon::events::Reply; @@ -21,7 +20,6 @@ use tokio::sync::Mutex; use tokio::sync::mpsc::{Receiver, Sender}; use tokio::pin; -use tokio::time::Duration; mod target { pub static ATTACHMENTS: &str = "attachments"; diff --git a/kordophoned/src/daemon/auth_store.rs b/kordophoned/src/daemon/auth_store.rs index 283b169..35a789a 100644 --- a/kordophoned/src/daemon/auth_store.rs +++ b/kordophoned/src/daemon/auth_store.rs @@ -5,7 +5,6 @@ use std::sync::Arc; use tokio::sync::Mutex; use kordophone::api::{http_client::Credentials, AuthenticationStore}; -use kordophone::model::JwtToken; use kordophone_db::database::{Database, DatabaseAccess}; use async_trait::async_trait; diff --git a/kordophoned/src/daemon/mod.rs b/kordophoned/src/daemon/mod.rs index c735034..3f64f3c 100644 --- a/kordophoned/src/daemon/mod.rs +++ b/kordophoned/src/daemon/mod.rs @@ -13,7 +13,7 @@ use directories::ProjectDirs; use std::collections::HashMap; use std::error::Error; -use std::path::{Path, PathBuf}; +use std::path::PathBuf; use std::sync::Arc; use thiserror::Error; diff --git a/kordophoned/src/daemon/models/message.rs b/kordophoned/src/daemon/models/message.rs index 297dcc7..4735275 100644 --- a/kordophoned/src/daemon/models/message.rs +++ b/kordophoned/src/daemon/models/message.rs @@ -2,7 +2,6 @@ use chrono::NaiveDateTime; use chrono::DateTime; use std::collections::HashMap; -use uuid::Uuid; use kordophone::model::message::AttachmentMetadata; use kordophone::model::outgoing_message::OutgoingMessage; use crate::daemon::models::Attachment; diff --git a/kordophoned/src/dbus/server_impl.rs b/kordophoned/src/dbus/server_impl.rs index f66f676..4053a61 100644 --- a/kordophoned/src/dbus/server_impl.rs +++ b/kordophoned/src/dbus/server_impl.rs @@ -7,8 +7,7 @@ use tokio::sync::oneshot; use crate::daemon::{ events::{Event, Reply}, - settings::Settings, - Attachment, DaemonResult, + settings::Settings, DaemonResult, }; use crate::dbus::interface::NetBuzzertKordophoneRepository as DbusRepository;