Merge branch 'master' into story-138187767-mod-flag-names

models/user.js

@@ -157,7 +157,9 @@ const USER_GRAPH_OPERATIONS = [
   'mutation:editName',
   'mutation:setUserStatus',
   'mutation:suspendUser',
-  'mutation:setCommentStatus'
+  'mutation:setCommentStatus',
+  'mutation:addCommentTag',
+  'mutation:removeCommentTag'
 ];
 
 /**
@@ -177,6 +179,12 @@ UserSchema.method('can', function(...actions) {
     return false;
   }
 
+  // {add,remove}CommentTag - requires admin and/or moderator role
+  const userCanModifyTags = user => ['ADMIN', 'MODERATOR'].some(r => user.hasRoles(r));
+  if (actions.some(a => ['mutation:removeCommentTag', 'mutation:addCommentTag'].includes(a)) && ! userCanModifyTags(this)) {
+    return false;
+  }
+
   return true;
 });