[fractal] BKResponse, stickers: remove error variants and compose over Result instead

[Alexandre Franke <afranke src gnome org>]

commit 0d93f45b0643b5820cc599e619dd1b1ae1232f5f
Author: Alejandro Domínguez <adomu net-c com>
Date:   Mon Aug 26 10:50:22 2019 +0200

    BKResponse, stickers: remove error variants and compose over Result instead

 fractal-matrix-api/src/backend/mod.rs      | 6 +++---
 fractal-matrix-api/src/backend/stickers.rs | 6 +++---
 fractal-matrix-api/src/backend/types.rs    | 3 +--
 3 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/fractal-matrix-api/src/backend/mod.rs b/fractal-matrix-api/src/backend/mod.rs
index c1a08e58..dac3fbc3 100644
--- a/fractal-matrix-api/src/backend/mod.rs
+++ b/fractal-matrix-api/src/backend/mod.rs
@@ -281,15 +281,15 @@ impl Backend {
             // Stickers module
             Ok(BKCommand::ListStickers) => {
                 let r = stickers::list(self);
-                bkerror!(r, tx, BKResponse::StickersError);
+                bkerror2!(r, tx, BKResponse::Stickers);
             }
             Ok(BKCommand::SendSticker(room, sticker)) => {
                 let r = stickers::send(self, &room, &sticker);
-                bkerror!(r, tx, BKResponse::StickersError);
+                bkerror2!(r, tx, BKResponse::Stickers);
             }
             Ok(BKCommand::PurchaseSticker(group)) => {
                 let r = stickers::purchase(self, &group);
-                bkerror!(r, tx, BKResponse::StickersError);
+                bkerror2!(r, tx, BKResponse::Stickers);
             }
 
             // Internal commands
diff --git a/fractal-matrix-api/src/backend/stickers.rs b/fractal-matrix-api/src/backend/stickers.rs
index b8a126e4..1d79e63d 100644
--- a/fractal-matrix-api/src/backend/stickers.rs
+++ b/fractal-matrix-api/src/backend/stickers.rs
@@ -43,11 +43,11 @@ pub fn list(bk: &Backend) -> Result<(), Error> {
                 let group = StickerGroup::from_json(sticker_group);
                 stickers.push(group);
             }
-            tx.send(BKResponse::Stickers(stickers))
+            tx.send(BKResponse::Stickers(Ok(stickers)))
                 .expect_log("Connection closed");
         },
         |err| {
-            tx.send(BKResponse::StickersError(err))
+            tx.send(BKResponse::Stickers(Err(err)))
                 .expect_log("Connection closed");
         }
     );
@@ -165,7 +165,7 @@ pub fn purchase(bk: &Backend, group: &StickerGroup) -> Result<(), Error> {
                 .expect_log("Connection closed");
         },
         |err| {
-            tx.send(BKResponse::StickersError(err))
+            tx.send(BKResponse::Stickers(Err(err)))
                 .expect_log("Connection closed");
         }
     );
diff --git a/fractal-matrix-api/src/backend/types.rs b/fractal-matrix-api/src/backend/types.rs
index eeb3c0e4..9bee493f 100644
--- a/fractal-matrix-api/src/backend/types.rs
+++ b/fractal-matrix-api/src/backend/types.rs
@@ -134,7 +134,7 @@ pub enum BKResponse {
     AddedToFav(Result<(String, bool), Error>),
     RoomNotifications(String, i32, i32),
     UserSearch(Vec<Member>),
-    Stickers(Vec<StickerGroup>),
+    Stickers(Result<Vec<StickerGroup>, Error>),
 
     //errors
     UserNameError(Error),
@@ -157,7 +157,6 @@ pub enum BKResponse {
     CommandError(Error),
     GetFileAsyncError(Error),
     InviteError(Error),
-    StickersError(Error),
 }
 
 #[derive(Debug, Clone, Copy)]