Merge branch 'master' into ignored-users-reply

plugins/talk-plugin-akismet/errors.js

@@ -1,12 +1,16 @@
-const { APIError } = require('errors');
+const { TalkError } = require('errors');
 
 // ErrSpam is sent during a `CreateComment` mutation where
 // `input.checkSpam` is set to true and the comment contains
 // detected spam as determined by the akismet service.
-const ErrSpam = new APIError('Comment is spam', {
-  status: 400,
-  translation_key: 'COMMENT_IS_SPAM',
-});
+class ErrSpam extends TalkError {
+  constructor() {
+    super('Comment is spam', {
+      status: 400,
+      translation_key: 'COMMENT_IS_SPAM',
+    });
+  }
+}
 
 module.exports = {
   ErrSpam,

plugins/talk-plugin-akismet/index.js

@@ -100,7 +100,7 @@ module.exports = {
 
           if (spam) {
             if (input.checkSpam) {
-              throw ErrSpam;
+              throw new ErrSpam();
             }
 
             // Attach reason information for the flag being added.

plugins/talk-plugin-notifications/server/mutators.js

@@ -29,10 +29,11 @@ async function updateNotificationSettings(ctx, settings) {
 }
 
 module.exports = ctx => {
+  const { connectors: { errors: ErrNotAuthorized } } = ctx;
+
   let mutators = {
     User: {
-      updateNotificationSettings: () =>
-        Promise.reject(ctx.connectors.errors.ErrNotAuthorized),
+      updateNotificationSettings: () => Promise.reject(new ErrNotAuthorized()),
     },
   };
 

plugins/talk-plugin-toxic-comments/server/errors.js

@@ -1,12 +1,16 @@
-const { APIError } = require('errors');
+const { TalkError } = require('errors');
 
 // ErrToxic is sent during a `CreateComment` mutation where
 // `input.checkToxicity` is set to true and the comment contains
 // toxic language as determined by the perspective service.
-const ErrToxic = new APIError('Comment is toxic', {
-  status: 400,
-  translation_key: 'COMMENT_IS_TOXIC',
-});
+class ErrToxic extends TalkError {
+  constructor() {
+    super('Comment is toxic', {
+      status: 400,
+      translation_key: 'COMMENT_IS_TOXIC',
+    });
+  }
+}
 
 module.exports = {
   ErrToxic,

plugins/talk-plugin-toxic-comments/server/hooks.js

@@ -27,7 +27,7 @@ module.exports = {
 
         if (isToxic(scores)) {
           if (input.checkToxicity) {
-            throw ErrToxic;
+            throw new ErrToxic();
           }
 
           input.status = 'SYSTEM_WITHHELD';