From ceaeadb84b25171ee1b6ac136e2ae77e5167bf99 Mon Sep 17 00:00:00 2001
From: Francesco Esposito <33671357+frab1t@users.noreply.github.com>
Date: Mon, 4 Mar 2019 20:07:46 +0100
Subject: [PATCH] fix error handling

---
 api.js    |  8 ++++----
 server.js | 15 ---------------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/api.js b/api.js
index 1f39493..4a91a2c 100644
--- a/api.js
+++ b/api.js
@@ -27,7 +27,7 @@ function getDevices() {
     .then(json => json)
     .catch((err) => {
       logger.logError(err);
-      return err;
+      throw err;
     });
 }
 
@@ -61,7 +61,7 @@ function getInfoDevice(deviceId) {
     })
     .catch((err) => {
       logger.logError(err);
-      return err;
+      throw err;
     });
 }
 
@@ -91,7 +91,7 @@ function addDevice(name) {
     .then(json => json)
     .catch((err) => {
       logger.logError(err);
-      return err;
+      throw err;
     });
 }
 
@@ -117,7 +117,7 @@ function removeDevice(deviceId) {
     .then(json => json)
     .catch((err) => {
       logger.logError(err);
-      return err;
+      throw err;
     });
 }
 
diff --git a/server.js b/server.js
index c83cb37..47ff870 100644
--- a/server.js
+++ b/server.js
@@ -37,9 +37,6 @@ bot.on('/list', (msg) => {
 
   api.getDevices()
     .then((res) => {
-      if (res instanceof Error) {
-        throw res;
-      }
       res.forEach((elem) => {
         bot.sendMessage(msg.from.id, templates.deviceList(elem), { parseMode: 'Markdown' });
       });
@@ -56,10 +53,6 @@ bot.on('/position', (msg) => {
 
   api.getDevices()
     .then((res) => {
-      if (res instanceof Error) {
-        throw res;
-      }
-
       const devices = [];
       res.forEach((device) => {
         devices.push(device.name);
@@ -80,10 +73,6 @@ bot.on('ask.devicePosition', (msg) => {
 
   api.getInfoDevice(msg.text)
     .then((res) => {
-      if (res instanceof Error) {
-        throw res;
-      }
-
       bot.sendLocation(msg.from.id, [res.position.latitude, res.position.longtitude]);
       bot.sendMessage(msg.from.id, templates.position(res), { parseMode: 'Markdown' });
     })
@@ -106,10 +95,6 @@ bot.on('ask.addDevice', (msg) => {
 
   api.addDevice(msg.text)
     .then((res) => {
-      if (res instanceof Error) {
-        throw res;
-      }
-
       bot.sendMessage(msg.from.id, templates.addDeviceURL(res));
       bot.sendMessage(msg.from.id, templates.addDeviceHeader());
       bot.sendMessage(msg.from.id, templates.addDeviceBody());