1 files changed, 83 insertions, 11 deletions

diff --git a/filamento/src/error.rs b/filamento/src/error.rs
index 5111413..f2bf6ef 100644
--- a/filamento/src/error.rs
+++ b/filamento/src/error.rs
@@ -1,15 +1,19 @@
-use std::{string::FromUtf8Error, sync::Arc};
+use std::{num::TryFromIntError, string::FromUtf8Error, sync::Arc};
 
+use base64::DecodeError;
+use image::ImageError;
 use jid::JID;
-use lampada::error::{ConnectionError, ReadError, WriteError};
+use lampada::error::{ActorError, ConnectionError, ReadError, WriteError};
 use stanza::client::{Stanza, iq::Query};
 use thiserror::Error;
 
 pub use lampada::error::CommandError;
 
+use crate::files::FileStore;
+
 // for the client logic impl
 #[derive(Debug, Error, Clone)]
-pub enum Error {
+pub enum Error<Fs: FileStore> {
     #[error("core error: {0}")]
     Connection(#[from] ConnectionError),
     #[error("received unrecognized/unsupported content")]
@@ -17,7 +21,7 @@ pub enum Error {
     // TODO: include content
     // UnrecognizedContent(peanuts::element::Content),
     #[error("iq receive error: {0}")]
-    Iq(#[from] IqError),
+    Iq(#[from] IqProcessError),
     // TODO: change to Connecting(ConnectingError)
     #[error("connecting: {0}")]
     Connecting(#[from] ConnectionJobError),
@@ -33,11 +37,11 @@ pub enum Error {
     #[error("message send error: {0}")]
     MessageSend(#[from] MessageSendError),
     #[error("message receive error: {0}")]
-    MessageRecv(#[from] MessageRecvError),
+    MessageRecv(#[from] MessageRecvError<Fs>),
     #[error("subscripbe error: {0}")]
     Subscribe(#[from] SubscribeError),
     #[error("publish error: {0}")]
-    Publish(#[from] PublishError),
+    Publish(#[from] PEPError),
 }
 
 #[derive(Debug, Error, Clone)]
@@ -53,13 +57,29 @@ pub enum MessageSendError {
 }
 
 #[derive(Debug, Error, Clone)]
-pub enum MessageRecvError {
+pub enum MessageRecvError<Fs: FileStore> {
     #[error("could not add to message history: {0}")]
     MessageHistory(#[from] DatabaseError),
     #[error("missing from")]
     MissingFrom,
     #[error("could not update user nick: {0}")]
     NickUpdate(DatabaseError),
+    #[error("could not update user avatar: {0}")]
+    AvatarUpdate(#[from] AvatarUpdateError<Fs>),
+}
+
+#[derive(Debug, Error, Clone)]
+pub enum AvatarUpdateError<Fs: FileStore> {
+    #[error("could not save to disk: {0}")]
+    FileStore(Fs::Err),
+    #[error("could not fetch avatar data: {0}")]
+    PEPError(#[from] CommandError<PEPError>),
+    #[error("base64 decode: {0}")]
+    Base64(#[from] DecodeError),
+    #[error("pep node missing avatar data")]
+    MissingData,
+    #[error("database: {0}")]
+    Database(#[from] DatabaseError),
 }
 
 #[derive(Debug, Error, Clone)]
@@ -97,6 +117,17 @@ pub enum RosterError {
     StanzaError(#[from] stanza::client::error::Error),
     #[error("could not reply to roster push: {0}")]
     PushReply(WriteError),
+    #[error("actor error: {0}")]
+    Actor(ActorError),
+}
+
+impl From<CommandError<RosterError>> for RosterError {
+    fn from(value: CommandError<RosterError>) -> Self {
+        match value {
+            CommandError::Actor(actor_error) => Self::Actor(actor_error),
+            CommandError::Error(e) => e,
+        }
+    }
 }
 
 #[derive(Debug, Error, Clone)]
@@ -161,6 +192,14 @@ pub enum IqError {
 }
 
 #[derive(Debug, Error, Clone)]
+pub enum IqProcessError {
+    #[error("iq error")]
+    Iq(#[from] IqError),
+    #[error("roster push")]
+    Roster(#[from] RosterError),
+}
+
+#[derive(Debug, Error, Clone)]
 pub enum DatabaseOpenError {
     #[error("error: {0}")]
     Error(Arc<sqlx::Error>),
@@ -203,7 +242,7 @@ pub enum PresenceError {
 }
 
 #[derive(Debug, Error, Clone)]
-pub enum PublishError {
+pub enum PEPError {
     #[error("received mismatched query")]
     MismatchedQuery(Query),
     #[error("missing query")]
@@ -216,12 +255,19 @@ pub enum PublishError {
     UnexpectedStanza(Stanza),
     #[error("iq response: {0}")]
     IqResponse(#[from] IqRequestError),
+    #[error("missing pep item")]
+    MissingItem,
+    #[error("incorrect item id: expected {0}, got {1}")]
+    IncorrectItemID(String, String),
+    #[error("unsupported pep item")]
+    UnsupportedItem,
+    // TODO: should the item be in the error?
 }
 
 #[derive(Debug, Error, Clone)]
 pub enum NickError {
     #[error("publishing nick: {0}")]
-    Publish(#[from] CommandError<PublishError>),
+    Publish(#[from] CommandError<PEPError>),
     #[error("updating database: {0}")]
     Database(#[from] DatabaseError),
     #[error("disconnected")]
@@ -267,5 +313,31 @@ pub enum CapsNodeConversionError {
     #[error("missing hashtag")]
     MissingHashtag,
 }
-// #[derive(Debug, Error, Clone)]
-// pub enum CapsError {}
+
+#[derive(Debug, Error, Clone)]
+pub enum AvatarPublishError<Fs: FileStore> {
+    #[error("disconnected")]
+    Disconnected,
+    #[error("image read: {0}")]
+    Read(Arc<std::io::Error>),
+    #[error("image: {0}")]
+    Image(Arc<ImageError>),
+    #[error("pep publish: {0}")]
+    Publish(#[from] CommandError<PEPError>),
+    #[error("bytes number conversion: {0}")]
+    FromInt(#[from] TryFromIntError),
+    #[error("could not save to disk")]
+    FileStore(Fs::Err),
+}
+
+impl<Fs: FileStore> From<std::io::Error> for AvatarPublishError<Fs> {
+    fn from(value: std::io::Error) -> Self {
+        Self::Read(Arc::new(value))
+    }
+}
+
+impl<Fs: FileStore> From<ImageError> for AvatarPublishError<Fs> {
+    fn from(value: ImageError) -> Self {
+        Self::Image(Arc::new(value))
+    }
+}