diff --git a/graph/subscriptions.js b/graph/subscriptions.js index 47899e1e3..31b430523 100644 --- a/graph/subscriptions.js +++ b/graph/subscriptions.js @@ -11,10 +11,11 @@ const plugins = require('../services/plugins'); const {deserializeUser} = require('../services/subscriptions'); const { - SUBSCRIBE_COMMENT_STATUS, - SUBSCRIBE_COMMENT_FLAGS, - SUBSCRIBE_ALL_COMMENT_EDITS, - SUBSCRIBE_ALL_COMMENT_ADDITIONS, + SUBSCRIBE_COMMENT_ACCEPTED, + SUBSCRIBE_COMMENT_REJECTED, + SUBSCRIBE_COMMENT_FLAGGED, + SUBSCRIBE_ALL_COMMENT_EDITED, + SUBSCRIBE_ALL_COMMENT_ADDED, } = require('../perms/constants'); /** @@ -30,7 +31,7 @@ const setupFunctions = plugins.get('server', 'setupFunctions').reduce((acc, {plu commentAdded: (options, args) => ({ commentAdded: { filter: (comment, context) => { - if (!args.asset_id && (!context.user || !context.user.can(SUBSCRIBE_ALL_COMMENT_ADDITIONS))) { + if (!args.asset_id && (!context.user || !context.user.can(SUBSCRIBE_ALL_COMMENT_ADDED))) { return false; } return !args.asset_id || comment.asset_id === args.asset_id; @@ -40,7 +41,7 @@ const setupFunctions = plugins.get('server', 'setupFunctions').reduce((acc, {plu commentEdited: (options, args) => ({ commentEdited: { filter: (comment, context) => { - if (!args.asset_id && (!context.user || !context.user.can(SUBSCRIBE_ALL_COMMENT_EDITS))) { + if (!args.asset_id && (!context.user || !context.user.can(SUBSCRIBE_ALL_COMMENT_EDITED))) { return false; } return !args.asset_id || comment.asset_id === args.asset_id; @@ -50,7 +51,7 @@ const setupFunctions = plugins.get('server', 'setupFunctions').reduce((acc, {plu commentFlagged: (options, args) => ({ commentFlagged: { filter: ({comment}, context) => { - if (!context.user || !context.user.can(SUBSCRIBE_COMMENT_FLAGS)) { + if (!context.user || !context.user.can(SUBSCRIBE_COMMENT_FLAGGED)) { return false; } return !args.asset_id || comment.asset_id === args.asset_id; @@ -60,7 +61,7 @@ const setupFunctions = plugins.get('server', 'setupFunctions').reduce((acc, {plu commentAccepted: (options, args) => ({ commentAccepted: { filter: ({comment}, context) => { - if (!context.user || !context.user.can(SUBSCRIBE_COMMENT_STATUS)) { + if (!context.user || !context.user.can(SUBSCRIBE_COMMENT_ACCEPTED)) { return false; } return !args.asset_id || comment.asset_id === args.asset_id; @@ -70,7 +71,7 @@ const setupFunctions = plugins.get('server', 'setupFunctions').reduce((acc, {plu commentRejected: (options, args) => ({ commentRejected: { filter: ({comment}, context) => { - if (!context.user || !context.user.can(SUBSCRIBE_COMMENT_STATUS)) { + if (!context.user || !context.user.can(SUBSCRIBE_COMMENT_REJECTED)) { return false; } return !args.asset_id || comment.asset_id === args.asset_id; diff --git a/perms/constants.js b/perms/constants.js index 8f92c09a3..8be745f36 100644 --- a/perms/constants.js +++ b/perms/constants.js @@ -25,8 +25,9 @@ module.exports = { SEARCH_COMMENT_STATUS_HISTORY: 'SEARCH_COMMENT_STATUS_HISTORY', // subscriptions - SUBSCRIBE_COMMENT_STATUS: 'SUBSCRIBE_COMMENT_STATUS', - SUBSCRIBE_COMMENT_FLAGS: 'SUBSCRIBE_COMMENT_FLAGS', - SUBSCRIBE_ALL_COMMENT_ADDITIONS: 'SUBSCRIBE_ALL_COMMENT_ADDITIONS', - SUBSCRIBE_ALL_COMMENT_EDITS: 'SUBSCRIBE_ALL_COMMENT_EDITS', + SUBSCRIBE_COMMENT_ACCEPTED: 'SUBSCRIBE_COMMENT_ACCEPTED', + SUBSCRIBE_COMMENT_REJECTED: 'SUBSCRIBE_COMMENT_REJECTED', + SUBSCRIBE_COMMENT_FLAGGED: 'SUBSCRIBE_COMMENT_FLAGGED', + SUBSCRIBE_ALL_COMMENT_ADDED: 'SUBSCRIBE_ALL_COMMENT_ADDED', + SUBSCRIBE_ALL_COMMENT_EDITED: 'SUBSCRIBE_ALL_COMMENT_EDITED', }; diff --git a/perms/subscriptionReducer.js b/perms/subscriptionReducer.js index 218443ead..0b06902cf 100644 --- a/perms/subscriptionReducer.js +++ b/perms/subscriptionReducer.js @@ -3,13 +3,15 @@ const types = require('./constants'); module.exports = (user, perm) => { switch (perm) { - case types.SUBSCRIBE_COMMENT_FLAGS: + case types.SUBSCRIBE_COMMENT_FLAGGED: return check(user, ['ADMIN', 'MODERATOR']); - case types.SUBSCRIBE_COMMENT_STATUS: + case types.SUBSCRIBE_COMMENT_ACCEPTED: return check(user, ['ADMIN', 'MODERATOR']); - case types.SUBSCRIBE_ALL_COMMENT_EDITS: + case types.SUBSCRIBE_COMMENT_REJECTED: return check(user, ['ADMIN', 'MODERATOR']); - case types.SUBSCRIBE_ALL_COMMENT_ADDITIONS: + case types.SUBSCRIBE_ALL_COMMENT_EDITED: + return check(user, ['ADMIN', 'MODERATOR']); + case types.SUBSCRIBE_ALL_COMMENT_ADDED: return check(user, ['ADMIN', 'MODERATOR']); default: break;