adjust controller and triggers.saveComment to a new way of errors

Lokiedu · Nov 5, 2016 · 04400ee · 04400ee
1 parent 51931c7
commit 04400ee
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/src/api/controller.js b/src/api/controller.js
@@ -3022,7 +3022,6 @@ export default class ApiController {
       }).fetch({ require: true });
     } catch (e) {
       ctx.status = 404;
-      ctx.body = { error: e.message };
       return;
     }
 

diff --git a/src/triggers/index.js b/src/triggers/index.js
@@ -762,16 +762,14 @@ export class ActionsTrigger {
     try {
       const responseBody = await this.client.saveComment(postId, commentId, text);
 
-      if (responseBody) {
-        if (responseBody.error) {
-          this.dispatch(a.comments.saveCommentFailure(postId, commentId, responseBody.error));
-        } else {
-          this.dispatch(a.comments.setPostComments(postId, responseBody));
-          this.dispatch(a.comments.saveCommentSuccess(postId, commentId));
-        }
-      }
+      this.dispatch(a.comments.setPostComments(postId, responseBody));
+      this.dispatch(a.comments.saveCommentSuccess(postId, commentId));
     } catch (e) {
-      this.dispatch(a.comments.saveCommentFailure(postId, commentId, e.message));
+      if (e.response && ('error' in e.response)) {
+        this.dispatch(a.comments.deleteCommentFailure(postId, commentId, e.response.error));
+      } else {
+        this.dispatch(a.comments.saveCommentFailure(postId, commentId, e.message));
+      }
     }
   };