Merge branch 'master' of github.com:Plume-org/Plume

2018-09-08 20:32:12 +01:00
parent f1d5865a16 fe7f87c47f
commit 0a70ff2594
17 changed files with 1096 additions and 736 deletions
@@ -170,8 +170,8 @@ fn shared_inbox(conn: DbConn, data: String) -> String {
    match instance.received(&*conn, act) {
        Ok(_) => String::new(),
        Err(e) => {
-            println!("Shared inbox error: {}\n{}", e.cause(), e.backtrace());
-            format!("Error: {}", e.cause())
+            println!("Shared inbox error: {}\n{}", e.as_fail(), e.backtrace());
+            format!("Error: {}", e.as_fail())
        }
    }
 }