1 files changed, 21 insertions, 2 deletions
diff --git a/filamento/src/error.rs b/filamento/src/error.rs
index 23272b1..f2bf6ef 100644
--- a/filamento/src/error.rs
+++ b/filamento/src/error.rs
@@ -3,7 +3,7 @@ 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;
 
@@ -21,7 +21,7 @@ pub enum Error<Fs: FileStore> {
     // 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),
@@ -117,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)]
@@ -181,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>),