Rework error handling (fixes #1714) (#2135)

[lemmy.git] / crates / utils / src / lib.rs

diff --git a/crates/utils/src/lib.rs b/crates/utils/src/lib.rs
index 04c60e3fca5854360ac4eb34ccd338f5f948b61a..6e30104e8fa5c555c328b6c6592002f2ad560bf8 100644 (file)
--- a/crates/utils/src/lib.rs
+++ b/crates/utils/src/lib.rs
@@ -59,6 +59,7 @@ pub struct LemmyError {
 }
 
 impl LemmyError {
+  /// Create LemmyError from a message, including stack trace
   pub fn from_message(message: &'static str) -> Self {
     let inner = anyhow::anyhow!("{}", message);
     LemmyError {
@@ -67,12 +68,27 @@ impl LemmyError {
       context: SpanTrace::capture(),
     }
   }
+
+  /// Create a LemmyError from error and message, including stack trace
+  pub fn from_error_message<E>(error: E, message: &'static str) -> Self
+  where
+    E: Into<anyhow::Error>,
+  {
+    LemmyError {
+      message: Some(message),
+      inner: error.into(),
+      context: SpanTrace::capture(),
+    }
+  }
+
+  /// Add message to existing LemmyError (or overwrite existing error)
   pub fn with_message(self, message: &'static str) -> Self {
     LemmyError {
       message: Some(message),
       ..self
     }
   }
+
   pub fn to_json(&self) -> Result<String, Self> {
     let api_error = match self.message {
       Some(error) => ApiError { error },