From 1137fca3b4d5b6f059ae10cb757eed5f61da0e25 Mon Sep 17 00:00:00 2001
From: gaba <gabelula@gmail.com>
Date: Tue, 18 Apr 2017 14:03:26 -0700
Subject: [PATCH 001/264] Adds Tag Model that will be apply to different
 models.

---
 graph/resolvers/tag.js                       |  0
 models/comment.js                            | 22 ------
 models/tag.js                                | 64 +++++++++++++++++
 models/user.js                               |  6 +-
 services/comments.js                         | 67 ++++--------------
 services/mongoose.js                         |  1 +
 services/tags.js                             | 72 ++++++++++++++++++++
 test/server/graph/mutations/addCommentTag.js |  8 ++-
 8 files changed, 162 insertions(+), 78 deletions(-)
 create mode 100644 graph/resolvers/tag.js
 create mode 100644 models/tag.js
 create mode 100644 services/tags.js

diff --git a/graph/resolvers/tag.js b/graph/resolvers/tag.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/models/comment.js b/models/comment.js
index 0984a0832..09f592eca 100644
--- a/models/comment.js
+++ b/models/comment.js
@@ -30,27 +30,6 @@ const StatusSchema = new Schema({
   _id: false
 });
 
-/**
- * The Mongo schema for a Comment Tag.
- * @type {Schema}
- */
-const TagSchema = new Schema({
-  name: String,
-
-  // The User ID of the user that assigned the status.
-  assigned_by: {
-    type: String,
-    default: null
-  },
-
-  created_at: {
-    type: Date,
-    default: Date
-  }
-}, {
-  _id: false
-});
-
 /**
  * The Mongo schema for a Comment.
  * @type {Schema}
@@ -74,7 +53,6 @@ const CommentSchema = new Schema({
     enum: STATUSES,
     default: 'NONE'
   },
-  tags: [TagSchema],
   parent_id: String,
 
   // Additional metadata stored on the field.
diff --git a/models/tag.js b/models/tag.js
new file mode 100644
index 000000000..6991f3abb
--- /dev/null
+++ b/models/tag.js
@@ -0,0 +1,64 @@
+const mongoose = require('../services/mongoose');
+const uuid = require('uuid');
+const Schema = mongoose.Schema;
+
+// in settings
+// --> decide who can apply them (self, role, anyone) and
+
+// Who can see the tag (self, by role, anyone)
+const PRIVACY_TYPES = [
+  'ADMIN',
+  'SELF',
+  'PUBLIC'
+];
+
+// The type of item that the tag is apply on.
+const ITEM_TYPES = [
+  'ASSETS',
+  'COMMENTS',
+  'USERS'
+];
+
+/**
+ * The Mongo schema for a Comment Tag.
+ * @type {Schema}
+ */
+const TagSchema = new Schema({
+  id: {
+    type: String,
+    default: uuid.v4,
+    unique: true
+  },
+
+  name: {
+    type: String,
+    unique: true
+  },
+
+  item_type: {
+    type: String,
+    enum: ITEM_TYPES
+  },
+
+  item_id: String,
+
+  // The User ID of the user that assigned the status.
+  assigned_by: {
+    type: String,
+    default: null
+  },
+
+  privacy_type: {
+    type: String,
+    enum: PRIVACY_TYPES
+  },
+
+  // Additional metadata stored on the field.
+  metadata: Schema.Types.Mixed
+}, {
+  _id: false
+});
+
+const Tag = mongoose.model('Tag', TagSchema);
+
+module.exports = Tag;
diff --git a/models/user.js b/models/user.js
index 2663410a7..fdd3ed74a 100644
--- a/models/user.js
+++ b/models/user.js
@@ -185,7 +185,9 @@ const USER_GRAPH_OPERATIONS = [
   'mutation:suspendUser',
   'mutation:setCommentStatus',
   'mutation:addCommentTag',
-  'mutation:removeCommentTag'
+  'mutation:removeCommentTag',
+  'mutation:addUserTag',
+  'mutation:removeUserTag'
 ];
 
 /**
@@ -207,7 +209,7 @@ UserSchema.method('can', function(...actions) {
 
   // {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)) {
+  if (actions.some(a => ['mutation:removeCommentTag', 'mutation:addCommentTag', 'mutation:removeUserTag', 'mutation: addUserTag'].includes(a)) && ! userCanModifyTags(this)) {
     return false;
   }
 
diff --git a/services/comments.js b/services/comments.js
index 75b53873a..a7f483d2c 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -3,10 +3,8 @@ const CommentModel = require('../models/comment');
 const ActionModel = require('../models/action');
 const ActionsService = require('./actions');
 
-const ALLOWED_TAGS = [
-  {name: 'STAFF'},
-  {name: 'BEST'},
-];
+const TagModel = require('../models/tag');
+const TagsService = require('./tags');
 
 const STATUSES = [
   'ACCEPTED',
@@ -53,37 +51,14 @@ module.exports = class CommentsService {
    */
   static addTag(id, name, assigned_by) {
 
-    if (ALLOWED_TAGS.find((t) => t.name === name) == null) {
-      return Promise.reject(new Error('tag not allowed'));
-    }
+    return TagsService.insertCommentTag({
+      name,
+      item_id: id,
+      item_type: 'COMMENTS',
+      user_id: assigned_by,
+    });
 
-    const filter = {
-      id,
-      'tags.name': {$ne: name},
-    };
-    const update = {
-      $push: {tags: {
-        name,
-        assigned_by,
-        created_at: new Date()
-      }}
-    };
-    return CommentModel.update(filter, update)
-      .then(({nModified}) => {
-        switch (nModified) {
-        case 0:
-
-          // either the tag was already there, or the comment doesn't exist with that id...
-          throw new Error('Could not add tag to comment. Either the comment doesn\'t exist or the tag is already present.');
-        case 1:
-
-            // tag added
-          return;
-        default:
-
-          // this should never happen because no multi parameter and unique index on id
-        }
-      });
+    // Add the ID to the comment
   }
 
   /**
@@ -93,25 +68,11 @@ module.exports = class CommentsService {
    * @param {String} name the name of the tag to add
    */
   static removeTag(id, name) {
-    const filter = {
-      id,
-      'tags.name': name,
-    };
-    const update = {$pull: {tags: {name}}};
-    return CommentModel.update(filter, update)
-      .then(({nModified}) => {
-        switch (nModified) {
-        case 0:
-          throw new Error('Could not remove tag from comment. Either the comment doesn\'t exist or the tag is not present');
-        case 1:
-
-            // tag removed
-          return;
-        default:
-
-          // this should never happen because no multi parameter and unique index on id
-        }
-      });
+    return TagModel.remove({
+      item_type: 'COMMENTS',
+      item_id: id,
+      name
+    });
   }
 
   /**
diff --git a/services/mongoose.js b/services/mongoose.js
index c7092326f..206075239 100644
--- a/services/mongoose.js
+++ b/services/mongoose.js
@@ -65,4 +65,5 @@ require('../models/action');
 require('../models/asset');
 require('../models/comment');
 require('../models/setting');
+require('../models/tag');
 require('../models/user');
diff --git a/services/tags.js b/services/tags.js
new file mode 100644
index 000000000..caeb4e761
--- /dev/null
+++ b/services/tags.js
@@ -0,0 +1,72 @@
+const TagModel = require('../models/tag');
+
+const ALLOWED_COMMENT_TAGS = [
+  {name: 'STAFF'},
+  {name: 'BEST'},
+];
+
+module.exports = class TagsService {
+
+  /**
+   * Finds an action by the id.
+   * @param {String} id  identifier of the tag (uuid)
+  */
+  static findById(id) {
+    return TagModel.findOne({id});
+  }
+
+  /**
+   * Add a tag.
+   * @param {string} name the actual tag
+   * @param {String} item_id  identifier of the comment  (uuid)
+   * @param {String} item_type  type of the object being tag  (COMMENTS)
+   * @param {String} user_id  user id that assigned the tag (uuid)
+   * @param {String} privacy_type visibility of the tag on the comment
+   * @return {Promise}
+   */
+  static insertCommentTag(tag) {
+
+    if (ALLOWED_COMMENT_TAGS.find((t) => t.name === tag.name) == null) {
+      return Promise.reject(new Error('tag not allowed'));
+    }
+
+    // Tags are made unique by using a query that can be reproducable, i.e.,
+    // not containing user inputable values.
+    let query = {
+      name: tag.name,
+      item_id: tag.item_id,
+      item_type: tag.item_type,
+      assigned_by: tag.user_id,
+      privacy_type: tag.privacy_type
+    };
+
+    // Create/Update the tag.
+    return TagModel.findOneAndUpdate(query, tag, {
+
+      // Ensure that if it's new, we return the new object created.
+      new: true,
+
+      // Perform an upsert in the event that this doesn't exist.
+      upsert: true,
+
+      // Set the default values if not provided based on the mongoose models.
+      setDefaultsOnInsert: true
+    })
+    .then(({nModified}) => {
+      switch (nModified) {
+      case 0:
+
+        // either the tag was already there, or the comment doesn't exist with that id...
+        throw new Error('Could not add tag to comment. Either the comment doesn\'t exist or the tag is already present.');
+      case 1:
+
+          // tag added
+        return;
+      default:
+
+        // this should never happen because no multi parameter and unique index on id
+      }
+    });
+  }
+
+};
diff --git a/test/server/graph/mutations/addCommentTag.js b/test/server/graph/mutations/addCommentTag.js
index 018e96631..fbb7fe8a8 100644
--- a/test/server/graph/mutations/addCommentTag.js
+++ b/test/server/graph/mutations/addCommentTag.js
@@ -4,6 +4,7 @@ const {graphql} = require('graphql');
 const schema = require('../../../../graph/schema');
 const Context = require('../../../../graph/context');
 const UserModel = require('../../../../models/user');
+const TagModel = require('../../../../models/tag');
 const SettingsService = require('../../../../services/settings');
 const CommentsService = require('../../../../services/comments');
 
@@ -37,7 +38,12 @@ describe('graph.mutations.addCommentTag', () => {
       console.error(response.errors);
     }
     expect(response.errors).to.be.empty;
-    expect(response.data.addCommentTag.comment.tags).to.deep.equal([{name: 'BEST'}]);
+    TagModel.find({
+      item_id: response.data.addCommentTag.comment.id,
+      name: 'BEST'
+    }).then((tags) => {
+      expect(tags).to.have.length(1);
+    });
   });
 
   describe('users who cant add tags', () => {

From bd72bfc6ecd5a5f5b888aff7b97f8f069fada01e Mon Sep 17 00:00:00 2001
From: gaba <gabelula@gmail.com>
Date: Thu, 20 Apr 2017 12:24:08 -0700
Subject: [PATCH 002/264] Fix tests related to tags on comments.

---
 graph/loaders/index.js                        |  2 +
 graph/loaders/tags.js                         | 37 ++++++++++++
 graph/mutators/comment.js                     | 14 ++---
 models/tag.js                                 | 10 +++-
 services/comments.js                          | 27 ++++++---
 services/tags.js                              | 59 +++++++++----------
 test/server/graph/mutations/addCommentTag.js  | 13 ++--
 test/server/graph/mutations/createComment.js  | 14 +++--
 .../graph/mutations/removeCommentTag.js       | 16 +++--
 test/server/services/comments.js              | 28 +++++----
 10 files changed, 139 insertions(+), 81 deletions(-)
 create mode 100644 graph/loaders/tags.js

diff --git a/graph/loaders/index.js b/graph/loaders/index.js
index 26727940f..8bc170c6d 100644
--- a/graph/loaders/index.js
+++ b/graph/loaders/index.js
@@ -6,6 +6,7 @@ const Assets = require('./assets');
 const Comments = require('./comments');
 const Metrics = require('./metrics');
 const Settings = require('./settings');
+const Tags = require('./tags');
 const Users = require('./users');
 
 const plugins = require('../../services/plugins');
@@ -18,6 +19,7 @@ let loaders = [
   Comments,
   Metrics,
   Settings,
+  Tags,
   Users,
 
   // Load the plugin loaders from the manager.
diff --git a/graph/loaders/tags.js b/graph/loaders/tags.js
new file mode 100644
index 000000000..b76bc36bd
--- /dev/null
+++ b/graph/loaders/tags.js
@@ -0,0 +1,37 @@
+const DataLoader = require('dataloader');
+
+const util = require('./util');
+
+const TagsService = require('../../services/tags');
+const TagModel = require('../../models/tag');
+
+/**
+ * Gets tags based on their item id's.
+ */
+const genTagsByItemID = (_, item_ids) => {
+  return TagsService
+    .findByItemIdArray(item_ids)
+    .then(util.arrayJoinBy(item_ids, 'item_id'));
+};
+
+/**
+ * Search for tags based on their item_type and ensures that
+ * the tags returned have unique item id's.
+ * @param  {String} item_type   the item id to search by
+ * @return {Promise}            resolves to distinct items tags
+ */
+const getItemIdsByItemType = (_, item_type) => {
+  return TagModel.distinct('item_id', {item_type});
+};
+
+/**
+ * Creates a set of loaders based on a GraphQL context.
+ * @param  {Object} context the context of the GraphQL request
+ * @return {Object}         object of loaders
+ */
+module.exports = (context) => ({
+  Tags: {
+    getByID: new DataLoader((ids) => genTagsByItemID(context, ids)),
+    getByTypes: ({item_type}) => getItemIdsByItemType(context, item_type)
+  }
+});
diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index 728603ae2..930417c5c 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -5,6 +5,8 @@ const ActionsService = require('../../services/actions');
 const CommentsService = require('../../services/comments');
 const linkify = require('linkify-it')();
 
+const TagModel = require('../../models/tag');
+
 const Wordlist = require('../../services/wordlist');
 
 /**
@@ -18,20 +20,18 @@ const Wordlist = require('../../services/wordlist');
  */
 const createComment = ({user, loaders: {Comments}}, {body, asset_id, parent_id = null}, status = 'NONE') => {
 
-  let tags = [];
-  if (user.hasRoles('ADMIN') || user.hasRoles('MODERATOR')) {
-    tags = [{name: 'STAFF'}];
-  }
-
   return CommentsService.publicCreate({
     body,
     asset_id,
     parent_id,
     status,
-    tags,
     author_id: user.id
   })
-  .then((comment) => {
+  .then(async (comment) => {
+
+    if (user.hasRoles('ADMIN') || user.hasRoles('MODERATOR')) {
+      await CommentsService.addTag(comment.id, 'STAFF', user.id);
+    }
 
     // If the loaders are present, clear the caches for these values because we
     // just added a new comment, hence the counts should be updated. We should
diff --git a/models/tag.js b/models/tag.js
index 6991f3abb..155e57dbb 100644
--- a/models/tag.js
+++ b/models/tag.js
@@ -50,13 +50,17 @@ const TagSchema = new Schema({
 
   privacy_type: {
     type: String,
-    enum: PRIVACY_TYPES
+    enum: PRIVACY_TYPES,
+    default: 'SELF'
   },
 
   // Additional metadata stored on the field.
   metadata: Schema.Types.Mixed
-}, {
-  _id: false
+},  {
+  timestamps: {
+    createdAt: 'created_at',
+    updatedAt: 'updated_at'
+  }
 });
 
 const Tag = mongoose.model('Tag', TagSchema);
diff --git a/services/comments.js b/services/comments.js
index a7f483d2c..d61b6ca25 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -3,8 +3,8 @@ const CommentModel = require('../models/comment');
 const ActionModel = require('../models/action');
 const ActionsService = require('./actions');
 
-const TagModel = require('../models/tag');
 const TagsService = require('./tags');
+const TagModel = require('../models/tag');
 
 const STATUSES = [
   'ACCEPTED',
@@ -51,14 +51,18 @@ module.exports = class CommentsService {
    */
   static addTag(id, name, assigned_by) {
 
-    return TagsService.insertCommentTag({
-      name,
-      item_id: id,
-      item_type: 'COMMENTS',
-      user_id: assigned_by,
+    return CommentModel.findOne({id})
+    .then((comment) => {
+      if (comment == null) {
+        return Promise.reject(new Error('tag not allowed'));
+      }
+      return TagsService.insertCommentTag({
+        name,
+        item_id: id,
+        item_type: 'COMMENTS',
+        user_id: assigned_by,
+      });
     });
-
-    // Add the ID to the comment
   }
 
   /**
@@ -68,10 +72,15 @@ module.exports = class CommentsService {
    * @param {String} name the name of the tag to add
    */
   static removeTag(id, name) {
-    return TagModel.remove({
+    return TagModel.findOneAndRemove({
       item_type: 'COMMENTS',
       item_id: id,
       name
+    })
+    .then((tag) => {
+      if (tag == null) {
+        return Promise.reject(new Error('tag does not exist'));
+      }
     });
   }
 
diff --git a/services/tags.js b/services/tags.js
index caeb4e761..172148727 100644
--- a/services/tags.js
+++ b/services/tags.js
@@ -8,13 +8,26 @@ const ALLOWED_COMMENT_TAGS = [
 module.exports = class TagsService {
 
   /**
-   * Finds an action by the id.
+   * Finds a tag by the id.
    * @param {String} id  identifier of the tag (uuid)
   */
   static findById(id) {
     return TagModel.findOne({id});
   }
 
+  /**
+   * Finds atag by the item_id and name.
+   * @param {String} item_id  identifier of the item that the tag was applied into(uuid)
+   * @param {string} name name of the tag
+  */
+  static findByItemIdAndName(item_id, name, item_type) {
+    return TagModel.find({
+      item_id,
+      item_type,
+      name
+    });
+  }
+
   /**
    * Add a tag.
    * @param {string} name the actual tag
@@ -30,43 +43,25 @@ module.exports = class TagsService {
       return Promise.reject(new Error('tag not allowed'));
     }
 
-    // Tags are made unique by using a query that can be reproducable, i.e.,
-    // not containing user inputable values.
-    let query = {
+    // // Tags are made unique by using a query that can be reproducable, i.e.,
+    // // not containing user inputable values.
+    // let query = {
+    //   name: tag.name,
+    //   item_id: tag.item_id,
+    //   item_type: tag.item_type,
+    //   assigned_by: tag.user_id,
+    //   privacy_type: tag.privacy_type
+    // };
+
+    // Create/Update the tag.
+    let newtag = new TagModel({
       name: tag.name,
       item_id: tag.item_id,
       item_type: tag.item_type,
       assigned_by: tag.user_id,
       privacy_type: tag.privacy_type
-    };
-
-    // Create/Update the tag.
-    return TagModel.findOneAndUpdate(query, tag, {
-
-      // Ensure that if it's new, we return the new object created.
-      new: true,
-
-      // Perform an upsert in the event that this doesn't exist.
-      upsert: true,
-
-      // Set the default values if not provided based on the mongoose models.
-      setDefaultsOnInsert: true
-    })
-    .then(({nModified}) => {
-      switch (nModified) {
-      case 0:
-
-        // either the tag was already there, or the comment doesn't exist with that id...
-        throw new Error('Could not add tag to comment. Either the comment doesn\'t exist or the tag is already present.');
-      case 1:
-
-          // tag added
-        return;
-      default:
-
-        // this should never happen because no multi parameter and unique index on id
-      }
     });
+    return newtag.save();
   }
 
 };
diff --git a/test/server/graph/mutations/addCommentTag.js b/test/server/graph/mutations/addCommentTag.js
index fbb7fe8a8..063537004 100644
--- a/test/server/graph/mutations/addCommentTag.js
+++ b/test/server/graph/mutations/addCommentTag.js
@@ -4,7 +4,7 @@ const {graphql} = require('graphql');
 const schema = require('../../../../graph/schema');
 const Context = require('../../../../graph/context');
 const UserModel = require('../../../../models/user');
-const TagModel = require('../../../../models/tag');
+const TagService = require('../../../../services/tags');
 const SettingsService = require('../../../../services/settings');
 const CommentsService = require('../../../../services/comments');
 
@@ -19,9 +19,7 @@ describe('graph.mutations.addCommentTag', () => {
     mutation AddCommentTag ($id: ID!, $tag: String!) {
       addCommentTag(id:$id, tag:$tag) {
         comment {
-          tags {
-            name
-          }
+          id
         }
         errors {
           translation_key
@@ -38,10 +36,9 @@ describe('graph.mutations.addCommentTag', () => {
       console.error(response.errors);
     }
     expect(response.errors).to.be.empty;
-    TagModel.find({
-      item_id: response.data.addCommentTag.comment.id,
-      name: 'BEST'
-    }).then((tags) => {
+
+    return TagService.findByItemIdAndName(response.data.addCommentTag.comment.id, 'BEST', 'COMMENTS')
+    .then((tags) => {
       expect(tags).to.have.length(1);
     });
   });
diff --git a/test/server/graph/mutations/createComment.js b/test/server/graph/mutations/createComment.js
index b3bdd459a..11fa666d0 100644
--- a/test/server/graph/mutations/createComment.js
+++ b/test/server/graph/mutations/createComment.js
@@ -3,11 +3,14 @@ const {graphql} = require('graphql');
 
 const schema = require('../../../../graph/schema');
 const Context = require('../../../../graph/context');
+
 const UserModel = require('../../../../models/user');
 const AssetModel = require('../../../../models/asset');
-const SettingsService = require('../../../../services/settings');
 const ActionModel = require('../../../../models/action');
 
+const SettingsService = require('../../../../services/settings');
+const TagService = require('../../../../services/tags');
+
 describe('graph.mutations.createComment', () => {
   beforeEach(() => SettingsService.init());
 
@@ -217,11 +220,14 @@ describe('graph.mutations.createComment', () => {
               expect(data.createComment).to.have.property('comment').not.null;
               expect(data.createComment).to.have.property('errors').null;
 
+              return TagService.findByItemIdAndName(data.createComment.comment.id, tag, 'COMMENTS');
+            })
+            .then((tags) => {
               if (tag) {
-                expect(data.createComment.comment).to.have.property('tags').length(1);
-                expect(data.createComment.comment.tags[0]).to.have.property('name', tag);
+                expect(tags).to.have.length(1);
+                expect(tags[0]).to.have.property('name', tag);
               } else {
-                expect(data.createComment.comment).to.have.property('tags').length(0);
+                expect(tags).length(0);
               }
             });
         });
diff --git a/test/server/graph/mutations/removeCommentTag.js b/test/server/graph/mutations/removeCommentTag.js
index c0d452f37..4455a0108 100644
--- a/test/server/graph/mutations/removeCommentTag.js
+++ b/test/server/graph/mutations/removeCommentTag.js
@@ -4,8 +4,10 @@ const {graphql} = require('graphql');
 const schema = require('../../../../graph/schema');
 const Context = require('../../../../graph/context');
 const UserModel = require('../../../../models/user');
+
 const SettingsService = require('../../../../services/settings');
 const CommentsService = require('../../../../services/comments');
+const TagService = require('../../../../services/tags');
 
 describe('graph.mutations.removeCommentTag', () => {
   let comment;
@@ -18,9 +20,7 @@ describe('graph.mutations.removeCommentTag', () => {
     mutation RemoveCommentTag ($id: ID!, $tag: String!) {
       removeCommentTag(id:$id, tag:$tag) {
         comment {
-          tags {
-            name
-          }
+          id
         }
         errors {
           translation_key
@@ -41,7 +41,12 @@ describe('graph.mutations.removeCommentTag', () => {
     }
     expect(response.errors).to.be.empty;
     expect(response.data.removeCommentTag.errors).to.be.null;
-    expect(response.data.removeCommentTag.comment.tags).to.deep.equal([]);
+
+    TagService.findByItemIdAndName(response.data.removeCommentTag.comment.id, 'BEST')
+    .then((tags) => {
+      expect(tags).to.deep.equal([]);
+    });
+
   });
 
   describe('users who cant remove tags', () => {
@@ -60,8 +65,9 @@ describe('graph.mutations.removeCommentTag', () => {
           console.error(response.errors);
         }
         expect(response.errors).to.be.empty;
+
         expect(response.data.removeCommentTag.errors).to.deep.equal([{'translation_key':'NOT_AUTHORIZED'}]);
-        expect(response.data.removeCommentTag.comment).to.be.null;        
+        expect(response.data.removeCommentTag.comment).to.be.null;
       });
     });
   });
diff --git a/test/server/services/comments.js b/test/server/services/comments.js
index 5b9cbf4d1..952e071a3 100644
--- a/test/server/services/comments.js
+++ b/test/server/services/comments.js
@@ -5,6 +5,7 @@ const ActionsService = require('../../../services/actions');
 const UsersService = require('../../../services/users');
 const SettingsService = require('../../../services/settings');
 const CommentsService = require('../../../services/comments');
+const TagService = require('../../../services/tags');
 
 const settings = {id: '1', moderation: 'PRE', wordlist: {banned: ['bad words'], suspect: ['suspect words']}};
 
@@ -225,16 +226,17 @@ describe('services.CommentsService', () => {
       const tagName = 'BEST';
       const userId = users[0].id;
       await CommentsService.addTag(commentId, tagName, userId);
-      const updatedComment = await CommentsService.findById(commentId);
-      expect(updatedComment.tags.length).to.equal(1);
-      expect(updatedComment.tags[0].name).to.equal(tagName);
-      expect(updatedComment.tags[0].assigned_by).to.equal(userId);
-      expect(updatedComment.tags[0].created_at).to.be.an.instanceof(Date);
+      const tags = await TagService.findByItemIdAndName(commentId, 'BEST', 'COMMENTS');
+      expect(tags.length).to.equal(1);
+      expect(tags[0].name).to.equal(tagName);
+      expect(tags[0].assigned_by).to.equal(userId);
+      expect(tags[0].created_at).to.be.an.instanceof(Date);
     });
     it('can\'t add a tag to comment id that doesn\'t exist', async () => {
       const commentId = 'fakenews';
       const tagName = 'BEST';
       const userId = users[0].id;
+
       await expect(CommentsService.addTag(commentId, tagName, userId)).to.be.rejected;
     });
     it('can\'t add same tag.name twice', async () => {
@@ -255,23 +257,23 @@ describe('services.CommentsService', () => {
       const commentId = comments[0].id;
       const tagName = 'BEST';
       await CommentsService.addTag(commentId, tagName, users[0].id);
-      const updatedComment = await CommentsService.findById(commentId);
-      expect(updatedComment.tags.length).to.equal(1);
+      const tags = await TagService.findByItemIdAndName(commentId, tagName, 'COMMENTS');
+      expect(tags.length).to.equal(1);
 
       // ok now to remove it
       await CommentsService.removeTag(commentId, tagName);
-      const updatedComment2 = await CommentsService.findById(commentId);
-      expect(updatedComment2.tags.length).to.equal(0);
+      const tags2 = await TagService.findByItemIdAndName(commentId, tagName, 'COMMENTS');
+      expect(tags2.length).to.equal(0);
     });
     it('throws if removing a tag that isn\'t there', async () => {
       const commentId = comments[0].id;
 
-      // just make sure it has no tags to start
-      const updatedComment2 = await CommentsService.findById(commentId);
-      expect(updatedComment2.tags.length).to.equal(0);
-
       const tagName = 'BEST';
 
+      // just make sure it has no tags to start
+      const tags = await TagService.findByItemIdAndName(commentId, tagName, 'COMMENTS');
+      expect(tags.length).to.equal(0);
+      
       // ok now to remove it
       await expect(CommentsService.removeTag(commentId, tagName)).to.be.rejected;
     });

From 8458a9aecc160cca60e88d7809026395a2d9bb91 Mon Sep 17 00:00:00 2001
From: gaba <gabelula@gmail.com>
Date: Thu, 20 Apr 2017 12:29:21 -0700
Subject: [PATCH 003/264] fixed lint error.

---
 graph/mutators/comment.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index 930417c5c..096db4913 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -5,8 +5,6 @@ const ActionsService = require('../../services/actions');
 const CommentsService = require('../../services/comments');
 const linkify = require('linkify-it')();
 
-const TagModel = require('../../models/tag');
-
 const Wordlist = require('../../services/wordlist');
 
 /**

From 962a9bd6c91fed0e6674d4e7076a86e21a90bf21 Mon Sep 17 00:00:00 2001
From: gaba <gabelula@gmail.com>
Date: Thu, 20 Apr 2017 14:42:57 -0700
Subject: [PATCH 004/264] That was so so so silly...

---
 models/tag.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/models/tag.js b/models/tag.js
index 155e57dbb..b6e29a6ab 100644
--- a/models/tag.js
+++ b/models/tag.js
@@ -32,7 +32,6 @@ const TagSchema = new Schema({
 
   name: {
     type: String,
-    unique: true
   },
 
   item_type: {

From 91af8c2ecec35c275d3867876f058aab6ab1832b Mon Sep 17 00:00:00 2001
From: gaba <gabelula@gmail.com>
Date: Fri, 21 Apr 2017 10:34:57 -0700
Subject: [PATCH 005/264] Index on Tag for name, item id, item type.

---
 graph/loaders/tags.js      |  4 ++--
 graph/resolvers/comment.js |  7 +++++--
 models/tag.js              | 10 ++++++++++
 services/tags.js           | 16 ++++++++++++++++
 4 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/graph/loaders/tags.js b/graph/loaders/tags.js
index b76bc36bd..cb767fdf6 100644
--- a/graph/loaders/tags.js
+++ b/graph/loaders/tags.js
@@ -8,7 +8,7 @@ const TagModel = require('../../models/tag');
 /**
  * Gets tags based on their item id's.
  */
-const genTagsByItemID = (_, item_ids) => {
+const getByItemID = (_, item_ids) => {
   return TagsService
     .findByItemIdArray(item_ids)
     .then(util.arrayJoinBy(item_ids, 'item_id'));
@@ -31,7 +31,7 @@ const getItemIdsByItemType = (_, item_type) => {
  */
 module.exports = (context) => ({
   Tags: {
-    getByID: new DataLoader((ids) => genTagsByItemID(context, ids)),
+    getByID: new DataLoader((ids) => getByItemID(context, ids)),
     getByTypes: ({item_type}) => getItemIdsByItemType(context, item_type)
   }
 });
diff --git a/graph/resolvers/comment.js b/graph/resolvers/comment.js
index 19ea11efe..f94cfaf52 100644
--- a/graph/resolvers/comment.js
+++ b/graph/resolvers/comment.js
@@ -6,6 +6,9 @@ const Comment = {
 
     return Comments.get.load(parent_id);
   },
+  tags({id}, _, {loaders: {Tags}}) {
+    return Tags.getByID.load([id]);
+  },
   user({author_id}, _, {loaders: {Users}}) {
     return Users.getByID.load(author_id);
   },
@@ -23,9 +26,9 @@ const Comment = {
   },
   replyCount({id}, {excludeIgnored}, {user, loaders: {Comments}}) {
     if (user && excludeIgnored) {
-      return Comments.countByParentIDPersonalized({id, excludeIgnored});      
+      return Comments.countByParentIDPersonalized({id, excludeIgnored});
     }
-    return Comments.countByParentID.load(id);      
+    return Comments.countByParentID.load(id);
   },
   actions({id}, _, {user, loaders: {Actions}}) {
 
diff --git a/models/tag.js b/models/tag.js
index b6e29a6ab..85bb0845a 100644
--- a/models/tag.js
+++ b/models/tag.js
@@ -62,6 +62,16 @@ const TagSchema = new Schema({
   }
 });
 
+// Add the indixies on the tag on an item.
+TagSchema.index({
+  'item_type': 1,
+  'item_id': 1,
+  'name': 1
+}, {
+  unique: true,
+  background: false
+});
+
 const Tag = mongoose.model('Tag', TagSchema);
 
 module.exports = Tag;
diff --git a/services/tags.js b/services/tags.js
index 172148727..c4010e562 100644
--- a/services/tags.js
+++ b/services/tags.js
@@ -28,6 +28,22 @@ module.exports = class TagsService {
     });
   }
 
+  /**
+   * Finds actions in an array of ids.
+   * @param {String} ids array of user identifiers (uuid)
+  */
+  static async findByItemIdArray(item_ids) {
+    let tags = await TagModel.find({
+      'item_id': {$in: item_ids}
+    });
+
+    if (tags === null) {
+      return [];
+    }
+
+    return tags;
+  }
+
   /**
    * Add a tag.
    * @param {string} name the actual tag

From c4ffe58f585e66a5a863d6020dc633677919d97f Mon Sep 17 00:00:00 2001
From: gaba <gabelula@gmail.com>
Date: Fri, 21 Apr 2017 14:30:41 -0700
Subject: [PATCH 006/264] Adds privacy type to the methods to add tags.

---
 graph/mutators/comment.js                      |  6 +++---
 graph/resolvers/root_mutation.js               |  4 ++--
 graph/typeDefs.graphql                         |  2 +-
 services/comments.js                           |  3 ++-
 services/tags.js                               | 18 +++++++++---------
 test/server/graph/mutations/addCommentTag.js   |  8 ++++----
 .../server/graph/mutations/removeCommentTag.js |  4 ++--
 test/server/services/comments.js               | 12 ++++++------
 8 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index 0290d9f16..724e71917 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -28,7 +28,7 @@ const createComment = ({user, loaders: {Comments}}, {body, asset_id, parent_id =
   .then(async (comment) => {
 
     if (user.hasRoles('ADMIN') || user.hasRoles('MODERATOR')) {
-      await CommentsService.addTag(comment.id, 'STAFF', user.id);
+      await CommentsService.addTag(comment.id, 'STAFF', user.id, 'PUBLIC');
     }
 
     // If the loaders are present, clear the caches for these values because we
@@ -202,8 +202,8 @@ const setCommentStatus = ({loaders: {Comments}}, {id, status}) => {
  * @param {String} id          identifier of the comment  (uuid)
  * @param {String} tag     name of the tag
  */
-const addCommentTag = ({user, loaders: {Comments}}, {id, tag}) => {
-  return CommentsService.addTag(id, tag, user.id);
+const addCommentTag = ({user, loaders: {Comments}}, {id, tag, privacy_type}) => {
+  return CommentsService.addTag(id, tag, user.id, privacy_type);
 };
 
 /**
diff --git a/graph/resolvers/root_mutation.js b/graph/resolvers/root_mutation.js
index 661cc9f96..d669869cd 100644
--- a/graph/resolvers/root_mutation.js
+++ b/graph/resolvers/root_mutation.js
@@ -32,8 +32,8 @@ const RootMutation = {
   setCommentStatus(_, {id, status}, {mutators: {Comment}}) {
     return wrapResponse(null)(Comment.setCommentStatus({id, status}));
   },
-  addCommentTag(_, {id, tag}, {mutators: {Comment}}) {
-    return wrapResponse('comment')(Comment.addCommentTag({id, tag}).then(() => CommentsService.findById(id)));
+  addCommentTag(_, {id, tag, privacy_type}, {mutators: {Comment}}) {
+    return wrapResponse('comment')(Comment.addCommentTag({id, tag, privacy_type}).then(() => CommentsService.findById(id)));
   },
   removeCommentTag(_, {id, tag}, {mutators: {Comment}}) {
     return wrapResponse('comment')(Comment.removeCommentTag({id, tag}).then(() => CommentsService.findById(id)));
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 32c2c16c2..200e752b6 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -808,7 +808,7 @@ type RootMutation {
   setCommentStatus(id: ID!, status: COMMENT_STATUS!): SetCommentStatusResponse
 
   # Add tag to comment.
-  addCommentTag(id: ID!, tag: String!): AddCommentTagResponse
+  addCommentTag(id: ID!, tag: String!, privacy_type: String!): AddCommentTagResponse
 
   # Remove tag from comment.
   removeCommentTag(id: ID!, tag: String!): RemoveCommentTagResponse
diff --git a/services/comments.js b/services/comments.js
index d61b6ca25..ccb5a9131 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -49,7 +49,7 @@ module.exports = class CommentsService {
    * @param {String} name the name of the tag to add
    * @param {String} assigned_by the user id for the user who added the tag
    */
-  static addTag(id, name, assigned_by) {
+  static addTag(id, name, assigned_by, privacy_type) {
 
     return CommentModel.findOne({id})
     .then((comment) => {
@@ -61,6 +61,7 @@ module.exports = class CommentsService {
         item_id: id,
         item_type: 'COMMENTS',
         user_id: assigned_by,
+        privacy_type
       });
     });
   }
diff --git a/services/tags.js b/services/tags.js
index c4010e562..5cd0a09e1 100644
--- a/services/tags.js
+++ b/services/tags.js
@@ -5,6 +5,12 @@ const ALLOWED_COMMENT_TAGS = [
   {name: 'BEST'},
 ];
 
+const ALLOWED_PRIVACY_TYPE = [
+  {privacy_type: 'PUBLIC'},
+  {privacy_type: 'SELF'},
+  {privacy_type: 'ADMIN'}
+];
+
 module.exports = class TagsService {
 
   /**
@@ -59,15 +65,9 @@ module.exports = class TagsService {
       return Promise.reject(new Error('tag not allowed'));
     }
 
-    // // Tags are made unique by using a query that can be reproducable, i.e.,
-    // // not containing user inputable values.
-    // let query = {
-    //   name: tag.name,
-    //   item_id: tag.item_id,
-    //   item_type: tag.item_type,
-    //   assigned_by: tag.user_id,
-    //   privacy_type: tag.privacy_type
-    // };
+    if (ALLOWED_PRIVACY_TYPE.find((p) => p.privacy_type === tag.privacy_type) == null) {
+      return Promise.reject(new Error('privacy type not allowed'));
+    }
 
     // Create/Update the tag.
     let newtag = new TagModel({
diff --git a/test/server/graph/mutations/addCommentTag.js b/test/server/graph/mutations/addCommentTag.js
index 063537004..01966bd88 100644
--- a/test/server/graph/mutations/addCommentTag.js
+++ b/test/server/graph/mutations/addCommentTag.js
@@ -16,8 +16,8 @@ describe('graph.mutations.addCommentTag', () => {
   });
 
   const query = `
-    mutation AddCommentTag ($id: ID!, $tag: String!) {
-      addCommentTag(id:$id, tag:$tag) {
+    mutation AddCommentTag ($id: ID!, $tag: String!, $privacy_type: String!) {
+      addCommentTag(id:$id, tag:$tag, privacy_type:$privacy_type) {
         comment {
           id
         }
@@ -31,7 +31,7 @@ describe('graph.mutations.addCommentTag', () => {
   it('moderators can add tags to comments', async () => {
     const user = new UserModel({roles: ['MODERATOR' ]});
     const context = new Context({user});
-    const response = await graphql(schema, query, {}, context, {id: comment.id, tag: 'BEST'});
+    const response = await graphql(schema, query, {}, context, {id: comment.id, tag: 'BEST', privacy_type: 'PUBLIC'});
     if (response.errors && response.errors.length) {
       console.error(response.errors);
     }
@@ -51,7 +51,7 @@ describe('graph.mutations.addCommentTag', () => {
     }).forEach(([ userDescription, user ]) => {
       it(userDescription, async function () {
         const context = new Context({user});
-        const response = await graphql(schema, query, {}, context, {id: comment.id, tag: 'BEST'});
+        const response = await graphql(schema, query, {}, context, {id: comment.id, tag: 'BEST', privacy_type: 'PUBLIC'});
         if (response.errors && response.errors.length) {
           console.error(response.errors);
         }
diff --git a/test/server/graph/mutations/removeCommentTag.js b/test/server/graph/mutations/removeCommentTag.js
index 4455a0108..7660eef35 100644
--- a/test/server/graph/mutations/removeCommentTag.js
+++ b/test/server/graph/mutations/removeCommentTag.js
@@ -34,7 +34,7 @@ describe('graph.mutations.removeCommentTag', () => {
     const context = new Context({user});
 
     // add a tag first
-    await CommentsService.addTag(comment.id, 'BEST');
+    await CommentsService.addTag(comment.id, 'BEST', user.id, 'PUBLIC');
     const response = await graphql(schema, query, {}, context, {id: comment.id, tag: 'BEST'});
     if (response.errors && response.errors.length) {
       console.error(response.errors);
@@ -59,7 +59,7 @@ describe('graph.mutations.removeCommentTag', () => {
         const context = new Context({user});
 
         // add a tag first
-        await CommentsService.addTag(comment.id, 'BEST');
+        await CommentsService.addTag(comment.id, 'BEST', user ? user.id : null, 'PUBLIC');
         const response = await graphql(schema, query, {}, context, {id: comment.id, tag: 'BEST'});
         if (response.errors && response.errors.length) {
           console.error(response.errors);
diff --git a/test/server/services/comments.js b/test/server/services/comments.js
index 952e071a3..d4fc5f17e 100644
--- a/test/server/services/comments.js
+++ b/test/server/services/comments.js
@@ -225,7 +225,7 @@ describe('services.CommentsService', () => {
       const commentId = comments[0].id;
       const tagName = 'BEST';
       const userId = users[0].id;
-      await CommentsService.addTag(commentId, tagName, userId);
+      await CommentsService.addTag(commentId, tagName, userId, 'PUBLIC');
       const tags = await TagService.findByItemIdAndName(commentId, 'BEST', 'COMMENTS');
       expect(tags.length).to.equal(1);
       expect(tags[0].name).to.equal(tagName);
@@ -237,7 +237,7 @@ describe('services.CommentsService', () => {
       const tagName = 'BEST';
       const userId = users[0].id;
 
-      await expect(CommentsService.addTag(commentId, tagName, userId)).to.be.rejected;
+      await expect(CommentsService.addTag(commentId, tagName, userId, 'PUBLIC')).to.be.rejected;
     });
     it('can\'t add same tag.name twice', async () => {
       const commentId = comments[0].id;
@@ -245,10 +245,10 @@ describe('services.CommentsService', () => {
       const userId = users[0].id;
 
       // first time
-      await CommentsService.addTag(commentId, tagName, userId);
+      await CommentsService.addTag(commentId, tagName, userId, 'PUBLIC');
 
       // second time should fail
-      await expect(CommentsService.addTag(commentId, tagName, userId)).to.be.rejected;
+      await expect(CommentsService.addTag(commentId, tagName, userId, 'PUBLIC')).to.be.rejected;
     });
   });
 
@@ -256,7 +256,7 @@ describe('services.CommentsService', () => {
     it('removes a tag', async () => {
       const commentId = comments[0].id;
       const tagName = 'BEST';
-      await CommentsService.addTag(commentId, tagName, users[0].id);
+      await CommentsService.addTag(commentId, tagName, users[0].id, 'PUBLIC');
       const tags = await TagService.findByItemIdAndName(commentId, tagName, 'COMMENTS');
       expect(tags.length).to.equal(1);
 
@@ -273,7 +273,7 @@ describe('services.CommentsService', () => {
       // just make sure it has no tags to start
       const tags = await TagService.findByItemIdAndName(commentId, tagName, 'COMMENTS');
       expect(tags.length).to.equal(0);
-      
+
       // ok now to remove it
       await expect(CommentsService.removeTag(commentId, tagName)).to.be.rejected;
     });

From cb09c5082010f32e924beab7375544f7a11a8c42 Mon Sep 17 00:00:00 2001
From: gaba <gabelula@gmail.com>
Date: Mon, 8 May 2017 13:11:48 -0700
Subject: [PATCH 007/264] Error on duplicate.

---
 graph/loaders/index.js                        |  2 -
 graph/loaders/settings.js                     | 17 +++-
 graph/loaders/tags.js                         | 37 ---------
 graph/mutators/comment.js                     |  8 +-
 graph/resolvers/comment.js                    |  3 -
 graph/resolvers/root_mutation.js              |  4 +-
 graph/typeDefs.graphql                        | 17 ++--
 models/comment.js                             | 25 ++++++
 models/setting.js                             | 38 ++++++++-
 models/tag.js                                 | 77 -----------------
 models/user.js                                | 12 +++
 services/comments.js                          | 54 ++++++------
 services/mongoose.js                          |  1 -
 services/tags.js                              | 83 -------------------
 test/server/graph/loaders/metrics.js          | 28 +++++--
 test/server/graph/mutations/addCommentTag.js  | 11 ++-
 test/server/graph/mutations/createComment.js  |  6 +-
 .../graph/mutations/removeCommentTag.js       |  5 +-
 test/server/services/comments.js              | 11 ++-
 19 files changed, 173 insertions(+), 266 deletions(-)
 delete mode 100644 graph/loaders/tags.js
 delete mode 100644 models/tag.js
 delete mode 100644 services/tags.js

diff --git a/graph/loaders/index.js b/graph/loaders/index.js
index 8bc170c6d..26727940f 100644
--- a/graph/loaders/index.js
+++ b/graph/loaders/index.js
@@ -6,7 +6,6 @@ const Assets = require('./assets');
 const Comments = require('./comments');
 const Metrics = require('./metrics');
 const Settings = require('./settings');
-const Tags = require('./tags');
 const Users = require('./users');
 
 const plugins = require('../../services/plugins');
@@ -19,7 +18,6 @@ let loaders = [
   Comments,
   Metrics,
   Settings,
-  Tags,
   Users,
 
   // Load the plugin loaders from the manager.
diff --git a/graph/loaders/settings.js b/graph/loaders/settings.js
index 77ece165f..9d777255f 100644
--- a/graph/loaders/settings.js
+++ b/graph/loaders/settings.js
@@ -1,12 +1,25 @@
 const SettingsService = require('../../services/settings');
+const SettingModel = require('../../models/setting');
 
 const util = require('./util');
 
+/**
+ * Search for tags based on their item_type.
+ * @param  {String} item_type   the item type to search by
+ * @return {Promise}            resolves to distinct items tags
+ */
+const getByItemType = (_, item_type) => {
+  return SettingModel.distinct('tags.models', {item_type});
+};
+
 /**
  * Creates a set of loaders based on a GraphQL context.
  * @param  {Object} context the context of the GraphQL request
  * @return {Object}         object of loaders
  */
-module.exports = () => ({
-  Settings: new util.SingletonResolver(() => SettingsService.retrieve())
+module.exports = (context) => ({
+  Settings: {
+    get: new util.SingletonResolver(() => SettingsService.retrieve()),
+    getTagsByItemType: (item_type) => getByItemType(context, item_type)
+  }
 });
diff --git a/graph/loaders/tags.js b/graph/loaders/tags.js
deleted file mode 100644
index cb767fdf6..000000000
--- a/graph/loaders/tags.js
+++ /dev/null
@@ -1,37 +0,0 @@
-const DataLoader = require('dataloader');
-
-const util = require('./util');
-
-const TagsService = require('../../services/tags');
-const TagModel = require('../../models/tag');
-
-/**
- * Gets tags based on their item id's.
- */
-const getByItemID = (_, item_ids) => {
-  return TagsService
-    .findByItemIdArray(item_ids)
-    .then(util.arrayJoinBy(item_ids, 'item_id'));
-};
-
-/**
- * Search for tags based on their item_type and ensures that
- * the tags returned have unique item id's.
- * @param  {String} item_type   the item id to search by
- * @return {Promise}            resolves to distinct items tags
- */
-const getItemIdsByItemType = (_, item_type) => {
-  return TagModel.distinct('item_id', {item_type});
-};
-
-/**
- * Creates a set of loaders based on a GraphQL context.
- * @param  {Object} context the context of the GraphQL request
- * @return {Object}         object of loaders
- */
-module.exports = (context) => ({
-  Tags: {
-    getByID: new DataLoader((ids) => getByItemID(context, ids)),
-    getByTypes: ({item_type}) => getItemIdsByItemType(context, item_type)
-  }
-});
diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index ec310d763..3413c6f4e 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -16,7 +16,7 @@ const Wordlist = require('../../services/wordlist');
  * @param  {String} [status='NONE'] the status of the new comment
  * @return {Promise}              resolves to the created comment
  */
-const createComment = ({user, loaders: {Comments}, pubsub}, {body, asset_id, parent_id = null, tags = []}, status = 'NONE') => {
+const createComment = ({user, loaders: {Comments}, pubsub}, {body, asset_id, parent_id = null}, status = 'NONE') => {
 
   return CommentsService.publicCreate({
     body,
@@ -28,7 +28,7 @@ const createComment = ({user, loaders: {Comments}, pubsub}, {body, asset_id, par
   .then(async (comment) => {
 
     if (user.hasRoles('ADMIN') || user.hasRoles('MODERATOR')) {
-      await CommentsService.addTag(comment.id, 'STAFF', user.id, 'PUBLIC');
+      await CommentsService.addTag(comment.id, 'STAFF', user.id);
     }
 
     // If the loaders are present, clear the caches for these values because we
@@ -208,8 +208,8 @@ const setCommentStatus = ({user, loaders: {Comments}}, {id, status}) => {
  * @param {String} id          identifier of the comment  (uuid)
  * @param {String} tag     name of the tag
  */
-const addCommentTag = ({user, loaders: {Comments}}, {id, tag, privacy_type}) => {
-  return CommentsService.addTag(id, tag, user.id, privacy_type);
+const addCommentTag = ({user, loaders: {Comments}}, {id, tag}) => {
+  return CommentsService.addTag(id, tag, user.id);
 };
 
 /**
diff --git a/graph/resolvers/comment.js b/graph/resolvers/comment.js
index f94cfaf52..88ddbee07 100644
--- a/graph/resolvers/comment.js
+++ b/graph/resolvers/comment.js
@@ -6,9 +6,6 @@ const Comment = {
 
     return Comments.get.load(parent_id);
   },
-  tags({id}, _, {loaders: {Tags}}) {
-    return Tags.getByID.load([id]);
-  },
   user({author_id}, _, {loaders: {Users}}) {
     return Users.getByID.load(author_id);
   },
diff --git a/graph/resolvers/root_mutation.js b/graph/resolvers/root_mutation.js
index e3e3ae1d7..5b60fbaa8 100644
--- a/graph/resolvers/root_mutation.js
+++ b/graph/resolvers/root_mutation.js
@@ -29,8 +29,8 @@ const RootMutation = {
   setCommentStatus(_, {id, status}, {mutators: {Comment}}) {
     return wrapResponse(null)(Comment.setCommentStatus({id, status}));
   },
-  addCommentTag(_, {id, tag, privacy_type}, {mutators: {Comment}}) {
-    return wrapResponse('comment')(Comment.addCommentTag({id, tag, privacy_type}).then(() => CommentsService.findById(id)));
+  addCommentTag(_, {id, tag}, {mutators: {Comment}}) {
+    return wrapResponse('comment')(Comment.addCommentTag({id, tag}).then(() => CommentsService.findById(id)));
   },
   removeCommentTag(_, {id, tag}, {mutators: {Comment}}) {
     return wrapResponse('comment')(Comment.removeCommentTag({id, tag}).then(() => CommentsService.findById(id)));
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index a4ebe98b3..781b3b328 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -54,10 +54,10 @@ type User {
 
 type Tag {
   # the actual tag for the comment.
-  name: String!
+  id: String!
 
   # the user that assigned the tag. If NULL then the system automatically tagged it.
-  assigned_by: String
+  added_by: String
 
   # the time when the tag was assigned.
   created_at: Date!
@@ -588,8 +588,13 @@ enum ACTION_ITEM_TYPE {
   USERS
 }
 
-enum TAG_TYPE {
-  STAFF
+input CreateLikeInput {
+
+  # The item's id for which we are to create a like.
+  item_id: ID!
+
+  # The type of the item for which we are to create the like.
+  item_type: ACTION_ITEM_TYPE!
 }
 
 input CreateCommentInput {
@@ -604,7 +609,7 @@ input CreateCommentInput {
   body: String!
 
   # Tags
-  tags: [TAG_TYPE]
+  tags: [String]
 
 }
 
@@ -746,7 +751,7 @@ type RootMutation {
   setCommentStatus(id: ID!, status: COMMENT_STATUS!): SetCommentStatusResponse
 
   # Add tag to comment.
-  addCommentTag(id: ID!, tag: String!, privacy_type: String!): AddCommentTagResponse
+  addCommentTag(id: ID!, tag: String!): AddCommentTagResponse
 
   # Remove tag from comment.
   removeCommentTag(id: ID!, tag: String!): RemoveCommentTagResponse
diff --git a/models/comment.js b/models/comment.js
index 09f592eca..f3e239080 100644
--- a/models/comment.js
+++ b/models/comment.js
@@ -30,6 +30,29 @@ const StatusSchema = new Schema({
   _id: false
 });
 
+/**
+ * The Mongo schema for a Comment Tag.
+ * @type {Schema}
+ */
+const TagSchema = new Schema({
+
+  // This is the actual 'tag' and we only permit tags that are in Setting.tags.
+  id: String,
+
+  // The User ID of the user that added the tag.
+  added_by: {
+    type: String,
+    default: null
+  },
+
+  created_at: {
+    type: Date,
+    default: Date
+  }
+}, {
+  _id: false
+});
+
 /**
  * The Mongo schema for a Comment.
  * @type {Schema}
@@ -55,6 +78,8 @@ const CommentSchema = new Schema({
   },
   parent_id: String,
 
+  tags: [TagSchema],
+
   // Additional metadata stored on the field.
   metadata: {
     default: {},
diff --git a/models/setting.js b/models/setting.js
index e63fa8f3e..44f5ad5ca 100644
--- a/models/setting.js
+++ b/models/setting.js
@@ -1,6 +1,41 @@
 const mongoose = require('../services/mongoose');
 const Schema = mongoose.Schema;
 
+const PERMISSIONS = [
+  'ADMIN'
+];
+
+/**
+ * The Mongo schema for a Tag.
+ * @type {Schema}
+ */
+const TagSchema = new Schema({
+  id: {
+    type: String,
+    unique: true,
+    default: 'STAFF'
+  },
+  public: Boolean,
+  text: {
+    type: Schema.Types.Mixed,
+    default:  null
+  },
+  permissions: [{
+    type: String,
+    enum: PERMISSIONS,
+    default: 'ADMIN'
+  }],
+  models: [String],
+
+  // Additional metadata stored on the field.
+  metadata: Schema.Types.Mixed
+}, {
+  timestamps: {
+    createdAt: 'created_at',
+    updatedAt: 'updated_at'
+  }
+});
+
 const MODERATION_OPTIONS = [
   'PRE',
   'POST'
@@ -88,7 +123,8 @@ const SettingSchema = new Schema({
       type: Array,
       default: ['localhost']
     }
-  }
+  },
+  tags: [TagSchema]
 }, {
   timestamps: {
     createdAt: 'created_at',
diff --git a/models/tag.js b/models/tag.js
deleted file mode 100644
index 85bb0845a..000000000
--- a/models/tag.js
+++ /dev/null
@@ -1,77 +0,0 @@
-const mongoose = require('../services/mongoose');
-const uuid = require('uuid');
-const Schema = mongoose.Schema;
-
-// in settings
-// --> decide who can apply them (self, role, anyone) and
-
-// Who can see the tag (self, by role, anyone)
-const PRIVACY_TYPES = [
-  'ADMIN',
-  'SELF',
-  'PUBLIC'
-];
-
-// The type of item that the tag is apply on.
-const ITEM_TYPES = [
-  'ASSETS',
-  'COMMENTS',
-  'USERS'
-];
-
-/**
- * The Mongo schema for a Comment Tag.
- * @type {Schema}
- */
-const TagSchema = new Schema({
-  id: {
-    type: String,
-    default: uuid.v4,
-    unique: true
-  },
-
-  name: {
-    type: String,
-  },
-
-  item_type: {
-    type: String,
-    enum: ITEM_TYPES
-  },
-
-  item_id: String,
-
-  // The User ID of the user that assigned the status.
-  assigned_by: {
-    type: String,
-    default: null
-  },
-
-  privacy_type: {
-    type: String,
-    enum: PRIVACY_TYPES,
-    default: 'SELF'
-  },
-
-  // Additional metadata stored on the field.
-  metadata: Schema.Types.Mixed
-},  {
-  timestamps: {
-    createdAt: 'created_at',
-    updatedAt: 'updated_at'
-  }
-});
-
-// Add the indixies on the tag on an item.
-TagSchema.index({
-  'item_type': 1,
-  'item_id': 1,
-  'name': 1
-}, {
-  unique: true,
-  background: false
-});
-
-const Tag = mongoose.model('Tag', TagSchema);
-
-module.exports = Tag;
diff --git a/models/user.js b/models/user.js
index 159407fdf..b85f09a93 100644
--- a/models/user.js
+++ b/models/user.js
@@ -111,6 +111,18 @@ const UserSchema = new mongoose.Schema({
     default: false
   },
 
+  tags: [{
+    id: {
+      type: String,
+      unique: true
+    },
+    public: Boolean,
+    text: [{
+      type: mongoose.Schema.Types.Mixed,
+      default:  null
+    }]
+  }],
+
   // User's settings
   settings: {
     bio: {
diff --git a/services/comments.js b/services/comments.js
index bdc878ce1..4c8f423c6 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -3,8 +3,7 @@ const CommentModel = require('../models/comment');
 const ActionModel = require('../models/action');
 const ActionsService = require('./actions');
 
-const TagsService = require('./tags');
-const TagModel = require('../models/tag');
+const SettingsService = require('./settings');
 
 const STATUSES = [
   'ACCEPTED',
@@ -13,6 +12,10 @@ const STATUSES = [
   'NONE',
 ];
 
+const ALLOWED_TAGS = [
+  'STAFF'
+];
+
 module.exports = class CommentsService {
 
   /**
@@ -22,6 +25,8 @@ module.exports = class CommentsService {
    */
   static publicCreate(comment) {
 
+    console.log('-----------------> debug publicCreate');
+
     // Check to see if this is an array of comments, if so map it out.
     if (Array.isArray(comment)) {
       return Promise.all(comment.map(CommentsService.publicCreate));
@@ -47,22 +52,26 @@ module.exports = class CommentsService {
    * @throws if tag name is not in ALLOWED_TAGS
    * @param {String} id the id of the comment to tag
    * @param {String} name the name of the tag to add
-   * @param {String} assigned_by the user id for the user who added the tag
+   * @param {String} added_by the user id for the user who added the tag
    */
-  static addTag(id, name, assigned_by, privacy_type) {
+  static addTag(id, name, added_by) {
 
-    return CommentModel.findOne({id})
-    .then((comment) => {
-      if (comment == null) {
+    console.log('-----------------> debug addtag', name);
+
+    SettingsService.retrieve()
+    .then(({tags}) => {
+      if (!ALLOWED_TAGS.includes(name) || tags.findIndex((t) => {return t.id === name & t.models.include('COMMENTS');}) === -1) {
         return Promise.reject(new Error('tag not allowed'));
       }
-      return TagsService.insertCommentTag({
-        name,
-        item_id: id,
-        item_type: 'COMMENTS',
-        user_id: assigned_by,
-        privacy_type
-      });
+    });
+
+    return CommentModel.findOneAndUpdate({id}, {
+      $push: {
+        tags: {
+          id: name,
+          added_by: added_by
+        }
+      }
     });
   }
 
@@ -70,17 +79,14 @@ module.exports = class CommentsService {
    * Removes a tag from a comment
    * @throws if the tag is not on the comment
    * @param {String} id the id of the comment to tag
-   * @param {String} name the name of the tag to add
+   * @param {String} tag_id the id of the tag to remove
    */
-  static removeTag(id, name) {
-    return TagModel.findOneAndRemove({
-      item_type: 'COMMENTS',
-      item_id: id,
-      name
-    })
-    .then((tag) => {
-      if (tag == null) {
-        return Promise.reject(new Error('tag does not exist'));
+  static removeTag(id, tag_id) {
+    return CommentModel.findOneAndUpdate({id}, {
+      $pull: {
+        tags: {
+          id: tag_id
+        }
       }
     });
   }
diff --git a/services/mongoose.js b/services/mongoose.js
index 206075239..c7092326f 100644
--- a/services/mongoose.js
+++ b/services/mongoose.js
@@ -65,5 +65,4 @@ require('../models/action');
 require('../models/asset');
 require('../models/comment');
 require('../models/setting');
-require('../models/tag');
 require('../models/user');
diff --git a/services/tags.js b/services/tags.js
deleted file mode 100644
index 5cd0a09e1..000000000
--- a/services/tags.js
+++ /dev/null
@@ -1,83 +0,0 @@
-const TagModel = require('../models/tag');
-
-const ALLOWED_COMMENT_TAGS = [
-  {name: 'STAFF'},
-  {name: 'BEST'},
-];
-
-const ALLOWED_PRIVACY_TYPE = [
-  {privacy_type: 'PUBLIC'},
-  {privacy_type: 'SELF'},
-  {privacy_type: 'ADMIN'}
-];
-
-module.exports = class TagsService {
-
-  /**
-   * Finds a tag by the id.
-   * @param {String} id  identifier of the tag (uuid)
-  */
-  static findById(id) {
-    return TagModel.findOne({id});
-  }
-
-  /**
-   * Finds atag by the item_id and name.
-   * @param {String} item_id  identifier of the item that the tag was applied into(uuid)
-   * @param {string} name name of the tag
-  */
-  static findByItemIdAndName(item_id, name, item_type) {
-    return TagModel.find({
-      item_id,
-      item_type,
-      name
-    });
-  }
-
-  /**
-   * Finds actions in an array of ids.
-   * @param {String} ids array of user identifiers (uuid)
-  */
-  static async findByItemIdArray(item_ids) {
-    let tags = await TagModel.find({
-      'item_id': {$in: item_ids}
-    });
-
-    if (tags === null) {
-      return [];
-    }
-
-    return tags;
-  }
-
-  /**
-   * Add a tag.
-   * @param {string} name the actual tag
-   * @param {String} item_id  identifier of the comment  (uuid)
-   * @param {String} item_type  type of the object being tag  (COMMENTS)
-   * @param {String} user_id  user id that assigned the tag (uuid)
-   * @param {String} privacy_type visibility of the tag on the comment
-   * @return {Promise}
-   */
-  static insertCommentTag(tag) {
-
-    if (ALLOWED_COMMENT_TAGS.find((t) => t.name === tag.name) == null) {
-      return Promise.reject(new Error('tag not allowed'));
-    }
-
-    if (ALLOWED_PRIVACY_TYPE.find((p) => p.privacy_type === tag.privacy_type) == null) {
-      return Promise.reject(new Error('privacy type not allowed'));
-    }
-
-    // Create/Update the tag.
-    let newtag = new TagModel({
-      name: tag.name,
-      item_id: tag.item_id,
-      item_type: tag.item_type,
-      assigned_by: tag.user_id,
-      privacy_type: tag.privacy_type
-    });
-    return newtag.save();
-  }
-
-};
diff --git a/test/server/graph/loaders/metrics.js b/test/server/graph/loaders/metrics.js
index a24c18f79..5d74f154d 100644
--- a/test/server/graph/loaders/metrics.js
+++ b/test/server/graph/loaders/metrics.js
@@ -23,11 +23,27 @@ describe('graph.loaders.Metrics', () => {
 
     describe('different comment states', () => {
 
-      beforeEach(() => CommentModel.create([
-        {id: '1', body: 'a new comment!'},
-        {id: '2', body: 'a new comment!'},
-        {id: '3', body: 'a new comment!'}
-      ]));
+      beforeEach(() =>{
+        CommentModel.create( {id: '1', body: 'a new comment!'})
+        .then((comment) => {
+          console.log('*************** wtf comment', comment);
+        })
+        .catch((error) => {
+          console.log('1 debug the rror create ', error);
+        });
+        console.log('debug 1');
+        CommentModel.create({id: '2', body: 'a new comment!'})
+        .catch((error) => {
+          console.log('2 debug the rror create ', error);
+        });
+        console.log('debug 2');
+        CommentModel.create({id: '3', body: 'a new comment!'})
+        .catch((error) => {
+          console.log('3 debug the rror create ', error);
+        });
+        console.log('debug 3');
+      }
+      );
 
       [
         {flagged: 0, actions: []},
@@ -40,6 +56,7 @@ describe('graph.loaders.Metrics', () => {
         ]}
       ].forEach(({flagged, actions}) => {
 
+        console.log('-----------------> debug  forEach');
         describe(`with actions=${actions.length}`, () => {
 
           beforeEach(() => ActionModel.create(actions));
@@ -52,7 +69,6 @@ describe('graph.loaders.Metrics', () => {
               to: (new Date()).setMinutes((new Date()).getMinutes() + 5)
             })
               .then(({data, errors}) => {
-                console.log(errors);
                 expect(errors).to.be.undefined;
                 expect(data.flagged).to.have.length(flagged);
               });
diff --git a/test/server/graph/mutations/addCommentTag.js b/test/server/graph/mutations/addCommentTag.js
index 01966bd88..83a12dc2e 100644
--- a/test/server/graph/mutations/addCommentTag.js
+++ b/test/server/graph/mutations/addCommentTag.js
@@ -4,7 +4,6 @@ const {graphql} = require('graphql');
 const schema = require('../../../../graph/schema');
 const Context = require('../../../../graph/context');
 const UserModel = require('../../../../models/user');
-const TagService = require('../../../../services/tags');
 const SettingsService = require('../../../../services/settings');
 const CommentsService = require('../../../../services/comments');
 
@@ -16,8 +15,8 @@ describe('graph.mutations.addCommentTag', () => {
   });
 
   const query = `
-    mutation AddCommentTag ($id: ID!, $tag: String!, $privacy_type: String!) {
-      addCommentTag(id:$id, tag:$tag, privacy_type:$privacy_type) {
+    mutation AddCommentTag ($id: ID!, $tag: String!) {
+      addCommentTag(id:$id, tag:$tag) {
         comment {
           id
         }
@@ -31,14 +30,14 @@ describe('graph.mutations.addCommentTag', () => {
   it('moderators can add tags to comments', async () => {
     const user = new UserModel({roles: ['MODERATOR' ]});
     const context = new Context({user});
-    const response = await graphql(schema, query, {}, context, {id: comment.id, tag: 'BEST', privacy_type: 'PUBLIC'});
+    const response = await graphql(schema, query, {}, context, {id: comment.id, tag: 'BEST'});
     if (response.errors && response.errors.length) {
       console.error(response.errors);
     }
     expect(response.errors).to.be.empty;
 
-    return TagService.findByItemIdAndName(response.data.addCommentTag.comment.id, 'BEST', 'COMMENTS')
-    .then((tags) => {
+    return CommentsService.findById(response.data.addCommentTag.comment.id)
+    .then(({tags}) => {
       expect(tags).to.have.length(1);
     });
   });
diff --git a/test/server/graph/mutations/createComment.js b/test/server/graph/mutations/createComment.js
index d132c46c7..31cb9872f 100644
--- a/test/server/graph/mutations/createComment.js
+++ b/test/server/graph/mutations/createComment.js
@@ -9,7 +9,7 @@ const AssetModel = require('../../../../models/asset');
 const ActionModel = require('../../../../models/action');
 
 const SettingsService = require('../../../../services/settings');
-const TagService = require('../../../../services/tags');
+const CommentsService = require('../../../../services/comments');
 
 describe('graph.mutations.createComment', () => {
   beforeEach(() => SettingsService.init());
@@ -223,9 +223,9 @@ describe('graph.mutations.createComment', () => {
               expect(data.createComment).to.have.property('comment').not.null;
               expect(data.createComment).to.have.property('errors').null;
 
-              return TagService.findByItemIdAndName(data.createComment.comment.id, tag, 'COMMENTS');
+              return CommentsService.findById(data.createComment.comment.id);
             })
-            .then((tags) => {
+            .then(({tags}) => {
               if (tag) {
                 expect(tags).to.have.length(1);
                 expect(tags[0]).to.have.property('name', tag);
diff --git a/test/server/graph/mutations/removeCommentTag.js b/test/server/graph/mutations/removeCommentTag.js
index 7660eef35..4deb4bd5e 100644
--- a/test/server/graph/mutations/removeCommentTag.js
+++ b/test/server/graph/mutations/removeCommentTag.js
@@ -7,7 +7,6 @@ const UserModel = require('../../../../models/user');
 
 const SettingsService = require('../../../../services/settings');
 const CommentsService = require('../../../../services/comments');
-const TagService = require('../../../../services/tags');
 
 describe('graph.mutations.removeCommentTag', () => {
   let comment;
@@ -42,8 +41,8 @@ describe('graph.mutations.removeCommentTag', () => {
     expect(response.errors).to.be.empty;
     expect(response.data.removeCommentTag.errors).to.be.null;
 
-    TagService.findByItemIdAndName(response.data.removeCommentTag.comment.id, 'BEST')
-    .then((tags) => {
+    CommentsService.findById(response.data.removeCommentTag.comment.id)
+    .then(({tags}) => {
       expect(tags).to.deep.equal([]);
     });
 
diff --git a/test/server/services/comments.js b/test/server/services/comments.js
index d4fc5f17e..ed908d1b2 100644
--- a/test/server/services/comments.js
+++ b/test/server/services/comments.js
@@ -5,7 +5,6 @@ const ActionsService = require('../../../services/actions');
 const UsersService = require('../../../services/users');
 const SettingsService = require('../../../services/settings');
 const CommentsService = require('../../../services/comments');
-const TagService = require('../../../services/tags');
 
 const settings = {id: '1', moderation: 'PRE', wordlist: {banned: ['bad words'], suspect: ['suspect words']}};
 
@@ -226,7 +225,7 @@ describe('services.CommentsService', () => {
       const tagName = 'BEST';
       const userId = users[0].id;
       await CommentsService.addTag(commentId, tagName, userId, 'PUBLIC');
-      const tags = await TagService.findByItemIdAndName(commentId, 'BEST', 'COMMENTS');
+      const {tags} = await CommentsService.findById(commentId);
       expect(tags.length).to.equal(1);
       expect(tags[0].name).to.equal(tagName);
       expect(tags[0].assigned_by).to.equal(userId);
@@ -257,13 +256,13 @@ describe('services.CommentsService', () => {
       const commentId = comments[0].id;
       const tagName = 'BEST';
       await CommentsService.addTag(commentId, tagName, users[0].id, 'PUBLIC');
-      const tags = await TagService.findByItemIdAndName(commentId, tagName, 'COMMENTS');
+      const {tags} = await CommentsService.findById(commentId);
       expect(tags.length).to.equal(1);
 
       // ok now to remove it
       await CommentsService.removeTag(commentId, tagName);
-      const tags2 = await TagService.findByItemIdAndName(commentId, tagName, 'COMMENTS');
-      expect(tags2.length).to.equal(0);
+      const comment = await CommentsService.findById(commentId);
+      expect(comment.tags.length).to.equal(0);
     });
     it('throws if removing a tag that isn\'t there', async () => {
       const commentId = comments[0].id;
@@ -271,7 +270,7 @@ describe('services.CommentsService', () => {
       const tagName = 'BEST';
 
       // just make sure it has no tags to start
-      const tags = await TagService.findByItemIdAndName(commentId, tagName, 'COMMENTS');
+      const {tags} = await CommentsService.findById(commentId);
       expect(tags.length).to.equal(0);
 
       // ok now to remove it

From d7e72bb1387e1732ee6a543d88efca89f029b0ce Mon Sep 17 00:00:00 2001
From: gaba <gabelula@gmail.com>
Date: Fri, 5 May 2017 14:09:00 -0700
Subject: [PATCH 008/264] Fix tests.

---
 graph/mutators/comment.js                    |  4 +-
 services/comments.js                         | 39 ++++++++++++--------
 test/server/graph/loaders/metrics.js         | 25 ++-----------
 test/server/graph/mutations/createComment.js |  4 +-
 4 files changed, 32 insertions(+), 40 deletions(-)

diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index 3413c6f4e..427ab4c63 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -28,7 +28,7 @@ const createComment = ({user, loaders: {Comments}, pubsub}, {body, asset_id, par
   .then(async (comment) => {
 
     if (user.hasRoles('ADMIN') || user.hasRoles('MODERATOR')) {
-      await CommentsService.addTag(comment.id, 'STAFF', user.id);
+      await CommentsService.addTag(comment.id, 'STAFF', user);
     }
 
     // If the loaders are present, clear the caches for these values because we
@@ -209,7 +209,7 @@ const setCommentStatus = ({user, loaders: {Comments}}, {id, status}) => {
  * @param {String} tag     name of the tag
  */
 const addCommentTag = ({user, loaders: {Comments}}, {id, tag}) => {
-  return CommentsService.addTag(id, tag, user.id);
+  return CommentsService.addTag(id, tag, user);
 };
 
 /**
diff --git a/services/comments.js b/services/comments.js
index 4c8f423c6..41c383725 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -2,7 +2,7 @@ const CommentModel = require('../models/comment');
 
 const ActionModel = require('../models/action');
 const ActionsService = require('./actions');
-
+const SettingModel = require('../models/setting');
 const SettingsService = require('./settings');
 
 const STATUSES = [
@@ -25,8 +25,6 @@ module.exports = class CommentsService {
    */
   static publicCreate(comment) {
 
-    console.log('-----------------> debug publicCreate');
-
     // Check to see if this is an array of comments, if so map it out.
     if (Array.isArray(comment)) {
       return Promise.all(comment.map(CommentsService.publicCreate));
@@ -56,22 +54,33 @@ module.exports = class CommentsService {
    */
   static addTag(id, name, added_by) {
 
-    console.log('-----------------> debug addtag', name);
-
-    SettingsService.retrieve()
-    .then(({tags}) => {
-      if (!ALLOWED_TAGS.includes(name) || tags.findIndex((t) => {return t.id === name & t.models.include('COMMENTS');}) === -1) {
+    // Check that the tag is allowed by the system OR in our setting.tags.
+    return SettingsService.retrieve()
+    .then((settings) => {
+      
+      // Moderators or ADMIN can add any tag automatically.
+      if (added_by != null && (added_by.hasRoles('ADMIN') || added_by.hasRoles('MODERATOR'))) {
+        SettingModel.findOneAndUpdate({id: settings.id}, {
+          $push: {
+            tags: {
+              id: name,
+              added_by: added_by.id
+            }
+          }
+        });
+      }
+      else if (!ALLOWED_TAGS.includes(name) || settings.tags.findIndex((t) => {return t.id === name & t.models.include('COMMENTS');}) === -1) {
         return Promise.reject(new Error('tag not allowed'));
       }
-    });
 
-    return CommentModel.findOneAndUpdate({id}, {
-      $push: {
-        tags: {
-          id: name,
-          added_by: added_by
+      return CommentModel.findOneAndUpdate({id}, {
+        $push: {
+          tags: {
+            id: name,
+            added_by: added_by.id
+          }
         }
-      }
+      });
     });
   }
 
diff --git a/test/server/graph/loaders/metrics.js b/test/server/graph/loaders/metrics.js
index 5d74f154d..0d2741ef8 100644
--- a/test/server/graph/loaders/metrics.js
+++ b/test/server/graph/loaders/metrics.js
@@ -23,27 +23,11 @@ describe('graph.loaders.Metrics', () => {
 
     describe('different comment states', () => {
 
-      beforeEach(() =>{
-        CommentModel.create( {id: '1', body: 'a new comment!'})
-        .then((comment) => {
-          console.log('*************** wtf comment', comment);
-        })
-        .catch((error) => {
-          console.log('1 debug the rror create ', error);
-        });
-        console.log('debug 1');
-        CommentModel.create({id: '2', body: 'a new comment!'})
-        .catch((error) => {
-          console.log('2 debug the rror create ', error);
-        });
-        console.log('debug 2');
+      beforeEach(() =>[
+        CommentModel.create( {id: '1', body: 'a new comment!'}),
+        CommentModel.create({id: '2', body: 'a new comment!'}),
         CommentModel.create({id: '3', body: 'a new comment!'})
-        .catch((error) => {
-          console.log('3 debug the rror create ', error);
-        });
-        console.log('debug 3');
-      }
-      );
+      ]);
 
       [
         {flagged: 0, actions: []},
@@ -56,7 +40,6 @@ describe('graph.loaders.Metrics', () => {
         ]}
       ].forEach(({flagged, actions}) => {
 
-        console.log('-----------------> debug  forEach');
         describe(`with actions=${actions.length}`, () => {
 
           beforeEach(() => ActionModel.create(actions));
diff --git a/test/server/graph/mutations/createComment.js b/test/server/graph/mutations/createComment.js
index 31cb9872f..41822fcdb 100644
--- a/test/server/graph/mutations/createComment.js
+++ b/test/server/graph/mutations/createComment.js
@@ -21,7 +21,7 @@ describe('graph.mutations.createComment', () => {
           id
           status
           tags {
-            name
+            id
           }
         }
         errors {
@@ -228,7 +228,7 @@ describe('graph.mutations.createComment', () => {
             .then(({tags}) => {
               if (tag) {
                 expect(tags).to.have.length(1);
-                expect(tags[0]).to.have.property('name', tag);
+                expect(tags[0]).to.have.property('id', tag);
               } else {
                 expect(tags).length(0);
               }

From c72cb2428e241dd6b97790ff22542d2b26bb137c Mon Sep 17 00:00:00 2001
From: gaba <gabelula@gmail.com>
Date: Fri, 5 May 2017 14:33:02 -0700
Subject: [PATCH 009/264] Fixed errors on tags creation

---
 services/comments.js                            |  4 ++--
 test/server/graph/mutations/removeCommentTag.js | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/services/comments.js b/services/comments.js
index 41c383725..aae5c8248 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -57,14 +57,14 @@ module.exports = class CommentsService {
     // Check that the tag is allowed by the system OR in our setting.tags.
     return SettingsService.retrieve()
     .then((settings) => {
-      
+
       // Moderators or ADMIN can add any tag automatically.
       if (added_by != null && (added_by.hasRoles('ADMIN') || added_by.hasRoles('MODERATOR'))) {
         SettingModel.findOneAndUpdate({id: settings.id}, {
           $push: {
             tags: {
               id: name,
-              added_by: added_by.id
+              models: ['COMMENTS']
             }
           }
         });
diff --git a/test/server/graph/mutations/removeCommentTag.js b/test/server/graph/mutations/removeCommentTag.js
index 4deb4bd5e..663e0de9a 100644
--- a/test/server/graph/mutations/removeCommentTag.js
+++ b/test/server/graph/mutations/removeCommentTag.js
@@ -4,6 +4,7 @@ const {graphql} = require('graphql');
 const schema = require('../../../../graph/schema');
 const Context = require('../../../../graph/context');
 const UserModel = require('../../../../models/user');
+const SettingModel = require('../../../../models/setting');
 
 const SettingsService = require('../../../../services/settings');
 const CommentsService = require('../../../../services/comments');
@@ -33,7 +34,7 @@ describe('graph.mutations.removeCommentTag', () => {
     const context = new Context({user});
 
     // add a tag first
-    await CommentsService.addTag(comment.id, 'BEST', user.id, 'PUBLIC');
+    await CommentsService.addTag(comment.id, 'BEST', user);
     const response = await graphql(schema, query, {}, context, {id: comment.id, tag: 'BEST'});
     if (response.errors && response.errors.length) {
       console.error(response.errors);
@@ -49,6 +50,16 @@ describe('graph.mutations.removeCommentTag', () => {
   });
 
   describe('users who cant remove tags', () => {
+
+    // allow the tag in the settings
+    SettingModel.findOneAndUpdate({id: 1}, {
+      $push: {
+        tags: {
+          id: 'BEST',
+          models: ['COMMENTS']
+        }
+      }
+    });
     Object.entries({
       'anonymous': undefined,
       'regular commenter': new UserModel({}),
@@ -58,7 +69,7 @@ describe('graph.mutations.removeCommentTag', () => {
         const context = new Context({user});
 
         // add a tag first
-        await CommentsService.addTag(comment.id, 'BEST', user ? user.id : null, 'PUBLIC');
+        await CommentsService.addTag(comment.id, 'BEST', user);
         const response = await graphql(schema, query, {}, context, {id: comment.id, tag: 'BEST'});
         if (response.errors && response.errors.length) {
           console.error(response.errors);

From 607ab6c0d6c998542a64746eebd3ff88fb409e86 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 5 May 2017 13:14:34 -0600
Subject: [PATCH 010/264] Added privacy fix

---
 models/user.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/models/user.js b/models/user.js
index 159407fdf..95a1422f2 100644
--- a/models/user.js
+++ b/models/user.js
@@ -136,6 +136,14 @@ const UserSchema = new mongoose.Schema({
   timestamps: {
     createdAt: 'created_at',
     updatedAt: 'updated_at'
+  },
+
+  toJSON: {
+    transform: function (doc, ret) {
+      delete ret.password;
+      delete ret._id;
+      delete ret.__v;
+    }
   }
 });
 

From 85fae3104e475889cfd85316813f642e66bfc0f6 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Fri, 5 May 2017 14:05:52 -0600
Subject: [PATCH 011/264] float: right; in css is just fine.

---
 .../coral-configure/components/ConfigureCommentStream.css   | 6 ++----
 client/coral-configure/components/ConfigureCommentStream.js | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/client/coral-configure/components/ConfigureCommentStream.css b/client/coral-configure/components/ConfigureCommentStream.css
index 335c94377..a8cbc36cb 100644
--- a/client/coral-configure/components/ConfigureCommentStream.css
+++ b/client/coral-configure/components/ConfigureCommentStream.css
@@ -3,10 +3,8 @@
 }
 
 .apply {
-  position: absolute;
-  top: 38%;
-  transform: translateX(-50%);
-  right: 0;
+  float: right;
+  margin: 0 10px;
 }
 
 .wrapper ul {
diff --git a/client/coral-configure/components/ConfigureCommentStream.js b/client/coral-configure/components/ConfigureCommentStream.js
index bef53e1ef..6c00b5996 100644
--- a/client/coral-configure/components/ConfigureCommentStream.js
+++ b/client/coral-configure/components/ConfigureCommentStream.js
@@ -12,7 +12,6 @@ export default ({handleChange, handleApply, changed, ...props}) => (
     <div className={styles.wrapper}>
       <div className={styles.container}>
         <h3>{lang.t('configureCommentStream.title')}</h3>
-        <p>{lang.t('configureCommentStream.description')}</p>
         <Button
           type="submit"
           className={styles.apply}
@@ -20,6 +19,7 @@ export default ({handleChange, handleApply, changed, ...props}) => (
           cStyle={changed ? 'green' : 'darkGrey'} >
           {lang.t('configureCommentStream.apply')}
         </Button>
+        <p>{lang.t('configureCommentStream.description')}</p>
       </div>
       <ul>
         <li>

From c4c0ee79cd48a3972bb2f2e8e1d690131b48c9ca Mon Sep 17 00:00:00 2001
From: gaba <gabelula@gmail.com>
Date: Mon, 8 May 2017 12:57:37 -0700
Subject: [PATCH 012/264] Fix tests.

---
 errors.js                                     | 14 ++++++
 graph/mutators/comment.js                     |  4 +-
 models/user.js                                | 42 +++++++++++-------
 services/comments.js                          | 43 ++++++++++++-------
 services/users.js                             |  1 +
 test/server/graph/mutations/ignoreUser.js     | 11 +++++
 .../graph/mutations/removeCommentTag.js       | 39 +++++++++--------
 test/server/services/comments.js              |  6 +--
 8 files changed, 106 insertions(+), 54 deletions(-)

diff --git a/errors.js b/errors.js
index 67ae0693a..9f12c7835 100644
--- a/errors.js
+++ b/errors.js
@@ -75,6 +75,18 @@ const ErrMissingToken = new APIError('token is required', {
   status: 400
 });
 
+// ErrNoCommentFound is returned when trying to add a tag to a comment that does not exist.
+const ErrNoCommentFound = new APIError('comment does not exist', {
+  translation_key: 'COMMENT_NOT_FOUND',
+  status: 400
+});
+
+// ErrNoCommentFound is returned when trying to add a tag to a comment that does not exist.
+const ErrorTagNotAllowed = new APIError('tag not allowed', {
+  translation_key: 'TAG_NOT_ALLOWED',
+  status: 400
+});
+
 // ErrAssetCommentingClosed is returned when a comment or action is attempted on
 // a stream where commenting has been closed.
 class ErrAssetCommentingClosed extends APIError {
@@ -161,6 +173,8 @@ module.exports = {
   ErrMissingEmail,
   ErrMissingPassword,
   ErrMissingToken,
+  ErrNoCommentFound,
+  ErrorTagNotAllowed,
   ErrEmailTaken,
   ErrSpecialChars,
   ErrMissingUsername,
diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index 427ab4c63..3413c6f4e 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -28,7 +28,7 @@ const createComment = ({user, loaders: {Comments}, pubsub}, {body, asset_id, par
   .then(async (comment) => {
 
     if (user.hasRoles('ADMIN') || user.hasRoles('MODERATOR')) {
-      await CommentsService.addTag(comment.id, 'STAFF', user);
+      await CommentsService.addTag(comment.id, 'STAFF', user.id);
     }
 
     // If the loaders are present, clear the caches for these values because we
@@ -209,7 +209,7 @@ const setCommentStatus = ({user, loaders: {Comments}}, {id, status}) => {
  * @param {String} tag     name of the tag
  */
 const addCommentTag = ({user, loaders: {Comments}}, {id, tag}) => {
-  return CommentsService.addTag(id, tag, user);
+  return CommentsService.addTag(id, tag, user.id);
 };
 
 /**
diff --git a/models/user.js b/models/user.js
index 73e04c392..688c37c2c 100644
--- a/models/user.js
+++ b/models/user.js
@@ -1,5 +1,6 @@
 const mongoose = require('../services/mongoose');
 const bcrypt = require('bcrypt');
+const Schema = mongoose.Schema;
 const uuid = require('uuid');
 
 // USER_ROLES is the array of roles that is permissible as a user role.
@@ -16,9 +17,32 @@ const USER_STATUS = [
   'APPROVED' // Indicates that the users' username has been approved
 ];
 
+// /**
+//  * The Mongo schema for a User Tag.
+//  * @type {Schema}
+//  */
+// const TagSchema = new Schema({
+//
+//   // This is the actual 'tag' and we only permit tags that are in Setting.tags.
+//   id: String,
+//
+//   // The User ID of the user that added the tag.
+//   added_by: {
+//     type: String,
+//     default: null
+//   },
+//
+//   created_at: {
+//     type: Date,
+//     default: Date
+//   }
+// }, {
+//   _id: false
+// });
+
 // ProfileSchema is the mongoose schema defined as the representation of a
 // User's profile stored in MongoDB.
-const ProfileSchema = new mongoose.Schema({
+const ProfileSchema = new Schema({
 
   // ID provides the identifier for the user profile, in the case of a local
   // provider, the id would be an email, in the case of a social provider,
@@ -41,7 +65,7 @@ const ProfileSchema = new mongoose.Schema({
   // used by the `local` provider to indicate when the email address was
   // confirmed.
   metadata: {
-    type: mongoose.Schema.Types.Mixed
+    type: Schema.Types.Mixed
   }
 }, {
   _id: false
@@ -49,7 +73,7 @@ const ProfileSchema = new mongoose.Schema({
 
 // UserSchema is the mongoose schema defined as the representation of a User in
 // MongoDB.
-const UserSchema = new mongoose.Schema({
+const UserSchema = new Schema({
 
   // This ID represents the most unique identifier for a user, it is generated
   // when the user is created as a random uuid.
@@ -111,18 +135,6 @@ const UserSchema = new mongoose.Schema({
     default: false
   },
 
-  tags: [{
-    id: {
-      type: String,
-      unique: true
-    },
-    public: Boolean,
-    text: [{
-      type: mongoose.Schema.Types.Mixed,
-      default:  null
-    }]
-  }],
-
   // User's settings
   settings: {
     bio: {
diff --git a/services/comments.js b/services/comments.js
index aae5c8248..db4dd18c1 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -4,6 +4,9 @@ const ActionModel = require('../models/action');
 const ActionsService = require('./actions');
 const SettingModel = require('../models/setting');
 const SettingsService = require('./settings');
+const UsersService = require('./users');
+
+const errors = require('../errors');
 
 const STATUSES = [
   'ACCEPTED',
@@ -58,29 +61,37 @@ module.exports = class CommentsService {
     return SettingsService.retrieve()
     .then((settings) => {
 
-      // Moderators or ADMIN can add any tag automatically.
-      if (added_by != null && (added_by.hasRoles('ADMIN') || added_by.hasRoles('MODERATOR'))) {
-        SettingModel.findOneAndUpdate({id: settings.id}, {
-          $push: {
-            tags: {
-              id: name,
-              models: ['COMMENTS']
+      UsersService.findById(added_by)
+      .then((user) => {
+
+        // Moderators or ADMIN can add any tag automatically.
+        if (user != null && (user.hasRoles('ADMIN') || user.hasRoles('MODERATOR'))) {
+          SettingModel.findOneAndUpdate({id: settings.id}, {
+            $push: {
+              tags: {
+                id: name,
+                models: ['COMMENTS']
+              }
             }
-          }
-        });
-      }
-      else if (!ALLOWED_TAGS.includes(name) || settings.tags.findIndex((t) => {return t.id === name & t.models.include('COMMENTS');}) === -1) {
-        return Promise.reject(new Error('tag not allowed'));
-      }
+          });
+        }
+        else if (!ALLOWED_TAGS.includes(name) || settings.tags.findIndex((t) => {return t.id === name & t.models.include('COMMENTS');}) === -1) {
+          return Promise.reject(errors.ErrorTagNotAllowed);
+        }
+      });
 
       return CommentModel.findOneAndUpdate({id}, {
         $push: {
           tags: {
             id: name,
-            added_by: added_by.id
+            added_by: added_by
           }
-        }
-      });
+        },
+      },
+        {
+          new: false,
+          upsert: false
+        });
     });
   }
 
diff --git a/services/users.js b/services/users.js
index 14301ccf4..c33b18780 100644
--- a/services/users.js
+++ b/services/users.js
@@ -339,6 +339,7 @@ module.exports = class UsersService {
                   if (err.message.match('Username')) {
                     return reject(errors.ErrUsernameTaken);
                   }
+                  console.log('DEBUG FUCKING ERROR', err);
                   return reject(errors.ErrEmailTaken);
                 }
                 return reject(err);
diff --git a/test/server/graph/mutations/ignoreUser.js b/test/server/graph/mutations/ignoreUser.js
index 54d6305a1..94243a690 100644
--- a/test/server/graph/mutations/ignoreUser.js
+++ b/test/server/graph/mutations/ignoreUser.js
@@ -32,11 +32,18 @@ describe('graph.mutations.ignoreUser', () => {
 
   // @TODO (bengo) - test a user can't ignore themselves
   it('users can ignoreUser', async () => {
+    UsersService.findLocalUser('usernameB@example.com')
+    .then((user) => {
+      console.log('--------- debug user', user);
+    });
     const user = await UsersService.createLocalUser('usernameA@example.com', 'password', 'usernameA');
+    console.log('--------------- debug aca -2');
     const userToIgnore = await UsersService.createLocalUser('usernameB@example.com', 'password', 'usernameB');
+    console.log('--------------- debug aca -1');
     const context = new Context({user});
     const ignoreUserResponse = await graphql(schema, ignoreUserMutation, {}, context, {id: userToIgnore.id});
     if (ignoreUserResponse.errors && ignoreUserResponse.errors.length) {
+      console.log('--------------- debug aca 0');
       console.error(ignoreUserResponse.errors);
     }
     expect(ignoreUserResponse.errors).to.be.empty;
@@ -44,13 +51,17 @@ describe('graph.mutations.ignoreUser', () => {
     // now check my ignored users
     const myIgnoredUsersResponse = await graphql(schema, getMyIgnoredUsersQuery, {}, context, {});
     if (myIgnoredUsersResponse.errors && myIgnoredUsersResponse.errors.length) {
+      console.log('debug aca 1');
       console.error(myIgnoredUsersResponse.errors);
     }
     expect(myIgnoredUsersResponse.errors).to.be.empty;
     const myIgnoredUsers = myIgnoredUsersResponse.data.myIgnoredUsers;
     expect(myIgnoredUsers.length).to.equal(1);
+    console.log('debug aca 2');
     expect(myIgnoredUsers[0].id).to.equal(userToIgnore.id);
+    console.log('debug aca 3');
     expect(myIgnoredUsers[0].username).to.equal(userToIgnore.username);
+    console.log('debug aca 4');
   });
 
   it('users cannot ignore themselves', async () => {
diff --git a/test/server/graph/mutations/removeCommentTag.js b/test/server/graph/mutations/removeCommentTag.js
index 663e0de9a..760887a44 100644
--- a/test/server/graph/mutations/removeCommentTag.js
+++ b/test/server/graph/mutations/removeCommentTag.js
@@ -34,7 +34,7 @@ describe('graph.mutations.removeCommentTag', () => {
     const context = new Context({user});
 
     // add a tag first
-    await CommentsService.addTag(comment.id, 'BEST', user);
+    await CommentsService.addTag(comment.id, 'BEST', user.id);
     const response = await graphql(schema, query, {}, context, {id: comment.id, tag: 'BEST'});
     if (response.errors && response.errors.length) {
       console.error(response.errors);
@@ -59,25 +59,28 @@ describe('graph.mutations.removeCommentTag', () => {
           models: ['COMMENTS']
         }
       }
-    });
-    Object.entries({
-      'anonymous': undefined,
-      'regular commenter': new UserModel({}),
-      'banned moderator': new UserModel({roles: ['MODERATOR'], status: 'BANNED'})
-    }).forEach(([ userDescription, user ]) => {
-      it(userDescription, async function () {
-        const context = new Context({user});
+    })
+    .then(() => {
+      Object.entries({
+        'anonymous': undefined,
+        'regular commenter': new UserModel({}),
+        'banned moderator': new UserModel({roles: ['MODERATOR'], status: 'BANNED'})
+      }).forEach(([ userDescription, user ]) => {
+        it(userDescription, async function () {
+          const context = new Context({user});
 
-        // add a tag first
-        await CommentsService.addTag(comment.id, 'BEST', user);
-        const response = await graphql(schema, query, {}, context, {id: comment.id, tag: 'BEST'});
-        if (response.errors && response.errors.length) {
-          console.error(response.errors);
-        }
-        expect(response.errors).to.be.empty;
+          // add a tag first
+          await CommentsService.addTag(comment.id, 'BEST', user.id);
 
-        expect(response.data.removeCommentTag.errors).to.deep.equal([{'translation_key':'NOT_AUTHORIZED'}]);
-        expect(response.data.removeCommentTag.comment).to.be.null;
+          const response = await graphql(schema, query, {}, context, {id: comment.id, tag: 'BEST'});
+          if (response.errors && response.errors.length) {
+            console.error(response.errors);
+          }
+          expect(response.errors).to.be.empty;
+
+          expect(response.data.removeCommentTag.errors).to.deep.equal([{'translation_key':'NOT_AUTHORIZED'}]);
+          expect(response.data.removeCommentTag.comment).to.be.null;
+        });
       });
     });
   });
diff --git a/test/server/services/comments.js b/test/server/services/comments.js
index ed908d1b2..e01fc7bad 100644
--- a/test/server/services/comments.js
+++ b/test/server/services/comments.js
@@ -227,8 +227,8 @@ describe('services.CommentsService', () => {
       await CommentsService.addTag(commentId, tagName, userId, 'PUBLIC');
       const {tags} = await CommentsService.findById(commentId);
       expect(tags.length).to.equal(1);
-      expect(tags[0].name).to.equal(tagName);
-      expect(tags[0].assigned_by).to.equal(userId);
+      expect(tags[0].id).to.equal(tagName);
+      expect(tags[0].added_by).to.equal(userId);
       expect(tags[0].created_at).to.be.an.instanceof(Date);
     });
     it('can\'t add a tag to comment id that doesn\'t exist', async () => {
@@ -238,7 +238,7 @@ describe('services.CommentsService', () => {
 
       await expect(CommentsService.addTag(commentId, tagName, userId, 'PUBLIC')).to.be.rejected;
     });
-    it('can\'t add same tag.name twice', async () => {
+    it('can\'t add same tag.id twice', async () => {
       const commentId = comments[0].id;
       const tagName = 'BEST';
       const userId = users[0].id;

From 743a96cd217f7be2790658ca9e7455d6ece4ff81 Mon Sep 17 00:00:00 2001
From: gaba <gabelula@gmail.com>
Date: Mon, 8 May 2017 13:09:17 -0700
Subject: [PATCH 013/264] Removes debug statements.

---
 services/users.js                         |  1 -
 test/server/graph/mutations/ignoreUser.js | 12 +-----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/services/users.js b/services/users.js
index c33b18780..14301ccf4 100644
--- a/services/users.js
+++ b/services/users.js
@@ -339,7 +339,6 @@ module.exports = class UsersService {
                   if (err.message.match('Username')) {
                     return reject(errors.ErrUsernameTaken);
                   }
-                  console.log('DEBUG FUCKING ERROR', err);
                   return reject(errors.ErrEmailTaken);
                 }
                 return reject(err);
diff --git a/test/server/graph/mutations/ignoreUser.js b/test/server/graph/mutations/ignoreUser.js
index 94243a690..8de54a41d 100644
--- a/test/server/graph/mutations/ignoreUser.js
+++ b/test/server/graph/mutations/ignoreUser.js
@@ -32,18 +32,12 @@ describe('graph.mutations.ignoreUser', () => {
 
   // @TODO (bengo) - test a user can't ignore themselves
   it('users can ignoreUser', async () => {
-    UsersService.findLocalUser('usernameB@example.com')
-    .then((user) => {
-      console.log('--------- debug user', user);
-    });
+    UsersService.findLocalUser('usernameB@example.com');
     const user = await UsersService.createLocalUser('usernameA@example.com', 'password', 'usernameA');
-    console.log('--------------- debug aca -2');
     const userToIgnore = await UsersService.createLocalUser('usernameB@example.com', 'password', 'usernameB');
-    console.log('--------------- debug aca -1');
     const context = new Context({user});
     const ignoreUserResponse = await graphql(schema, ignoreUserMutation, {}, context, {id: userToIgnore.id});
     if (ignoreUserResponse.errors && ignoreUserResponse.errors.length) {
-      console.log('--------------- debug aca 0');
       console.error(ignoreUserResponse.errors);
     }
     expect(ignoreUserResponse.errors).to.be.empty;
@@ -51,17 +45,13 @@ describe('graph.mutations.ignoreUser', () => {
     // now check my ignored users
     const myIgnoredUsersResponse = await graphql(schema, getMyIgnoredUsersQuery, {}, context, {});
     if (myIgnoredUsersResponse.errors && myIgnoredUsersResponse.errors.length) {
-      console.log('debug aca 1');
       console.error(myIgnoredUsersResponse.errors);
     }
     expect(myIgnoredUsersResponse.errors).to.be.empty;
     const myIgnoredUsers = myIgnoredUsersResponse.data.myIgnoredUsers;
     expect(myIgnoredUsers.length).to.equal(1);
-    console.log('debug aca 2');
     expect(myIgnoredUsers[0].id).to.equal(userToIgnore.id);
-    console.log('debug aca 3');
     expect(myIgnoredUsers[0].username).to.equal(userToIgnore.username);
-    console.log('debug aca 4');
   });
 
   it('users cannot ignore themselves', async () => {

From 96cd5197e3b5b0804ccfc28d27edca6c332b3377 Mon Sep 17 00:00:00 2001
From: gaba <gabelula@gmail.com>
Date: Mon, 8 May 2017 16:05:40 -0700
Subject: [PATCH 014/264] Test was failing as I was not returning an error.

---
 errors.js                                 |  4 ++--
 models/comment.js                         |  9 +++++++
 services/comments.js                      | 29 +++++++++++++++++------
 test/server/graph/mutations/ignoreUser.js |  1 -
 test/server/services/comments.js          | 11 +++++----
 5 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/errors.js b/errors.js
index 9f12c7835..5c2b05f92 100644
--- a/errors.js
+++ b/errors.js
@@ -82,7 +82,7 @@ const ErrNoCommentFound = new APIError('comment does not exist', {
 });
 
 // ErrNoCommentFound is returned when trying to add a tag to a comment that does not exist.
-const ErrorTagNotAllowed = new APIError('tag not allowed', {
+const ErrTagNotAllowed = new APIError('tag not allowed', {
   translation_key: 'TAG_NOT_ALLOWED',
   status: 400
 });
@@ -174,7 +174,7 @@ module.exports = {
   ErrMissingPassword,
   ErrMissingToken,
   ErrNoCommentFound,
-  ErrorTagNotAllowed,
+  ErrTagNotAllowed,
   ErrEmailTaken,
   ErrSpecialChars,
   ErrMissingUsername,
diff --git a/models/comment.js b/models/comment.js
index f3e239080..219ec055d 100644
--- a/models/comment.js
+++ b/models/comment.js
@@ -92,6 +92,15 @@ const CommentSchema = new Schema({
   }
 });
 
+// Add the indexes on the comment tag.
+CommentSchema.index({
+  'id': 1,
+  'tags.id': 1
+}, {
+  unique: true,
+  background: false
+});
+
 // Comment model.
 const Comment = mongoose.model('Comment', CommentSchema);
 
diff --git a/services/comments.js b/services/comments.js
index db4dd18c1..e1873ba02 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -76,21 +76,26 @@ module.exports = class CommentsService {
           });
         }
         else if (!ALLOWED_TAGS.includes(name) || settings.tags.findIndex((t) => {return t.id === name & t.models.include('COMMENTS');}) === -1) {
-          return Promise.reject(errors.ErrorTagNotAllowed);
+          return Promise.reject(errors.ErrTagNotAllowed);
         }
       });
 
-      return CommentModel.findOneAndUpdate({id}, {
+      return CommentModel.findOneAndUpdate({id, 'tags.id': {$ne: name}}, {
         $push: {
           tags: {
             id: name,
             added_by: added_by
           }
         },
-      },
-        {
-          new: false,
-          upsert: false
+      })
+        .then(({nModified}) => {
+          switch (nModified) {
+          case 0:
+            return Promise.reject(errors.ErrNoCommentFound);
+          case 1:
+            return;
+          default:
+          }
         });
     });
   }
@@ -102,12 +107,22 @@ module.exports = class CommentsService {
    * @param {String} tag_id the id of the tag to remove
    */
   static removeTag(id, tag_id) {
-    return CommentModel.findOneAndUpdate({id}, {
+    return CommentModel.findOneAndUpdate({id, 'tags.id': tag_id}, {
       $pull: {
         tags: {
           id: tag_id
         }
       }
+    }
+    )
+    .then(({nModified}) => {
+      switch(nModified) {
+      case 0:
+        return Promise.reject(errors.ErrNoCommentFound);
+      case 1:
+        return;
+      default:
+      }
     });
   }
 
diff --git a/test/server/graph/mutations/ignoreUser.js b/test/server/graph/mutations/ignoreUser.js
index 8de54a41d..54d6305a1 100644
--- a/test/server/graph/mutations/ignoreUser.js
+++ b/test/server/graph/mutations/ignoreUser.js
@@ -32,7 +32,6 @@ describe('graph.mutations.ignoreUser', () => {
 
   // @TODO (bengo) - test a user can't ignore themselves
   it('users can ignoreUser', async () => {
-    UsersService.findLocalUser('usernameB@example.com');
     const user = await UsersService.createLocalUser('usernameA@example.com', 'password', 'usernameA');
     const userToIgnore = await UsersService.createLocalUser('usernameB@example.com', 'password', 'usernameB');
     const context = new Context({user});
diff --git a/test/server/services/comments.js b/test/server/services/comments.js
index e01fc7bad..27657efa5 100644
--- a/test/server/services/comments.js
+++ b/test/server/services/comments.js
@@ -236,7 +236,10 @@ describe('services.CommentsService', () => {
       const tagName = 'BEST';
       const userId = users[0].id;
 
-      await expect(CommentsService.addTag(commentId, tagName, userId, 'PUBLIC')).to.be.rejected;
+      CommentsService.addTag(commentId, tagName, userId)
+      .catch((error) => {
+        expect(error).to.not.be.null;
+      });
     });
     it('can\'t add same tag.id twice', async () => {
       const commentId = comments[0].id;
@@ -244,10 +247,10 @@ describe('services.CommentsService', () => {
       const userId = users[0].id;
 
       // first time
-      await CommentsService.addTag(commentId, tagName, userId, 'PUBLIC');
+      await CommentsService.addTag(commentId, tagName, userId);
 
       // second time should fail
-      await expect(CommentsService.addTag(commentId, tagName, userId, 'PUBLIC')).to.be.rejected;
+      await expect(CommentsService.addTag(commentId, tagName, userId)).to.be.rejected;
     });
   });
 
@@ -255,7 +258,7 @@ describe('services.CommentsService', () => {
     it('removes a tag', async () => {
       const commentId = comments[0].id;
       const tagName = 'BEST';
-      await CommentsService.addTag(commentId, tagName, users[0].id, 'PUBLIC');
+      await CommentsService.addTag(commentId, tagName, users[0].id);
       const {tags} = await CommentsService.findById(commentId);
       expect(tags.length).to.equal(1);
 

From 7c09902294e7c9217ed751548606735c63a509ac Mon Sep 17 00:00:00 2001
From: gaba <gabelula@gmail.com>
Date: Mon, 8 May 2017 16:55:11 -0700
Subject: [PATCH 015/264] The name for the tag is called ID.

---
 .../src/containers/Comment.js                  |  2 +-
 .../graphql/fragments/commentView.graphql      |  2 +-
 .../graphql/mutations/addCommentTag.graphql    |  2 +-
 .../graphql/mutations/removeCommentTag.graphql |  2 +-
 graph/loaders/settings.js                      | 18 ++----------------
 5 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/client/coral-embed-stream/src/containers/Comment.js b/client/coral-embed-stream/src/containers/Comment.js
index 9b48e0809..09723b973 100644
--- a/client/coral-embed-stream/src/containers/Comment.js
+++ b/client/coral-embed-stream/src/containers/Comment.js
@@ -28,7 +28,7 @@ export default withFragments({
       created_at
       status
       tags {
-        name
+        id
       }
       user {
         id
diff --git a/client/coral-framework/graphql/fragments/commentView.graphql b/client/coral-framework/graphql/fragments/commentView.graphql
index 0ed5e00b8..71a6ae2d4 100644
--- a/client/coral-framework/graphql/fragments/commentView.graphql
+++ b/client/coral-framework/graphql/fragments/commentView.graphql
@@ -6,7 +6,7 @@ fragment commentView on Comment {
     created_at
     status
     tags {
-      name
+      id
     }
     user {
         id
diff --git a/client/coral-framework/graphql/mutations/addCommentTag.graphql b/client/coral-framework/graphql/mutations/addCommentTag.graphql
index 5fd63868e..a4ff36da4 100644
--- a/client/coral-framework/graphql/mutations/addCommentTag.graphql
+++ b/client/coral-framework/graphql/mutations/addCommentTag.graphql
@@ -3,7 +3,7 @@ mutation AddCommentTag ($id: ID!, $tag: String!) {
     comment {
       id
       tags {
-        name
+        id
       }
     }
     errors {
diff --git a/client/coral-framework/graphql/mutations/removeCommentTag.graphql b/client/coral-framework/graphql/mutations/removeCommentTag.graphql
index 3826b0703..642466f00 100644
--- a/client/coral-framework/graphql/mutations/removeCommentTag.graphql
+++ b/client/coral-framework/graphql/mutations/removeCommentTag.graphql
@@ -3,7 +3,7 @@ mutation RemoveCommentTag ($id: ID!, $tag: String!) {
     comment {
       id
       tags {
-        name
+        id
       }
     }
     errors {
diff --git a/graph/loaders/settings.js b/graph/loaders/settings.js
index 9d777255f..83545821d 100644
--- a/graph/loaders/settings.js
+++ b/graph/loaders/settings.js
@@ -1,25 +1,11 @@
 const SettingsService = require('../../services/settings');
-const SettingModel = require('../../models/setting');
-
 const util = require('./util');
 
-/**
- * Search for tags based on their item_type.
- * @param  {String} item_type   the item type to search by
- * @return {Promise}            resolves to distinct items tags
- */
-const getByItemType = (_, item_type) => {
-  return SettingModel.distinct('tags.models', {item_type});
-};
-
 /**
  * Creates a set of loaders based on a GraphQL context.
  * @param  {Object} context the context of the GraphQL request
  * @return {Object}         object of loaders
  */
-module.exports = (context) => ({
-  Settings: {
-    get: new util.SingletonResolver(() => SettingsService.retrieve()),
-    getTagsByItemType: (item_type) => getByItemType(context, item_type)
-  }
+module.exports = () => ({
+  Settings: new util.SingletonResolver(() => SettingsService.retrieve())
 });

From da0cebbda72b2e6b2e8335987c8dfc8179193ae7 Mon Sep 17 00:00:00 2001
From: gaba <gabelula@gmail.com>
Date: Mon, 8 May 2017 17:06:49 -0700
Subject: [PATCH 016/264] Fix the plugin TagLabel to show the staff tag.

---
 client/coral-embed-stream/src/components/Comment.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-embed-stream/src/components/Comment.js b/client/coral-embed-stream/src/components/Comment.js
index 4349fe38d..b58bf2957 100644
--- a/client/coral-embed-stream/src/components/Comment.js
+++ b/client/coral-embed-stream/src/components/Comment.js
@@ -23,7 +23,7 @@ import {getActionSummary, iPerformedThisAction} from 'coral-framework/utils';
 
 import styles from './Comment.css';
 
-const isStaff = tags => !tags.every(t => t.name !== 'STAFF');
+const isStaff = tags => !tags.every(t => t.id !== 'STAFF');
 
 // hold actions links (e.g. Reply) along the comment footer
 const ActionButton = ({children}) => {
@@ -72,7 +72,7 @@ class Comment extends React.Component {
       id: PropTypes.string.isRequired,
       tags: PropTypes.arrayOf(
         PropTypes.shape({
-          name: PropTypes.string
+          id: PropTypes.string
         })
       ),
       replies: PropTypes.arrayOf(

From 2e1bc8d75a2b21f3a8ffac41653ae78ede367c6a Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Tue, 9 May 2017 15:01:01 -0600
Subject: [PATCH 017/264] Adjusted query/tag flow

---
 graph/mutators/comment.js                     | 155 ++++++++++++++++--
 graph/resolvers/index.js                      |   4 +
 graph/resolvers/root_mutation.js              |  11 +-
 graph/resolvers/tag.js                        |   5 +
 graph/resolvers/tag_link.js                   |   9 +
 graph/typeDefs.graphql                        |  36 ++--
 models/action.js                              |  13 +-
 models/comment.js                             |  44 +----
 models/enum/action_types.js                   |   4 +
 models/enum/comment_status.js                 |   6 +
 models/enum/item_types.js                     |   5 +
 models/enum/moderation_options.js             |   4 +
 models/enum/user_roles.js                     |   4 +
 models/enum/user_status.js                    |   6 +
 models/schema/tag.js                          |  53 ++++++
 models/schema/tag_link.js                     |  31 ++++
 models/setting.js                             |  43 +----
 models/user.js                                |  43 +----
 services/comments.js                          | 122 +++++---------
 services/tags.js                              |   5 +
 services/users.js                             |   4 +-
 test/server/graph/mutations/addCommentTag.js  |  29 ++--
 test/server/graph/mutations/createComment.js  |   6 +-
 .../graph/mutations/removeCommentTag.js       |  68 ++++----
 test/server/services/comments.js              | 109 +++++++-----
 25 files changed, 476 insertions(+), 343 deletions(-)
 create mode 100644 graph/resolvers/tag_link.js
 create mode 100644 models/enum/action_types.js
 create mode 100644 models/enum/comment_status.js
 create mode 100644 models/enum/item_types.js
 create mode 100644 models/enum/moderation_options.js
 create mode 100644 models/enum/user_roles.js
 create mode 100644 models/enum/user_status.js
 create mode 100644 models/schema/tag.js
 create mode 100644 models/schema/tag_link.js
 create mode 100644 services/tags.js

diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index 3413c6f4e..3a57f3b3a 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -18,18 +18,25 @@ const Wordlist = require('../../services/wordlist');
  */
 const createComment = ({user, loaders: {Comments}, pubsub}, {body, asset_id, parent_id = null}, status = 'NONE') => {
 
+  // Add the staff tag for comments created as a staff member.
+  let tags = [];
+  if (user.hasRoles('ADMIN') || user.hasRoles('MODERATOR')) {
+    tags = [{
+      tag: {
+        name: 'STAFF'
+      }
+    }];
+  }
+
   return CommentsService.publicCreate({
     body,
     asset_id,
     parent_id,
     status,
+    tags,
     author_id: user.id
   })
-  .then(async (comment) => {
-
-    if (user.hasRoles('ADMIN') || user.hasRoles('MODERATOR')) {
-      await CommentsService.addTag(comment.id, 'STAFF', user.id);
-    }
+  .then((comment) => {
 
     // If the loaders are present, clear the caches for these values because we
     // just added a new comment, hence the counts should be updated. We should
@@ -204,21 +211,139 @@ const setCommentStatus = ({user, loaders: {Comments}}, {id, status}) => {
 };
 
 /**
- * Adds a tag to a Comment
- * @param {String} id          identifier of the comment  (uuid)
- * @param {String} tag     name of the tag
+ * Adds a tag to a Comment.
  */
-const addCommentTag = ({user, loaders: {Comments}}, {id, tag}) => {
-  return CommentsService.addTag(id, tag, user.id);
+const addCommentTag = async ({user, loaders: {Assets, Comments, Settings}}, {id, asset_id, name}) => {
+
+  // If the current user does not have the ADMIN or MODERATOR role
+  if (!user || !user.can('mutation:addCommentTag')) {
+    throw errors.ErrNotAuthorized;
+  }
+
+  // Load the settings from the dataloader, it will be cached if it was
+  // retrieved already.
+  let settings = await AssetsService.rectifySettings(AssetsService.findById(asset_id));
+
+  // Try to find the tag in the asset tags. This will contain the permission
+  // information.
+  let tag = settings.tags.find((globalTag) => {
+    return globalTag.name === name && globalTag.models.include('COMMENTS');
+  });
+
+  // Create the new tagLink that will be created to attach to the comment.
+  let tagLink = {
+    tag,
+    assigned_by: user.id,
+    created_at: new Date()
+  };
+
+  // If the tag was found, we need to ensure that the current user can indeed
+  // set this tag on the comment.
+  if (tag) {
+    
+    // If the tag has roles defined, and the current user has at least one of
+    // the required roles, then add the tag without checking for ownership.
+    if (tag.permissions && tag.permissions.roles && tag.permissions.roles.some((role) => user.roles.include(role))) {
+      return CommentsService.addTag(id, tagLink, false);
+    }
+
+    // If the permissions allow for self assignment, then ensure that the query
+    // is compose with that in mind.
+    if (tag.permissions && tag.permissions.self) {
+
+      // Otherwise, we assume that we have to check to see that the user indeed
+      // owns the resource before allowing the tag to get added.
+      return CommentsService.addTag(id, tagLink, true);
+    }
+
+    throw errors.ErrNotAuthorized;
+  }
+
+  // Only admin/moderators can add unique tags, these are tags that are not in
+  // the global list.
+  if (!(user.hasRoles('ADMIN') || user.hasRoles('MODERATOR'))) {
+    throw errors.ErrNotAuthorized;
+  }
+
+  // Generate the tag in the event now that we have to create the tag for this
+  // specific comment.
+  tagLink.tag = {
+    name,
+    permissions: {
+      public: true,
+      self: false,
+      roles: []
+    },
+    models: ['COMMENTS'],
+    created_at: new Date()
+  };
+
+  // Actually attach the new tag that we created to the comment.
+  return CommentsService.addTag(id, tagLink, false);
 };
 
 /**
- * Removes a tag from a Comment
- * @param {String} id          identifier of the comment  (uuid)
- * @param {String} tag     name of the tag
+ * Removes a tag from a Comment.
  */
-const removeCommentTag = ({user, loaders: {Comments}}, {id, tag}) => {
-  return CommentsService.removeTag(id, tag);
+const removeCommentTag = async ({user, loaders: {Comments}}, {id, asset_id, name}) => {
+
+  // If the current user does not have the ADMIN or MODERATOR role
+  if (!user || !user.can('mutation:removeCommentTag')) {
+    throw errors.ErrNotAuthorized;
+  }
+
+  // Load the settings from the dataloader, it will be cached if it was
+  // retrieved already.
+  let settings = await AssetsService.rectifySettings(AssetsService.findById(asset_id));
+
+  // Try to find the tag in the asset tags. This will contain the permission
+  // information.
+  let tag = settings.tags.find((globalTag) => {
+    return globalTag.name === name && globalTag.models.include('COMMENTS');
+  });
+
+  // Create the new tagLink that will be created to attach to the comment.
+  let tagLink = {
+    tag,
+    assigned_by: user.id
+  };
+
+  // If the tag was found, we need to ensure that the current user can indeed
+  // remove this tag on the comment.
+  if (tag) {
+    
+    // If the tag has roles defined, and the current user has at least one of
+    // the required roles, then remove the tag without checking for ownership.
+    if (tag.permissions && tag.permissions.roles && tag.permissions.roles.some((role) => user.roles.include(role))) {
+      return CommentsService.removeTag(id, tagLink, false);
+    }
+
+    // If the permissions allow for self assignment, then ensure that the query
+    // is compose with that in mind.
+    if (tag.permissions && tag.permissions.self) {
+
+      // Otherwise, we assume that we have to check to see that the user indeed
+      // owns the resource before allowing the tag to get removed.
+      return CommentsService.removeTag(id, tagLink, true);
+    }
+
+    throw errors.ErrNotAuthorized;
+  }
+
+  // Only admin/moderators can remove unique tags, these are tags that are not
+  // in the global list.
+  if (!(user.hasRoles('ADMIN') || user.hasRoles('MODERATOR'))) {
+    throw errors.ErrNotAuthorized;
+  }
+
+  // Generate the tag in the event now that we have to create the tag for this
+  // specific comment.
+  tagLink.tag = {
+    name
+  };
+
+  // Actually attach the new tag that we created to the comment.
+  return CommentsService.removeTag(id, tagLink, false);
 };
 
 module.exports = (context) => {
diff --git a/graph/resolvers/index.js b/graph/resolvers/index.js
index cbeb6dbf9..f2707bcc8 100644
--- a/graph/resolvers/index.js
+++ b/graph/resolvers/index.js
@@ -16,6 +16,8 @@ const RootMutation = require('./root_mutation');
 const RootQuery = require('./root_query');
 const Settings = require('./settings');
 const Subscription = require('./subscription');
+const TagLink = require('./tag_link');
+const Tag = require('./tag');
 const UserError = require('./user_error');
 const User = require('./user');
 const ValidationUserError = require('./validation_user_error');
@@ -39,6 +41,8 @@ let resolvers = {
   RootQuery,
   Settings,
   Subscription,
+  TagLink,
+  Tag,
   UserError,
   User,
   ValidationUserError,
diff --git a/graph/resolvers/root_mutation.js b/graph/resolvers/root_mutation.js
index 5b60fbaa8..442845bd2 100644
--- a/graph/resolvers/root_mutation.js
+++ b/graph/resolvers/root_mutation.js
@@ -1,5 +1,4 @@
 const wrapResponse = require('../helpers/response');
-const CommentsService = require('../../services/comments');
 
 const RootMutation = {
   createComment(_, {comment}, {mutators: {Comment}}) {
@@ -29,12 +28,12 @@ const RootMutation = {
   setCommentStatus(_, {id, status}, {mutators: {Comment}}) {
     return wrapResponse(null)(Comment.setCommentStatus({id, status}));
   },
-  addCommentTag(_, {id, tag}, {mutators: {Comment}}) {
-    return wrapResponse('comment')(Comment.addCommentTag({id, tag}).then(() => CommentsService.findById(id)));
-  },
-  removeCommentTag(_, {id, tag}, {mutators: {Comment}}) {
-    return wrapResponse('comment')(Comment.removeCommentTag({id, tag}).then(() => CommentsService.findById(id)));
+  addCommentTag(_, {id, asset_id, name}, {mutators: {Comment}}) {
+    return wrapResponse('comment')(Comment.addCommentTag({id, asset_id, name}));
   },
+  removeCommentTag(_, {id, asset_id, name}, {mutators: {Comment}}) {
+    return wrapResponse('comment')(Comment.removeCommentTag({id, asset_id, name}));
+  }
 };
 
 module.exports = RootMutation;
diff --git a/graph/resolvers/tag.js b/graph/resolvers/tag.js
index e69de29bb..e1cd7922d 100644
--- a/graph/resolvers/tag.js
+++ b/graph/resolvers/tag.js
@@ -0,0 +1,5 @@
+const Tag = {
+
+};
+
+module.exports = Tag;
diff --git a/graph/resolvers/tag_link.js b/graph/resolvers/tag_link.js
new file mode 100644
index 000000000..5c0d39587
--- /dev/null
+++ b/graph/resolvers/tag_link.js
@@ -0,0 +1,9 @@
+const TagLink = {
+  assigned_by({assigned_by}, _, {user, loaders: {Users}}) {
+    if (user && user.hasRole('ADMIN')) {
+      return Users.getByID.load(assigned_by);
+    }
+  }
+};
+
+module.exports = TagLink;
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 781b3b328..bbe3e4d17 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -52,14 +52,30 @@ type User {
   status: USER_STATUS
 }
 
+# Tag represents the underlying Tag that can be either stored in a global list
+# or added uniquely to the entity.
 type Tag {
-  # the actual tag for the comment.
-  id: String!
 
-  # the user that assigned the tag. If NULL then the system automatically tagged it.
-  added_by: String
+  # The actual name of the tag entry.
+  name: String!
 
-  # the time when the tag was assigned.
+  # The time that this Tag was created.
+  created_at: Date!
+}
+
+# TagLink is used to associate a given Tag with a Model via a TagLink.
+type TagLink {
+
+  # The underlying Tag that is either duplicated from the global list or created
+  # uniquely for this specific model.
+  tag: Tag!
+  
+  # The user that assigned the tag. This TagLink could have been created by the
+  # system, in which case this will be null. It could also be null if the
+  # current user is not an Admin/Moderator.
+  assigned_by: User
+  
+  # The date that the TagLink was created.
   created_at: Date!
 }
 
@@ -176,7 +192,7 @@ type Comment {
   body: String!
 
   # the tags on the comment
-  tags: [Tag]
+  tags: [TagLink!]
 
   # the user who authored the comment.
   user: User
@@ -702,15 +718,15 @@ type SetCommentStatusResponse implements Response {
 
 # Response to addCommentTag mutation
 type AddCommentTagResponse implements Response {
+  
   # An array of errors relating to the mutation that occured.
-  comment: Comment
   errors: [UserError]
 }
 
 # Response to removeCommentTag mutation
 type RemoveCommentTagResponse implements Response {
+
   # An array of errors relating to the mutation that occured.
-  comment: Comment
   errors: [UserError]
 }
 
@@ -751,10 +767,10 @@ type RootMutation {
   setCommentStatus(id: ID!, status: COMMENT_STATUS!): SetCommentStatusResponse
 
   # Add tag to comment.
-  addCommentTag(id: ID!, tag: String!): AddCommentTagResponse
+  addCommentTag(id: ID!, asset_id: ID!, name: String!): AddCommentTagResponse
 
   # Remove tag from comment.
-  removeCommentTag(id: ID!, tag: String!): RemoveCommentTagResponse
+  removeCommentTag(id: ID!, asset_id: ID!, name: String!): RemoveCommentTagResponse
 
   # Ignore comments by another user
   ignoreUser(id: ID!): IgnoreUserResponse
diff --git a/models/action.js b/models/action.js
index 36d83574e..8aa7322e3 100644
--- a/models/action.js
+++ b/models/action.js
@@ -1,17 +1,8 @@
 const mongoose = require('../services/mongoose');
 const uuid = require('uuid');
 const Schema = mongoose.Schema;
-
-const ACTION_TYPES = [
-  'LIKE',
-  'FLAG'
-];
-
-const ITEM_TYPES = [
-  'ASSETS',
-  'COMMENTS',
-  'USERS'
-];
+const ACTION_TYPES = require('./enum/action_types');
+const ITEM_TYPES = require('./enum/item_types');
 
 const ActionSchema = new Schema({
   id: {
diff --git a/models/comment.js b/models/comment.js
index 219ec055d..e3443376b 100644
--- a/models/comment.js
+++ b/models/comment.js
@@ -1,13 +1,8 @@
 const mongoose = require('../services/mongoose');
 const Schema = mongoose.Schema;
+const TagLinkSchema = require('./schema/tag_link');
 const uuid = require('uuid');
-
-const STATUSES = [
-  'ACCEPTED',
-  'REJECTED',
-  'PREMOD',
-  'NONE'
-];
+const COMMENT_STATUS = require('./enum/comment_status');
 
 /**
  * The Mongo schema for a Comment Status.
@@ -16,7 +11,7 @@ const STATUSES = [
 const StatusSchema = new Schema({
   type: {
     type: String,
-    enum: STATUSES,
+    enum: COMMENT_STATUS,
   },
 
   // The User ID of the user that assigned the status.
@@ -30,29 +25,6 @@ const StatusSchema = new Schema({
   _id: false
 });
 
-/**
- * The Mongo schema for a Comment Tag.
- * @type {Schema}
- */
-const TagSchema = new Schema({
-
-  // This is the actual 'tag' and we only permit tags that are in Setting.tags.
-  id: String,
-
-  // The User ID of the user that added the tag.
-  added_by: {
-    type: String,
-    default: null
-  },
-
-  created_at: {
-    type: Date,
-    default: Date
-  }
-}, {
-  _id: false
-});
-
 /**
  * The Mongo schema for a Comment.
  * @type {Schema}
@@ -73,12 +45,11 @@ const CommentSchema = new Schema({
   status_history: [StatusSchema],
   status: {
     type: String,
-    enum: STATUSES,
+    enum: COMMENT_STATUS,
     default: 'NONE'
   },
   parent_id: String,
-
-  tags: [TagSchema],
+  tags: [TagLinkSchema],
 
   // Additional metadata stored on the field.
   metadata: {
@@ -92,10 +63,9 @@ const CommentSchema = new Schema({
   }
 });
 
-// Add the indexes on the comment tag.
+// Add the indexes for the id of the comment.
 CommentSchema.index({
-  'id': 1,
-  'tags.id': 1
+  'id': 1
 }, {
   unique: true,
   background: false
diff --git a/models/enum/action_types.js b/models/enum/action_types.js
new file mode 100644
index 000000000..3a27d3b85
--- /dev/null
+++ b/models/enum/action_types.js
@@ -0,0 +1,4 @@
+module.exports = [
+  'LIKE',
+  'FLAG'
+];
diff --git a/models/enum/comment_status.js b/models/enum/comment_status.js
new file mode 100644
index 000000000..64633e9de
--- /dev/null
+++ b/models/enum/comment_status.js
@@ -0,0 +1,6 @@
+module.exports = [
+  'ACCEPTED',
+  'REJECTED',
+  'PREMOD',
+  'NONE'
+];
diff --git a/models/enum/item_types.js b/models/enum/item_types.js
new file mode 100644
index 000000000..e95aff82d
--- /dev/null
+++ b/models/enum/item_types.js
@@ -0,0 +1,5 @@
+module.exports = [
+  'ASSETS',
+  'COMMENTS',
+  'USERS'
+];
diff --git a/models/enum/moderation_options.js b/models/enum/moderation_options.js
new file mode 100644
index 000000000..0331d59e0
--- /dev/null
+++ b/models/enum/moderation_options.js
@@ -0,0 +1,4 @@
+module.exports = [
+  'PRE',
+  'POST'
+];
diff --git a/models/enum/user_roles.js b/models/enum/user_roles.js
new file mode 100644
index 000000000..0711adcd7
--- /dev/null
+++ b/models/enum/user_roles.js
@@ -0,0 +1,4 @@
+module.exports = [
+  'ADMIN',
+  'MODERATOR'
+];
diff --git a/models/enum/user_status.js b/models/enum/user_status.js
new file mode 100644
index 000000000..cec930904
--- /dev/null
+++ b/models/enum/user_status.js
@@ -0,0 +1,6 @@
+module.exports = [
+  'ACTIVE',
+  'BANNED',
+  'PENDING',
+  'APPROVED' // Indicates that the users' username has been approved
+];
diff --git a/models/schema/tag.js b/models/schema/tag.js
new file mode 100644
index 000000000..2d97185a0
--- /dev/null
+++ b/models/schema/tag.js
@@ -0,0 +1,53 @@
+const mongoose = require('../../services/mongoose');
+const Schema = mongoose.Schema;
+
+const ITEM_TYPES = require('../enum/item_types');
+const USER_ROLES = require('../enum/user_roles');
+
+/**
+ * The Mongo schema for a Tag.
+ * @type {Schema}
+ */
+const TagSchema = new Schema({
+
+  // The actual name of the tag.
+  name: String,
+
+  // Contains permission data.
+  permissions: {
+
+    // Determines if this tag is public or not.
+    public: {
+      type: Boolean,
+      default: true
+    },
+
+    // Determines if the owner of the Model can add/remove this tag on their own
+    // resources.
+    self: Boolean,
+
+    // Determines other roles that are allowed to set this tag on other
+    // resources.
+    roles: [{
+      type: String,
+      enum: USER_ROLES,
+      default: []
+    }]
+  },
+
+  // A list of all the model types that this tag can be added to.
+  models: [{
+    type: String,
+    enum: ITEM_TYPES
+  }],
+
+  // The date for when the tag was created.
+  created_at: {
+    type: Date,
+    default: Date
+  }
+}, {
+  _id: false
+});
+
+module.exports = TagSchema;
diff --git a/models/schema/tag_link.js b/models/schema/tag_link.js
new file mode 100644
index 000000000..1cc1dbd08
--- /dev/null
+++ b/models/schema/tag_link.js
@@ -0,0 +1,31 @@
+const mongoose = require('../../services/mongoose');
+const Schema = mongoose.Schema;
+const TagSchema = require('./tag');
+
+/**
+ * The Mongo schema for linking a Tag to a Model.
+ * @type {Schema}
+ */
+const TagLinkSchema = new Schema({
+
+  // A deep copy of the tag that is the origin for this link. If the ID matches
+  // with existing tags in the global/asset context then content will be
+  // substituted.
+  tag: TagSchema,
+
+  // The User ID of the user that assigned the status.
+  assigned_by: {
+    type: String,
+    default: null
+  },
+
+  // The date when the tag was added to the model.
+  created_at: {
+    type: Date,
+    default: Date
+  }
+}, {
+  _id: false
+});
+
+module.exports = TagLinkSchema;
diff --git a/models/setting.js b/models/setting.js
index 44f5ad5ca..aee266054 100644
--- a/models/setting.js
+++ b/models/setting.js
@@ -1,45 +1,7 @@
 const mongoose = require('../services/mongoose');
 const Schema = mongoose.Schema;
-
-const PERMISSIONS = [
-  'ADMIN'
-];
-
-/**
- * The Mongo schema for a Tag.
- * @type {Schema}
- */
-const TagSchema = new Schema({
-  id: {
-    type: String,
-    unique: true,
-    default: 'STAFF'
-  },
-  public: Boolean,
-  text: {
-    type: Schema.Types.Mixed,
-    default:  null
-  },
-  permissions: [{
-    type: String,
-    enum: PERMISSIONS,
-    default: 'ADMIN'
-  }],
-  models: [String],
-
-  // Additional metadata stored on the field.
-  metadata: Schema.Types.Mixed
-}, {
-  timestamps: {
-    createdAt: 'created_at',
-    updatedAt: 'updated_at'
-  }
-});
-
-const MODERATION_OPTIONS = [
-  'PRE',
-  'POST'
-];
+const TagSchema = require('./schema/tag');
+const MODERATION_OPTIONS = require('./enum/moderation_options');
 
 /**
  * SettingSchema manages application settings that get used on front and backend.
@@ -156,4 +118,3 @@ SettingSchema.method('merge', function(src) {
 const Setting = mongoose.model('Setting', SettingSchema);
 
 module.exports = Setting;
-module.exports.MODERATION_OPTIONS = MODERATION_OPTIONS;
diff --git a/models/user.js b/models/user.js
index 688c37c2c..b61ddd6eb 100644
--- a/models/user.js
+++ b/models/user.js
@@ -4,41 +4,10 @@ const Schema = mongoose.Schema;
 const uuid = require('uuid');
 
 // USER_ROLES is the array of roles that is permissible as a user role.
-const USER_ROLES = [
-  'ADMIN',
-  'MODERATOR'
-];
+const USER_ROLES = require('./enum/user_roles');
 
 // USER_STATUS is the list of statuses that are permitted for the user status.
-const USER_STATUS = [
-  'ACTIVE',
-  'BANNED',
-  'PENDING',
-  'APPROVED' // Indicates that the users' username has been approved
-];
-
-// /**
-//  * The Mongo schema for a User Tag.
-//  * @type {Schema}
-//  */
-// const TagSchema = new Schema({
-//
-//   // This is the actual 'tag' and we only permit tags that are in Setting.tags.
-//   id: String,
-//
-//   // The User ID of the user that added the tag.
-//   added_by: {
-//     type: String,
-//     default: null
-//   },
-//
-//   created_at: {
-//     type: Date,
-//     default: Date
-//   }
-// }, {
-//   _id: false
-// });
+const USER_STATUS = require('./enum/user_status');
 
 // ProfileSchema is the mongoose schema defined as the representation of a
 // User's profile stored in MongoDB.
@@ -245,12 +214,6 @@ 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', 'mutation:removeUserTag', 'mutation: addUserTag'].includes(a)) && ! userCanModifyTags(this)) {
-    return false;
-  }
-
   return true;
 });
 
@@ -258,5 +221,3 @@ UserSchema.method('can', function(...actions) {
 const UserModel = mongoose.model('User', UserSchema);
 
 module.exports = UserModel;
-module.exports.USER_ROLES = USER_ROLES;
-module.exports.USER_STATUS = USER_STATUS;
diff --git a/services/comments.js b/services/comments.js
index e1873ba02..0ef15c552 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -1,23 +1,7 @@
 const CommentModel = require('../models/comment');
-
 const ActionModel = require('../models/action');
 const ActionsService = require('./actions');
-const SettingModel = require('../models/setting');
-const SettingsService = require('./settings');
-const UsersService = require('./users');
-
-const errors = require('../errors');
-
-const STATUSES = [
-  'ACCEPTED',
-  'REJECTED',
-  'PREMOD',
-  'NONE',
-];
-
-const ALLOWED_TAGS = [
-  'STAFF'
-];
+const COMMENT_STATUS = require('../models/enum/comment_status');
 
 module.exports = class CommentsService {
 
@@ -47,82 +31,52 @@ module.exports = class CommentsService {
     return commentModel.save();
   }
 
-  /**
-   * Adds a tag if it doesn't already exist on the comment.
-   * @throws if tag is already added to the comment
-   * @throws if tag name is not in ALLOWED_TAGS
-   * @param {String} id the id of the comment to tag
-   * @param {String} name the name of the tag to add
-   * @param {String} added_by the user id for the user who added the tag
-   */
-  static addTag(id, name, added_by) {
+  static addTag(id, tagLink, verifyOwnership = false) {
 
-    // Check that the tag is allowed by the system OR in our setting.tags.
-    return SettingsService.retrieve()
-    .then((settings) => {
+    // Compose the query to find the comment.
+    const query = {
+      id,
+      'tags.tag.name': {
+        $ne: tagLink.tag.name
+      }
+    };
 
-      UsersService.findById(added_by)
-      .then((user) => {
+    // If ownership verification is required, ensure that the person that is
+    // assigning the tag is the same person that owns the comment.
+    if (verifyOwnership) {
+      query['author_id'] = tagLink.assigned_by;
+    }
 
-        // Moderators or ADMIN can add any tag automatically.
-        if (user != null && (user.hasRoles('ADMIN') || user.hasRoles('MODERATOR'))) {
-          SettingModel.findOneAndUpdate({id: settings.id}, {
-            $push: {
-              tags: {
-                id: name,
-                models: ['COMMENTS']
-              }
-            }
-          });
-        }
-        else if (!ALLOWED_TAGS.includes(name) || settings.tags.findIndex((t) => {return t.id === name & t.models.include('COMMENTS');}) === -1) {
-          return Promise.reject(errors.ErrTagNotAllowed);
-        }
-      });
-
-      return CommentModel.findOneAndUpdate({id, 'tags.id': {$ne: name}}, {
-        $push: {
-          tags: {
-            id: name,
-            added_by: added_by
-          }
-        },
-      })
-        .then(({nModified}) => {
-          switch (nModified) {
-          case 0:
-            return Promise.reject(errors.ErrNoCommentFound);
-          case 1:
-            return;
-          default:
-          }
-        });
+    return CommentModel.update(query, {
+      $push: {
+        tags: tagLink
+      }
     });
   }
 
-  /**
-   * Removes a tag from a comment
-   * @throws if the tag is not on the comment
-   * @param {String} id the id of the comment to tag
-   * @param {String} tag_id the id of the tag to remove
-   */
-  static removeTag(id, tag_id) {
-    return CommentModel.findOneAndUpdate({id, 'tags.id': tag_id}, {
+  static removeTag(id, {tag: {name}, assigned_by}, verifyOwnership = false) {
+
+    // Compose the query to find the comment that has the id: `id` and a tag
+    // that has the name: `name`.
+    const query = {
+      id,
+      'tags.tag.name': {
+        $eq: name
+      }
+    };
+
+    // If ownership verification is required, ensure that the person that is
+    // assigning the tag is the same person that owns the comment.
+    if (verifyOwnership) {
+      query['author_id'] = assigned_by;
+    }
+
+    return CommentModel.update(query, {
       $pull: {
         tags: {
-          id: tag_id
+          name
         }
       }
-    }
-    )
-    .then(({nModified}) => {
-      switch(nModified) {
-      case 0:
-        return Promise.reject(errors.ErrNoCommentFound);
-      case 1:
-        return;
-      default:
-      }
     });
   }
 
@@ -226,7 +180,7 @@ module.exports = class CommentsService {
   static pushStatus(id, status, assigned_by = null) {
 
     // Check to see if the comment status is in the allowable set of statuses.
-    if (STATUSES.indexOf(status) === -1) {
+    if (COMMENT_STATUS.indexOf(status) === -1) {
 
       // Comment status is not supported! Error out here.
       return Promise.reject(new Error(`status ${status} is not supported`));
diff --git a/services/tags.js b/services/tags.js
new file mode 100644
index 000000000..94212cb13
--- /dev/null
+++ b/services/tags.js
@@ -0,0 +1,5 @@
+class TagsService {
+  
+}
+
+module.exports = TagsService;
diff --git a/services/users.js b/services/users.js
index 14301ccf4..53b51b686 100644
--- a/services/users.js
+++ b/services/users.js
@@ -12,8 +12,8 @@ const redis = require('./redis');
 const redisClient = redis.createClient();
 
 const UserModel = require('../models/user');
-const USER_STATUS = require('../models/user').USER_STATUS;
-const USER_ROLES = require('../models/user').USER_ROLES;
+const USER_STATUS = require('../models/enum/user_status');
+const USER_ROLES = require('../models/enum/user_roles');
 
 const RECAPTCHA_WINDOW_SECONDS = 60 * 10; // 10 minutes.
 const RECAPTCHA_INCORRECT_TRIGGER = 5; // after 3 incorrect attempts, recaptcha will be required.
diff --git a/test/server/graph/mutations/addCommentTag.js b/test/server/graph/mutations/addCommentTag.js
index 83a12dc2e..5783a14c1 100644
--- a/test/server/graph/mutations/addCommentTag.js
+++ b/test/server/graph/mutations/addCommentTag.js
@@ -3,23 +3,25 @@ const {graphql} = require('graphql');
 
 const schema = require('../../../../graph/schema');
 const Context = require('../../../../graph/context');
+const AssetModel = require('../../../../models/asset');
 const UserModel = require('../../../../models/user');
 const SettingsService = require('../../../../services/settings');
 const CommentsService = require('../../../../services/comments');
 
 describe('graph.mutations.addCommentTag', () => {
-  let comment;
+  let comment, asset;
   beforeEach(async () => {
     await SettingsService.init();
-    comment = await CommentsService.publicCreate({body: `hello there! ${  String(Math.random()).slice(2)}`});
+    
+    asset = new AssetModel({url: 'http://new.test.com/'});
+    await asset.save();
+
+    comment = await CommentsService.publicCreate({asset_id: asset.id, body: `hello there! ${String(Math.random()).slice(2)}`});
   });
 
   const query = `
-    mutation AddCommentTag ($id: ID!, $tag: String!) {
-      addCommentTag(id:$id, tag:$tag) {
-        comment {
-          id
-        }
+    mutation AddCommentTag ($id: ID!, $asset_id: ID!, $name: String!) {
+      addCommentTag(id: $id, asset_id: $asset_id, name: $name) {
         errors {
           translation_key
         }
@@ -30,16 +32,14 @@ describe('graph.mutations.addCommentTag', () => {
   it('moderators can add tags to comments', async () => {
     const user = new UserModel({roles: ['MODERATOR' ]});
     const context = new Context({user});
-    const response = await graphql(schema, query, {}, context, {id: comment.id, tag: 'BEST'});
+    const response = await graphql(schema, query, {}, context, {id: comment.id, asset_id: asset.id, name: 'BEST'});
     if (response.errors && response.errors.length) {
       console.error(response.errors);
     }
     expect(response.errors).to.be.empty;
 
-    return CommentsService.findById(response.data.addCommentTag.comment.id)
-    .then(({tags}) => {
-      expect(tags).to.have.length(1);
-    });
+    let {tags} = await CommentsService.findById(comment.id);
+    expect(tags).to.have.length(1);
   });
 
   describe('users who cant add tags', () => {
@@ -48,15 +48,14 @@ describe('graph.mutations.addCommentTag', () => {
       'regular commenter': new UserModel({}),
       'banned moderator': new UserModel({roles: ['MODERATOR'], status: 'BANNED'})
     }).forEach(([ userDescription, user ]) => {
-      it(userDescription, async function () {
+      it(userDescription, async () => {
         const context = new Context({user});
-        const response = await graphql(schema, query, {}, context, {id: comment.id, tag: 'BEST', privacy_type: 'PUBLIC'});
+        const response = await graphql(schema, query, {}, context, {id: comment.id, asset_id: asset.id, name: 'BEST'});
         if (response.errors && response.errors.length) {
           console.error(response.errors);
         }
         expect(response.errors).to.be.empty;
         expect(response.data.addCommentTag.errors).to.deep.equal([{'translation_key':'NOT_AUTHORIZED'}]);
-        expect(response.data.addCommentTag.comment).to.be.null;
       });
     });
   });
diff --git a/test/server/graph/mutations/createComment.js b/test/server/graph/mutations/createComment.js
index 41822fcdb..e32943720 100644
--- a/test/server/graph/mutations/createComment.js
+++ b/test/server/graph/mutations/createComment.js
@@ -21,7 +21,9 @@ describe('graph.mutations.createComment', () => {
           id
           status
           tags {
-            id
+            tag {
+              name
+            }
           }
         }
         errors {
@@ -228,7 +230,7 @@ describe('graph.mutations.createComment', () => {
             .then(({tags}) => {
               if (tag) {
                 expect(tags).to.have.length(1);
-                expect(tags[0]).to.have.property('id', tag);
+                expect(tags[0].tag.name).to.have.equal(tag);
               } else {
                 expect(tags).length(0);
               }
diff --git a/test/server/graph/mutations/removeCommentTag.js b/test/server/graph/mutations/removeCommentTag.js
index 760887a44..cca072af2 100644
--- a/test/server/graph/mutations/removeCommentTag.js
+++ b/test/server/graph/mutations/removeCommentTag.js
@@ -6,22 +6,24 @@ const Context = require('../../../../graph/context');
 const UserModel = require('../../../../models/user');
 const SettingModel = require('../../../../models/setting');
 
+const AssetModel = require('../../../../models/asset');
 const SettingsService = require('../../../../services/settings');
 const CommentsService = require('../../../../services/comments');
 
 describe('graph.mutations.removeCommentTag', () => {
-  let comment;
+  let asset, comment;
   beforeEach(async () => {
     await SettingsService.init();
-    comment = await CommentsService.publicCreate({body: `hello there! ${  String(Math.random()).slice(2)}`});
+    
+    asset = new AssetModel({url: 'http://new.test.com/'});
+    await asset.save();
+
+    comment = await CommentsService.publicCreate({asset_id: asset.id, body: `hello there! ${String(Math.random()).slice(2)}`});
   });
 
   const query = `
-    mutation RemoveCommentTag ($id: ID!, $tag: String!) {
-      removeCommentTag(id:$id, tag:$tag) {
-        comment {
-          id
-        }
+    mutation RemoveCommentTag ($id: ID!, $asset_id: ID!, $name: String!) {
+      removeCommentTag(id: $id, asset_id: $asset_id, name: $name) {
         errors {
           translation_key
         }
@@ -30,57 +32,53 @@ describe('graph.mutations.removeCommentTag', () => {
   `;
 
   it('moderators can add remove tags from comments', async () => {
-    const user = new UserModel({roles: ['MODERATOR' ]});
+    const user = new UserModel({roles: ['MODERATOR']});
     const context = new Context({user});
 
     // add a tag first
-    await CommentsService.addTag(comment.id, 'BEST', user.id);
-    const response = await graphql(schema, query, {}, context, {id: comment.id, tag: 'BEST'});
+    await CommentsService.addTag(comment.id, {tag: {name: 'BEST'}}, false);
+
+    const response = await graphql(schema, query, {}, context, {id: comment.id, asset_id: asset.id, name: 'BEST'});
     if (response.errors && response.errors.length) {
       console.error(response.errors);
     }
     expect(response.errors).to.be.empty;
     expect(response.data.removeCommentTag.errors).to.be.null;
 
-    CommentsService.findById(response.data.removeCommentTag.comment.id)
-    .then(({tags}) => {
-      expect(tags).to.deep.equal([]);
-    });
+    let retrievedComment = await CommentsService.findById(comment.id);
 
+    expect(retrievedComment.tags).to.have.length(0);
   });
 
   describe('users who cant remove tags', () => {
 
-    // allow the tag in the settings
-    SettingModel.findOneAndUpdate({id: 1}, {
+    before(() => SettingModel.findOneAndUpdate({id: 1}, {
       $push: {
         tags: {
           id: 'BEST',
           models: ['COMMENTS']
         }
       }
-    })
-    .then(() => {
-      Object.entries({
-        'anonymous': undefined,
-        'regular commenter': new UserModel({}),
-        'banned moderator': new UserModel({roles: ['MODERATOR'], status: 'BANNED'})
-      }).forEach(([ userDescription, user ]) => {
-        it(userDescription, async function () {
-          const context = new Context({user});
+    }));
 
-          // add a tag first
-          await CommentsService.addTag(comment.id, 'BEST', user.id);
+    Object.entries({
+      'anonymous': undefined,
+      'regular commenter': new UserModel({}),
+      'banned moderator': new UserModel({roles: ['MODERATOR'], status: 'BANNED'})
+    }).forEach(([userDescription, user]) => {
+      it(userDescription, async function () {
+        const context = new Context({user});
 
-          const response = await graphql(schema, query, {}, context, {id: comment.id, tag: 'BEST'});
-          if (response.errors && response.errors.length) {
-            console.error(response.errors);
-          }
-          expect(response.errors).to.be.empty;
+        // add a tag first
+        await CommentsService.addTag(comment.id, {tag: {name: 'BEST'}}, false);
 
-          expect(response.data.removeCommentTag.errors).to.deep.equal([{'translation_key':'NOT_AUTHORIZED'}]);
-          expect(response.data.removeCommentTag.comment).to.be.null;
-        });
+        const response = await graphql(schema, query, {}, context, {id: comment.id, asset_id: asset.id, name: 'BEST'});
+        if (response.errors && response.errors.length) {
+          console.error(response.errors);
+        }
+        expect(response.errors).to.be.empty;
+
+        expect(response.data.removeCommentTag.errors).to.deep.equal([{'translation_key':'NOT_AUTHORIZED'}]);
       });
     });
   });
diff --git a/test/server/services/comments.js b/test/server/services/comments.js
index 27657efa5..f5d82d1de 100644
--- a/test/server/services/comments.js
+++ b/test/server/services/comments.js
@@ -221,63 +221,84 @@ describe('services.CommentsService', () => {
 
   describe('#addTag', () => {
     it('adds a tag', async () => {
-      const commentId = comments[0].id;
-      const tagName = 'BEST';
-      const userId = users[0].id;
-      await CommentsService.addTag(commentId, tagName, userId, 'PUBLIC');
-      const {tags} = await CommentsService.findById(commentId);
-      expect(tags.length).to.equal(1);
-      expect(tags[0].id).to.equal(tagName);
-      expect(tags[0].added_by).to.equal(userId);
-      expect(tags[0].created_at).to.be.an.instanceof(Date);
-    });
-    it('can\'t add a tag to comment id that doesn\'t exist', async () => {
-      const commentId = 'fakenews';
-      const tagName = 'BEST';
-      const userId = users[0].id;
-
-      CommentsService.addTag(commentId, tagName, userId)
-      .catch((error) => {
-        expect(error).to.not.be.null;
+      const id = comments[0].id;
+      const name = 'BEST';
+      const assigned_by = users[0].id;
+      
+      await CommentsService.addTag(id, {
+        tag: {
+          name
+        },
+        assigned_by
       });
+
+      const {tags} = await CommentsService.findById(id);
+      expect(tags.length).to.equal(1);
+      expect(tags[0].tag.name).to.equal(name);
+      expect(tags[0].assigned_by).to.equal(assigned_by);
     });
+
     it('can\'t add same tag.id twice', async () => {
-      const commentId = comments[0].id;
-      const tagName = 'BEST';
-      const userId = users[0].id;
+      const id = comments[0].id;
+      const name = 'BEST';
+      const assigned_by = users[0].id;
+      
+      await CommentsService.addTag(id, {
+        tag: {
+          name
+        },
+        assigned_by
+      });
 
-      // first time
-      await CommentsService.addTag(commentId, tagName, userId);
+      {
+        let {tags} = await CommentsService.findById(id);
+        expect(tags.length).to.equal(1);
+      }
 
-      // second time should fail
-      await expect(CommentsService.addTag(commentId, tagName, userId)).to.be.rejected;
+      await CommentsService.addTag(id, {
+        tag: {
+          name
+        },
+        assigned_by
+      });
+
+      {
+        let {tags} = await CommentsService.findById(id);
+        expect(tags.length).to.equal(1);
+      }
     });
   });
 
   describe('#removeTag', () => {
     it('removes a tag', async () => {
-      const commentId = comments[0].id;
-      const tagName = 'BEST';
-      await CommentsService.addTag(commentId, tagName, users[0].id);
-      const {tags} = await CommentsService.findById(commentId);
-      expect(tags.length).to.equal(1);
+      const id = comments[0].id;
+      const name = 'BEST';
+      const assigned_by = users[0].id;
+
+      await CommentsService.addTag(id, {
+        tag: {
+          name
+        },
+        assigned_by
+      });
+
+      {
+        const {tags} = await CommentsService.findById(id);
+        expect(tags.length).to.equal(1);
+      }
 
       // ok now to remove it
-      await CommentsService.removeTag(commentId, tagName);
-      const comment = await CommentsService.findById(commentId);
-      expect(comment.tags.length).to.equal(0);
-    });
-    it('throws if removing a tag that isn\'t there', async () => {
-      const commentId = comments[0].id;
+      await CommentsService.removeTag(id, {
+        tag: {
+          name
+        },
+        assigned_by
+      });
 
-      const tagName = 'BEST';
-
-      // just make sure it has no tags to start
-      const {tags} = await CommentsService.findById(commentId);
-      expect(tags.length).to.equal(0);
-
-      // ok now to remove it
-      await expect(CommentsService.removeTag(commentId, tagName)).to.be.rejected;
+      {
+        const {tags} = await CommentsService.findById(id);
+        expect(tags.length).to.equal(0);
+      }
     });
   });
 

From 0d47ee895c4262fa15709578613f9797ae6d4845 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Tue, 9 May 2017 15:02:31 -0600
Subject: [PATCH 018/264] removed unused service

---
 services/tags.js | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 services/tags.js

diff --git a/services/tags.js b/services/tags.js
deleted file mode 100644
index 94212cb13..000000000
--- a/services/tags.js
+++ /dev/null
@@ -1,5 +0,0 @@
-class TagsService {
-  
-}
-
-module.exports = TagsService;

From aeaf809a0f5c9ef618b4781549d840b82490588b Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 11 May 2017 14:42:06 -0600
Subject: [PATCH 019/264] Made queries more generic related to tags

---
 graph/mutators/comment.js                     | 148 +-----------------
 graph/mutators/index.js                       |   2 +
 graph/mutators/tag.js                         |  82 ++++++++++
 graph/resolvers/asset.js                      |   5 +
 graph/resolvers/comment.js                    |   5 +
 graph/resolvers/root_mutation.js              |   8 +-
 graph/resolvers/user.js                       |   5 +
 graph/resolvers/util.js                       |  16 ++
 graph/typeDefs.graphql                        | 112 ++++++++-----
 models/asset.js                               |   4 +
 models/comment.js                             |   2 +
 models/user.js                                |  10 +-
 .../server/typeDefs.graphql                   |   2 +-
 services/tags.js                              | 133 ++++++++++++++++
 .../mutations/{addCommentTag.js => addTag.js} |  24 +--
 .../{removeCommentTag.js => removeTag.js}     |  10 +-
 16 files changed, 356 insertions(+), 212 deletions(-)
 create mode 100644 graph/mutators/tag.js
 create mode 100644 graph/resolvers/util.js
 create mode 100644 services/tags.js
 rename test/server/graph/mutations/{addCommentTag.js => addTag.js} (65%)
 rename test/server/graph/mutations/{removeCommentTag.js => removeTag.js} (87%)

diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index 3a57f3b3a..23c906f15 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -210,149 +210,11 @@ const setCommentStatus = ({user, loaders: {Comments}}, {id, status}) => {
     });
 };
 
-/**
- * Adds a tag to a Comment.
- */
-const addCommentTag = async ({user, loaders: {Assets, Comments, Settings}}, {id, asset_id, name}) => {
-
-  // If the current user does not have the ADMIN or MODERATOR role
-  if (!user || !user.can('mutation:addCommentTag')) {
-    throw errors.ErrNotAuthorized;
-  }
-
-  // Load the settings from the dataloader, it will be cached if it was
-  // retrieved already.
-  let settings = await AssetsService.rectifySettings(AssetsService.findById(asset_id));
-
-  // Try to find the tag in the asset tags. This will contain the permission
-  // information.
-  let tag = settings.tags.find((globalTag) => {
-    return globalTag.name === name && globalTag.models.include('COMMENTS');
-  });
-
-  // Create the new tagLink that will be created to attach to the comment.
-  let tagLink = {
-    tag,
-    assigned_by: user.id,
-    created_at: new Date()
-  };
-
-  // If the tag was found, we need to ensure that the current user can indeed
-  // set this tag on the comment.
-  if (tag) {
-    
-    // If the tag has roles defined, and the current user has at least one of
-    // the required roles, then add the tag without checking for ownership.
-    if (tag.permissions && tag.permissions.roles && tag.permissions.roles.some((role) => user.roles.include(role))) {
-      return CommentsService.addTag(id, tagLink, false);
-    }
-
-    // If the permissions allow for self assignment, then ensure that the query
-    // is compose with that in mind.
-    if (tag.permissions && tag.permissions.self) {
-
-      // Otherwise, we assume that we have to check to see that the user indeed
-      // owns the resource before allowing the tag to get added.
-      return CommentsService.addTag(id, tagLink, true);
-    }
-
-    throw errors.ErrNotAuthorized;
-  }
-
-  // Only admin/moderators can add unique tags, these are tags that are not in
-  // the global list.
-  if (!(user.hasRoles('ADMIN') || user.hasRoles('MODERATOR'))) {
-    throw errors.ErrNotAuthorized;
-  }
-
-  // Generate the tag in the event now that we have to create the tag for this
-  // specific comment.
-  tagLink.tag = {
-    name,
-    permissions: {
-      public: true,
-      self: false,
-      roles: []
-    },
-    models: ['COMMENTS'],
-    created_at: new Date()
-  };
-
-  // Actually attach the new tag that we created to the comment.
-  return CommentsService.addTag(id, tagLink, false);
-};
-
-/**
- * Removes a tag from a Comment.
- */
-const removeCommentTag = async ({user, loaders: {Comments}}, {id, asset_id, name}) => {
-
-  // If the current user does not have the ADMIN or MODERATOR role
-  if (!user || !user.can('mutation:removeCommentTag')) {
-    throw errors.ErrNotAuthorized;
-  }
-
-  // Load the settings from the dataloader, it will be cached if it was
-  // retrieved already.
-  let settings = await AssetsService.rectifySettings(AssetsService.findById(asset_id));
-
-  // Try to find the tag in the asset tags. This will contain the permission
-  // information.
-  let tag = settings.tags.find((globalTag) => {
-    return globalTag.name === name && globalTag.models.include('COMMENTS');
-  });
-
-  // Create the new tagLink that will be created to attach to the comment.
-  let tagLink = {
-    tag,
-    assigned_by: user.id
-  };
-
-  // If the tag was found, we need to ensure that the current user can indeed
-  // remove this tag on the comment.
-  if (tag) {
-    
-    // If the tag has roles defined, and the current user has at least one of
-    // the required roles, then remove the tag without checking for ownership.
-    if (tag.permissions && tag.permissions.roles && tag.permissions.roles.some((role) => user.roles.include(role))) {
-      return CommentsService.removeTag(id, tagLink, false);
-    }
-
-    // If the permissions allow for self assignment, then ensure that the query
-    // is compose with that in mind.
-    if (tag.permissions && tag.permissions.self) {
-
-      // Otherwise, we assume that we have to check to see that the user indeed
-      // owns the resource before allowing the tag to get removed.
-      return CommentsService.removeTag(id, tagLink, true);
-    }
-
-    throw errors.ErrNotAuthorized;
-  }
-
-  // Only admin/moderators can remove unique tags, these are tags that are not
-  // in the global list.
-  if (!(user.hasRoles('ADMIN') || user.hasRoles('MODERATOR'))) {
-    throw errors.ErrNotAuthorized;
-  }
-
-  // Generate the tag in the event now that we have to create the tag for this
-  // specific comment.
-  tagLink.tag = {
-    name
-  };
-
-  // Actually attach the new tag that we created to the comment.
-  return CommentsService.removeTag(id, tagLink, false);
-};
-
 module.exports = (context) => {
   let mutators = {
     Comment: {
       create: () => Promise.reject(errors.ErrNotAuthorized),
-      setCommentStatus: () => Promise.reject(errors.ErrNotAuthorized),
-      addCommentTag: () => Promise.reject(errors.ErrNotAuthorized),
-      removeCommentTag: () => Promise.reject(errors.ErrNotAuthorized),
+      setCommentStatus: () => Promise.reject(errors.ErrNotAuthorized)
     }
   };
 
@@ -364,13 +226,5 @@ module.exports = (context) => {
     mutators.Comment.setCommentStatus = (action) => setCommentStatus(context, action);
   }
 
-  if (context.user && context.user.can('mutation:addCommentTag')) {
-    mutators.Comment.addCommentTag = (action) => addCommentTag(context, action);
-  }
-
-  if (context.user && context.user.can('mutation:removeCommentTag')) {
-    mutators.Comment.removeCommentTag = (action) => removeCommentTag(context, action);
-  }
-
   return mutators;
 };
diff --git a/graph/mutators/index.js b/graph/mutators/index.js
index 9975bedde..0076a5e8f 100644
--- a/graph/mutators/index.js
+++ b/graph/mutators/index.js
@@ -3,6 +3,7 @@ const debug = require('debug')('talk:graph:mutators');
 
 const Comment = require('./comment');
 const Action = require('./action');
+const Tag = require('./tag');
 const User = require('./user');
 
 const plugins = require('../../services/plugins');
@@ -12,6 +13,7 @@ let mutators = [
   // Load in the core mutators.
   Comment,
   Action,
+  Tag,
   User,
 
   // Load the plugin mutators from the manager.
diff --git a/graph/mutators/tag.js b/graph/mutators/tag.js
new file mode 100644
index 000000000..3182a7d00
--- /dev/null
+++ b/graph/mutators/tag.js
@@ -0,0 +1,82 @@
+const TagsService = require('../../services/tags');
+const errors = require('../../errors');
+
+/**
+ * Modifies the targeted model with the specified operation to add/remove a tag.
+ */
+const modify = async ({user}, operation, {name, id, item_type, asset_id}) => {
+
+  // Try to find the tag in the global list. This will contain the permission
+  // information if it's found.
+  let tag = await TagsService.get({name, id, item_type, asset_id});
+
+  // Create the new tagLink that will be created to interact to the comment.
+  let tagLink = {
+    tag,
+    assigned_by: user.id,
+    created_at: new Date()
+  };
+
+  // If the tag was found, we need to ensure that the current user can indeed
+  // modify this tag on the comment.
+  if (tag) {
+    
+    // If the tag has roles defined, and the current user has at least one of
+    // the required roles, then modify the tag without checking for ownership.
+    if (tag.permissions && tag.permissions.roles && tag.permissions.roles.some((role) => user.roles.include(role))) {
+      return operation(id, item_type, tagLink, false);
+    }
+
+    // If the permissions allow for self assignment, then ensure that the query
+    // is compose with that in mind.
+    if (tag.permissions && tag.permissions.self) {
+
+      // Otherwise, we assume that we have to check to see that the user indeed
+      // owns the resource before allowing the tag to get modified.
+      return operation(id, item_type, tagLink, true);
+    }
+
+    throw errors.ErrNotAuthorized;
+  }
+
+  // Only admin/moderators can modify unique tags, these are tags that are not
+  // in the global list.
+  if (!(user.hasRoles('ADMIN') || user.hasRoles('MODERATOR'))) {
+    throw errors.ErrNotAuthorized;
+  }
+
+  // Generate the tag in the event now that we have to create the tag for this
+  // specific comment.
+  tagLink.tag = {
+    name,
+    permissions: {
+      public: true,
+      self: false,
+      roles: []
+    },
+    models: [item_type],
+    created_at: new Date()
+  };
+
+  // Actually modify the tag on the model.
+  return operation(id, item_type, tagLink, false);
+};
+
+module.exports = (context) => {
+  let mutators = {
+    Tag: {
+      add: () => Promise.reject(errors.ErrNotAuthorized),
+      remove: () => Promise.reject(errors.ErrNotAuthorized)
+    }
+  };
+
+  if (context.user && context.user.can('mutation:addTag')) {
+    mutators.Tag.add = (tag) => modify(context, TagsService.add, tag);
+  }
+
+  if (context.user && context.user.can('mutation:removeTag')) {
+    mutators.Tag.remove = (tag) => modify(context, TagsService.remove, tag);
+  }
+
+  return mutators;
+};
diff --git a/graph/resolvers/asset.js b/graph/resolvers/asset.js
index c260d0070..012e77927 100644
--- a/graph/resolvers/asset.js
+++ b/graph/resolvers/asset.js
@@ -1,3 +1,5 @@
+const {decorateWithTags} = require('./util');
+
 const Asset = {
   lastComment({id}, _, {loaders: {Comments}}) {
     return Comments.getByQuery({
@@ -49,4 +51,7 @@ const Asset = {
   }
 };
 
+// Decorate the Asset type resolver with a tags field.
+decorateWithTags(Asset);
+
 module.exports = Asset;
diff --git a/graph/resolvers/comment.js b/graph/resolvers/comment.js
index 88ddbee07..b0251f626 100644
--- a/graph/resolvers/comment.js
+++ b/graph/resolvers/comment.js
@@ -1,3 +1,5 @@
+const {decorateWithTags} = require('./util');
+
 const Comment = {
   parent({parent_id}, _, {loaders: {Comments}}) {
     if (parent_id == null) {
@@ -48,4 +50,7 @@ const Comment = {
   }
 };
 
+// Decorate the Comment type resolver with a tags field.
+decorateWithTags(Comment);
+
 module.exports = Comment;
diff --git a/graph/resolvers/root_mutation.js b/graph/resolvers/root_mutation.js
index 442845bd2..3d18bb277 100644
--- a/graph/resolvers/root_mutation.js
+++ b/graph/resolvers/root_mutation.js
@@ -28,11 +28,11 @@ const RootMutation = {
   setCommentStatus(_, {id, status}, {mutators: {Comment}}) {
     return wrapResponse(null)(Comment.setCommentStatus({id, status}));
   },
-  addCommentTag(_, {id, asset_id, name}, {mutators: {Comment}}) {
-    return wrapResponse('comment')(Comment.addCommentTag({id, asset_id, name}));
+  addTag(_, {tag}, {mutators: {Tag}}) {
+    return wrapResponse(null)(Tag.add(tag));
   },
-  removeCommentTag(_, {id, asset_id, name}, {mutators: {Comment}}) {
-    return wrapResponse('comment')(Comment.removeCommentTag({id, asset_id, name}));
+  removeTag(_, {tag}, {mutators: {Tag}}) {
+    return wrapResponse(null)(Tag.remove(tag));
   }
 };
 
diff --git a/graph/resolvers/user.js b/graph/resolvers/user.js
index d8ed7ee15..53f4f7c1b 100644
--- a/graph/resolvers/user.js
+++ b/graph/resolvers/user.js
@@ -1,3 +1,5 @@
+const {decorateWithTags} = require('./util');
+
 const User = {
   action_summaries({id}, _, {loaders: {Actions}}) {
     return Actions.getSummariesByItemID.load(id);
@@ -31,4 +33,7 @@ const User = {
   }
 };
 
+// Decorate the User type resolver with a tags field.
+decorateWithTags(User);
+
 module.exports = User;
diff --git a/graph/resolvers/util.js b/graph/resolvers/util.js
new file mode 100644
index 000000000..11cfcbb13
--- /dev/null
+++ b/graph/resolvers/util.js
@@ -0,0 +1,16 @@
+/**
+ * Decorates the typeResolver with the tags field.
+ */
+const decorateWithTags = (typeResolver) => {
+  typeResolver.tags = ({tags = []}, _, {user}) => {
+    if (user && user.hasRoles('ADMIN')) {
+      return tags;
+    }
+
+    return tags.filter((tag) => tag.public);
+  };
+};
+
+module.exports = {
+  decorateWithTags
+};
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index bbe3e4d17..b6d29e5ef 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -39,6 +39,9 @@ type User {
   # the current roles of the user.
   roles: [USER_ROLES]
 
+  # the tags on the user
+  tags: [TagLink!]
+
   # determines whether the user can edit their username
   canEditName: Boolean
 
@@ -52,6 +55,38 @@ type User {
   status: USER_STATUS
 }
 
+# UsersQuery allows the ability to query users by a specific fields.
+input UsersQuery {
+  action_type: ACTION_TYPE
+
+  # Limit the number of results to be returned.
+  limit: Int = 10
+
+  # Skip results from the last created_at timestamp.
+  cursor: Date
+
+  # Sort the results by created_at.
+  sort: SORT_ORDER = REVERSE_CHRONOLOGICAL
+}
+
+
+################################################################################
+## Tags
+################################################################################
+
+# Used to represent the item type for a tag.
+enum TAGGABLE_ITEM_TYPE {
+
+  # The action references a entity of type Asset.
+  ASSETS
+
+  # The action references a entity of type Comment.
+  COMMENTS
+
+  # The action references a entity of type User.
+  USERS
+}
+
 # Tag represents the underlying Tag that can be either stored in a global list
 # or added uniquely to the entity.
 type Tag {
@@ -79,20 +114,6 @@ type TagLink {
   created_at: Date!
 }
 
-# UsersQuery allows the ability to query users by a specific fields.
-input UsersQuery {
-  action_type: ACTION_TYPE
-
-  # Limit the number of results to be returned.
-  limit: Int = 10
-
-  # Skip results from the last created_at timestamp.
-  cursor: Date
-
-  # Sort the results by created_at.
-  sort: SORT_ORDER = REVERSE_CHRONOLOGICAL
-}
-
 ################################################################################
 ## Comments
 ################################################################################
@@ -459,6 +480,9 @@ type Asset {
   # The date that the asset was created.
   created_at: Date
 
+  # the tags on the asset
+  tags: [TagLink!]
+
   # The author(s) of the asset.
   author: String
 }
@@ -495,7 +519,7 @@ type ValidationUserError implements UserError {
 }
 
 ################################################################################
-## Queries;
+## Queries
 ################################################################################
 
 # Establishes the ordering of the content by their created_at time stamp.
@@ -577,7 +601,7 @@ type RootQuery {
 interface Response {
 
   # An array of errors relating to the mutation that occurred.
-  errors: [UserError]
+  errors: [UserError!]
 }
 
 # CreateCommentResponse is returned with the comment that was created and any
@@ -588,7 +612,7 @@ type CreateCommentResponse implements Response {
   comment: Comment
 
   # An array of errors relating to the mutation that occurred.
-  errors: [UserError]
+  errors: [UserError!]
 }
 
 # Used to represent the item type for an action.
@@ -653,7 +677,7 @@ type CreateFlagResponse implements Response {
   flag: FlagAction
 
   # An array of errors relating to the mutation that occurred.
-  errors: [UserError]
+  errors: [UserError!]
 }
 
 
@@ -666,7 +690,7 @@ type CreateDontAgreeResponse implements Response {
   dontagree: DontAgreeAction
 
   # An array of errors relating to the mutation that occurred.
-  errors: [UserError]
+  errors: [UserError!]
 }
 
 input CreateDontAgreeInput {
@@ -689,7 +713,7 @@ input CreateDontAgreeInput {
 type DeleteActionResponse implements Response {
 
   # An array of errors relating to the mutation that occurred.
-  errors: [UserError]
+  errors: [UserError!]
 }
 
 # SetUserStatusResponse is the response returned with possibly some errors
@@ -697,7 +721,7 @@ type DeleteActionResponse implements Response {
 type SetUserStatusResponse implements Response {
 
   # An array of errors relating to the mutation that occurred.
-  errors: [UserError]
+  errors: [UserError!]
 }
 
 # SuspendUserResponse is the response returned with possibly some errors
@@ -705,7 +729,7 @@ type SetUserStatusResponse implements Response {
 type SuspendUserResponse implements Response {
 
   # An array of errors relating to the mutation that occurred.
-  errors: [UserError]
+  errors: [UserError!]
 }
 
 # SetCommentStatusResponse is the response returned with possibly some errors
@@ -713,33 +737,43 @@ type SuspendUserResponse implements Response {
 type SetCommentStatusResponse implements Response {
 
   # An array of errors relating to the mutation that occurred.
-  errors: [UserError]
+  errors: [UserError!]
 }
 
-# Response to addCommentTag mutation
-type AddCommentTagResponse implements Response {
+# ModifyTagInput is the input used to modify a tag.
+input ModifyTagInput {
+
+  # name is the actual tag to add to the model.
+  name: String!
+
+  # id is the ID of the model in question that we are modifying the tag of.
+  id: ID!
+
+  # item_type is the type of item that we are modifying the tag if.
+  item_type: TAGGABLE_ITEM_TYPE!
+
+  # asset_id is used when the item_type is `COMMENTS`, the is needed to rectify
+  # the settings to get the asset specific tags/settings.
+  asset_id: ID
+}
+
+# Response to the addTag or removeTag mutations.
+type ModifyTagResponse implements Response {
   
   # An array of errors relating to the mutation that occured.
-  errors: [UserError]
-}
-
-# Response to removeCommentTag mutation
-type RemoveCommentTagResponse implements Response {
-
-  # An array of errors relating to the mutation that occured.
-  errors: [UserError]
+  errors: [UserError!]
 }
 
 # Response to ignoreUser mutation
 type IgnoreUserResponse implements Response {
   # An array of errors relating to the mutation that occured.
-  errors: [UserError]
+  errors: [UserError!]
 }
 
 # Response to stopIgnoringUser mutation
 type StopIgnoringUserResponse implements Response {
   # An array of errors relating to the mutation that occured.
-  errors: [UserError]
+  errors: [UserError!]
 }
 
 # All mutations for the application are defined on this object.
@@ -766,11 +800,11 @@ type RootMutation {
   # Sets Comment status. Requires the `ADMIN` role.
   setCommentStatus(id: ID!, status: COMMENT_STATUS!): SetCommentStatusResponse
 
-  # Add tag to comment.
-  addCommentTag(id: ID!, asset_id: ID!, name: String!): AddCommentTagResponse
+  # Add a tag.
+  addTag(tag: ModifyTagInput!): ModifyTagResponse!
 
-  # Remove tag from comment.
-  removeCommentTag(id: ID!, asset_id: ID!, name: String!): RemoveCommentTagResponse
+  # Removes a tag.
+  removeTag(tag: ModifyTagInput!): ModifyTagResponse!
 
   # Ignore comments by another user
   ignoreUser(id: ID!): IgnoreUserResponse
diff --git a/models/asset.js b/models/asset.js
index 51ff42705..1aeec34f3 100644
--- a/models/asset.js
+++ b/models/asset.js
@@ -1,6 +1,7 @@
 const mongoose = require('../services/mongoose');
 const Schema = mongoose.Schema;
 const uuid = require('uuid');
+const TagLinkSchema = require('./schema/tag_link');
 
 const AssetSchema = new Schema({
   id: {
@@ -47,6 +48,9 @@ const AssetSchema = new Schema({
     default: null
   },
 
+  // Tags are added by the self or by administrators.
+  tags: [TagLinkSchema],
+
   // Additional metadata stored on the field.
   metadata: {
     default: {},
diff --git a/models/comment.js b/models/comment.js
index e3443376b..76065f5cb 100644
--- a/models/comment.js
+++ b/models/comment.js
@@ -49,6 +49,8 @@ const CommentSchema = new Schema({
     default: 'NONE'
   },
   parent_id: String,
+  
+  // Tags are added by the self or by administrators.
   tags: [TagLinkSchema],
 
   // Additional metadata stored on the field.
diff --git a/models/user.js b/models/user.js
index b61ddd6eb..d069ac457 100644
--- a/models/user.js
+++ b/models/user.js
@@ -2,6 +2,7 @@ const mongoose = require('../services/mongoose');
 const bcrypt = require('bcrypt');
 const Schema = mongoose.Schema;
 const uuid = require('uuid');
+const TagLinkSchema = require('./schema/tag_link');
 
 // USER_ROLES is the array of roles that is permissible as a user role.
 const USER_ROLES = require('./enum/user_roles');
@@ -118,6 +119,9 @@ const UserSchema = new Schema({
     type: String,
   }],
 
+  // Tags are added by the self or by administrators.
+  tags: [TagLinkSchema],
+
   // Additional metadata stored on the field.
   metadata: {
     default: {},
@@ -191,10 +195,8 @@ const USER_GRAPH_OPERATIONS = [
   'mutation:setUserStatus',
   'mutation:suspendUser',
   'mutation:setCommentStatus',
-  'mutation:addCommentTag',
-  'mutation:removeCommentTag',
-  'mutation:addUserTag',
-  'mutation:removeUserTag'
+  'mutation:addTag',
+  'mutation:removeTag'
 ];
 
 /**
diff --git a/plugins/coral-plugin-respect/server/typeDefs.graphql b/plugins/coral-plugin-respect/server/typeDefs.graphql
index 6639aa454..56734e543 100644
--- a/plugins/coral-plugin-respect/server/typeDefs.graphql
+++ b/plugins/coral-plugin-respect/server/typeDefs.graphql
@@ -44,7 +44,7 @@ type CreateRespectResponse implements Response {
   respect: RespectAction
 
   # An array of errors relating to the mutation that occurred.
-  errors: [UserError]
+  errors: [UserError!]
 }
 
 type RootMutation {
diff --git a/services/tags.js b/services/tags.js
new file mode 100644
index 000000000..3ee3de121
--- /dev/null
+++ b/services/tags.js
@@ -0,0 +1,133 @@
+const CommentModel = require('../models/comment');
+const AssetModel = require('../models/asset');
+const UserModel = require('../models/user');
+
+const AssetsService = require('./assets');
+const SettingsService = require('./settings');
+
+const updateModel = async (item_type, query, update) => {
+
+  // Get the model to update with.
+  let Model;
+  switch (item_type) {
+  case 'COMMENTS':
+    Model = CommentModel;
+    break;
+  case 'ASSETS':
+    Model = AssetModel;
+    break;
+  case 'USERS':
+    Model = UserModel;
+    break;
+  default:
+    throw new Error(`item_type ${item_type} is not a valid item_type to update a tag on`);
+  }
+
+  // Execute the update operation.
+  return Model.update(query, update);
+};
+
+const ownershipQuery = async (item_type, link, query) => {
+  switch (item_type) {
+  case 'COMMENTS':
+    query['author_id'] = link.assigned_by;
+    break;
+  case 'USERS':
+    query['id'] = link.assigned_by;
+    break;
+  }
+};
+
+class TagsService {
+
+  /**
+   * Retrives a global tag from the settings based on the input_type.
+   */
+  static async get({name, id, item_type, asset_id = null}) {
+
+    // Extract the settings from the database.
+    let settings;
+    switch (item_type) {
+    case 'COMMENTS':
+      settings = await AssetsService.rectifySettings(AssetsService.findById(asset_id));
+      break;
+    case 'ASSETS':
+      settings = await AssetsService.rectifySettings(AssetsService.findById(id));
+      break;
+    case 'USERS':
+      settings = await SettingsService.retrieve();
+      break;
+    default:
+      settings = await SettingsService.retrieve();
+      break;
+    }
+
+    // Extract the tags from the settings object.
+    let {tags = []} = settings;
+
+    // Return the first tag that matches the requested form.
+    return tags.find((tag) => tag.name === name && tag.models.include(item_type));
+  }
+
+  /**
+   * Adds a TagLink to a Model, optionally checking for ownership.
+   */
+  static async add(id, item_type, link, ownershipCheck) {
+
+    // Compose the query to find the comment.
+    const query = {
+      id,
+      'tags.tag.name': {
+        $ne: link.tag.name
+      }
+    };
+
+    // If ownership verification is required, ensure that the person that is
+    // assigning the tag is the same person that owns the comment.
+    if (ownershipCheck) {
+
+      // Modify the query to support an ownership verification.
+      ownershipQuery(item_type, link, query);
+    }
+
+    // Get the Model to perform the update.
+    return updateModel(item_type, query, {
+      $push: {
+        tags: link
+      }
+    });
+  }
+
+  /**
+   * Removes a TagLink to a Model, optionally checking for ownership.
+   */
+  static async remove(id, item_type, link, ownershipCheck) {
+
+    // Compose the query to find the comment.
+    const query = {
+      id,
+      'tags.tag.name': {
+        $eq: link.tag.name
+      }
+    };
+
+    // If ownership verification is required, ensure that the person that is
+    // assigning the tag is the same person that owns the comment.
+    if (ownershipCheck) {
+
+      // Modify the query to support an ownership verification.
+      ownershipQuery(item_type, link, query);
+    }
+
+    // Get the Model to perform the update.
+    return updateModel(item_type, query, {
+      $pull: {
+        tags: {
+          name: link.tag.name
+        }
+      }
+    });
+  }
+}
+
+module.exports = TagsService;
diff --git a/test/server/graph/mutations/addCommentTag.js b/test/server/graph/mutations/addTag.js
similarity index 65%
rename from test/server/graph/mutations/addCommentTag.js
rename to test/server/graph/mutations/addTag.js
index 5783a14c1..e6639d49c 100644
--- a/test/server/graph/mutations/addCommentTag.js
+++ b/test/server/graph/mutations/addTag.js
@@ -8,7 +8,7 @@ const UserModel = require('../../../../models/user');
 const SettingsService = require('../../../../services/settings');
 const CommentsService = require('../../../../services/comments');
 
-describe('graph.mutations.addCommentTag', () => {
+describe('graph.mutations.addTag', () => {
   let comment, asset;
   beforeEach(async () => {
     await SettingsService.init();
@@ -21,7 +21,7 @@ describe('graph.mutations.addCommentTag', () => {
 
   const query = `
     mutation AddCommentTag ($id: ID!, $asset_id: ID!, $name: String!) {
-      addCommentTag(id: $id, asset_id: $asset_id, name: $name) {
+      addTag(tag: {name: $name, id: $id, item_type: COMMENTS, asset_id: $asset_id}) {
         errors {
           translation_key
         }
@@ -30,13 +30,13 @@ describe('graph.mutations.addCommentTag', () => {
   `;
 
   it('moderators can add tags to comments', async () => {
-    const user = new UserModel({roles: ['MODERATOR' ]});
+    const user = new UserModel({roles: ['MODERATOR']});
     const context = new Context({user});
-    const response = await graphql(schema, query, {}, context, {id: comment.id, asset_id: asset.id, name: 'BEST'});
-    if (response.errors && response.errors.length) {
-      console.error(response.errors);
+    const res = await graphql(schema, query, {}, context, {id: comment.id, asset_id: asset.id, name: 'BEST'}, 'AddCommentTag');
+    if (res.errors && res.errors.length) {
+      console.error(res.errors);
     }
-    expect(response.errors).to.be.empty;
+    expect(res.errors).to.be.empty;
 
     let {tags} = await CommentsService.findById(comment.id);
     expect(tags).to.have.length(1);
@@ -50,12 +50,12 @@ describe('graph.mutations.addCommentTag', () => {
     }).forEach(([ userDescription, user ]) => {
       it(userDescription, async () => {
         const context = new Context({user});
-        const response = await graphql(schema, query, {}, context, {id: comment.id, asset_id: asset.id, name: 'BEST'});
-        if (response.errors && response.errors.length) {
-          console.error(response.errors);
+        const res = await graphql(schema, query, {}, context, {id: comment.id, asset_id: asset.id, name: 'BEST'}, 'AddCommentTag');
+        if (res.errors && res.errors.length) {
+          console.error(res.errors);
         }
-        expect(response.errors).to.be.empty;
-        expect(response.data.addCommentTag.errors).to.deep.equal([{'translation_key':'NOT_AUTHORIZED'}]);
+        expect(res.errors).to.be.empty;
+        expect(res.data.addTag.errors).to.deep.equal([{'translation_key':'NOT_AUTHORIZED'}]);
       });
     });
   });
diff --git a/test/server/graph/mutations/removeCommentTag.js b/test/server/graph/mutations/removeTag.js
similarity index 87%
rename from test/server/graph/mutations/removeCommentTag.js
rename to test/server/graph/mutations/removeTag.js
index cca072af2..1075cab49 100644
--- a/test/server/graph/mutations/removeCommentTag.js
+++ b/test/server/graph/mutations/removeTag.js
@@ -10,7 +10,7 @@ const AssetModel = require('../../../../models/asset');
 const SettingsService = require('../../../../services/settings');
 const CommentsService = require('../../../../services/comments');
 
-describe('graph.mutations.removeCommentTag', () => {
+describe('graph.mutations.removeTag', () => {
   let asset, comment;
   beforeEach(async () => {
     await SettingsService.init();
@@ -22,8 +22,8 @@ describe('graph.mutations.removeCommentTag', () => {
   });
 
   const query = `
-    mutation RemoveCommentTag ($id: ID!, $asset_id: ID!, $name: String!) {
-      removeCommentTag(id: $id, asset_id: $asset_id, name: $name) {
+    mutation RemoveCommentTag($id: ID!, $asset_id: ID!, $name: String!) {
+      removeTag(tag: {name: $name, id: $id, item_type: COMMENTS, asset_id: $asset_id}) {
         errors {
           translation_key
         }
@@ -43,7 +43,7 @@ describe('graph.mutations.removeCommentTag', () => {
       console.error(response.errors);
     }
     expect(response.errors).to.be.empty;
-    expect(response.data.removeCommentTag.errors).to.be.null;
+    expect(response.data.removeTag.errors).to.be.null;
 
     let retrievedComment = await CommentsService.findById(comment.id);
 
@@ -78,7 +78,7 @@ describe('graph.mutations.removeCommentTag', () => {
         }
         expect(response.errors).to.be.empty;
 
-        expect(response.data.removeCommentTag.errors).to.deep.equal([{'translation_key':'NOT_AUTHORIZED'}]);
+        expect(response.data.removeTag.errors).to.deep.equal([{'translation_key':'NOT_AUTHORIZED'}]);
       });
     });
   });

From 0d957bcfb9878620c2575e92fe5e5e15bc9e6810 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 11 May 2017 14:56:36 -0600
Subject: [PATCH 020/264] Code cleanup related to old tag services

---
 services/comments.js                     |  49 -----------
 test/server/graph/mutations/removeTag.js |   5 +-
 test/server/services/comments.js         |  83 ------------------
 test/server/services/tags.js             | 107 +++++++++++++++++++++++
 4 files changed, 110 insertions(+), 134 deletions(-)
 create mode 100644 test/server/services/tags.js

diff --git a/services/comments.js b/services/comments.js
index e23e4e486..ca258934f 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -31,55 +31,6 @@ module.exports = class CommentsService {
     return commentModel.save();
   }
 
-  static addTag(id, tagLink, verifyOwnership = false) {
-
-    // Compose the query to find the comment.
-    const query = {
-      id,
-      'tags.tag.name': {
-        $ne: tagLink.tag.name
-      }
-    };
-
-    // If ownership verification is required, ensure that the person that is
-    // assigning the tag is the same person that owns the comment.
-    if (verifyOwnership) {
-      query['author_id'] = tagLink.assigned_by;
-    }
-
-    return CommentModel.update(query, {
-      $push: {
-        tags: tagLink
-      }
-    });
-  }
-
-  static removeTag(id, {tag: {name}, assigned_by}, verifyOwnership = false) {
-
-    // Compose the query to find the comment that has the id: `id` and a tag
-    // that has the name: `name`.
-    const query = {
-      id,
-      'tags.tag.name': {
-        $eq: name
-      }
-    };
-
-    // If ownership verification is required, ensure that the person that is
-    // assigning the tag is the same person that owns the comment.
-    if (verifyOwnership) {
-      query['author_id'] = assigned_by;
-    }
-
-    return CommentModel.update(query, {
-      $pull: {
-        tags: {
-          name
-        }
-      }
-    });
-  }
-
   /**
    * Finds a comment by the id.
    * @param {String} id  identifier of comment (uuid)
diff --git a/test/server/graph/mutations/removeTag.js b/test/server/graph/mutations/removeTag.js
index 1075cab49..a7ee4053b 100644
--- a/test/server/graph/mutations/removeTag.js
+++ b/test/server/graph/mutations/removeTag.js
@@ -9,6 +9,7 @@ const SettingModel = require('../../../../models/setting');
 const AssetModel = require('../../../../models/asset');
 const SettingsService = require('../../../../services/settings');
 const CommentsService = require('../../../../services/comments');
+const TagsService = require('../../../../services/tags');
 
 describe('graph.mutations.removeTag', () => {
   let asset, comment;
@@ -36,7 +37,7 @@ describe('graph.mutations.removeTag', () => {
     const context = new Context({user});
 
     // add a tag first
-    await CommentsService.addTag(comment.id, {tag: {name: 'BEST'}}, false);
+    await TagsService.add(comment.id, 'COMMENTS', {tag: {name: 'BEST'}}, false);
 
     const response = await graphql(schema, query, {}, context, {id: comment.id, asset_id: asset.id, name: 'BEST'});
     if (response.errors && response.errors.length) {
@@ -70,7 +71,7 @@ describe('graph.mutations.removeTag', () => {
         const context = new Context({user});
 
         // add a tag first
-        await CommentsService.addTag(comment.id, {tag: {name: 'BEST'}}, false);
+        await TagsService.add(comment.id, 'COMMENTS', {tag: {name: 'BEST'}}, false);
 
         const response = await graphql(schema, query, {}, context, {id: comment.id, asset_id: asset.id, name: 'BEST'});
         if (response.errors && response.errors.length) {
diff --git a/test/server/services/comments.js b/test/server/services/comments.js
index f5d82d1de..68859077f 100644
--- a/test/server/services/comments.js
+++ b/test/server/services/comments.js
@@ -219,89 +219,6 @@ describe('services.CommentsService', () => {
 
   });
 
-  describe('#addTag', () => {
-    it('adds a tag', async () => {
-      const id = comments[0].id;
-      const name = 'BEST';
-      const assigned_by = users[0].id;
-      
-      await CommentsService.addTag(id, {
-        tag: {
-          name
-        },
-        assigned_by
-      });
-
-      const {tags} = await CommentsService.findById(id);
-      expect(tags.length).to.equal(1);
-      expect(tags[0].tag.name).to.equal(name);
-      expect(tags[0].assigned_by).to.equal(assigned_by);
-    });
-
-    it('can\'t add same tag.id twice', async () => {
-      const id = comments[0].id;
-      const name = 'BEST';
-      const assigned_by = users[0].id;
-      
-      await CommentsService.addTag(id, {
-        tag: {
-          name
-        },
-        assigned_by
-      });
-
-      {
-        let {tags} = await CommentsService.findById(id);
-        expect(tags.length).to.equal(1);
-      }
-
-      await CommentsService.addTag(id, {
-        tag: {
-          name
-        },
-        assigned_by
-      });
-
-      {
-        let {tags} = await CommentsService.findById(id);
-        expect(tags.length).to.equal(1);
-      }
-    });
-  });
-
-  describe('#removeTag', () => {
-    it('removes a tag', async () => {
-      const id = comments[0].id;
-      const name = 'BEST';
-      const assigned_by = users[0].id;
-
-      await CommentsService.addTag(id, {
-        tag: {
-          name
-        },
-        assigned_by
-      });
-
-      {
-        const {tags} = await CommentsService.findById(id);
-        expect(tags.length).to.equal(1);
-      }
-
-      // ok now to remove it
-      await CommentsService.removeTag(id, {
-        tag: {
-          name
-        },
-        assigned_by
-      });
-
-      {
-        const {tags} = await CommentsService.findById(id);
-        expect(tags.length).to.equal(0);
-      }
-    });
-  });
-
   describe('#changeStatus', () => {
 
     it('should change the status of a comment from no status', () => {
diff --git a/test/server/services/tags.js b/test/server/services/tags.js
new file mode 100644
index 000000000..7cdad829e
--- /dev/null
+++ b/test/server/services/tags.js
@@ -0,0 +1,107 @@
+const CommentsService = require('../../../services/comments');
+const TagsService = require('../../../services/tags');
+const UsersService = require('../../../services/users');
+const SettingsService = require('../../../services/settings');
+
+const CommentModel = require('../../../models/comment');
+
+const expect = require('chai').use(require('chai-as-promised')).expect;
+
+describe('services.TagsService', () => {
+  let comment, user;
+  beforeEach(async () => {
+    await SettingsService.init();
+    user = await UsersService.createLocalUser('stampi@gmail.com', '1Coral!!', 'Stampi');
+    comment = await CommentModel.create({
+      id: '1',
+      body: 'comment 10',
+      asset_id: '123',
+      status_history: [],
+      parent_id: null,
+      author_id: user.id
+    });
+  });
+
+  describe('#add', () => {
+    it('adds a tag', async () => {
+      const id = comment.id;
+      const name = 'BEST';
+      const assigned_by = user.id;
+      
+      await TagsService.add(id, 'COMMENTS', {
+        tag: {
+          name
+        },
+        assigned_by
+      });
+
+      const {tags} = await CommentsService.findById(id);
+      expect(tags.length).to.equal(1);
+      expect(tags[0].tag.name).to.equal(name);
+      expect(tags[0].assigned_by).to.equal(assigned_by);
+    });
+
+    it('can\'t add same tag.id twice', async () => {
+      const id = comment.id;
+      const name = 'BEST';
+      const assigned_by = user.id;
+      
+      await TagsService.add(id, 'COMMENTS', {
+        tag: {
+          name
+        },
+        assigned_by
+      });
+
+      {
+        let {tags} = await CommentsService.findById(id);
+        expect(tags.length).to.equal(1);
+      }
+
+      await TagsService.add(id, 'COMMENTS', {
+        tag: {
+          name
+        },
+        assigned_by
+      });
+
+      {
+        let {tags} = await CommentsService.findById(id);
+        expect(tags.length).to.equal(1);
+      }
+    });
+  });
+
+  describe('#remove', () => {
+    it('removes a tag', async () => {
+      const id = comment.id;
+      const name = 'BEST';
+      const assigned_by = user.id;
+
+      await TagsService.add(id, 'COMMENTS', {
+        tag: {
+          name
+        },
+        assigned_by
+      });
+
+      {
+        const {tags} = await CommentsService.findById(id);
+        expect(tags.length).to.equal(1);
+      }
+
+      // ok now to remove it
+      await TagsService.remove(id, 'COMMENTS', {
+        tag: {
+          name
+        },
+        assigned_by
+      });
+
+      {
+        const {tags} = await CommentsService.findById(id);
+        expect(tags.length).to.equal(0);
+      }
+    });
+  });
+});

From e6b2ff19b8435cdc8e133cdf4e9ef1f81992dcc9 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 12 May 2017 07:51:53 -0600
Subject: [PATCH 021/264] fixing graph merge error

---
 graph/typeDefs.graphql | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index e69a39f23..a8d13e80c 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -104,12 +104,12 @@ type TagLink {
   # The underlying Tag that is either duplicated from the global list or created
   # uniquely for this specific model.
   tag: Tag!
-  
+
   # The user that assigned the tag. This TagLink could have been created by the
   # system, in which case this will be null. It could also be null if the
   # current user is not an Admin/Moderator.
   assigned_by: User
-  
+
   # The date that the TagLink was created.
   created_at: Date!
 }
@@ -767,7 +767,7 @@ input ModifyTagInput {
 
 # Response to the addTag or removeTag mutations.
 type ModifyTagResponse implements Response {
-  
+
   # An array of errors relating to the mutation that occured.
   errors: [UserError!]
 }
@@ -798,7 +798,7 @@ type CommentInfoAfterEdit {
 type EditCommentResponse implements Response {
   comment: CommentInfoAfterEdit!
   # An array of errors relating to the mutation that occured.
-  errors: [UserError]  
+  errors: [UserError!]
 }
 
 # All mutations for the application are defined on this object.

From b60ed166d0fd70f3aabae7b7babae7c93bac920e Mon Sep 17 00:00:00 2001
From: David Erwin <davidjerwin@gmail.com>
Date: Fri, 12 May 2017 15:38:38 -0400
Subject: [PATCH 022/264] Allow MODERATORs to access tags

---
 graph/resolvers/util.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graph/resolvers/util.js b/graph/resolvers/util.js
index 11cfcbb13..96e125a55 100644
--- a/graph/resolvers/util.js
+++ b/graph/resolvers/util.js
@@ -3,7 +3,7 @@
  */
 const decorateWithTags = (typeResolver) => {
   typeResolver.tags = ({tags = []}, _, {user}) => {
-    if (user && user.hasRoles('ADMIN')) {
+    if (user && (user.hasRoles('ADMIN') || user.hasRoles('MODERATOR'))) {
       return tags;
     }
 

From c3d02a14a0fc43cba9ae26f2d77a37441c960363 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 15 May 2017 18:11:14 -0300
Subject: [PATCH 023/264] Updated queries and hasRoles

---
 .../src/containers/Comment.js                 |  8 ++++++-
 .../coral-embed-stream/src/graphql/index.js   | 24 ++++++++++++++++---
 graph/resolvers/tag_link.js                   |  2 +-
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/client/coral-embed-stream/src/containers/Comment.js b/client/coral-embed-stream/src/containers/Comment.js
index 4a8e877b5..7b5159cc1 100644
--- a/client/coral-embed-stream/src/containers/Comment.js
+++ b/client/coral-embed-stream/src/containers/Comment.js
@@ -28,7 +28,13 @@ export default withFragments({
       created_at
       status
       tags {
-        id
+        tag {
+          name
+          created_at
+        }
+        assigned_by {
+          id
+        }
       }
       user {
         id
diff --git a/client/coral-embed-stream/src/graphql/index.js b/client/coral-embed-stream/src/graphql/index.js
index daa8389b3..d43bfd3d5 100644
--- a/client/coral-embed-stream/src/graphql/index.js
+++ b/client/coral-embed-stream/src/graphql/index.js
@@ -33,7 +33,13 @@ const extension = {
         comment {
           id
           tags {
-            name
+            tag {
+              name
+              created_at
+            }
+            assigned_by {
+              id
+            }
           }
         }
         errors {
@@ -46,7 +52,13 @@ const extension = {
         comment {
           id
           tags {
-            name
+            tag {
+              name
+              created_at
+            }
+            assigned_by {
+              id
+            }
           }
         }
         errors {
@@ -101,7 +113,13 @@ const extension = {
         status
         replyCount
         tags {
-          name
+          tag {
+            name
+            created_at
+          }
+          assigned_by {
+            id
+          }
         }
         user {
           id
diff --git a/graph/resolvers/tag_link.js b/graph/resolvers/tag_link.js
index 5c0d39587..11ee1350d 100644
--- a/graph/resolvers/tag_link.js
+++ b/graph/resolvers/tag_link.js
@@ -1,6 +1,6 @@
 const TagLink = {
   assigned_by({assigned_by}, _, {user, loaders: {Users}}) {
-    if (user && user.hasRole('ADMIN')) {
+    if (user && user.hasRoles('ADMIN')) {
       return Users.getByID.load(assigned_by);
     }
   }

From c59346eb0ae5b347669bb73de89f1c03b7ba8b65 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 15 May 2017 18:13:45 -0300
Subject: [PATCH 024/264] tags, and assignedby nul

---
 graph/resolvers/tag_link.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graph/resolvers/tag_link.js b/graph/resolvers/tag_link.js
index 11ee1350d..2fede45ec 100644
--- a/graph/resolvers/tag_link.js
+++ b/graph/resolvers/tag_link.js
@@ -1,6 +1,6 @@
 const TagLink = {
   assigned_by({assigned_by}, _, {user, loaders: {Users}}) {
-    if (user && user.hasRoles('ADMIN')) {
+    if (user && user.hasRoles('ADMIN') && assigned_by != null) {
       return Users.getByID.load(assigned_by);
     }
   }

From 793f63495915e47bc0678f6feda738d21ac41ef2 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 17 May 2017 09:01:41 -0300
Subject: [PATCH 025/264] Working tags

---
 client/coral-embed-stream/src/components/Comment.js           | 2 +-
 client/coral-embed-stream/src/containers/Comment.js           | 4 ----
 client/coral-framework/graphql/fragments/commentView.graphql  | 4 +++-
 .../coral-framework/graphql/mutations/addCommentTag.graphql   | 4 +++-
 .../graphql/mutations/removeCommentTag.graphql                | 4 +++-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/client/coral-embed-stream/src/components/Comment.js b/client/coral-embed-stream/src/components/Comment.js
index 9d7cb436d..dabac433c 100644
--- a/client/coral-embed-stream/src/components/Comment.js
+++ b/client/coral-embed-stream/src/components/Comment.js
@@ -25,7 +25,7 @@ import {getActionSummary, iPerformedThisAction} from 'coral-framework/utils';
 import {getEditableUntilDate} from './util';
 import styles from './Comment.css';
 
-const isStaff = tags => !tags.every(t => t.id !== 'STAFF');
+const isStaff = tags => !!tags.filter(i => i.tag.name === 'STAFF').length;
 
 // hold actions links (e.g. Reply) along the comment footer
 const ActionButton = ({children}) => {
diff --git a/client/coral-embed-stream/src/containers/Comment.js b/client/coral-embed-stream/src/containers/Comment.js
index 7b5159cc1..7ae96e177 100644
--- a/client/coral-embed-stream/src/containers/Comment.js
+++ b/client/coral-embed-stream/src/containers/Comment.js
@@ -30,10 +30,6 @@ export default withFragments({
       tags {
         tag {
           name
-          created_at
-        }
-        assigned_by {
-          id
         }
       }
       user {
diff --git a/client/coral-framework/graphql/fragments/commentView.graphql b/client/coral-framework/graphql/fragments/commentView.graphql
index 1832cc77d..0aa80c9cf 100644
--- a/client/coral-framework/graphql/fragments/commentView.graphql
+++ b/client/coral-framework/graphql/fragments/commentView.graphql
@@ -6,7 +6,9 @@ fragment commentView on Comment {
     created_at
     status
     tags {
-      id
+      tag {
+        name
+      }
     }
     user {
         id
diff --git a/client/coral-framework/graphql/mutations/addCommentTag.graphql b/client/coral-framework/graphql/mutations/addCommentTag.graphql
index a4ff36da4..aa4ce7f5b 100644
--- a/client/coral-framework/graphql/mutations/addCommentTag.graphql
+++ b/client/coral-framework/graphql/mutations/addCommentTag.graphql
@@ -3,7 +3,9 @@ mutation AddCommentTag ($id: ID!, $tag: String!) {
     comment {
       id
       tags {
-        id
+        tag {
+          name
+        }
       }
     }
     errors {
diff --git a/client/coral-framework/graphql/mutations/removeCommentTag.graphql b/client/coral-framework/graphql/mutations/removeCommentTag.graphql
index 642466f00..c89fc24f9 100644
--- a/client/coral-framework/graphql/mutations/removeCommentTag.graphql
+++ b/client/coral-framework/graphql/mutations/removeCommentTag.graphql
@@ -3,7 +3,9 @@ mutation RemoveCommentTag ($id: ID!, $tag: String!) {
     comment {
       id
       tags {
-        id
+        tag {
+          name
+        }
       }
     }
     errors {

From 54eb078a131e4ac5767e2c2456fd3514eab25b20 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 17 May 2017 09:37:26 -0300
Subject: [PATCH 026/264] Working offtopic tag

---
 graph/mutators/comment.js                        | 16 ++++++++++++----
 .../client/components/OffTopicTag.js             |  4 +---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index 5c39f7b69..4755aa4ac 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -16,16 +16,24 @@ const Wordlist = require('../../services/wordlist');
  * @param  {String} [status='NONE'] the status of the new comment
  * @return {Promise}              resolves to the created comment
  */
-const createComment = ({user, loaders: {Comments}, pubsub}, {body, asset_id, parent_id = null}, status = 'NONE') => {
+const createComment = ({user, loaders: {Comments}, pubsub}, {tags = [], body, asset_id, parent_id = null}, status = 'NONE') => {
+
+  // Handle Tags
+  if (!!tags.length) {
+    tags = tags.map(tag => ({
+      tag: {
+        name: tag
+      }
+    }))
+  }
 
   // Add the staff tag for comments created as a staff member.
-  let tags = [];
   if (user.hasRoles('ADMIN') || user.hasRoles('MODERATOR')) {
-    tags = [{
+    tags.push({
       tag: {
         name: 'STAFF'
       }
-    }];
+    });
   }
 
   return CommentsService.publicCreate({
diff --git a/plugins/coral-plugin-offtopic/client/components/OffTopicTag.js b/plugins/coral-plugin-offtopic/client/components/OffTopicTag.js
index 73e2372ed..0b50eb131 100644
--- a/plugins/coral-plugin-offtopic/client/components/OffTopicTag.js
+++ b/plugins/coral-plugin-offtopic/client/components/OffTopicTag.js
@@ -1,9 +1,7 @@
 import React from 'react';
 import styles from './styles.css';
 
-const isOffTopic = (tags) => {
-  return !!tags.filter(tag => tag.name === 'OFF_TOPIC').length
-}
+const isOffTopic = tags => !!tags.filter(i => i.tag.name === 'OFF_TOPIC').length;
 
 export default (props) => (
   <span>

From 9dc0693530e62efcc10c108c0edb49407b7dd2b6 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 17 May 2017 09:43:04 -0300
Subject: [PATCH 027/264] Linting

---
 graph/mutators/comment.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index 4755aa4ac..615d9cd43 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -19,12 +19,12 @@ const Wordlist = require('../../services/wordlist');
 const createComment = ({user, loaders: {Comments}, pubsub}, {tags = [], body, asset_id, parent_id = null}, status = 'NONE') => {
 
   // Handle Tags
-  if (!!tags.length) {
+  if (tags.length) {
     tags = tags.map(tag => ({
       tag: {
         name: tag
       }
-    }))
+    }));
   }
 
   // Add the staff tag for comments created as a staff member.

From 9db77360b456fd62b26ab3a57f65c49e4fb8fb4f Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 17 May 2017 08:16:48 -0600
Subject: [PATCH 028/264] removed unused errors

---
 errors.js | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/errors.js b/errors.js
index c0d405553..19b0ec90c 100644
--- a/errors.js
+++ b/errors.js
@@ -75,18 +75,6 @@ const ErrMissingToken = new APIError('token is required', {
   status: 400
 });
 
-// ErrNoCommentFound is returned when trying to add a tag to a comment that does not exist.
-const ErrNoCommentFound = new APIError('comment does not exist', {
-  translation_key: 'COMMENT_NOT_FOUND',
-  status: 400
-});
-
-// ErrNoCommentFound is returned when trying to add a tag to a comment that does not exist.
-const ErrTagNotAllowed = new APIError('tag not allowed', {
-  translation_key: 'TAG_NOT_ALLOWED',
-  status: 400
-});
-
 // ErrAssetCommentingClosed is returned when a comment or action is attempted on
 // a stream where commenting has been closed.
 class ErrAssetCommentingClosed extends APIError {
@@ -179,8 +167,6 @@ module.exports = {
   ErrMissingEmail,
   ErrMissingPassword,
   ErrMissingToken,
-  ErrNoCommentFound,
-  ErrTagNotAllowed,
   ErrEmailTaken,
   ErrSpecialChars,
   ErrMissingUsername,

From b2f1707f1732d92c08c03efb3efe39fb6b8b67a5 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 17 May 2017 11:19:06 -0300
Subject: [PATCH 029/264] Fully working offtopic

---
 client/coral-embed-stream/src/graphql/index.js     | 10 +++++++++-
 client/coral-framework/graphql/mutations.js        |  1 -
 client/coral-plugin-commentbox/actions.js          |  4 ++++
 client/coral-plugin-commentbox/constants.js        |  1 +
 client/coral-plugin-commentbox/reducer.js          |  4 +++-
 .../client/components/OffTopicCheckbox.js          | 14 ++++++++++++--
 6 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/client/coral-embed-stream/src/graphql/index.js b/client/coral-embed-stream/src/graphql/index.js
index d43bfd3d5..77041f554 100644
--- a/client/coral-embed-stream/src/graphql/index.js
+++ b/client/coral-embed-stream/src/graphql/index.js
@@ -170,7 +170,15 @@ const extension = {
             parent_id,
             asset_id,
             action_summaries: [],
-            tags,
+            tags: tags.map(tag => ({
+              tag: {
+                name: tag,
+                created_at: new Date().toISOString(),
+              },
+              assigned_by: {
+                id: auth.toJS().user.id,
+              },
+            })),
             status: null,
             id: 'pending'
           }
diff --git a/client/coral-framework/graphql/mutations.js b/client/coral-framework/graphql/mutations.js
index 66e68be97..1d5318853 100644
--- a/client/coral-framework/graphql/mutations.js
+++ b/client/coral-framework/graphql/mutations.js
@@ -168,4 +168,3 @@ export const withStopIgnoringUser = withMutation(
         });
       }}),
   });
-
diff --git a/client/coral-plugin-commentbox/actions.js b/client/coral-plugin-commentbox/actions.js
index 46bcf4b1b..879824d68 100644
--- a/client/coral-plugin-commentbox/actions.js
+++ b/client/coral-plugin-commentbox/actions.js
@@ -7,3 +7,7 @@ export const removeTag = idx => ({
   type: 'REMOVE_TAG',
   idx
 });
+
+export const clearTags = () => ({
+  type: 'CLEAR_TAGS',
+});
diff --git a/client/coral-plugin-commentbox/constants.js b/client/coral-plugin-commentbox/constants.js
index b1290f02e..4a80bfe4f 100644
--- a/client/coral-plugin-commentbox/constants.js
+++ b/client/coral-plugin-commentbox/constants.js
@@ -1,2 +1,3 @@
 export const ADD_TAG = 'ADD_TAG';
 export const REMOVE_TAG = 'REMOVE_TAG';
+export const CLEAR_TAGS = 'CLEAR_TAGS';
diff --git a/client/coral-plugin-commentbox/reducer.js b/client/coral-plugin-commentbox/reducer.js
index d9065fe87..e84f35e93 100644
--- a/client/coral-plugin-commentbox/reducer.js
+++ b/client/coral-plugin-commentbox/reducer.js
@@ -1,4 +1,4 @@
-import {ADD_TAG, REMOVE_TAG} from './constants';
+import {ADD_TAG, REMOVE_TAG, CLEAR_TAGS} from './constants';
 
 const initialState = {
   tags: []
@@ -19,6 +19,8 @@ export default function commentBox (state = initialState, action) {
         ...state.tags.slice(action.idx + 1)
       ]
     };
+  case CLEAR_TAGS :
+    return initialState;
   default :
     return state;
   }
diff --git a/plugins/coral-plugin-offtopic/client/components/OffTopicCheckbox.js b/plugins/coral-plugin-offtopic/client/components/OffTopicCheckbox.js
index 4e7ef7adf..329a16dca 100644
--- a/plugins/coral-plugin-offtopic/client/components/OffTopicCheckbox.js
+++ b/plugins/coral-plugin-offtopic/client/components/OffTopicCheckbox.js
@@ -1,13 +1,23 @@
 import React from 'react';
 import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
-import {addTag, removeTag} from 'coral-plugin-commentbox/actions';
+import {addTag, removeTag, clearTags} from 'coral-plugin-commentbox/actions';
 import styles from './styles.css';
 
 class OffTopicCheckbox extends React.Component {
 
   label = 'OFF_TOPIC';
 
+  componentDidMount() {
+    this.clearTagsHook = this.props.registerHook('postSubmit', (data) => {
+      this.props.clearTags();
+    });
+  }
+
+  componentWillUnmount() {
+    this.props.unregisterHook(this.clearTagsHook);
+  }
+
   handleChange = (e) => {
     if (e.target.checked) {
       this.props.addTag(this.label)
@@ -33,6 +43,6 @@ class OffTopicCheckbox extends React.Component {
 const mapStateToProps = ({commentBox}) => ({commentBox});
 
 const mapDispatchToProps = dispatch =>
-  bindActionCreators({addTag, removeTag}, dispatch);
+  bindActionCreators({addTag, removeTag, clearTags}, dispatch);
 
 export default connect(mapStateToProps, mapDispatchToProps)(OffTopicCheckbox);

From 6664f73d2df567ceb6c2ab8372736c09418e355f Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 17 May 2017 11:57:51 -0300
Subject: [PATCH 030/264] Best tag working, only Optimistic Missing

---
 .../src/services/fragmentMatcher.js           |  3 +-
 .../src/components/Comment.js                 | 22 ++++++------
 .../src/components/Stream.js                  | 12 +++----
 .../src/containers/Stream.js                  |  7 ++--
 .../coral-embed-stream/src/graphql/index.js   | 35 ++-----------------
 client/coral-framework/graphql/mutations.js   | 28 ++++++++-------
 .../graphql/mutations/addCommentTag.graphql   | 15 --------
 .../mutations/removeCommentTag.graphql        | 15 --------
 client/coral-plugin-best/BestButton.js        |  8 ++---
 9 files changed, 44 insertions(+), 101 deletions(-)
 delete mode 100644 client/coral-framework/graphql/mutations/addCommentTag.graphql
 delete mode 100644 client/coral-framework/graphql/mutations/removeCommentTag.graphql

diff --git a/client/coral-admin/src/services/fragmentMatcher.js b/client/coral-admin/src/services/fragmentMatcher.js
index 3b57de0b1..231c0fa2b 100644
--- a/client/coral-admin/src/services/fragmentMatcher.js
+++ b/client/coral-admin/src/services/fragmentMatcher.js
@@ -26,8 +26,7 @@ const fm = new IntrospectionFragmentMatcher({
             {name: 'SetUserStatusResponse'},
             {name: 'SuspendUserResponse'},
             {name: 'SetCommentStatusResponse'},
-            {name: 'AddCommentTagResponse'},
-            {name: 'RemoveCommentTagResponse'},
+            {name: 'ModifyTagResponse'},
             {name: 'IgnoreUserResponse'},
             {name: 'StopIgnoringUserResponse'}
           ]
diff --git a/client/coral-embed-stream/src/components/Comment.js b/client/coral-embed-stream/src/components/Comment.js
index dabac433c..6525f528f 100644
--- a/client/coral-embed-stream/src/components/Comment.js
+++ b/client/coral-embed-stream/src/components/Comment.js
@@ -109,10 +109,10 @@ class Comment extends React.Component {
     commentIsIgnored: React.PropTypes.func,
 
     // dispatch action to add a tag to a comment
-    addCommentTag: React.PropTypes.func,
+    addTag: React.PropTypes.func,
 
     // dispatch action to remove a tag from a comment
-    removeCommentTag: React.PropTypes.func,
+    removeTag: React.PropTypes.func,
 
     // dispatch action to ignore another user
     ignoreUser: React.PropTypes.func,
@@ -171,8 +171,8 @@ class Comment extends React.Component {
       setActiveReplyBox,
       activeReplyBox,
       deleteAction,
-      addCommentTag,
-      removeCommentTag,
+      addTag,
+      removeTag,
       ignoreUser,
       disableReply,
       commentIsIgnored,
@@ -213,18 +213,20 @@ class Comment extends React.Component {
 
     const addBestTag = notifyOnError(
       () =>
-        addCommentTag({
+        addTag({
           id: comment.id,
-          tag: BEST_TAG
+          name: BEST_TAG,
+          asset_id: asset.id
         }),
       () => 'Failed to tag comment as best'
     );
 
     const removeBestTag = notifyOnError(
       () =>
-        removeCommentTag({
+        removeTag({
           id: comment.id,
-          tag: BEST_TAG
+          name: BEST_TAG,
+          asset_id: asset.id
         }),
       () => 'Failed to remove best comment tag'
     );
@@ -394,8 +396,8 @@ class Comment extends React.Component {
                   currentUser={currentUser}
                   postFlag={postFlag}
                   deleteAction={deleteAction}
-                  addCommentTag={addCommentTag}
-                  removeCommentTag={removeCommentTag}
+                  addTag={addTag}
+                  removeTag={removeTag}
                   ignoreUser={ignoreUser}
                   charCountEnable={charCountEnable}
                   maxCharCount={maxCharCount}
diff --git a/client/coral-embed-stream/src/components/Stream.js b/client/coral-embed-stream/src/components/Stream.js
index b7b325cf6..848427aa3 100644
--- a/client/coral-embed-stream/src/components/Stream.js
+++ b/client/coral-embed-stream/src/components/Stream.js
@@ -33,8 +33,8 @@ class Stream extends React.Component {
       loadMore,
       deleteAction,
       showSignInDialog,
-      addCommentTag,
-      removeCommentTag,
+      addTag,
+      removeTag,
       pluginProps,
       ignoreUser,
       auth: {loggedIn, isAdmin, user},
@@ -166,8 +166,8 @@ class Stream extends React.Component {
                           currentUser={user}
                           postFlag={postFlag}
                           postDontAgree={postDontAgree}
-                          addCommentTag={addCommentTag}
-                          removeCommentTag={removeCommentTag}
+                          addTag={addTag}
+                          removeTag={removeTag}
                           ignoreUser={ignoreUser}
                           commentIsIgnored={commentIsIgnored}
                           loadMore={loadMore}
@@ -201,10 +201,10 @@ Stream.propTypes = {
   postComment: PropTypes.func.isRequired,
 
   // dispatch action to add a tag to a comment
-  addCommentTag: PropTypes.func,
+  addTag: PropTypes.func,
 
   // dispatch action to remove a tag from a comment
-  removeCommentTag: PropTypes.func,
+  removeTag: PropTypes.func,
 
   // dispatch action to ignore another user
   ignoreUser: React.PropTypes.func,
diff --git a/client/coral-embed-stream/src/containers/Stream.js b/client/coral-embed-stream/src/containers/Stream.js
index f19cc0a34..69f3c5491 100644
--- a/client/coral-embed-stream/src/containers/Stream.js
+++ b/client/coral-embed-stream/src/containers/Stream.js
@@ -8,7 +8,7 @@ import isNil from 'lodash/isNil';
 import {NEW_COMMENT_COUNT_POLL_INTERVAL} from '../constants/stream';
 import {
   withPostComment, withPostFlag, withPostDontAgree, withDeleteAction,
-  withAddCommentTag, withRemoveCommentTag, withIgnoreUser, withEditComment,
+  withAddTag, withRemoveTag, withIgnoreUser, withEditComment,
 } from 'coral-framework/graphql/mutations';
 
 import {notificationActions, authActions} from 'coral-framework';
@@ -243,10 +243,9 @@ export default compose(
   withPostComment,
   withPostFlag,
   withPostDontAgree,
-  withAddCommentTag,
-  withRemoveCommentTag,
+  withAddTag,
+  withRemoveTag,
   withIgnoreUser,
   withDeleteAction,
   withEditComment,
 )(StreamContainer);
-
diff --git a/client/coral-embed-stream/src/graphql/index.js b/client/coral-embed-stream/src/graphql/index.js
index 77041f554..201f088dc 100644
--- a/client/coral-embed-stream/src/graphql/index.js
+++ b/client/coral-embed-stream/src/graphql/index.js
@@ -28,39 +28,8 @@ const extension = {
         }
       }
     `,
-    RemoveCommentTagResponse: gql`
-      fragment CoralEmbedStream_RemoveCommentTagResponse on RemoveCommentTagResponse {
-        comment {
-          id
-          tags {
-            tag {
-              name
-              created_at
-            }
-            assigned_by {
-              id
-            }
-          }
-        }
-        errors {
-          translation_key
-        }
-      }
-    `,
-    AddCommentTagResponse: gql`
-      fragment CoralEmbedStream_AddCommentTagResponse on AddCommentTagResponse {
-        comment {
-          id
-          tags {
-            tag {
-              name
-              created_at
-            }
-            assigned_by {
-              id
-            }
-          }
-        }
+    ModifyTagResponse: gql`
+      fragment CoralEmbedStream_ModifyTagResponse on ModifyTagResponse {
         errors {
           translation_key
         }
diff --git a/client/coral-framework/graphql/mutations.js b/client/coral-framework/graphql/mutations.js
index 1d5318853..ab07b4441 100644
--- a/client/coral-framework/graphql/mutations.js
+++ b/client/coral-framework/graphql/mutations.js
@@ -95,39 +95,43 @@ export const withDeleteAction = withMutation(
       }}),
   });
 
-export const withAddCommentTag = withMutation(
+export const withAddTag = withMutation(
   gql`
-    mutation AddCommentTag($id: ID!, $tag: String!) {
-      addCommentTag(id:$id, tag:$tag) {
-        ...AddCommentTagResponse
+    mutation AddCommentTag($id: ID!, $asset_id: ID!, $name: String!) {
+      addTag(tag: {name: $name, id: $id, item_type: COMMENTS, asset_id: $asset_id}) {
+        ...ModifyTagResponse
       }
     }
   `, {
     props: ({mutate}) => ({
-      addCommentTag: ({id, tag}) => {
+      addTag: ({id, name, asset_id}) => {
         return mutate({
           variables: {
             id,
-            tag
+            name,
+            asset_id
           }
         });
       }}),
   });
 
-export const withRemoveCommentTag = withMutation(
+export const withRemoveTag = withMutation(
   gql`
-    mutation RemoveCommentTag($id: ID!, $tag: String!) {
-      removeCommentTag(id:$id, tag:$tag) {
-        ...RemoveCommentTagResponse
+    mutation RemoveCommentTag($id: ID!, $asset_id: ID!, $name: String!) {
+      removeTag(tag: {name: $name, id: $id, item_type: COMMENTS, asset_id: $asset_id}) {
+        errors {
+          translation_key
+        }
       }
     }
   `, {
     props: ({mutate}) => ({
-      removeCommentTag: ({id, tag}) => {
+      removeTag: ({id, name, asset_id}) => {
         return mutate({
           variables: {
             id,
-            tag
+            name,
+            asset_id
           }
         });
       }}),
diff --git a/client/coral-framework/graphql/mutations/addCommentTag.graphql b/client/coral-framework/graphql/mutations/addCommentTag.graphql
deleted file mode 100644
index aa4ce7f5b..000000000
--- a/client/coral-framework/graphql/mutations/addCommentTag.graphql
+++ /dev/null
@@ -1,15 +0,0 @@
-mutation AddCommentTag ($id: ID!, $tag: String!) {
-  addCommentTag(id:$id, tag:$tag) {
-    comment {
-      id
-      tags {
-        tag {
-          name
-        }
-      }
-    }
-    errors {
-      translation_key
-    }
-  }
-}
diff --git a/client/coral-framework/graphql/mutations/removeCommentTag.graphql b/client/coral-framework/graphql/mutations/removeCommentTag.graphql
deleted file mode 100644
index c89fc24f9..000000000
--- a/client/coral-framework/graphql/mutations/removeCommentTag.graphql
+++ /dev/null
@@ -1,15 +0,0 @@
-mutation RemoveCommentTag ($id: ID!, $tag: String!) {
-  removeCommentTag(id:$id, tag:$tag) {
-    comment {
-      id
-      tags {
-        tag {
-          name
-        }
-      }
-    }
-    errors {
-      translation_key
-    }
-  }
-}
diff --git a/client/coral-plugin-best/BestButton.js b/client/coral-plugin-best/BestButton.js
index 96ef45f86..691b3c889 100644
--- a/client/coral-plugin-best/BestButton.js
+++ b/client/coral-plugin-best/BestButton.js
@@ -6,10 +6,10 @@ import classnames from 'classnames';
 
 // tag string for best comments
 export const BEST_TAG = 'BEST';
-export const commentIsBest = ({tags} = {}) => {
-  const isBest = Array.isArray(tags) && tags.some(t => t.name === BEST_TAG);
-  return isBest;
-};
+
+export const commentIsBest = ({tags} = {}) => tags.some(t => t.tag.name === BEST_TAG);
+
+// const commentIsBest = tags => !!tags.filter(i => i.tag.name === 'BEST_TAG).length;
 
 const name = 'coral-plugin-best';
 const lang = new I18n(translations);

From f57fa7cb7bb9753f461c244b956df3a9060efdbb Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 17 May 2017 23:53:07 -0300
Subject: [PATCH 031/264] Update Cache

---
 .../src/components/Comment.js                 |  2 +-
 client/coral-framework/graphql/mutations.js   | 49 +++++++++++++++++--
 client/coral-plugin-best/BestButton.js        |  2 -
 3 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/client/coral-embed-stream/src/components/Comment.js b/client/coral-embed-stream/src/components/Comment.js
index 6525f528f..a0d293bdb 100644
--- a/client/coral-embed-stream/src/components/Comment.js
+++ b/client/coral-embed-stream/src/components/Comment.js
@@ -216,7 +216,7 @@ class Comment extends React.Component {
         addTag({
           id: comment.id,
           name: BEST_TAG,
-          asset_id: asset.id
+          assetId: asset.id
         }),
       () => 'Failed to tag comment as best'
     );
diff --git a/client/coral-framework/graphql/mutations.js b/client/coral-framework/graphql/mutations.js
index ab07b4441..2ad2d6f50 100644
--- a/client/coral-framework/graphql/mutations.js
+++ b/client/coral-framework/graphql/mutations.js
@@ -95,6 +95,16 @@ export const withDeleteAction = withMutation(
       }}),
   });
 
+  const COMMENT_FRAGMENT = gql`
+    fragment CoralRespect_UpdateFragment on Comment {
+      tags {
+        tag {
+          name
+        }
+      }
+    }
+  `;
+
 export const withAddTag = withMutation(
   gql`
     mutation AddCommentTag($id: ID!, $asset_id: ID!, $name: String!) {
@@ -104,13 +114,35 @@ export const withAddTag = withMutation(
     }
   `, {
     props: ({mutate}) => ({
-      addTag: ({id, name, asset_id}) => {
+      addTag: ({id, name, assetId}) => {
         return mutate({
           variables: {
             id,
             name,
-            asset_id
-          }
+            asset_id: assetId
+          },
+          optimisticResponse: {
+            deleteAction: {
+              __typename: 'DeleteActionResponse',
+              errors: null,
+            }
+          },
+          update: (proxy) => {
+            const fragmentId = `Comment_${id}`;
+
+            // Read the data from our cache for this query.
+            const data = proxy.readFragment({fragment: COMMENT_FRAGMENT, id: fragmentId});
+
+            data.tags.push({
+              tag: {
+                __typename: 'TagLink',
+                name
+              }
+            });
+
+            // Write our data back to the cache.
+            proxy.writeFragment({fragment: COMMENT_FRAGMENT, id: fragmentId, data});
+          },
         });
       }}),
   });
@@ -132,6 +164,17 @@ export const withRemoveTag = withMutation(
             id,
             name,
             asset_id
+          },
+          update: (proxy) => {
+            const fragmentId = `Comment_${id}`;
+
+            // Read the data from our cache for this query.
+            const data = proxy.readFragment({fragment: COMMENT_FRAGMENT, id: fragmentId});
+
+            console.log('remove', data);
+
+            // Write our data back to the cache.
+            proxy.writeFragment({fragment: COMMENT_FRAGMENT, id: fragmentId, data});
           }
         });
       }}),
diff --git a/client/coral-plugin-best/BestButton.js b/client/coral-plugin-best/BestButton.js
index 691b3c889..b279c0adc 100644
--- a/client/coral-plugin-best/BestButton.js
+++ b/client/coral-plugin-best/BestButton.js
@@ -9,8 +9,6 @@ export const BEST_TAG = 'BEST';
 
 export const commentIsBest = ({tags} = {}) => tags.some(t => t.tag.name === BEST_TAG);
 
-// const commentIsBest = tags => !!tags.filter(i => i.tag.name === 'BEST_TAG).length;
-
 const name = 'coral-plugin-best';
 const lang = new I18n(translations);
 

From 17e7b28688f60e5780906af3b3f8200586a08cbc Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 18 May 2017 00:21:08 -0300
Subject: [PATCH 032/264] Fully working best tag

---
 client/coral-framework/graphql/mutations.js | 15 +++++++++------
 client/coral-plugin-best/BestButton.js      |  4 ----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/client/coral-framework/graphql/mutations.js b/client/coral-framework/graphql/mutations.js
index ab7f4ae78..cf57688ee 100644
--- a/client/coral-framework/graphql/mutations.js
+++ b/client/coral-framework/graphql/mutations.js
@@ -95,8 +95,8 @@ export const withDeleteAction = withMutation(
       }}),
   });
 
-  const COMMENT_FRAGMENT = gql`
-    fragment CoralRespect_UpdateFragment on Comment {
+const COMMENT_FRAGMENT = gql`
+    fragment CoraBest_UpdateFragment on Comment {
       tags {
         tag {
           name
@@ -135,9 +135,10 @@ export const withAddTag = withMutation(
 
             data.tags.push({
               tag: {
-                __typename: 'TagLink',
-                name
-              }
+                __typename: 'Tag',
+                name: "BEST"
+              },
+              __typename: 'TagLink'
             });
 
             // Write our data back to the cache.
@@ -171,7 +172,9 @@ export const withRemoveTag = withMutation(
             // Read the data from our cache for this query.
             const data = proxy.readFragment({fragment: COMMENT_FRAGMENT, id: fragmentId});
 
-            console.log('remove', data);
+            const idx = data.tags.findIndex(i => i.tag.name === 'BEST');
+
+            data.tags = [...data.tags.slice(0, idx), ...data.tags.slice(idx + 1)];
 
             // Write our data back to the cache.
             proxy.writeFragment({fragment: COMMENT_FRAGMENT, id: fragmentId, data});
diff --git a/client/coral-plugin-best/BestButton.js b/client/coral-plugin-best/BestButton.js
index acc971a05..8a17cfdf8 100644
--- a/client/coral-plugin-best/BestButton.js
+++ b/client/coral-plugin-best/BestButton.js
@@ -6,12 +6,8 @@ import classnames from 'classnames';
 
 // tag string for best comments
 export const BEST_TAG = 'BEST';
-<<<<<<< HEAD
 
-export const commentIsBest = ({tags} = {}) => tags.some(t => t.tag.name === BEST_TAG);
-=======
 export const commentIsBest = ({tags} = {}) => tags.some((t) => t.tag.name === BEST_TAG);
->>>>>>> 7a256bdd2b62c5bdf6f20df76baa910ab0b44166
 
 const name = 'coral-plugin-best';
 const lang = new I18n(translations);

From 132b0a854d4654fbf53c2c09964dc30be7f3f118 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 18 May 2017 00:22:39 -0300
Subject: [PATCH 033/264] linting

---
 client/coral-framework/graphql/mutations.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-framework/graphql/mutations.js b/client/coral-framework/graphql/mutations.js
index cf57688ee..6eb1b4bad 100644
--- a/client/coral-framework/graphql/mutations.js
+++ b/client/coral-framework/graphql/mutations.js
@@ -136,7 +136,7 @@ export const withAddTag = withMutation(
             data.tags.push({
               tag: {
                 __typename: 'Tag',
-                name: "BEST"
+                name: 'BEST'
               },
               __typename: 'TagLink'
             });
@@ -172,7 +172,7 @@ export const withRemoveTag = withMutation(
             // Read the data from our cache for this query.
             const data = proxy.readFragment({fragment: COMMENT_FRAGMENT, id: fragmentId});
 
-            const idx = data.tags.findIndex(i => i.tag.name === 'BEST');
+            const idx = data.tags.findIndex((i) => i.tag.name === 'BEST');
 
             data.tags = [...data.tags.slice(0, idx), ...data.tags.slice(idx + 1)];
 

From 8f219c47a763c6a4db19e06b5ce45288b2dc994e Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 19 May 2017 12:23:53 -0600
Subject: [PATCH 034/264] Tag server impl

---
 PLUGINS.md                                    | 24 ++++++
 graph/loaders/index.js                        |  2 +
 graph/loaders/tags.js                         | 22 +++++
 graph/mutators/comment.js                     | 74 +++++++++++-----
 graph/mutators/tag.js                         | 60 ++-----------
 plugins.default.json                          |  3 +-
 plugins/coral-plugin-offtopic/index.js        | 13 ++-
 .../server/typeDefs.graphql                   |  4 -
 services/tags.js                              | 85 ++++++++++++++++++-
 test/server/graph/mutations/addTag.js         |  2 +-
 10 files changed, 209 insertions(+), 80 deletions(-)
 create mode 100644 graph/loaders/tags.js
 delete mode 100644 plugins/coral-plugin-offtopic/server/typeDefs.graphql

diff --git a/PLUGINS.md b/PLUGINS.md
index 0d17ccd55..4462f8577 100644
--- a/PLUGINS.md
+++ b/PLUGINS.md
@@ -307,6 +307,30 @@ module.exports = {
 }
 ```
 
+#### Field: `tags`
+
+The tags hook allows a plugin to define tags that are code controlled (added
+or enabled by code). Below is an example pulled from the core off topic plugin
+on how to create a hook for the `OFF_TOPIC` name:
+
+```js
+[
+  {
+    name: 'OFF_TOPIC',
+    permissions: {
+      public: true,
+      self: true,
+      roles: []
+    },
+    models: ['COMMENTS'],
+    created_at: new Date()
+  }
+]
+```
+
+You can refer to `models/schema/tag.js` for the available schema to match when
+creating models to enable/disable specific features.
+
 #### Field: `passport`
 
 ```js
diff --git a/graph/loaders/index.js b/graph/loaders/index.js
index 26727940f..8bc170c6d 100644
--- a/graph/loaders/index.js
+++ b/graph/loaders/index.js
@@ -6,6 +6,7 @@ const Assets = require('./assets');
 const Comments = require('./comments');
 const Metrics = require('./metrics');
 const Settings = require('./settings');
+const Tags = require('./tags');
 const Users = require('./users');
 
 const plugins = require('../../services/plugins');
@@ -18,6 +19,7 @@ let loaders = [
   Comments,
   Metrics,
   Settings,
+  Tags,
   Users,
 
   // Load the plugin loaders from the manager.
diff --git a/graph/loaders/tags.js b/graph/loaders/tags.js
new file mode 100644
index 000000000..23ab6fd43
--- /dev/null
+++ b/graph/loaders/tags.js
@@ -0,0 +1,22 @@
+const DataLoader = require('dataloader');
+const TagsService = require('../../services/tags');
+
+/**
+ * Get all the tags for the context for the dataloader.
+ */
+const genAll = (context, queries) => {
+  return Promise.all(queries.map(({id, item_type, asset_id}) => {
+    return TagsService.getAll({id, item_type, asset_id});
+  }));
+};
+
+/**
+ * Creates a set of loaders based on a GraphQL context.
+ * @param  {Object} context the context of the GraphQL request
+ * @return {Object}         object of loaders
+ */
+module.exports = (context) => ({
+  Tags: {
+    getAll: new DataLoader((queries) => genAll(context, queries))
+  }
+});
diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index 193753275..75e7d9fc0 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -2,11 +2,61 @@ const errors = require('../../errors');
 
 const AssetsService = require('../../services/assets');
 const ActionsService = require('../../services/actions');
+const TagsService = require('../../services/tags');
 const CommentsService = require('../../services/comments');
 const linkify = require('linkify-it')();
-
 const Wordlist = require('../../services/wordlist');
 
+const debug = require('debug')('talk:graph:mutators:tags');
+const plugins = require('../../services/plugins');
+
+const pluginTags = plugins.get('server', 'tags').reduce((acc, {plugin, tags}) => {
+  debug(`added plugin '${plugin.name}'`);
+
+  acc = acc.concat(tags);
+
+  return acc;
+}, []);
+
+const resolveTagsForComment = async ({user, loaders: {Tags}}, {asset_id, tags = []}) => {
+  const item_type = 'COMMENTS';
+
+  // Handle Tags
+  if (tags.length) {
+
+    // Get the global list of tags from the dataloader.
+    let globalTags = await Tags.getAll.load({
+      item_type,
+      asset_id
+    });
+    if (!Array.isArray(globalTags)) {
+      globalTags = [];
+    }
+
+    globalTags = globalTags.concat(pluginTags);
+
+    // Merge in the tags for the given comment.
+    tags = tags.map((name) => {
+
+      // Resolve the TagLink that we can use for the comment.
+      let {tagLink} = TagsService.resolveLink(user, globalTags, {name, item_type});
+
+      // Return the tagLink for tag insertion.
+      return tagLink;
+    });
+  }
+
+  // Add the staff tag for comments created as a staff member.
+  if (user.hasRoles('ADMIN') || user.hasRoles('MODERATOR')) {
+    tags.push(TagsService.newTagLink(user, {
+      name: 'STAFF',
+      item_type
+    }));
+  }
+
+  return tags;
+};
+
 /**
  * Creates a new comment.
  * @param  {Object} user          the user performing the request
@@ -16,25 +66,11 @@ const Wordlist = require('../../services/wordlist');
  * @param  {String} [status='NONE'] the status of the new comment
  * @return {Promise}              resolves to the created comment
  */
-const createComment = async ({user, loaders: {Comments}, pubsub}, {tags = [], body, asset_id, parent_id = null}, status = 'NONE') => {
+const createComment = async (context, {tags = [], body, asset_id, parent_id = null}, status = 'NONE') => {
+  const {user, loaders: {Comments}, pubsub} = context;
 
-  // Handle Tags
-  if (tags.length) {
-    tags = tags.map((tag) => ({
-      tag: {
-        name: tag
-      }
-    }));
-  }
-
-  // Add the staff tag for comments created as a staff member.
-  if (user.hasRoles('ADMIN') || user.hasRoles('MODERATOR')) {
-    tags.push({
-      tag: {
-        name: 'STAFF'
-      }
-    });
-  }
+  // Resolve the tags for the comment.
+  tags = await resolveTagsForComment(context, {asset_id, tags});
 
   let comment = await CommentsService.publicCreate({
     body,
diff --git a/graph/mutators/tag.js b/graph/mutators/tag.js
index 3182a7d00..0c93d8ea0 100644
--- a/graph/mutators/tag.js
+++ b/graph/mutators/tag.js
@@ -4,62 +4,18 @@ const errors = require('../../errors');
 /**
  * Modifies the targeted model with the specified operation to add/remove a tag.
  */
-const modify = async ({user}, operation, {name, id, item_type, asset_id}) => {
+const modify = async ({user, loaders: {Tags}}, operation, {name, id, item_type, asset_id}) => {
 
-  // Try to find the tag in the global list. This will contain the permission
-  // information if it's found.
-  let tag = await TagsService.get({name, id, item_type, asset_id});
+  // Get the global list of tags from the dataloader.
+  const tags = await Tags.getAll.load({id, item_type, asset_id});
 
-  // Create the new tagLink that will be created to interact to the comment.
-  let tagLink = {
-    tag,
-    assigned_by: user.id,
-    created_at: new Date()
-  };
-
-  // If the tag was found, we need to ensure that the current user can indeed
-  // modify this tag on the comment.
-  if (tag) {
-    
-    // If the tag has roles defined, and the current user has at least one of
-    // the required roles, then modify the tag without checking for ownership.
-    if (tag.permissions && tag.permissions.roles && tag.permissions.roles.some((role) => user.roles.include(role))) {
-      return operation(id, item_type, tagLink, false);
-    }
-
-    // If the permissions allow for self assignment, then ensure that the query
-    // is compose with that in mind.
-    if (tag.permissions && tag.permissions.self) {
-
-      // Otherwise, we assume that we have to check to see that the user indeed
-      // owns the resource before allowing the tag to get modified.
-      return operation(id, item_type, tagLink, true);
-    }
-
-    throw errors.ErrNotAuthorized;
-  }
-
-  // Only admin/moderators can modify unique tags, these are tags that are not
-  // in the global list.
-  if (!(user.hasRoles('ADMIN') || user.hasRoles('MODERATOR'))) {
-    throw errors.ErrNotAuthorized;
-  }
-
-  // Generate the tag in the event now that we have to create the tag for this
-  // specific comment.
-  tagLink.tag = {
-    name,
-    permissions: {
-      public: true,
-      self: false,
-      roles: []
-    },
-    models: [item_type],
-    created_at: new Date()
-  };
+  // Resolve the TagLink that should be used to insert to the user. This will
+  // addtionally return with an ownership property that can be used to determine
+  // that the user who adds this tag must also be the owner of the resource.
+  let {tagLink, ownership} = TagsService.resolveLink(user, tags, {name, item_type});
 
   // Actually modify the tag on the model.
-  return operation(id, item_type, tagLink, false);
+  return operation(id, item_type, tagLink, ownership);
 };
 
 module.exports = (context) => {
diff --git a/plugins.default.json b/plugins.default.json
index b3443af48..7af4eb4fe 100644
--- a/plugins.default.json
+++ b/plugins.default.json
@@ -1,7 +1,8 @@
 {
   "server": [
     "coral-plugin-respect",
-    "coral-plugin-facebook-auth"
+    "coral-plugin-facebook-auth",
+    "coral-plugin-offtopic"
   ],
   "client": [
     "coral-plugin-respect"
diff --git a/plugins/coral-plugin-offtopic/index.js b/plugins/coral-plugin-offtopic/index.js
index 51ad1c24e..9988686ff 100644
--- a/plugins/coral-plugin-offtopic/index.js
+++ b/plugins/coral-plugin-offtopic/index.js
@@ -2,5 +2,16 @@ const {readFileSync} = require('fs');
 const path = require('path');
 
 module.exports = {
-  typeDefs: readFileSync(path.join(__dirname, 'server/typeDefs.graphql'), 'utf8')
+  tags: [
+    {
+      name: 'OFF_TOPIC',
+      permissions: {
+        public: true,
+        self: true,
+        roles: []
+      },
+      models: ['COMMENTS'],
+      created_at: new Date()
+    }
+  ]
 };
diff --git a/plugins/coral-plugin-offtopic/server/typeDefs.graphql b/plugins/coral-plugin-offtopic/server/typeDefs.graphql
deleted file mode 100644
index 48ba577cf..000000000
--- a/plugins/coral-plugin-offtopic/server/typeDefs.graphql
+++ /dev/null
@@ -1,4 +0,0 @@
-## Extending TAG_TYPE by adding OFF_TOPIC Tag
-enum TAG_TYPE {
-  OFF_TOPIC
-}
diff --git a/services/tags.js b/services/tags.js
index 3ee3de121..7653434c9 100644
--- a/services/tags.js
+++ b/services/tags.js
@@ -5,6 +5,8 @@ const UserModel = require('../models/user');
 const AssetsService = require('./assets');
 const SettingsService = require('./settings');
 
+const errors = require('../errors');
+
 const updateModel = async (item_type, query, update) => {
 
   // Get the model to update with.
@@ -43,7 +45,7 @@ class TagsService {
   /**
    * Retrives a global tag from the settings based on the input_type.
    */
-  static async get({name, id, item_type, asset_id = null}) {
+  static async getAll({id, item_type, asset_id = null}) {
 
     // Extract the settings from the database.
     let settings;
@@ -66,7 +68,86 @@ class TagsService {
     let {tags = []} = settings;
 
     // Return the first tag that matches the requested form.
-    return tags.find((tag) => tag.name === name && tag.models.include(item_type));
+    return tags;
+  }
+
+  /**
+   * Resolves the tagLink and ownership verification requirements that should be
+   * used when trying to perform tag adding/removing operations.
+   */
+  static resolveLink(user, tags, {name, item_type}) {
+
+    // Try to find the tag in the global list. This will contain the permission
+    // information if it's found.
+    let tag = tags.find((tag) => {
+      return tag.name === name && Array.isArray(tag.models) && tag.models.includes(item_type);
+    });
+
+    // Create the new tagLink that will be created to interact to the comment.
+    let tagLink = {
+      tag,
+      assigned_by: user.id,
+      created_at: new Date()
+    };
+
+    // If the tag was found, we need to ensure that the current user can indeed
+    // modify this tag on the comment.
+    if (tag) {
+
+      // If the tag has roles defined, and the current user has at least one of
+      // the required roles, then modify the tag without checking for ownership.
+      if (tag.permissions && tag.permissions.roles && tag.permissions.roles.some((role) => user.roles.include(role))) {
+        return {tagLink, ownership: false};
+      }
+
+      // If the permissions allow for self assignment, then ensure that the query
+      // is compose with that in mind.
+      if (tag.permissions && tag.permissions.self) {
+
+        // Otherwise, we assume that we have to check to see that the user indeed
+        // owns the resource before allowing the tag to get modified.
+        return {tagLink, ownership: true};
+      }
+
+      throw errors.ErrNotAuthorized;
+    }
+
+    // Only admin/moderators can modify unique tags, these are tags that are not
+    // in the global list.
+    if (!(user.hasRoles('ADMIN') || user.hasRoles('MODERATOR'))) {
+      throw errors.ErrNotAuthorized;
+    }
+
+    // Generate the tag in the event now that we have to create the tag for this
+    // specific comment.
+    tagLink = TagsService.newTagLink(user, {name, item_type});
+
+    // Actually modify the tag on the model.
+    return {tagLink, ownership: false};
+  }
+
+  static newTag({name, item_type}) {
+    return {
+      name,
+      permissions: {
+        public: true,
+        self: false,
+        roles: []
+      },
+      models: [item_type],
+      created_at: new Date()
+    };
+  }
+
+  /**
+   * Creates a new TagLink based on the input user and the tag data.
+   */
+  static newTagLink(user, tag) {
+    return {
+      tag: TagsService.newTag(tag),
+      assigned_by: user.id,
+      created_at: new Date()
+    };
   }
 
   /**
diff --git a/test/server/graph/mutations/addTag.js b/test/server/graph/mutations/addTag.js
index e6639d49c..17e268cea 100644
--- a/test/server/graph/mutations/addTag.js
+++ b/test/server/graph/mutations/addTag.js
@@ -12,7 +12,7 @@ describe('graph.mutations.addTag', () => {
   let comment, asset;
   beforeEach(async () => {
     await SettingsService.init();
-    
+
     asset = new AssetModel({url: 'http://new.test.com/'});
     await asset.save();
 

From 1e904584e74d79ea1596688b7913f57b4323c1f3 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Tue, 6 Jun 2017 17:31:52 -0600
Subject: [PATCH 035/264] Added model migrations

---
 bin/cli                       |   1 +
 bin/cli-migration             |  88 +++++++++++++++++++++
 migrations/1496771633_tags.js |  78 +++++++++++++++++++
 models/migration.js           |  10 +++
 package.json                  |   1 +
 services/migration.js         | 142 ++++++++++++++++++++++++++++++++++
 yarn.lock                     |  16 ++++
 7 files changed, 336 insertions(+)
 create mode 100755 bin/cli-migration
 create mode 100644 migrations/1496771633_tags.js
 create mode 100644 models/migration.js
 create mode 100644 services/migration.js

diff --git a/bin/cli b/bin/cli
index 7e27fa85b..1f3d50ad2 100755
--- a/bin/cli
+++ b/bin/cli
@@ -13,6 +13,7 @@ program
   .command('setup', 'setup the application')
   .command('jobs', 'work with the job queues')
   .command('users', 'work with the application auth')
+  .command('migration', 'provides utilities for migrating the database')
   .command('plugins', 'provides utilities for interacting with the plugin system')
   .parse(process.argv);
 
diff --git a/bin/cli-migration b/bin/cli-migration
new file mode 100755
index 000000000..9c3e077b1
--- /dev/null
+++ b/bin/cli-migration
@@ -0,0 +1,88 @@
+#!/usr/bin/env node
+
+/**
+ * Module dependencies.
+ */
+
+const program = require('./commander');
+const util = require('./util');
+const inquirer = require('inquirer');
+const mongoose = require('../services/mongoose');
+const MigrationService = require('../services/migration');
+
+// Register shutdown hooks.
+util.onshutdown([
+  () => mongoose.disconnect()
+]);
+
+async function createMigration(name) {
+  try {
+
+    // Create the migration.
+    await MigrationService.create(name);
+
+    util.shutdown();
+  } catch (e) {
+    console.error(e);
+    util.shutdown(1);
+  }
+}
+
+async function runMigrations() {
+
+  try {
+
+    // Get the migrations to run.
+    let migrations = await MigrationService.listPending();
+
+    console.log('Now going to run the following migrations:\n');
+
+    for (let {filename} of migrations) {
+      console.log(`\tmigrations/${filename}`);
+    }
+
+    let answers = await inquirer.prompt([
+      {
+        type: 'confirm',
+        name: 'confirm',
+        message: 'Proceed with migrations',
+        default: false
+      }
+    ]);
+
+    if (answers.confirm) {
+
+      // Run the migrations.
+      await MigrationService.run(migrations);
+    } else {
+      console.warn('Skipping migrations');
+    }
+
+    util.shutdown();
+  } catch (e) {
+    console.error(e);
+    util.shutdown(1);
+  }
+}
+
+//==============================================================================
+// Setting up the program command line arguments.
+//==============================================================================
+
+program
+  .command('create <name>')
+  .description('creates a new migration')
+  .action(createMigration);
+
+program
+  .command('run')
+  .description('runs all pending migrations')
+  .action(runMigrations);
+
+program.parse(process.argv);
+
+// If there is no command listed, output help.
+if (process.argv.length <= 2) {
+  program.outputHelp();
+  util.shutdown();
+}
diff --git a/migrations/1496771633_tags.js b/migrations/1496771633_tags.js
new file mode 100644
index 000000000..9b2aeedf0
--- /dev/null
+++ b/migrations/1496771633_tags.js
@@ -0,0 +1,78 @@
+const CommentModel = require('../models/comment');
+
+module.exports = {
+  async up() {
+
+    // Find all comments that have tags.
+    let comments = await CommentModel.aggregate([
+      {$match: {
+        tags: {
+          $exists: true,
+          $ne: []
+        }
+      }},
+      {$project: {
+        id: true,
+        tags: true
+      }}
+    ]);
+
+    // Create a new batch operation.
+    let batch = CommentModel.collection.initializeUnorderedBulkOp();
+
+    // Loop over the comments retrieved, updating the tag structure.
+    for (let {id, tags} of comments) {
+
+      // OLD
+      //
+      // [
+      //   {
+      //     name: 'OFF_TOPIC',
+      //     assigned_by: '',
+      //     created_at: new Date()
+      //   }
+      // ]
+
+      // NEW
+      //
+      // [
+      //   {
+      //     tag: {
+      //       name: 'OFF_TOPIC',
+      //       permissions: {
+      //         public: true,
+      //         self: false,
+      //         roles: []
+      //       },
+      //       models: ['COMMENTS'],
+      //       created_at: new Date()
+      //     },
+      //     assigned_by: '',
+      //     created_at: new Date()
+      //   }
+      // ]
+
+      // Remap the tag structure.
+      tags = tags.map(({name, assigned_by, created_at}) => ({
+        tag: {
+          name,
+          permissions: {
+            public: true,
+            self: name === 'OFF_TOPIC', // at the time of migration, only off topic tags were self assigning
+            roles: []
+          },
+          models: ['COMMENTS'],
+          created_at
+        },
+        assigned_by,
+        created_at
+      }));
+
+      // Execute the batch operation.
+      batch.find({id}).updateOne({$set: {tags}});
+    }
+
+    // Execute the batch update operation.
+    await batch.execute();
+  }
+};
diff --git a/models/migration.js b/models/migration.js
new file mode 100644
index 000000000..648c5594b
--- /dev/null
+++ b/models/migration.js
@@ -0,0 +1,10 @@
+const mongoose = require('../services/mongoose');
+const Schema = mongoose.Schema;
+
+const MigrationSchema = new Schema({
+  version: Number
+});
+
+const Migration = mongoose.model('Migration', MigrationSchema);
+
+module.exports = Migration;
diff --git a/package.json b/package.json
index 84d0fdf52..450764c90 100644
--- a/package.json
+++ b/package.json
@@ -106,6 +106,7 @@
     "resolve": "^1.3.2",
     "semver": "^5.3.0",
     "simplemde": "^1.11.2",
+    "snake-case": "^2.1.0",
     "subscriptions-transport-ws": "^0.5.5-alpha.0",
     "timekeeper": "^1.0.0",
     "uuid": "^3.0.1"
diff --git a/services/migration.js b/services/migration.js
new file mode 100644
index 000000000..bc2274de4
--- /dev/null
+++ b/services/migration.js
@@ -0,0 +1,142 @@
+const MigrationModel = require('../models/migration');
+const fs = require('fs');
+const path = require('path');
+const Joi = require('joi');
+const sc = require('snake-case');
+
+const migrationTemplate = `
+module.exports = {
+  async up() {
+    
+  }
+};
+
+`;
+
+module.exports = class MigrationService {
+  static async create(name) {
+    if (!name || typeof name !== 'string' || name.length === 0) {
+      throw new Error('name must be defined');
+    }
+
+    let version = Math.round(Date.now() / 1000, 0);
+    let filename = path.join(__dirname, '..', 'migrations', `${version}_${sc(name)}.js`);
+    fs.writeFileSync(filename, migrationTemplate, 'utf8');
+
+    console.log(`Created migration ${version} in ${filename}`);
+  }
+
+  static async listPending() {
+
+    // Get all the migration files.
+    let migrationFiles = fs.readdirSync(path.join(__dirname, '..', 'migrations'));
+
+    // Ensure that all migrations follow this format.
+    const migrationSchema = Joi.object({
+      up: Joi.func().required(),
+      down: Joi.func()
+    });
+
+    // Extract the version from the filename with this regex.
+    const versionRe = /(\d+)_([\S_]+)\.js/;
+
+    // Get the latest version.
+    let latestVersion = await MigrationService.latestVersion();
+
+    // Parse the migrations from the file listing.
+    let migrations = migrationFiles
+      .map((filename) => {
+
+        // Parse the version from the filename.
+        let matches = filename.match(versionRe);
+        if (matches.length !== 3) {
+          return null;
+        }
+        let version = parseInt(matches[1]);
+
+        // Don't rerun migrations from versions already ran.
+        if (version <= latestVersion) {
+          return null;
+        }
+
+        // Read the migration from the filesystem.
+        let migration = require(`../migrations/${filename}`);
+        Joi.assert(migration, migrationSchema, `Migration ${filename} does did not pass validation`);
+
+        return {
+          filename,
+          version,
+          migration
+        };
+      })
+      .filter((migration) => migration !== null)
+      .sort((a, b) => {
+        if (a.version < b.version) {
+          return -1;
+        }
+
+        if (a.version > b.version) {
+          return 1;
+        }
+
+        return 0;
+      });
+    
+    return migrations;
+  }
+
+  static async run(migrations) {
+    if (migrations.length === 0) {
+      console.log('No migrations to run!');
+      return;
+    }
+
+    for (let {version, migration} of migrations) {
+      console.log(`Starting migration ${version}.js`);
+      await migration.up();
+      console.log(`Finished migration ${version}.js`);
+      
+      console.log(`Recording migration ${version}.js`);
+
+      // Record that the migration was finished.
+      let m = new MigrationModel({version});
+      await m.save();
+
+      console.log(`Finished recording migration ${version}.js`);
+    }
+  }
+
+  static async latestVersion() {
+
+    // Load the latest migration details from the database.
+    let latestMigration = await MigrationModel
+      .find({})
+      .sort({version: -1})
+      .limit(1)
+      .exec();
+
+    // If there weren't any migrations at all, then error out.
+    if (latestMigration.length === 0) {
+      return null;
+    }
+    
+    // If the latest migration does not match the required version, then error
+    // out.
+    return latestMigration[0].version;
+  }
+
+  static async verify(requiredVersion) {
+
+    // If the requiredVersion isn't specified or is 0, then don't complain.
+    if (typeof requiredVersion !== 'number' || requiredVersion === 0) {
+      return;
+    }
+
+    // If the latest migration does not match the required version, then error
+    // out.
+    let latestVersion = await MigrationService.latestVersion();
+    if (!latestVersion || latestVersion < requiredVersion) {
+      throw new Error(`A database migration is required, version required ${requiredVersion}, found ${latestVersion}. Please run \`./bin/cli migration run\``);
+    }
+  }
+};
diff --git a/yarn.lock b/yarn.lock
index 728687248..adf0675d3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5028,6 +5028,10 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0:
   dependencies:
     js-tokens "^3.0.0"
 
+lower-case@^1.1.1:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
+
 lowercase-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
@@ -5409,6 +5413,12 @@ nightwatch@^0.9.11:
     proxy-agent "2.0.0"
     q "1.4.1"
 
+no-case@^2.2.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.1.tgz#7aeba1c73a52184265554b7dc03baf720df80081"
+  dependencies:
+    lower-case "^1.1.1"
+
 nocache@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/nocache/-/nocache-2.0.0.tgz#202b48021a0c4cbde2df80de15a17443c8b43980"
@@ -7533,6 +7543,12 @@ smtp-connection@2.12.0:
     httpntlm "1.6.1"
     nodemailer-shared "1.1.0"
 
+snake-case@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-2.1.0.tgz#41bdb1b73f30ec66a04d4e2cad1b76387d4d6d9f"
+  dependencies:
+    no-case "^2.2.0"
+
 sntp@1.x.x:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"

From cf82f5b7079e41e36d4db3d569a2451b922b5aaf Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Tue, 6 Jun 2017 17:32:52 -0600
Subject: [PATCH 036/264] fixed enum

---
 bin/cli-setup | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/cli-setup b/bin/cli-setup
index 1d6de4090..e9f0959ef 100755
--- a/bin/cli-setup
+++ b/bin/cli-setup
@@ -8,6 +8,7 @@ const program = require('./commander');
 const inquirer = require('inquirer');
 const mongoose = require('../services/mongoose');
 const SettingModel = require('../models/setting');
+const MODERATION_OPTIONS = require('../models/enum/moderation_options');
 const SettingsService = require('../services/settings');
 const SetupService = require('../services/setup');
 const UsersService = require('../services/users');
@@ -90,7 +91,7 @@ const performSetup = () => {
         },
         {
           type: 'list',
-          choices: SettingModel.MODERATION_OPTIONS,
+          choices: MODERATION_OPTIONS,
           name: 'moderation',
           default: settings.moderation,
           message: 'Select a moderation mode'

From 6827ff2f1fd723145c9e05d13523d7a68c4fa2a7 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 7 Jun 2017 10:27:42 -0600
Subject: [PATCH 037/264] Added support for version enforcing

---
 migrations/1496771633_tags.js |  5 +++
 package.json                  |  5 +++
 services/cache.js             |  2 +-
 services/karma.js             |  2 +-
 services/migration.js         | 74 +++++++++++++++++++++++++++++------
 services/mongoose.js          |  1 +
 services/passport.js          |  2 +-
 services/redis.js             |  2 +-
 8 files changed, 76 insertions(+), 17 deletions(-)

diff --git a/migrations/1496771633_tags.js b/migrations/1496771633_tags.js
index 9b2aeedf0..be3fa2577 100644
--- a/migrations/1496771633_tags.js
+++ b/migrations/1496771633_tags.js
@@ -17,6 +17,11 @@ module.exports = {
       }}
     ]);
 
+    // If no comments were found, nothing needes to be done!
+    if (comments.length <= 0) {
+      return;
+    }
+
     // Create a new batch operation.
     let batch = CommentModel.collection.initializeUnorderedBulkOp();
 
diff --git a/package.json b/package.json
index 450764c90..137249884 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,11 @@
     "embed-start": "NODE_ENV=development yarn build && ./bin/cli serve --jobs",
     "heroku-postbuild": "./bin/cli plugins reconcile && yarn build"
   },
+  "talk": {
+    "migration": {
+      "minVersion": 1496771633
+    }
+  },
   "config": {
     "pre-git": {
       "commit-msg": [],
diff --git a/services/cache.js b/services/cache.js
index 92da6df0a..25642e1d0 100644
--- a/services/cache.js
+++ b/services/cache.js
@@ -1,5 +1,5 @@
 const redis = require('./redis');
-const debug = require('debug')('talk:cache');
+const debug = require('debug')('talk:services:cache');
 const crypto = require('crypto');
 
 const cache = module.exports = {
diff --git a/services/karma.js b/services/karma.js
index ea932c86a..c76bcebb3 100644
--- a/services/karma.js
+++ b/services/karma.js
@@ -1,4 +1,4 @@
-const debug = require('debug')('talk:trust');
+const debug = require('debug')('talk:services:karma');
 const UserModel = require('../models/user');
 
 /**
diff --git a/services/migration.js b/services/migration.js
index bc2274de4..11eec3247 100644
--- a/services/migration.js
+++ b/services/migration.js
@@ -2,10 +2,11 @@ const MigrationModel = require('../models/migration');
 const fs = require('fs');
 const path = require('path');
 const Joi = require('joi');
+const debug = require('debug')('talk:services:migration');
 const sc = require('snake-case');
+const {talk: {migration: {minVersion}}} = require('../package.json');
 
-const migrationTemplate = `
-module.exports = {
+const migrationTemplate = `module.exports = {
   async up() {
     
   }
@@ -13,12 +14,19 @@ module.exports = {
 
 `;
 
-module.exports = class MigrationService {
+class MigrationService {
+
+  /**
+   * Creates a new migration file.
+   * 
+   * @param {String} name name of the migration
+   */
   static async create(name) {
     if (!name || typeof name !== 'string' || name.length === 0) {
       throw new Error('name must be defined');
     }
 
+    // Create a new Migration based on the current time.
     let version = Math.round(Date.now() / 1000, 0);
     let filename = path.join(__dirname, '..', 'migrations', `${version}_${sc(name)}.js`);
     fs.writeFileSync(filename, migrationTemplate, 'utf8');
@@ -26,6 +34,9 @@ module.exports = class MigrationService {
     console.log(`Created migration ${version} in ${filename}`);
   }
 
+  /**
+   * Returns a list of all pending migrations.
+   */
   static async listPending() {
 
     // Get all the migration files.
@@ -85,27 +96,48 @@ module.exports = class MigrationService {
     return migrations;
   }
 
+  /**
+   * Runs an list of migrations.
+   * 
+   * @param {Array} migrations a list of migrations returned by `listPending`
+   */
   static async run(migrations) {
     if (migrations.length === 0) {
       console.log('No migrations to run!');
       return;
     }
 
-    for (let {version, migration} of migrations) {
-      console.log(`Starting migration ${version}.js`);
-      await migration.up();
-      console.log(`Finished migration ${version}.js`);
+    for (let {filename, version, migration} of migrations) {
+      try {
+        console.log(`Starting migration ${filename}`);
+        await migration.up();
+        console.log(`Finished migration ${filename}`);
+      } catch (e) {
+        console.error(`Migration ${filename} failed`);
+        throw e;
+      }
       
-      console.log(`Recording migration ${version}.js`);
+      try {
+        console.log(`Recording migration ${filename}`);
 
-      // Record that the migration was finished.
-      let m = new MigrationModel({version});
-      await m.save();
+        // Record that the migration was finished.
+        let m = new MigrationModel({version});
+        await m.save();
 
-      console.log(`Finished recording migration ${version}.js`);
+        console.log(`Finished recording migration ${filename}`);
+      } catch (e) {
+        console.error(`Migration ${filename} could not be recorded`);
+        throw e;
+      }
     }
+
+    console.log(`Database now at migration version ${migrations[migrations.length - 1].version}`);
   }
 
+  /**
+   * Returns the latest migration version number that has been applied to the
+   * database, null if none were found.
+   */
   static async latestVersion() {
 
     // Load the latest migration details from the database.
@@ -138,5 +170,21 @@ module.exports = class MigrationService {
     if (!latestVersion || latestVersion < requiredVersion) {
       throw new Error(`A database migration is required, version required ${requiredVersion}, found ${latestVersion}. Please run \`./bin/cli migration run\``);
     }
+
+    return latestVersion;
   }
-};
+}
+
+// Verify that the minimum migration version is met.
+MigrationService
+  .verify(minVersion)
+  .then((latestVersion) => {
+    debug(`minimum migration version ${minVersion} was met with version ${latestVersion}`);
+  })
+  .catch((e) => {
+
+    // Throw the error in the catch block.
+    throw e;
+  });
+
+module.exports = MigrationService;
diff --git a/services/mongoose.js b/services/mongoose.js
index acda2f564..c697e38ef 100644
--- a/services/mongoose.js
+++ b/services/mongoose.js
@@ -59,3 +59,4 @@ require('../models/asset');
 require('../models/comment');
 require('../models/setting');
 require('../models/user');
+require('./migration');
diff --git a/services/passport.js b/services/passport.js
index c64bb2334..826297ae5 100644
--- a/services/passport.js
+++ b/services/passport.js
@@ -7,7 +7,7 @@ const JWT = require('jsonwebtoken');
 const LocalStrategy = require('passport-local').Strategy;
 const errors = require('../errors');
 const uuid = require('uuid');
-const debug = require('debug')('talk:passport');
+const debug = require('debug')('talk:services:passport');
 const {createClient} = require('./redis');
 
 // Create a redis client to use for authentication.
diff --git a/services/redis.js b/services/redis.js
index c049b2d00..c6506eb3c 100644
--- a/services/redis.js
+++ b/services/redis.js
@@ -1,5 +1,5 @@
 const redis = require('redis');
-const debug = require('debug')('talk:redis');
+const debug = require('debug')('talk:services:redis');
 const {
   REDIS_URL
 } = require('../config');

From 4cbc8b2226ffae6c724630acf8d9765c8ffed752 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 7 Jun 2017 11:08:39 -0600
Subject: [PATCH 038/264] Updates to setup process

---
 bin/cli-serve         |  13 +-
 bin/cli-setup         | 309 ++++++++++++++++++++++--------------------
 services/migration.js |  22 +--
 3 files changed, 183 insertions(+), 161 deletions(-)

diff --git a/bin/cli-serve b/bin/cli-serve
index 7978c6c85..63eda3af2 100755
--- a/bin/cli-serve
+++ b/bin/cli-serve
@@ -5,6 +5,7 @@ const app = require('../app');
 const {createServer} = require('http');
 const scraper = require('../services/scraper');
 const mailer = require('../services/mailer');
+const MigrationService = require('../services/migration');
 const kue = require('../services/kue');
 const mongoose = require('../services/mongoose');
 const util = require('./util');
@@ -87,7 +88,17 @@ function onListening() {
 /**
  * Start the app.
  */
-function startApp(program) {
+async function startApp(program) {
+
+  try {
+
+    // Verify that the minimum migration version is met.
+    await MigrationService.verify();
+
+  } catch(e) {
+    console.error(e);
+    process.exit(1);
+  }
 
   /**
   * Listen on provided port, on all network interfaces.
diff --git a/bin/cli-setup b/bin/cli-setup
index e9f0959ef..add134209 100755
--- a/bin/cli-setup
+++ b/bin/cli-setup
@@ -12,6 +12,7 @@ const MODERATION_OPTIONS = require('../models/enum/moderation_options');
 const SettingsService = require('../services/settings');
 const SetupService = require('../services/setup');
 const UsersService = require('../services/users');
+const MigrationService = require('../services/migration');
 const util = require('./util');
 const errors = require('../errors');
 
@@ -33,166 +34,186 @@ program
 // Setup the application
 //==============================================================================
 
-const performSetup = () => {
+const performSetup = async () => {
 
   if (program.defaults) {
-    return SettingsService
-      .init()
-      .then(() => {
-        console.log('Settings created.');
-        console.log('\nTalk is now installed!');
-        util.shutdown();
-      })
-      .catch((err) => {
-        console.error(err);
-        util.shutdown(1);
-      });
+    await SettingsService.init();
+
+    console.log('Settings created.');
+    console.log('\nTalk is now installed!');
+
+    return;
   }
 
   // Get the current settings, we are expecing an error here.
-  return SettingsService
-    .retrieve()
-    .then(() => {
+  try {
 
-      // We should NOT have gotten a settings object, this means that the
-      // application is already setup. Error out here.
-      throw errors.ErrSettingsInit;
+    // Try to get the settings.
+    await SettingsService.retrieve();
 
-    })
-    .catch((err) => {
+    // We should NOT have gotten a settings object, this means that the
+    // application is already setup. Error out here.
+    throw errors.ErrSettingsInit;
 
-      // If the error is `not init`, then we're good, otherwise, it's something
-      // else.
-      if (err !== errors.ErrSettingsNotInit) {
-        throw err;
+  } catch (e) {
+
+    // If the error is `not init`, then we're good, otherwise, it's something
+    // else.
+    if (e !== errors.ErrSettingsNotInit) {
+      throw e;
+    }
+  }
+
+  // Get the migrations to run.
+  let migrations = await MigrationService.listPending();
+  if (migrations.length > 0) {
+
+    console.log('Now going to run the following migrations:\n');
+
+    for (let {filename} of migrations) {
+      console.log(`\tmigrations/${filename}`);
+    }
+
+    console.log('');
+
+    let {confirm} = await inquirer.prompt([
+      {
+        type: 'confirm',
+        name: 'confirm',
+        message: 'Proceed with migrations',
+        default: false
       }
+    ]);
 
-    })
-    .then(() => {
+    if (!confirm) {
+      throw new Error('migrations are needed to complete setup');
+    }
 
-      // Create the base settings model.
-      let settings = new SettingModel();
+    // Perform all migrations.
+    await MigrationService.run(migrations);
+  } else {
+    console.log('No migrations have to be run.');
+  }
 
-      console.log('We\'ll ask you some questions in order to setup your installation of Talk.\n');
+  // Create the base settings model.
+  let settings = new SettingModel();
 
-      return inquirer.prompt([
-        {
-          type: 'input',
-          name: 'organizationName',
-          message: 'Organization Name',
-          default: settings.organizationName,
-          validate: (input) => {
-            if (input && input.length > 0) {
-              return true;
-            }
+  console.log('\nWe\'ll ask you some questions in order to setup your installation of Talk.\n');
 
-            return 'Organization Name is required.';
-          }
-        },
-        {
-          type: 'list',
-          choices: MODERATION_OPTIONS,
-          name: 'moderation',
-          default: settings.moderation,
-          message: 'Select a moderation mode'
-        },
-        {
-          type: 'confirm',
-          name: 'requireEmailConfirmation',
-          default: settings.requireEmailConfirmation,
-          message: 'Should emails always be confirmed'
-        }
-      ])
-      .then((answers) => {
-
-        // Update the settings that were changed.
-        Object.keys(answers).forEach((key) => {
-          if (answers[key] !== undefined) {
-            settings[key] = answers[key];
-          }
-        });
-
-        console.log('\nWe\'ll ask you some questions about your first admin user.\n');
-
-        return inquirer.prompt([
-          {
-            type: 'input',
-            name: 'username',
-            message: 'Username',
-            filter: (username) => {
-              return UsersService
-                .isValidUsername(username, false)
-                .catch((err) => {
-                  throw err.message;
-                });
-            }
-          },
-          {
-            name: 'email',
-            message: 'Email',
-            format: 'email',
-            validate: (value) => {
-              if (value && value.length >= 3) {
-                return true;
-              }
-
-              return 'Email is required';
-            }
-          },
-          {
-            name: 'password',
-            message: 'Password',
-            type: 'password',
-            filter: (password) => {
-              return UsersService
-                .isValidPassword(password)
-                .catch((err) => {
-                  throw err.message;
-                });
-            }
-          },
-          {
-            name: 'confirmPassword',
-            message: 'Confirm Password',
-            type: 'password',
-            filter: (confirmPassword) => {
-              return UsersService
-                .isValidPassword(confirmPassword)
-                .catch((err) => {
-                  throw err.message;
-                });
-            }
-          },
-        ]);
-      })
-      .then((user) => {
-
-        if (user.password !== user.confirmPassword) {
-          return Promise.reject(new Error('Passwords do not match'));
+  let answers = await inquirer.prompt([
+    {
+      type: 'input',
+      name: 'organizationName',
+      message: 'Organization Name',
+      default: settings.organizationName,
+      validate: (input) => {
+        if (input && input.length > 0) {
+          return true;
         }
 
-        return SetupService.setup({
-          settings: settings.toObject(),
-          user: {
-            email: user.email,
-            username: user.username,
-            password: user.password
-          }
-        });
-      });
-    })
-    .then(({user}) => {
-      console.log('Settings created.');
-      console.log(`User ${user.id} created.`);
-      console.log('\nTalk is now installed!');
-      console.log('\nWe recommend adding TALK_INSTALL_LOCK=TRUE to your environment to turn off the dynamic setup.');
-      util.shutdown();
-    })
-    .catch((err) => {
-      console.error(err);
-      util.shutdown(1);
-    });
+        return 'Organization Name is required.';
+      }
+    },
+    {
+      type: 'list',
+      choices: MODERATION_OPTIONS,
+      name: 'moderation',
+      default: settings.moderation,
+      message: 'Select a moderation mode'
+    },
+    {
+      type: 'confirm',
+      name: 'requireEmailConfirmation',
+      default: settings.requireEmailConfirmation,
+      message: 'Should emails always be confirmed'
+    }
+  ]);
+
+  // Update the settings that were changed.
+  Object.keys(answers).forEach((key) => {
+    if (answers[key] !== undefined) {
+      settings[key] = answers[key];
+    }
+  });
+
+  console.log('\nWe\'ll ask you some questions about your first admin user.\n');
+
+  let user = await inquirer.prompt([
+    {
+      type: 'input',
+      name: 'username',
+      message: 'Username',
+      filter: (username) => {
+        return UsersService
+          .isValidUsername(username, false)
+          .catch((err) => {
+            throw err.message;
+          });
+      }
+    },
+    {
+      name: 'email',
+      message: 'Email',
+      format: 'email',
+      validate: (value) => {
+        if (value && value.length >= 3) {
+          return true;
+        }
+
+        return 'Email is required';
+      }
+    },
+    {
+      name: 'password',
+      message: 'Password',
+      type: 'password',
+      filter: (password) => {
+        return UsersService
+          .isValidPassword(password)
+          .catch((err) => {
+            throw err.message;
+          });
+      }
+    },
+    {
+      name: 'confirmPassword',
+      message: 'Confirm Password',
+      type: 'password',
+      filter: (confirmPassword) => {
+        return UsersService
+          .isValidPassword(confirmPassword)
+          .catch((err) => {
+            throw err.message;
+          });
+      }
+    },
+  ]);
+
+  if (user.password !== user.confirmPassword) {
+    return Promise.reject(new Error('Passwords do not match'));
+  }
+
+  let {user: newUser} = await SetupService.setup({
+    settings: settings.toObject(),
+    user: {
+      email: user.email,
+      username: user.username,
+      password: user.password
+    }
+  });
+    
+  console.log('Settings created.');
+  console.log(`User ${newUser.id} created.`);
+  console.log('\nTalk is now installed!');
+  console.log('\nWe recommend adding TALK_INSTALL_LOCK=TRUE to your environment to turn off the dynamic setup.');
 };
 
 // Start tthe setup process.
-performSetup();
+performSetup()
+  .then(() => {
+    util.shutdown();
+  })
+  .catch((e) => {
+    console.error(e);
+    util.shutdown(1);
+  });
diff --git a/services/migration.js b/services/migration.js
index 11eec3247..8676b91be 100644
--- a/services/migration.js
+++ b/services/migration.js
@@ -157,34 +157,24 @@ class MigrationService {
     return latestMigration[0].version;
   }
 
-  static async verify(requiredVersion) {
+  static async verify() {
 
     // If the requiredVersion isn't specified or is 0, then don't complain.
-    if (typeof requiredVersion !== 'number' || requiredVersion === 0) {
+    if (typeof minVersion !== 'number' || minVersion === 0) {
       return;
     }
 
     // If the latest migration does not match the required version, then error
     // out.
     let latestVersion = await MigrationService.latestVersion();
-    if (!latestVersion || latestVersion < requiredVersion) {
-      throw new Error(`A database migration is required, version required ${requiredVersion}, found ${latestVersion}. Please run \`./bin/cli migration run\``);
+    if (!latestVersion || latestVersion < minVersion) {
+      throw new Error(`A database migration is required, version required ${minVersion}, found ${latestVersion}. Please run \`./bin/cli migration run\``);
     }
 
+    debug(`minimum migration version ${minVersion} was met with version ${latestVersion}`);
+
     return latestVersion;
   }
 }
 
-// Verify that the minimum migration version is met.
-MigrationService
-  .verify(minVersion)
-  .then((latestVersion) => {
-    debug(`minimum migration version ${minVersion} was met with version ${latestVersion}`);
-  })
-  .catch((e) => {
-
-    // Throw the error in the catch block.
-    throw e;
-  });
-
 module.exports = MigrationService;

From 9818b851db907b0757739470d1eb95f5ce146160 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Wed, 7 Jun 2017 15:40:36 -0600
Subject: [PATCH 039/264] clean up the ModerationHeader component

---
 .../Moderation/components/Moderation.js       |  6 ++-
 .../Moderation/components/ModerationHeader.js | 48 +++++++++++--------
 .../routes/Moderation/components/styles.css   |  5 ++
 3 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js
index c788da993..3efe48bdc 100644
--- a/client/coral-admin/src/routes/Moderation/components/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js
@@ -32,6 +32,10 @@ export default class Moderation extends Component {
     this.toggleModal(false);
   }
 
+  openSearch = () => {
+
+  }
+
   moderate = (accept) => () => {
     const {acceptComment, rejectComment} = this.props;
     const {selectedIndex} = this.state;
@@ -128,7 +132,7 @@ export default class Moderation extends Component {
 
     return (
       <div>
-        <ModerationHeader asset={asset} />
+        <ModerationHeader openSearch={this.openSearch} asset={asset} />
         <ModerationMenu
           asset={asset}
           allCount={root.allCount}
diff --git a/client/coral-admin/src/routes/Moderation/components/ModerationHeader.js b/client/coral-admin/src/routes/Moderation/components/ModerationHeader.js
index c6909226b..da88d1226 100644
--- a/client/coral-admin/src/routes/Moderation/components/ModerationHeader.js
+++ b/client/coral-admin/src/routes/Moderation/components/ModerationHeader.js
@@ -1,30 +1,38 @@
-import React from 'react';
+import React, {PropTypes} from 'react';
 import {Link} from 'react-router';
 import {Icon} from 'coral-ui';
 import styles from './styles.css';
 import t from 'coral-framework/services/i18n';
 
-const ModerationHeader = (props) => (
+const ModerationHeader = (props) => {
+
+  const allStreams = props.asset
+    ? <Link className="mdl-tabs__tab" to="/admin/moderate">{t('modqueue.all_streams')}</Link>
+    : <a className="mdl-tabs__tab" />;
+
+  const title = props.asset
+    ? (
+      <Link className="mdl-tabs__tab" to={`/admin/moderate/${props.asset.id}`}>
+        {props.asset.title} <Icon className={styles.searchTrigger} name="keyboard_arrow_down" />
+      </Link>
+    )
+    : <a className="mdl-tabs__tab">{t('modqueue.all_streams')} <Icon className={styles.searchTrigger} name="keyboard_arrow_down" /></a>;
+
+  return (
     <div className=''>
       <div className={`mdl-tabs ${styles.header}`}>
-        {
-          props.asset ?
-            <div className={`mdl-tabs__tab-bar ${styles.moderateAsset}`}>
-              <Link className="mdl-tabs__tab" to="/admin/moderate">{t('modqueue.all_streams')}</Link>
-              <a className="mdl-tabs__tab" href={props.asset.url} target="_blank">
-                <span>{props.asset.title}</span>
-                <Icon className={styles.settingsButton} name="open_in_new"/>
-              </a>
-              <Link className="mdl-tabs__tab" to="/admin/stories">Select Stream</Link>
-            </div>
-            :
-            <div className={`mdl-tabs__tab-bar ${styles.moderateAsset}`}>
-              <a className="mdl-tabs__tab" />
-              <a className="mdl-tabs__tab">{t('modqueue.all_streams')}</a>
-              <Link className="mdl-tabs__tab" to="/admin/stories">{t('modqueue.select_stream')}</Link>
-            </div>
-        }
+        <div className={`mdl-tabs__tab-bar ${styles.moderateAsset}`}>
+          {allStreams}
+          {title}
+          <Link className="mdl-tabs__tab" to="/admin/stories">{t('modqueue.select_stream')}</Link>
+        </div>
       </div>
     </div>
-);
+  );
+};
+
+ModerationHeader.propTypes = {
+  openSearch: PropTypes.func.isRequired
+};
+
 export default ModerationHeader;
diff --git a/client/coral-admin/src/routes/Moderation/components/styles.css b/client/coral-admin/src/routes/Moderation/components/styles.css
index d10311f74..b0c2cc5ac 100644
--- a/client/coral-admin/src/routes/Moderation/components/styles.css
+++ b/client/coral-admin/src/routes/Moderation/components/styles.css
@@ -467,3 +467,8 @@ span {
 .bulkSelectInput {
   cursor: pointer;
 }
+
+.searchTrigger {
+  position: relative;
+  top: .3em;
+}

From 06da4d7d269eb50a7eff200c1262b4c89ebce428 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Wed, 7 Jun 2017 16:36:27 -0600
Subject: [PATCH 040/264] toggle story search

---
 client/coral-admin/src/actions/moderation.js  |  2 ++
 .../coral-admin/src/constants/moderation.js   |  2 ++
 client/coral-admin/src/reducers/moderation.js |  6 +++++
 .../Moderation/components/Moderation.js       | 14 +++++++++--
 .../Moderation/components/ModerationHeader.js | 24 +++++++++++--------
 .../routes/Moderation/components/styles.css   |  1 +
 .../Moderation/containers/Moderation.js       |  2 ++
 7 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/client/coral-admin/src/actions/moderation.js b/client/coral-admin/src/actions/moderation.js
index 37e09590d..9f1c40c94 100644
--- a/client/coral-admin/src/actions/moderation.js
+++ b/client/coral-admin/src/actions/moderation.js
@@ -51,3 +51,5 @@ export const toggleSelectCommentInUserDetail = (id, active) => {
     id
   };
 };
+
+export const toggleStorySearch = (active) => ({type: active ? actions.SHOW_STORY_SEARCH : actions.HIDE_STORY_SEARCH});
diff --git a/client/coral-admin/src/constants/moderation.js b/client/coral-admin/src/constants/moderation.js
index 374de616a..29cf03143 100644
--- a/client/coral-admin/src/constants/moderation.js
+++ b/client/coral-admin/src/constants/moderation.js
@@ -12,3 +12,5 @@ export const CHANGE_USER_DETAIL_STATUSES = 'CHANGE_USER_DETAIL_STATUSES';
 export const SELECT_USER_DETAIL_COMMENT = 'SELECT_USER_DETAIL_COMMENT';
 export const UNSELECT_USER_DETAIL_COMMENT = 'UNSELECT_USER_DETAIL_COMMENT';
 export const CLEAR_USER_DETAIL_SELECTIONS = 'CLEAR_USER_DETAIL_SELECTIONS';
+export const SHOW_STORY_SEARCH = 'SHOW_STORY_SEARCH';
+export const HIDE_STORY_SEARCH = 'HIDE_STORY_SEARCH';
diff --git a/client/coral-admin/src/reducers/moderation.js b/client/coral-admin/src/reducers/moderation.js
index 1b95bdb90..4bab9eda1 100644
--- a/client/coral-admin/src/reducers/moderation.js
+++ b/client/coral-admin/src/reducers/moderation.js
@@ -12,6 +12,8 @@ const initialState = fromJS({
   userDetailStatuses: ['NONE', 'ACCEPTED', 'REJECTED', 'PREMOD'],
   userDetailSelectedIds: new Set(),
   banDialog: false,
+  storySearchVisible: false,
+  storySearchString: '',
   shortcutsNoteVisible: window.localStorage.getItem('coral:shortcutsNote') || 'show',
   sortOrder: 'REVERSE_CHRONOLOGICAL',
   suspendUserDialog: {
@@ -80,6 +82,10 @@ export default function moderation (state = initialState, action) {
     return state.update('userDetailSelectedIds', (set) => set.add(action.id));
   case actions.UNSELECT_USER_DETAIL_COMMENT:
     return state.update('userDetailSelectedIds', (set) => set.delete(action.id));
+  case actions.SHOW_STORY_SEARCH:
+    return state.set('storySearchVisible', true);
+  case actions.HIDE_STORY_SEARCH:
+    return state.set('storySearchVisible', false);
   case actions.SET_SORT_ORDER:
     return state.set('sortOrder', action.order);
   default :
diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js
index 3efe48bdc..f7338cf6b 100644
--- a/client/coral-admin/src/routes/Moderation/components/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js
@@ -32,8 +32,14 @@ export default class Moderation extends Component {
     this.toggleModal(false);
   }
 
-  openSearch = () => {
+  closeSearch = () => {
+    console.log('closeSearch');
+    this.props.toggleStorySearch(false);
+  }
 
+  openSearch = () => {
+    console.log('openSearch');
+    this.props.toggleStorySearch(true);
   }
 
   moderate = (accept) => () => {
@@ -132,7 +138,11 @@ export default class Moderation extends Component {
 
     return (
       <div>
-        <ModerationHeader openSearch={this.openSearch} asset={asset} />
+        <ModerationHeader
+          searchVisible={this.props.moderation.storySearchVisible}
+          openSearch={this.openSearch}
+          closeSearch={this.closeSearch}
+          asset={asset} />
         <ModerationMenu
           asset={asset}
           allCount={root.allCount}
diff --git a/client/coral-admin/src/routes/Moderation/components/ModerationHeader.js b/client/coral-admin/src/routes/Moderation/components/ModerationHeader.js
index da88d1226..9aa9788fb 100644
--- a/client/coral-admin/src/routes/Moderation/components/ModerationHeader.js
+++ b/client/coral-admin/src/routes/Moderation/components/ModerationHeader.js
@@ -4,19 +4,18 @@ import {Icon} from 'coral-ui';
 import styles from './styles.css';
 import t from 'coral-framework/services/i18n';
 
-const ModerationHeader = (props) => {
+const ModerationHeader = ({asset, searchVisible, openSearch, closeSearch}) => {
 
-  const allStreams = props.asset
+  const trigger = searchVisible ? closeSearch : openSearch;
+  const searchTriggerIcon = <Icon className={styles.searchTrigger} name={searchVisible ? 'arrow_drop_up' : 'arrow_drop_down'} />;
+
+  const allStreams = asset
     ? <Link className="mdl-tabs__tab" to="/admin/moderate">{t('modqueue.all_streams')}</Link>
     : <a className="mdl-tabs__tab" />;
 
-  const title = props.asset
-    ? (
-      <Link className="mdl-tabs__tab" to={`/admin/moderate/${props.asset.id}`}>
-        {props.asset.title} <Icon className={styles.searchTrigger} name="keyboard_arrow_down" />
-      </Link>
-    )
-    : <a className="mdl-tabs__tab">{t('modqueue.all_streams')} <Icon className={styles.searchTrigger} name="keyboard_arrow_down" /></a>;
+  const title = asset
+    ? <span onClick={trigger} className="mdl-tabs__tab">{asset.title} {searchTriggerIcon}</span>
+    : <span onClick={trigger} className="mdl-tabs__tab">{t('modqueue.all_streams')} {searchTriggerIcon}</span>;
 
   return (
     <div className=''>
@@ -32,7 +31,12 @@ const ModerationHeader = (props) => {
 };
 
 ModerationHeader.propTypes = {
-  openSearch: PropTypes.func.isRequired
+  asset: PropTypes.shape({
+    title: PropTypes.string,
+    id: PropTypes.string
+  }),
+  openSearch: PropTypes.func.isRequired,
+  closeSearch: PropTypes.func.isRequired
 };
 
 export default ModerationHeader;
diff --git a/client/coral-admin/src/routes/Moderation/components/styles.css b/client/coral-admin/src/routes/Moderation/components/styles.css
index b0c2cc5ac..a6bf7e89e 100644
--- a/client/coral-admin/src/routes/Moderation/components/styles.css
+++ b/client/coral-admin/src/routes/Moderation/components/styles.css
@@ -471,4 +471,5 @@ span {
 .searchTrigger {
   position: relative;
   top: .3em;
+  background-color: blue;
 }
diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index 537aa1d65..31ac05450 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -21,6 +21,7 @@ import {
   showSuspendUserDialog,
   hideSuspendUserDialog,
   hideShortcutsNote,
+  toggleStorySearch,
   viewUserDetail,
   hideUserDetail,
   setSortOrder,
@@ -299,6 +300,7 @@ const mapDispatchToProps = (dispatch) => ({
     showBanUserDialog,
     hideBanUserDialog,
     hideShortcutsNote,
+    toggleStorySearch,
     showSuspendUserDialog,
     hideSuspendUserDialog,
     viewUserDetail,

From 5d28f611b272a09bbec5bd605469874cc61250ac Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 7 Jun 2017 20:26:48 -0600
Subject: [PATCH 041/264] support for targeting new targets

---
 plugins.js        | 91 +++++++++++++++++++++++++++++------------------
 webpack.config.js | 15 +++++++-
 2 files changed, 71 insertions(+), 35 deletions(-)

diff --git a/plugins.js b/plugins.js
index f0c31407f..4403f89bb 100644
--- a/plugins.js
+++ b/plugins.js
@@ -78,7 +78,11 @@ function isInternal(name) {
  */
 function pluginPath(name) {
   if (isInternal(name)) {
-    return path.join(__dirname, 'plugins', name);
+    try {
+      return resolve.sync(name, {moduleDirectory: 'plugins', basedir: process.cwd()});
+    } catch (e) {
+      return undefined;
+    }
   }
 
   try {
@@ -88,15 +92,8 @@ function pluginPath(name) {
   }
 }
 
-/**
- * Itterates over the plugins and gets the plugin path's, version, and name.
- *
- * @param {Array<Object|String>} plugins
- * @returns {Array<Object>}
- */
-function itteratePlugins(plugins) {
-  return plugins.map((p) => {
-    let plugin = {};
+class Plugin {
+  constructor(entry) {
 
     // This checks to see if the structure for this entry is an object:
     //
@@ -106,23 +103,47 @@ function itteratePlugins(plugins) {
     //
     // "people"
     //
-    if (typeof p === 'object') {
-      plugin.name = Object.keys(p).find((name) => name !== null);
-      plugin.version = p[plugin.name];
-    } else if (typeof p === 'string') {
-      plugin.name = p;
-      plugin.version = `file:./plugins/${plugin.name}`;
+    if (typeof entry === 'object') {
+      this.name = Object.keys(entry).find((name) => name !== null);
+      this.version = entry[this.name];
+    } else if (typeof entry === 'string') {
+      this.name = entry;
+      this.version = `file:./plugins/${this.name}`;
     } else {
-      throw new Error(`plugins.json is malformed, refer to PLUGINS.md for formatting, expected a string or an object for a plugin entry, found a ${typeof p}`);
+      throw new Error(`plugins.json is malformed, refer to PLUGINS.md for formatting, expected a string or an object for a plugin entry, found a ${typeof entry}`);
     }
 
     // Get the path for the plugin.
-    plugin.path = pluginPath(plugin.name);
+    this.path = pluginPath(this.name);
+  }
 
-    return plugin;
-  });
+  require() {
+    if (typeof this.path === 'undefined') {
+      throw new Error(`plugin '${this.name}' is not local and is not resolvable, plugin reconsiliation may be required`);
+    }
+
+    try {
+      this.module = require(this.path);
+    } catch (e) {
+      if (e && e.code && e.code === 'MODULE_NOT_FOUND' && isInternal(this.name)) {
+        console.error(new Error(`plugin '${this.name}' could not be loaded due to missing dependencies, plugin reconsiliation may be required`));
+        throw e;
+      }
+
+      console.error(new Error(`plugin '${this.name}' could not be required from '${this.path}': ${e.message}`));
+      throw e;
+    }
+  }
 }
 
+/**
+ * Itterates over the plugins and gets the plugin path's, version, and name.
+ *
+ * @param {Array<Object|String>} plugins
+ * @returns {Array<Object>}
+ */
+const itteratePlugins = (plugins) => plugins.map((p) => new Plugin(p));
+
 // Add each plugin folder to the allowed import path so that they can import our
 // internal dependancies.
 Object.keys(plugins).forEach((type) => itteratePlugins(plugins[type]).forEach((plugin) => {
@@ -139,22 +160,20 @@ Object.keys(plugins).forEach((type) => itteratePlugins(plugins[type]).forEach((p
  */
 class PluginSection {
   constructor(plugins) {
-    this.plugins = itteratePlugins(plugins).map((plugin) => {
-      if (typeof plugin.path === 'undefined') {
-        throw new Error(`plugin '${plugin.name}' is not local and is not resolvable, plugin reconsiliation may be required`);
-      }
+    this.required = false;
+    this.plugins = itteratePlugins(plugins);
+  }
 
-      try {
-        plugin.module = require(plugin.path);
-      } catch (e) {
-        if (e && e.code && e.code === 'MODULE_NOT_FOUND' && isInternal(plugin.name)) {
-          console.error(new Error(`plugin '${plugin.name}' could not be loaded due to missing dependencies, plugin reconsiliation may be required`));
-          throw e;
-        }
+  require() {
+    if (this.required) {
+      return;
+    }
+    
+    this.required = true;
+    this.plugins.forEach((plugin) => {
 
-        console.error(new Error(`plugin '${plugin.name}' could not be required from '${plugin.path}': ${e.message}`));
-        throw e;
-      }
+      // Load the plugin.
+      plugin.require();
 
       if (isInternal(plugin.name)) {
         debug(`loading internal plugin '${plugin.name}' from '${plugin.path}'`);
@@ -171,6 +190,10 @@ class PluginSection {
    * available.
    */
   hook(hook) {
+
+    // Load the plugin source if we haven't already.
+    this.require();
+
     return this.plugins
       .filter(({module}) => hook in module)
       .filter((plugin) => {
diff --git a/webpack.config.js b/webpack.config.js
index ddd2f9577..d2cd07300 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -10,6 +10,11 @@ const webpack = require('webpack');
 // Possibly load the config from the .env file (if there is one).
 require('dotenv').config();
 
+const {plugins, PluginManager} = require('./plugins');
+
+const pluginManager = new PluginManager(plugins);
+const targetPlugins = pluginManager.section('targets').plugins;
+
 let pluginsConfigPath;
 
 let envPlugins = path.join(__dirname, 'plugins.env.js');
@@ -61,6 +66,13 @@ const config = {
       path.join(__dirname, 'client/', `coral-embed-${embed}`, '/src/index')
     ];
 
+    return entry;
+  }, {}), targetPlugins.reduce((entry, plugin) => {
+    entry[`${plugin.name}/bundle`] = [
+      'babel-polyfill',
+      plugin.path
+    ];
+
     return entry;
   }, {})),
   output: {
@@ -127,7 +139,8 @@ const config = {
   plugins: [
     new LicenseWebpackPlugin({
       pattern: /^(MIT|ISC|BSD.*)$/,
-      addUrl: true
+      addUrl: true,
+      suppressErrors: true
     }),
     new Copy([
       ...buildEmbeds.map((embed) => ({

From fb39446c6af9fed207f52d24cca90340d092b6ee Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Thu, 8 Jun 2017 18:28:46 +0700
Subject: [PATCH 042/264] Port perm checks to the new framework

---
 .../coral-embed-stream/src/components/Comment.js | 16 ++++++++++++++--
 .../coral-embed-stream/src/components/Stream.js  |  1 +
 client/coral-framework/hocs/withReaction.js      | 13 +++++--------
 client/coral-framework/services/perms.js         |  6 ++++++
 client/coral-plugin-flags/FlagButton.js          | 11 +++++++----
 client/coral-plugin-replies/ReplyButton.js       |  5 ++---
 plugin-api/beta/client/services/index.js         |  1 +
 .../client/components/FakeComment.js             |  1 -
 plugins/coral-plugin-love/client/LoveButton.js   | 12 ++++++------
 9 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/client/coral-embed-stream/src/components/Comment.js b/client/coral-embed-stream/src/components/Comment.js
index b5eca4ff2..2a12139b5 100644
--- a/client/coral-embed-stream/src/components/Comment.js
+++ b/client/coral-embed-stream/src/components/Comment.js
@@ -7,6 +7,7 @@ import Content from 'coral-plugin-commentcontent/CommentContent';
 import PubDate from 'coral-plugin-pubdate/PubDate';
 import {ReplyBox, ReplyButton} from 'coral-plugin-replies';
 import FlagComment from 'coral-plugin-flags/FlagComment';
+import {can} from 'coral-framework/services/perms';
 import {TransitionGroup} from 'react-transition-group';
 import cn from 'classnames';
 
@@ -219,6 +220,18 @@ export default class Comment extends React.Component {
     this.setState(resetCursors);
   };
 
+  showReplyBox = () => {
+    if (!this.props.currentUser) {
+      this.props.showSignInDialog();
+      return;
+    }
+    if (can(this.props.currentUser, 'INTERACT_WITH_COMMUNITY')) {
+      this.props.setActiveReplyBox(this.props.comment.id);
+      return;
+    }
+    return;
+  }
+
   // getVisibileReplies returns a list containing comments
   // which were authored by current user or comes before the `idCursor`.
   getVisibileReplies() {
@@ -477,10 +490,9 @@ export default class Comment extends React.Component {
             {!disableReply &&
               <ActionButton>
                 <ReplyButton
-                  onClick={() => setActiveReplyBox(comment.id)}
+                  onClick={this.showReplyBox}
                   parentCommentId={parentId || comment.id}
                   currentUserId={currentUser && currentUser.id}
-                  banned={false}
                 />
               </ActionButton>}
             <Slot
diff --git a/client/coral-embed-stream/src/components/Stream.js b/client/coral-embed-stream/src/components/Stream.js
index 586d28f23..a25c07444 100644
--- a/client/coral-embed-stream/src/components/Stream.js
+++ b/client/coral-embed-stream/src/components/Stream.js
@@ -223,6 +223,7 @@ class Stream extends React.Component {
               activeReplyBox={this.props.activeReplyBox}
               addNotification={addNotification}
               depth={0}
+              disableReply={!open}
               postComment={this.props.postComment}
               asset={asset}
               currentUser={user}
diff --git a/client/coral-framework/hocs/withReaction.js b/client/coral-framework/hocs/withReaction.js
index f2897e606..ca373b6bd 100644
--- a/client/coral-framework/hocs/withReaction.js
+++ b/client/coral-framework/hocs/withReaction.js
@@ -208,18 +208,15 @@ export default (reaction) => (WrappedComponent) => {
     }
   );
 
+  const mapStateToProps = (state) => ({
+    user: state.auth.toJS().user,
+  });
+
   const mapDispatchToProps = (dispatch) =>
     bindActionCreators({showSignInDialog}, dispatch);
 
   const enhance = compose(
     withFragments({
-      root: gql`
-          fragment ${capitalize(reaction)}Button_root on RootQuery {
-            me {
-                status
-            }
-          }
-      `,
       comment: gql`
           fragment ${capitalize(reaction)}Button_comment on Comment {
             action_summaries {
@@ -232,7 +229,7 @@ export default (reaction) => (WrappedComponent) => {
             }
           }`
     }),
-    connect(null, mapDispatchToProps),
+    connect(mapStateToProps, mapDispatchToProps),
     withDeleteReaction,
     withPostReaction
   );
diff --git a/client/coral-framework/services/perms.js b/client/coral-framework/services/perms.js
index e93744506..825c978ca 100644
--- a/client/coral-framework/services/perms.js
+++ b/client/coral-framework/services/perms.js
@@ -23,7 +23,13 @@ export const can = (user, ...perms) => {
     return false;
   }
 
+  const banned = user.status === 'BANNED';
+  const suspended = user.suspension.until && new Date(user.suspension.until) > new Date();
+
   return perms.every((perm) => {
+    if (perm === 'INTERACT_WITH_COMMUNITY') {
+      return !banned && !suspended;
+    }
     const role = roles[perm];
     if (typeof role === 'undefined') {
       throw new Error(`${perm} is not a valid role`);
diff --git a/client/coral-plugin-flags/FlagButton.js b/client/coral-plugin-flags/FlagButton.js
index 9a772f102..73ed50e9c 100644
--- a/client/coral-plugin-flags/FlagButton.js
+++ b/client/coral-plugin-flags/FlagButton.js
@@ -1,6 +1,7 @@
 import React, {Component} from 'react';
 
 import t from 'coral-framework/services/i18n';
+import {can} from 'coral-framework/services/perms';
 
 import {PopupMenu, Button} from 'coral-ui';
 import onClickOutside from 'react-onclickoutside';
@@ -32,10 +33,12 @@ class FlagButton extends Component {
       this.props.showSignInDialog();
       return;
     }
-    if (this.state.showMenu) {
-      this.closeMenu();
-    } else {
-      this.setState({showMenu: true});
+    if (can(currentUser, 'INTERACT_WITH_COMMUNITY')) {
+      if (this.state.showMenu) {
+        this.closeMenu();
+      } else {
+        this.setState({showMenu: true});
+      }
     }
   }
 
diff --git a/client/coral-plugin-replies/ReplyButton.js b/client/coral-plugin-replies/ReplyButton.js
index 6fb6a5aca..a66e3c156 100644
--- a/client/coral-plugin-replies/ReplyButton.js
+++ b/client/coral-plugin-replies/ReplyButton.js
@@ -6,21 +6,20 @@ import classnames from 'classnames';
 
 const name = 'coral-plugin-replies';
 
-const ReplyButton = ({banned, onClick}) => {
+const ReplyButton = ({onClick}) => {
   return (
     <button
       className={classnames(`${name}-reply-button`)}
       onClick={onClick}>
       {t('reply')}
       <i className={`${name}-icon material-icons`}
-        aria-hidden={true}>{banned ? 'BANNED' : 'reply'}</i>
+        aria-hidden={true}>reply</i>
     </button>
   );
 };
 
 ReplyButton.propTypes = {
   onClick: PropTypes.func.isRequired,
-  banned: PropTypes.bool.isRequired
 };
 
 export default ReplyButton;
diff --git a/plugin-api/beta/client/services/index.js b/plugin-api/beta/client/services/index.js
index 16872b9f3..509d4f55c 100644
--- a/plugin-api/beta/client/services/index.js
+++ b/plugin-api/beta/client/services/index.js
@@ -1 +1,2 @@
 export {t} from 'coral-framework/services/i18n';
+export {can} from 'coral-framework/services/perms';
diff --git a/plugins/coral-plugin-auth/client/components/FakeComment.js b/plugins/coral-plugin-auth/client/components/FakeComment.js
index 9900ccdc6..390dd409b 100644
--- a/plugins/coral-plugin-auth/client/components/FakeComment.js
+++ b/plugins/coral-plugin-auth/client/components/FakeComment.js
@@ -30,7 +30,6 @@ export const FakeComment = ({username, created_at, body}) => (
         onClick={() => {}}
         parentCommentId={'commentID'}
         currentUserId={{}}
-        banned={false}
       />
     </div>
     <div className="commentActionsRight comment__action-container">
diff --git a/plugins/coral-plugin-love/client/LoveButton.js b/plugins/coral-plugin-love/client/LoveButton.js
index 4e9b56d44..de4c4c9e7 100644
--- a/plugins/coral-plugin-love/client/LoveButton.js
+++ b/plugins/coral-plugin-love/client/LoveButton.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import {Icon} from 'coral-ui';
 import styles from './styles.css';
-import t from 'coral-framework/services/i18n';
 import {withReaction} from 'plugin-api/beta/client/hocs';
+import {t, can} from 'plugin-api/beta/client/services';
 
 class LoveButton extends React.Component {
   handleClick = () => {
@@ -10,18 +10,18 @@ class LoveButton extends React.Component {
       postReaction,
       deleteReaction,
       showSignInDialog,
-      alreadyReacted
+      alreadyReacted,
+      user,
     } = this.props;
-    const {root: {me}} = this.props;
 
     // If the current user does not exist, trigger sign in dialog.
-    if (!me) {
+    if (!user) {
       showSignInDialog();
       return;
     }
 
-    // If the current user is banned, do nothing.
-    if (me.status === 'BANNED') {
+    // If the current user is suspended, do nothing.
+    if (!can(user, 'INTERACT_WITH_COMMUNITY')) {
       return;
     }
 

From 38077cf3cfc19fdda0ce843fa9ab10fd72bf479e Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 8 Jun 2017 11:56:38 -0300
Subject: [PATCH 043/264] Missing fragment

---
 client/coral-embed-stream/src/graphql/index.js | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/client/coral-embed-stream/src/graphql/index.js b/client/coral-embed-stream/src/graphql/index.js
index 7d20ea48b..aa6b5d9a2 100644
--- a/client/coral-embed-stream/src/graphql/index.js
+++ b/client/coral-embed-stream/src/graphql/index.js
@@ -36,18 +36,6 @@ const extension = {
             name
           }
         }
-    ModifyTagResponse: gql`
-      fragment CoralEmbedStream_ModifyTagResponse on ModifyTagResponse {
-        errors {
-          translation_key
-        }
-      }
-    `,
-    DeleteActionResponse: gql`
-      fragment CoralEmbedStream_DeleteActionResponse on DeleteActionResponse {
-        errors {
-          translation_key
-        }
       }
     `,
     CreateFlagResponse: gql`

From 15b5dc2236fd52d9701df94a05049d028feb1f07 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 8 Jun 2017 11:58:38 -0300
Subject: [PATCH 044/264] Linting

---
 client/coral-embed-stream/src/graphql/index.js | 2 +-
 plugins/coral-plugin-offtopic/index.js         | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/client/coral-embed-stream/src/graphql/index.js b/client/coral-embed-stream/src/graphql/index.js
index aa6b5d9a2..7f62240b5 100644
--- a/client/coral-embed-stream/src/graphql/index.js
+++ b/client/coral-embed-stream/src/graphql/index.js
@@ -158,8 +158,8 @@ const extension = {
               assigned_by: {
                 id: auth.toJS().user.id,
               },
+              __typename: 'Tag'
             })),
-            tags: tags.map((t) => ({name: t, __typename: 'Tag'})),
             status: null,
             replyCount: 0,
             parent: parent_id
diff --git a/plugins/coral-plugin-offtopic/index.js b/plugins/coral-plugin-offtopic/index.js
index 9988686ff..eae6a2ef7 100644
--- a/plugins/coral-plugin-offtopic/index.js
+++ b/plugins/coral-plugin-offtopic/index.js
@@ -1,6 +1,3 @@
-const {readFileSync} = require('fs');
-const path = require('path');
-
 module.exports = {
   tags: [
     {

From 82a72e506fe9eb0542c26529e42d8fed329ba5be Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 8 Jun 2017 12:04:33 -0300
Subject: [PATCH 045/264] Off-topic and Staff working

---
 client/coral-embed-stream/src/components/Comment.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-embed-stream/src/components/Comment.js b/client/coral-embed-stream/src/components/Comment.js
index b5eca4ff2..d798b446c 100644
--- a/client/coral-embed-stream/src/components/Comment.js
+++ b/client/coral-embed-stream/src/components/Comment.js
@@ -26,8 +26,8 @@ import {getActionSummary, iPerformedThisAction} from 'coral-framework/utils';
 import {getEditableUntilDate} from './util';
 import styles from './Comment.css';
 
-const isStaff = (tags) => !tags.every((t) => t.name !== 'STAFF');
-const hasTag = (tags, lookupTag) => !!tags.filter((tag) => tag.name === lookupTag).length;
+const isStaff = (tags) => !tags.every((t) => t.tag.name !== 'STAFF');
+const hasTag = (tags, lookupTag) => !!tags.filter((t) => t.tag.name === lookupTag).length;
 const hasComment = (nodes, id) => nodes.some((node) => node.id === id);
 
 // resetCursors will return the id cursors of the first and second newest comment in

From 3a285d92a5cc889cb802abd3e43470d80ecc3710 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 8 Jun 2017 09:10:53 -0600
Subject: [PATCH 046/264] Added more warnings

---
 bin/cli-migration    | 17 +++++++++++++++--
 plugins.default.json |  2 +-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/bin/cli-migration b/bin/cli-migration
index 9c3e077b1..83a84e29d 100755
--- a/bin/cli-migration
+++ b/bin/cli-migration
@@ -41,7 +41,20 @@ async function runMigrations() {
       console.log(`\tmigrations/${filename}`);
     }
 
-    let answers = await inquirer.prompt([
+    let {backedUp} = await inquirer.prompt([
+      {
+        type: 'confirm',
+        name: 'backedUp',
+        message: 'Did you perform a database backup',
+        default: false
+      }
+    ]);
+
+    if (!backedUp) {
+      throw new Error('Please backup your databases prior to migrations occuring');
+    }
+
+    let {confirm} = await inquirer.prompt([
       {
         type: 'confirm',
         name: 'confirm',
@@ -50,7 +63,7 @@ async function runMigrations() {
       }
     ]);
 
-    if (answers.confirm) {
+    if (confirm) {
 
       // Run the migrations.
       await MigrationService.run(migrations);
diff --git a/plugins.default.json b/plugins.default.json
index 753eb9000..2fb3aaa21 100644
--- a/plugins.default.json
+++ b/plugins.default.json
@@ -4,7 +4,7 @@
     "coral-plugin-like",
     "coral-plugin-respect",
     "coral-plugin-offtopic",
-    "coral-plugin-facebook-auth",
+    "coral-plugin-facebook-auth"
   ],
   "client": [
     "coral-plugin-respect",

From 480bab3c1a170b5d882f39812f493b9ff03ee227 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 8 Jun 2017 09:12:08 -0600
Subject: [PATCH 047/264] changed some text around

---
 bin/cli-migration | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/bin/cli-migration b/bin/cli-migration
index 83a84e29d..036ac8b02 100755
--- a/bin/cli-migration
+++ b/bin/cli-migration
@@ -32,15 +32,6 @@ async function runMigrations() {
 
   try {
 
-    // Get the migrations to run.
-    let migrations = await MigrationService.listPending();
-
-    console.log('Now going to run the following migrations:\n');
-
-    for (let {filename} of migrations) {
-      console.log(`\tmigrations/${filename}`);
-    }
-
     let {backedUp} = await inquirer.prompt([
       {
         type: 'confirm',
@@ -54,6 +45,15 @@ async function runMigrations() {
       throw new Error('Please backup your databases prior to migrations occuring');
     }
 
+    // Get the migrations to run.
+    let migrations = await MigrationService.listPending();
+
+    console.log('Now going to run the following migrations:\n');
+
+    for (let {filename} of migrations) {
+      console.log(`\tmigrations/${filename}`);
+    }
+
     let {confirm} = await inquirer.prompt([
       {
         type: 'confirm',

From 1f261f5216f03f1adaa7f408b0e5945d15342a19 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 8 Jun 2017 12:35:42 -0300
Subject: [PATCH 048/264] Fully working

---
 .../src/components/Comment.js                 | 22 ++++++++++---------
 .../src/components/Stream.js                  | 12 +++++-----
 .../coral-embed-stream/src/graphql/index.js   |  8 +++----
 client/coral-framework/graphql/mutations.js   | 16 ++++++++------
 .../client/components/OffTopicTag.js          |  5 +----
 test/server/graph/mutations/removeTag.js      |  2 +-
 6 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/client/coral-embed-stream/src/components/Comment.js b/client/coral-embed-stream/src/components/Comment.js
index d798b446c..4233325c5 100644
--- a/client/coral-embed-stream/src/components/Comment.js
+++ b/client/coral-embed-stream/src/components/Comment.js
@@ -180,10 +180,10 @@ export default class Comment extends React.Component {
     commentIsIgnored: React.PropTypes.func,
 
     // dispatch action to add a tag to a comment
-    addCommentTag: React.PropTypes.func,
+    addTag: React.PropTypes.func,
 
     // dispatch action to remove a tag from a comment
-    removeCommentTag: React.PropTypes.func,
+    removeTag: React.PropTypes.func,
 
     // dispatch action to ignore another user
     ignoreUser: React.PropTypes.func,
@@ -286,11 +286,11 @@ export default class Comment extends React.Component {
       deleteAction,
       disableReply,
       maxCharCount,
-      addCommentTag,
       addNotification,
       charCountEnable,
       showSignInDialog,
-      removeCommentTag,
+      addTag,
+      removeTag,
       liveUpdates,
       commentIsIgnored,
       commentClassNames = []
@@ -333,18 +333,20 @@ export default class Comment extends React.Component {
 
     const addBestTag = notifyOnError(
       () =>
-        addCommentTag({
+        addTag({
           id: comment.id,
-          tag: BEST_TAG
+          name: BEST_TAG,
+          assetId: asset.id
         }),
       () => 'Failed to tag comment as best'
     );
 
     const removeBestTag = notifyOnError(
       () =>
-        removeCommentTag({
+        removeTag({
           id: comment.id,
-          tag: BEST_TAG
+          name: BEST_TAG,
+          assetId: asset.id
         }),
       () => 'Failed to remove best comment tag'
     );
@@ -547,8 +549,8 @@ export default class Comment extends React.Component {
                 currentUser={currentUser}
                 postFlag={postFlag}
                 deleteAction={deleteAction}
-                addCommentTag={addCommentTag}
-                removeCommentTag={removeCommentTag}
+                addTag={addTag}
+                removeTag={removeTag}
                 ignoreUser={ignoreUser}
                 charCountEnable={charCountEnable}
                 maxCharCount={maxCharCount}
diff --git a/client/coral-embed-stream/src/components/Stream.js b/client/coral-embed-stream/src/components/Stream.js
index 586d28f23..91e696652 100644
--- a/client/coral-embed-stream/src/components/Stream.js
+++ b/client/coral-embed-stream/src/components/Stream.js
@@ -129,10 +129,10 @@ class Stream extends React.Component {
       postDontAgree,
       deleteAction,
       showSignInDialog,
-      addCommentTag,
+      addTag,
       ignoreUser,
       auth: {loggedIn, user},
-      removeCommentTag,
+      removeTag,
       pluginProps,
       editName
     } = this.props;
@@ -264,8 +264,8 @@ class Stream extends React.Component {
                         currentUser={user}
                         postFlag={postFlag}
                         postDontAgree={postDontAgree}
-                        addCommentTag={addCommentTag}
-                        removeCommentTag={removeCommentTag}
+                        addTag={addTag}
+                        removeTag={removeTag}
                         ignoreUser={ignoreUser}
                         commentIsIgnored={commentIsIgnored}
                         loadMore={this.props.loadNewReplies}
@@ -298,10 +298,10 @@ Stream.propTypes = {
   postComment: PropTypes.func.isRequired,
 
   // dispatch action to add a tag to a comment
-  addCommentTag: PropTypes.func,
+  addTag: PropTypes.func,
 
   // dispatch action to remove a tag from a comment
-  removeCommentTag: PropTypes.func,
+  removeTag: PropTypes.func,
 
   // dispatch action to ignore another user
   ignoreUser: React.PropTypes.func,
diff --git a/client/coral-embed-stream/src/graphql/index.js b/client/coral-embed-stream/src/graphql/index.js
index 7f62240b5..dab648c8b 100644
--- a/client/coral-embed-stream/src/graphql/index.js
+++ b/client/coral-embed-stream/src/graphql/index.js
@@ -18,8 +18,8 @@ const extension = {
         }
       }
     `,
-    RemoveCommentTagResponse: gql`
-      fragment CoralEmbedStream_RemoveCommentTagResponse on RemoveCommentTagResponse {
+    RemoveTagResponse: gql`
+      fragment CoralEmbedStream_RemoveTagResponse on RemoveTagResponse {
         comment {
           id
           tags {
@@ -28,8 +28,8 @@ const extension = {
         }
       }
     `,
-    AddCommentTagResponse: gql`
-      fragment CoralEmbedStream_AddCommentTagResponse on AddCommentTagResponse {
+    AddTagResponse: gql`
+      fragment CoralEmbedStream_AddTagResponse on AddTagResponse {
         comment {
           id
           tags {
diff --git a/client/coral-framework/graphql/mutations.js b/client/coral-framework/graphql/mutations.js
index 183dead09..6660af999 100644
--- a/client/coral-framework/graphql/mutations.js
+++ b/client/coral-framework/graphql/mutations.js
@@ -174,7 +174,7 @@ export const withDeleteAction = withMutation(
   });
 
 const COMMENT_FRAGMENT = gql`
-    fragment CoraBest_UpdateFragment on Comment {
+    fragment CoralBest_UpdateFragment on Comment {
       tags {
         tag {
           name
@@ -185,9 +185,11 @@ const COMMENT_FRAGMENT = gql`
 
 export const withAddTag = withMutation(
   gql`
-    mutation AddCommentTag($id: ID!, $asset_id: ID!, $name: String!) {
+    mutation AddTag($id: ID!, $asset_id: ID!, $name: String!) {
       addTag(tag: {name: $name, id: $id, item_type: COMMENTS, asset_id: $asset_id}) {
-        ...ModifyTagResponse
+          errors {
+              translation_key
+          }
       }
     }
   `, {
@@ -228,7 +230,7 @@ export const withAddTag = withMutation(
 
 export const withRemoveTag = withMutation(
   gql`
-    mutation RemoveCommentTag($id: ID!, $asset_id: ID!, $name: String!) {
+    mutation RemoveTag($id: ID!, $asset_id: ID!, $name: String!) {
       removeTag(tag: {name: $name, id: $id, item_type: COMMENTS, asset_id: $asset_id}) {
         errors {
           translation_key
@@ -237,12 +239,12 @@ export const withRemoveTag = withMutation(
     }
   `, {
     props: ({mutate}) => ({
-      removeTag: ({id, name, asset_id}) => {
+      removeTag: ({id, name, assetId}) => {
         return mutate({
           variables: {
             id,
             name,
-            asset_id
+            asset_id: assetId
           },
           update: (proxy) => {
             const fragmentId = `Comment_${id}`;
@@ -250,7 +252,7 @@ export const withRemoveTag = withMutation(
             // Read the data from our cache for this query.
             const data = proxy.readFragment({fragment: COMMENT_FRAGMENT, id: fragmentId});
 
-            const idx = data.tags.findIndex((i) => i.tag.name === 'BEST');
+            const idx = data.tags.findIndex(i => i.tag.name === 'BEST');
 
             data.tags = [...data.tags.slice(0, idx), ...data.tags.slice(idx + 1)];
 
diff --git a/plugins/coral-plugin-offtopic/client/components/OffTopicTag.js b/plugins/coral-plugin-offtopic/client/components/OffTopicTag.js
index e8029ce5e..0e028c6bf 100644
--- a/plugins/coral-plugin-offtopic/client/components/OffTopicTag.js
+++ b/plugins/coral-plugin-offtopic/client/components/OffTopicTag.js
@@ -1,11 +1,8 @@
 import React from 'react';
 import styles from './styles.css';
-
 import {t} from 'plugin-api/beta/client/services';
 
-const isOffTopic = (tags) => {
-  return !!tags.filter((tag) => tag.name === 'OFF_TOPIC').length;
-};
+const isOffTopic = (tags) => !!tags.filter((t) => t.tag.name === 'OFF_TOPIC').length;
 
 export default (props) => (
   <span>
diff --git a/test/server/graph/mutations/removeTag.js b/test/server/graph/mutations/removeTag.js
index 95b3e8bd2..a1521c2ce 100644
--- a/test/server/graph/mutations/removeTag.js
+++ b/test/server/graph/mutations/removeTag.js
@@ -23,7 +23,7 @@ describe('graph.mutations.removeTag', () => {
   });
 
   const query = `
-    mutation RemoveCommentTag($id: ID!, $asset_id: ID!, $name: String!) {
+    mutation RemoveTag($id: ID!, $asset_id: ID!, $name: String!) {
       removeTag(tag: {name: $name, id: $id, item_type: COMMENTS, asset_id: $asset_id}) {
         errors {
           translation_key

From f6798af74d38f0b115e98dde1f3fcd59a0ac7577 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 8 Jun 2017 12:37:37 -0300
Subject: [PATCH 049/264] Lint

---
 client/coral-framework/graphql/mutations.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-framework/graphql/mutations.js b/client/coral-framework/graphql/mutations.js
index 6660af999..20ed175b3 100644
--- a/client/coral-framework/graphql/mutations.js
+++ b/client/coral-framework/graphql/mutations.js
@@ -252,7 +252,7 @@ export const withRemoveTag = withMutation(
             // Read the data from our cache for this query.
             const data = proxy.readFragment({fragment: COMMENT_FRAGMENT, id: fragmentId});
 
-            const idx = data.tags.findIndex(i => i.tag.name === 'BEST');
+            const idx = data.tags.findIndex((i) => i.tag.name === 'BEST');
 
             data.tags = [...data.tags.slice(0, idx), ...data.tags.slice(idx + 1)];
 

From 283c13fae8551cf1906bd163d5bdfb2813155ad8 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 8 Jun 2017 12:43:02 -0300
Subject: [PATCH 050/264] =?UTF-8?q?=C3=81dding=20typenames=20to=20update?=
 =?UTF-8?q?=20the=20store?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/coral-embed-stream/src/graphql/index.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/coral-embed-stream/src/graphql/index.js b/client/coral-embed-stream/src/graphql/index.js
index dab648c8b..7ca22a5f4 100644
--- a/client/coral-embed-stream/src/graphql/index.js
+++ b/client/coral-embed-stream/src/graphql/index.js
@@ -154,11 +154,13 @@ const extension = {
               tag: {
                 name: tag,
                 created_at: new Date().toISOString(),
+                __typename: 'Tag'
               },
               assigned_by: {
                 id: auth.toJS().user.id,
+                __typename: 'User'
               },
-              __typename: 'Tag'
+              __typename: 'TagLink'
             })),
             status: null,
             replyCount: 0,

From 8eb8010a3346d19aedd19bd04031c5b208202d69 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Thu, 8 Jun 2017 23:54:08 +0700
Subject: [PATCH 051/264] Implement Response interface

---
 plugins/coral-plugin-like/server/typeDefs.graphql | 2 +-
 plugins/coral-plugin-love/server/typeDefs.graphql | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/coral-plugin-like/server/typeDefs.graphql b/plugins/coral-plugin-like/server/typeDefs.graphql
index 1a1100754..40c600f2f 100644
--- a/plugins/coral-plugin-like/server/typeDefs.graphql
+++ b/plugins/coral-plugin-like/server/typeDefs.graphql
@@ -60,7 +60,7 @@ type CreateLikeResponse implements Response {
   like: LikeAction
 
   # An array of errors relating to the mutation that occurred.
-  errors: [UserError]
+  errors: [UserError!]
 }
 
 type RootMutation {
diff --git a/plugins/coral-plugin-love/server/typeDefs.graphql b/plugins/coral-plugin-love/server/typeDefs.graphql
index e22b91a2d..edc45e20b 100644
--- a/plugins/coral-plugin-love/server/typeDefs.graphql
+++ b/plugins/coral-plugin-love/server/typeDefs.graphql
@@ -60,7 +60,7 @@ type CreateLoveResponse implements Response {
     love: LoveAction
 
     # An array of errors relating to the mutation that occurred.
-    errors: [UserError]
+    errors: [UserError!]
 }
 
 type RootMutation {

From 9b839b76f508390629a12a814b3c5ad87844d67f Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Thu, 8 Jun 2017 23:55:37 +0700
Subject: [PATCH 052/264] Don't assume response name pattern

---
 client/coral-framework/graphql/fragments.js | 34 +++++++++------------
 client/coral-framework/utils/index.js       | 15 +++++++++
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/client/coral-framework/graphql/fragments.js b/client/coral-framework/graphql/fragments.js
index 9c396cbaa..3c64090bd 100644
--- a/client/coral-framework/graphql/fragments.js
+++ b/client/coral-framework/graphql/fragments.js
@@ -1,23 +1,19 @@
-import {gql} from 'react-apollo';
-import * as mutations from './mutations';
-
-function createDefaultResponseFragments() {
-  const names = Object.keys(mutations).map((key) => key.replace('with', ''));
-  const result = {};
-  names.forEach((name) => {
-    const response = `${name}Response`;
-    result[response] = gql`
-      fragment Coral_${response} on ${response} {
-        errors {
-          translation_key
-        }
-      }
-    `;
-  });
-  return result;
-}
+import {createDefaultResponseFragments} from '../utils';
 
 // fragments defined here are automatically registered.
 export default {
-  ...createDefaultResponseFragments()
+  ...createDefaultResponseFragments(
+    'SetCommentStatusResponse',
+    'SuspendUserResponse',
+    'RejectUsernameResponse',
+    'SetUserStatusResponse',
+    'PostCommentResponse',
+    'EditCommentResponse',
+    'PostFlagResponse',
+    'CreateDontAgreeResponse',
+    'DeleteActionResponse',
+    'ModifyTagResponse',
+    'IgnoreUserResponse',
+    'StopIgnoringUserResponse',
+  )
 };
diff --git a/client/coral-framework/utils/index.js b/client/coral-framework/utils/index.js
index ca2dd5ab2..1d430f1fc 100644
--- a/client/coral-framework/utils/index.js
+++ b/client/coral-framework/utils/index.js
@@ -112,3 +112,18 @@ export function getResponseErrors(mutationResult) {
   });
   return result.length ? result : false;
 }
+
+export function createDefaultResponseFragments(...names) {
+  const result = {};
+  names.forEach((name) => {
+    const response = `${name}Response`;
+    result[response] = gql`
+      fragment Coral_${response} on ${response} {
+        errors {
+          translation_key
+        }
+      }
+    `;
+  });
+  return result;
+}

From 80900a98fdae57bb7d26f7eed1294b973dac1d4e Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 8 Jun 2017 11:19:43 -0600
Subject: [PATCH 053/264] perform migrations during web install

---
 bin/cli-serve     | 42 +++++++++++++++++++++---
 services/setup.js | 84 +++++++++++++++++++++++------------------------
 2 files changed, 78 insertions(+), 48 deletions(-)

diff --git a/bin/cli-serve b/bin/cli-serve
index 63eda3af2..f2a6d3592 100755
--- a/bin/cli-serve
+++ b/bin/cli-serve
@@ -2,10 +2,13 @@
 
 const program = require('./commander');
 const app = require('../app');
+const debug = require('debug')('talk:cli:serve');
+const errors = require('../errors');
 const {createServer} = require('http');
 const scraper = require('../services/scraper');
 const mailer = require('../services/mailer');
 const MigrationService = require('../services/migration');
+const SetupService = require('../services/setup');
 const kue = require('../services/kue');
 const mongoose = require('../services/mongoose');
 const util = require('./util');
@@ -92,12 +95,41 @@ async function startApp(program) {
 
   try {
 
-    // Verify that the minimum migration version is met.
-    await MigrationService.verify();
+    // Check to see if the application is installed. If the application
+    // has been installed, then it will throw errors.ErrSettingsNotInit, this
+    // just means we don't have to check that the migrations have run.
+    await SetupService.isAvailable();
 
-  } catch(e) {
-    console.error(e);
-    process.exit(1);
+    debug('setup is currently available, migrations not being checked');
+
+  } catch (e) {
+
+    // Check the error.
+    switch (e) {
+    case errors.ErrInstallLock, errors.ErrSettingsInit:
+
+      debug('setup is not currently available, migrations now being checked');
+
+      // The error was expected, just continue.
+      break;
+    default:
+
+      // The error was not expected, throw the error!
+      throw e;
+    }
+
+    // Now try and check the migration status.
+    try {
+
+      // Verify that the minimum migration version is met.
+      await MigrationService.verify();
+
+    } catch (e) {
+      console.error(e);
+      process.exit(1);
+    }
+
+    debug('migrations do not have to be run');
   }
 
   /**
diff --git a/services/setup.js b/services/setup.js
index 233021c17..053a85789 100644
--- a/services/setup.js
+++ b/services/setup.js
@@ -1,5 +1,6 @@
 const UsersService = require('./users');
 const SettingsService = require('./settings');
+const MigrationService = require('./migration');
 const SettingsModel = require('../models/setting');
 const errors = require('../errors');
 const {
@@ -15,34 +16,32 @@ module.exports = class SetupService {
   /**
    * This returns a promise which resolves if the setup is available.
    */
-  static isAvailable() {
+  static async isAvailable() {
 
     // Check if we have an install lock present.
     if (INSTALL_LOCK) {
-      return Promise.reject(errors.ErrInstallLock);
+      throw errors.ErrInstallLock;
     }
 
-    // Get the current settings, we are expecing an error here.
-    return SettingsService
-      .retrieve()
-      .then(() => {
+    try {
 
-        // We should NOT have gotten a settings object, this means that the
-        // application is already setup. Error out here.
-        return Promise.reject(errors.ErrSettingsInit);
+      // Get the current settings, we are expecing an error here.
+      await SettingsService.retrieve();
+      
+      // We should NOT have gotten a settings object, this means that the
+      // application is already setup. Error out here.
+      throw errors.ErrSettingsInit;
+    } catch (e) {
 
-      })
-      .catch((err) => {
+      // If the error is `not init`, then we're good, otherwise, it's something
+      // else.
+      if (e !== errors.ErrSettingsNotInit) {
+        throw e;
+      }
 
-        // If the error is `not init`, then we're good, otherwise, it's something
-        // else.
-        if (err !== errors.ErrSettingsNotInit) {
-          return Promise.reject(err);
-        }
-
-        // Allow the request to keep going here.
-        return;
-      });
+      // Allow the request to keep going here.
+      return;
+    }
   }
 
   /**
@@ -69,35 +68,34 @@ module.exports = class SetupService {
   /**
    * This will perform the setup.
    */
-  static setup({settings, user: {email, password, username}}) {
+  static async setup({settings, user: {email, password, username}}) {
 
     // Validate the settings first.
-    return SetupService
-      .validate({settings, user: {email, password, username}})
-      .then(() => {
-        return SettingsService.update(settings);
-      })
-      .then((settings) => {
+    await SetupService.validate({settings, user: {email, password, username}});
 
-        // Settings are created! Create the user.
+    // Get the migrations to run.
+    let migrations = await MigrationService.listPending();
 
-        // Create the user.
-        return UsersService
-          .createLocalUser(email, password, username)
+    // Perform all migrations.
+    await MigrationService.run(migrations);
 
-          // Grant them administrative privileges and confirm the email account.
-          .then((user) => {
+    settings = await SettingsService.update(settings);
 
-            return Promise.all([
-              UsersService.addRoleToUser(user.id, 'ADMIN'),
-              UsersService.confirmEmail(user.id, email)
-            ])
-            .then(() => ({
-              settings,
-              user
-            }));
-          });
-      });
+    // Settings are created! Create the user.
+
+    // Create the user.
+    let user = await UsersService.createLocalUser(email, password, username);
+
+    // Grant them administrative privileges and confirm the email account.
+    await Promise.all([
+      UsersService.addRoleToUser(user.id, 'ADMIN'),
+      UsersService.confirmEmail(user.id, email)
+    ]);
+    
+    return {
+      settings,
+      user
+    };
   }
 
 };

From b95e20e493f7356c0f1fdccbdad554fdfe5a5160 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 8 Jun 2017 11:21:09 -0600
Subject: [PATCH 054/264] removed explicit migration step

---
 bin/cli-setup | 32 --------------------------------
 1 file changed, 32 deletions(-)

diff --git a/bin/cli-setup b/bin/cli-setup
index add134209..680fba91a 100755
--- a/bin/cli-setup
+++ b/bin/cli-setup
@@ -12,7 +12,6 @@ const MODERATION_OPTIONS = require('../models/enum/moderation_options');
 const SettingsService = require('../services/settings');
 const SetupService = require('../services/setup');
 const UsersService = require('../services/users');
-const MigrationService = require('../services/migration');
 const util = require('./util');
 const errors = require('../errors');
 
@@ -64,37 +63,6 @@ const performSetup = async () => {
     }
   }
 
-  // Get the migrations to run.
-  let migrations = await MigrationService.listPending();
-  if (migrations.length > 0) {
-
-    console.log('Now going to run the following migrations:\n');
-
-    for (let {filename} of migrations) {
-      console.log(`\tmigrations/${filename}`);
-    }
-
-    console.log('');
-
-    let {confirm} = await inquirer.prompt([
-      {
-        type: 'confirm',
-        name: 'confirm',
-        message: 'Proceed with migrations',
-        default: false
-      }
-    ]);
-
-    if (!confirm) {
-      throw new Error('migrations are needed to complete setup');
-    }
-
-    // Perform all migrations.
-    await MigrationService.run(migrations);
-  } else {
-    console.log('No migrations have to be run.');
-  }
-
   // Create the base settings model.
   let settings = new SettingModel();
 

From b06a58ebe1b96f9753fccc56b8b560914472e88a Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 8 Jun 2017 11:21:44 -0600
Subject: [PATCH 055/264] adjusted flow

---
 bin/cli-setup | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/bin/cli-setup b/bin/cli-setup
index 680fba91a..9ecdecc95 100755
--- a/bin/cli-setup
+++ b/bin/cli-setup
@@ -35,15 +35,6 @@ program
 
 const performSetup = async () => {
 
-  if (program.defaults) {
-    await SettingsService.init();
-
-    console.log('Settings created.');
-    console.log('\nTalk is now installed!');
-
-    return;
-  }
-
   // Get the current settings, we are expecing an error here.
   try {
 
@@ -63,6 +54,15 @@ const performSetup = async () => {
     }
   }
 
+  if (program.defaults) {
+    await SettingsService.init();
+
+    console.log('Settings created.');
+    console.log('\nTalk is now installed!');
+
+    return;
+  }
+
   // Create the base settings model.
   let settings = new SettingModel();
 

From 57747e8f13486d1e9ed32a4cb8353a4e3ed25757 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 9 Jun 2017 00:22:58 +0700
Subject: [PATCH 056/264] Make mutations extendable

---
 client/coral-framework/graphql/mutations.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/client/coral-framework/graphql/mutations.js b/client/coral-framework/graphql/mutations.js
index 20ed175b3..dcba97891 100644
--- a/client/coral-framework/graphql/mutations.js
+++ b/client/coral-framework/graphql/mutations.js
@@ -187,9 +187,7 @@ export const withAddTag = withMutation(
   gql`
     mutation AddTag($id: ID!, $asset_id: ID!, $name: String!) {
       addTag(tag: {name: $name, id: $id, item_type: COMMENTS, asset_id: $asset_id}) {
-          errors {
-              translation_key
-          }
+        ...ModifyTagResponse
       }
     }
   `, {
@@ -232,9 +230,7 @@ export const withRemoveTag = withMutation(
   gql`
     mutation RemoveTag($id: ID!, $asset_id: ID!, $name: String!) {
       removeTag(tag: {name: $name, id: $id, item_type: COMMENTS, asset_id: $asset_id}) {
-        errors {
-          translation_key
-        }
+        ...ModifyTagResponse
       }
     }
   `, {

From 995dd9fd6065b15717a481ee5156ea0053ecff5c Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 9 Jun 2017 00:31:19 +0700
Subject: [PATCH 057/264] Correct fragment names

---
 client/coral-framework/utils/index.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/coral-framework/utils/index.js b/client/coral-framework/utils/index.js
index 1d430f1fc..0b79b7b02 100644
--- a/client/coral-framework/utils/index.js
+++ b/client/coral-framework/utils/index.js
@@ -115,8 +115,7 @@ export function getResponseErrors(mutationResult) {
 
 export function createDefaultResponseFragments(...names) {
   const result = {};
-  names.forEach((name) => {
-    const response = `${name}Response`;
+  names.forEach((response) => {
     result[response] = gql`
       fragment Coral_${response} on ${response} {
         errors {

From 1153c52c2c702529df6d9d7209986a3b8f849eb8 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 9 Jun 2017 00:31:29 +0700
Subject: [PATCH 058/264] Correct optimistic response

---
 client/coral-framework/graphql/mutations.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/client/coral-framework/graphql/mutations.js b/client/coral-framework/graphql/mutations.js
index dcba97891..3b9ef01f4 100644
--- a/client/coral-framework/graphql/mutations.js
+++ b/client/coral-framework/graphql/mutations.js
@@ -200,8 +200,8 @@ export const withAddTag = withMutation(
             asset_id: assetId
           },
           optimisticResponse: {
-            deleteAction: {
-              __typename: 'DeleteActionResponse',
+            addTag: {
+              __typename: 'ModifyTagResponse',
               errors: null,
             }
           },
@@ -242,6 +242,12 @@ export const withRemoveTag = withMutation(
             name,
             asset_id: assetId
           },
+          optimisticResponse: {
+            removeTag: {
+              __typename: 'ModifyTagResponse',
+              errors: null,
+            }
+          },
           update: (proxy) => {
             const fragmentId = `Comment_${id}`;
 

From a9a24b96c0ae6cea62eb8210fa9109c53f7dd086 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 8 Jun 2017 11:49:36 -0600
Subject: [PATCH 059/264] cleaned up plugins in webpack

---
 plugins.js        | 10 +++++++---
 webpack.config.js | 28 ++++++----------------------
 2 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/plugins.js b/plugins.js
index 4403f89bb..fa17027a2 100644
--- a/plugins.js
+++ b/plugins.js
@@ -10,6 +10,7 @@ const PLUGINS_JSON = process.env.TALK_PLUGINS_JSON;
 // Add the current path to the module root.
 amp.addPath(__dirname);
 
+let pluginsPath;
 let plugins = {};
 
 // Try to parse the plugins.json file, logging out an error if the plugins.json
@@ -22,14 +23,16 @@ try {
 
   if (PLUGINS_JSON && PLUGINS_JSON.length > 0) {
     debug('Now using TALK_PLUGINS_JSON environment variable for plugins');
-    plugins = require(envPlugins);
+    pluginsPath = envPlugins;
   } else if (fs.existsSync(customPlugins)) {
     debug(`Now using ${customPlugins} for plugins`);
-    plugins = JSON.parse(fs.readFileSync(customPlugins, 'utf8'));
+    pluginsPath = customPlugins;
   } else {
     debug(`Now using ${defaultPlugins} for plugins`);
-    plugins = JSON.parse(fs.readFileSync(defaultPlugins, 'utf8'));
+    pluginsPath = defaultPlugins;
   }
+
+  plugins = require(pluginsPath);
 } catch (err) {
   if (err.code === 'ENOENT') {
     console.error('plugins.json and plugins.default.json not found, plugins will not be active');
@@ -249,6 +252,7 @@ class PluginManager {
 
 module.exports = {
   plugins,
+  pluginsPath,
   PluginManager,
   isInternal,
   pluginPath,
diff --git a/webpack.config.js b/webpack.config.js
index d2cd07300..3973adc6d 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,5 +1,4 @@
 const path = require('path');
-const fs = require('fs');
 const CompressionPlugin = require('compression-webpack-plugin');
 const autoprefixer = require('autoprefixer');
 const precss = require('precss');
@@ -10,26 +9,11 @@ const webpack = require('webpack');
 // Possibly load the config from the .env file (if there is one).
 require('dotenv').config();
 
-const {plugins, PluginManager} = require('./plugins');
+const {plugins, pluginsPath, PluginManager} = require('./plugins');
+const manager = new PluginManager(plugins);
+const targetPlugins = manager.section('targets').plugins;
 
-const pluginManager = new PluginManager(plugins);
-const targetPlugins = pluginManager.section('targets').plugins;
-
-let pluginsConfigPath;
-
-let envPlugins = path.join(__dirname, 'plugins.env.js');
-let customPlugins = path.join(__dirname, 'plugins.json');
-let defaultPlugins = path.join(__dirname, 'plugins.default.json');
-
-if (process.env.TALK_PLUGINS_JSON && process.env.TALK_PLUGINS_JSON.length > 0) {
-  pluginsConfigPath = envPlugins;
-} else if (fs.existsSync(customPlugins)) {
-  pluginsConfigPath = customPlugins;
-} else {
-  pluginsConfigPath = defaultPlugins;
-}
-
-console.log(`Using ${pluginsConfigPath} as the plugin configuration path`);
+console.log(`Using ${pluginsPath} as the plugin configuration path`);
 
 // Edit the build targets and embeds below.
 
@@ -89,7 +73,7 @@ const config = {
       {
         loader: 'plugins-loader',
         test: /\.(json|js)$/,
-        include: pluginsConfigPath
+        include: pluginsPath
       },
       {
         loader: 'babel-loader',
@@ -168,7 +152,7 @@ const config = {
   resolve: {
     alias: {
       plugins: path.resolve(__dirname, 'plugins/'),
-      pluginsConfig: pluginsConfigPath
+      pluginsConfig: pluginsPath
     },
     modules: [
       path.resolve(__dirname, 'plugins'),

From 428246cbe2f199246e3e2bbe9d1b39afef95e68e Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 9 Jun 2017 01:16:39 +0700
Subject: [PATCH 060/264] Make it work without iframe

---
 client/coral-embed-stream/src/index.js | 27 ++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/client/coral-embed-stream/src/index.js b/client/coral-embed-stream/src/index.js
index 821399488..16c510c29 100644
--- a/client/coral-embed-stream/src/index.js
+++ b/client/coral-embed-stream/src/index.js
@@ -19,14 +19,29 @@ loadPluginsTranslations();
 injectPluginsReducers();
 injectReducers(reducers);
 
+function inIframe() {
+  try {
+    return window.self !== window.top;
+  } catch (e) {
+    return true;
+  }
+}
+
+function init(config = {}) {
+  store.dispatch(addExternalConfig(config));
+  store.dispatch(checkLogin());
+}
+
 // Don't run this in the popup.
 if (!window.opener) {
-  pym.sendMessage('getConfig');
-
-  pym.onMessage('config', (config) => {
-    store.dispatch(addExternalConfig(JSON.parse(config)));
-    store.dispatch(checkLogin());
-  });
+  if (inIframe()) {
+    pym.sendMessage('getConfig');
+    pym.onMessage('config', (config) => {
+      init(JSON.parse(config));
+    });
+  } else {
+    init();
+  }
 }
 
 render(

From 4e5680577e1f086327b0087f86d0621e9688c82b Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 9 Jun 2017 01:17:27 +0700
Subject: [PATCH 061/264] Include public comments

---
 graph/resolvers/util.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graph/resolvers/util.js b/graph/resolvers/util.js
index 9dd67bb0e..ef3c70865 100644
--- a/graph/resolvers/util.js
+++ b/graph/resolvers/util.js
@@ -9,7 +9,7 @@ const decorateWithTags = (typeResolver) => {
       return tags;
     }
 
-    return tags.filter((tag) => tag.public);
+    return tags.filter((t) => t.tag.permissions.public);
   };
 };
 

From dbb0a68766cd8a722469a555569db67570eb82c5 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Thu, 8 Jun 2017 15:53:12 -0400
Subject: [PATCH 062/264] Prep to release 2.0.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d78ba8713..bb804c6e4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "talk",
-  "version": "1.9.1",
+  "version": "2.0.0",
   "description": "A better commenting experience from Mozilla, The New York Times, and the Washington Post. https://coralproject.net",
   "main": "app.js",
   "scripts": {

From d0b3845d0f92412532647beed166672c7c6d814f Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Thu, 8 Jun 2017 15:55:41 -0400
Subject: [PATCH 063/264] Update README

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 48055e326..c7ff21cdd 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,10 @@ sign and verify tokens via a `HS256` algorithm.
 Refer to the wiki page on [Configuration Loading](https://github.com/coralproject/talk/wiki/Configuration-Loading) for
 alternative methods of loading configuration during development.
 
+### Running Migrations
+
+We have a migration tool that can be run using `bin/cli-migration run`. This will detect new migrations available and prompt you to backup your database before proceeding with the migration. Migrations are required with major version releases.
+
 ### Using Trust
 
 Talk ships with core components we call "Trust". This allows Talk to automate certain actions based on previous user behavior.

From 32708e9098e9c32c69c484d8d77afb435880862e Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 8 Jun 2017 15:08:18 -0600
Subject: [PATCH 064/264] submscription fixes

---
 client/coral-framework/actions/auth.js    | 11 ++++++
 client/coral-framework/services/client.js | 42 +++++++++++++++++++++--
 graph/subscriptions.js                    | 28 ++++++++++++---
 services/subscriptions.js                 | 32 ++++++-----------
 4 files changed, 84 insertions(+), 29 deletions(-)

diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js
index 91f709b35..fe6546296 100644
--- a/client/coral-framework/actions/auth.js
+++ b/client/coral-framework/actions/auth.js
@@ -4,6 +4,7 @@ import * as actions from '../constants/auth';
 import * as Storage from '../helpers/storage';
 import coralApi, {base} from '../helpers/request';
 
+import {resetWebsocket} from 'coral-framework/services/client';
 import t from 'coral-framework/services/i18n';
 
 export const showSignInDialog = () => (dispatch, getState) => {
@@ -117,6 +118,12 @@ const signInFailure = (error) => ({
 export const handleAuthToken = (token) => (dispatch) => {
   Storage.setItem('exp', jwtDecode(token).exp);
   Storage.setItem('token', token);
+
+  alert('handled the auth token!');
+
+  // Reset the websocket.
+  resetWebsocket();
+
   dispatch({type: 'HANDLE_AUTH_TOKEN'});
 };
 
@@ -277,6 +284,10 @@ export const logout = () => (dispatch) => {
     if (!bowser.safari && !bowser.ios) {
       Storage.removeItem('token');
     }
+
+    // Reset the websocket.
+    resetWebsocket();
+
     dispatch({type: actions.LOGOUT});
   });
 };
diff --git a/client/coral-framework/services/client.js b/client/coral-framework/services/client.js
index 6095e17ab..70408248c 100644
--- a/client/coral-framework/services/client.js
+++ b/client/coral-framework/services/client.js
@@ -1,8 +1,31 @@
 import ApolloClient, {addTypename} from 'apollo-client';
 import {networkInterface} from './transport';
 import {SubscriptionClient, addGraphQLSubscriptions} from 'subscriptions-transport-ws';
+import {SUBSCRIPTION_END} from 'subscriptions-transport-ws/dist/messageTypes';
+import {getAuthToken} from '../helpers/request';
 
-let client;
+let client, wsClient = null, wsClientToken = null;
+
+export function resetWebsocket() {
+  if (wsClient === null) {
+
+    // Nothing to reset!
+    return;
+  }
+
+  // Unsubscribe from all the active subscriptions.
+  Object.keys(wsClient.subscriptions).forEach((id) => {
+
+    // Create the message.
+    let message = {id: parseInt(id), type: SUBSCRIPTION_END};
+
+    // Send the unsubscribe message.
+    wsClient.client.send(JSON.stringify(message));
+  });
+
+  // Close the client, this will trigger a reconnect.
+  wsClient.close();
+}
 
 export function getClient() {
   if (client) {
@@ -10,8 +33,21 @@ export function getClient() {
   }
 
   const protocol = location.protocol === 'https:' ? 'wss' : 'ws';
-  const wsClient = new SubscriptionClient(`${protocol}://${location.host}/api/v1/live`, {
-    reconnect: true
+  wsClient = new SubscriptionClient(`${protocol}://${location.host}/api/v1/live`, {
+    reconnect: true,
+    connectionParams: {
+      get token() {
+
+        wsClientToken = getAuthToken();
+
+        // Try to get the token from localStorage. If it isn't here, it may
+        // be passed as a cookie.
+
+        // NOTE: THIS IS ONLY EVER EVALUATED ONCE, IN ORDER TO SEND A DIFFERNT
+        // TOKEN YOU MUST DISCONNECT AND RECONNECT THE WEBSOCKET CLIENT.
+        return wsClientToken;
+      }
+    }
   });
 
   const networkInterfaceWithSubscriptions = addGraphQLSubscriptions(
diff --git a/graph/subscriptions.js b/graph/subscriptions.js
index 0442c237d..0cc37e841 100644
--- a/graph/subscriptions.js
+++ b/graph/subscriptions.js
@@ -41,16 +41,34 @@ const createSubscriptionManager = (server) => new SubscriptionServer({
     pubsub,
     setupFunctions,
   }),
+  onConnect: ({token}, connection) => {
+
+    // Attach the token from the connection options if it was provided.
+    if (token) {
+
+      // Attach it to the upgrade request.
+      connection.upgradeReq.headers['authorization'] = `Bearer ${token}`;
+    }
+  },
   onSubscribe: (parsedMessage, baseParams, connection) => {
 
+    // Cache the upgrade request.
+    let upgradeReq = connection.upgradeReq;
+
     // Attach the context per request.
-    baseParams.context = () => deserializeUser(connection.upgradeReq)
-      .then((req) => new Context(req, pubsub))
-      .catch((err) => {
-        console.error(err);
+    baseParams.context = async () => {
+      let req;
+      
+      try {
+        req = await deserializeUser(upgradeReq);
+      } catch (e) {
+        console.error(e);
 
         return new Context({}, pubsub);
-      });
+      }
+      
+      return new Context(req, pubsub);
+    };
 
     return baseParams;
   }
diff --git a/services/subscriptions.js b/services/subscriptions.js
index c4cd2378a..d6a5b430c 100644
--- a/services/subscriptions.js
+++ b/services/subscriptions.js
@@ -1,4 +1,4 @@
-const passport = require('./passport');
+const cookieParser = require('cookie-parser')();
 const authentication = require('../middleware/authentication');
 
 // Session data does not automatically attach to websocket req objects.
@@ -7,32 +7,22 @@ const authentication = require('../middleware/authentication');
 const deserializeUser = (req) => {
   return new Promise((resolve, reject) => {
 
-    // This uses the authentication connect middleware to establish the session
-    // user details from the headers.
-    authentication(req, null, (err) => {
+    // Parse the cookies (if they exist?).
+    cookieParser(req, null, (err) => {
       if (err) {
         return reject(err);
       }
 
-      if ('session' in req && 'passport' in req.session && 'user' in req.session.passport) {
-        passport.deserializeUser(req.session.passport.user, (err, user) => {
-          if (err) {
-            return reject(err);
-          }
-
-          req.user = user;
-
-          return resolve(req);
-        });
-      }
-
-        // Remove the user from the request (if there was one)
-      if (req.user) {
-        delete req.user;
-      }
+      // This uses the authentication connect middleware to establish the
+      // current user.
+      authentication(req, null, (err) => {
+        if (err) {
+          return reject(err);
+        }
 
         // Resolve with the request (user removed possibly).
-      return resolve(req);
+        return resolve(req);
+      });
     });
   });
 };

From 399f1e74584fd1ddaa84a7a13dee075e8aa83d01 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 8 Jun 2017 16:53:22 -0600
Subject: [PATCH 065/264] simplified webpack file

---
 plugins.js        |   1 +
 webpack.config.js | 100 ++++++++++++++++++++++++++++------------------
 2 files changed, 62 insertions(+), 39 deletions(-)

diff --git a/plugins.js b/plugins.js
index fa17027a2..dfe3d3312 100644
--- a/plugins.js
+++ b/plugins.js
@@ -84,6 +84,7 @@ function pluginPath(name) {
     try {
       return resolve.sync(name, {moduleDirectory: 'plugins', basedir: process.cwd()});
     } catch (e) {
+      console.warn(e);
       return undefined;
     }
   }
diff --git a/webpack.config.js b/webpack.config.js
index 3973adc6d..c580a0c13 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -2,6 +2,7 @@ const path = require('path');
 const CompressionPlugin = require('compression-webpack-plugin');
 const autoprefixer = require('autoprefixer');
 const precss = require('precss');
+const _ = require('lodash');
 const Copy = require('copy-webpack-plugin');
 const LicenseWebpackPlugin = require('license-webpack-plugin');
 const webpack = require('webpack');
@@ -15,8 +16,6 @@ const targetPlugins = manager.section('targets').plugins;
 
 console.log(`Using ${pluginsPath} as the plugin configuration path`);
 
-// Edit the build targets and embeds below.
-
 const buildTargets = [
   'coral-admin',
   'coral-docs'
@@ -26,47 +25,16 @@ const buildEmbeds = [
   'stream'
 ];
 
+//==============================================================================
+// Base Webpack Config
+//==============================================================================
+
 const config = {
   devtool: 'cheap-module-source-map',
-  entry: Object.assign({}, {
-    'embed': [
-      'babel-polyfill',
-      path.join(__dirname, 'client/coral-embed/src/index')
-    ]
-  }, buildTargets.reduce((entry, target) => {
-
-    // Add the entry for the bundle.
-    entry[`${target}/bundle`] = [
-      'babel-polyfill',
-      path.join(__dirname, 'client/', target, '/src/index')
-    ];
-
-    return entry;
-  }, {}), buildEmbeds.reduce((entry, embed) => {
-
-    // Add the entry for the bundle.
-    entry[`embed/${embed}/bundle`] = [
-      'babel-polyfill',
-      path.join(__dirname, 'client/', `coral-embed-${embed}`, '/src/index')
-    ];
-
-    return entry;
-  }, {}), targetPlugins.reduce((entry, plugin) => {
-    entry[`${plugin.name}/bundle`] = [
-      'babel-polyfill',
-      plugin.path
-    ];
-
-    return entry;
-  }, {})),
   output: {
     path: path.join(__dirname, 'dist'),
     publicPath: '/client/',
-    filename: '[name].js',
-
-    // NOTE: this causes all exports to override the global.Coral, so no more
-    // than one bundle.js can be included on a page.
-    library: 'Coral'
+    filename: '[name].js'
   },
   module: {
     rules: [
@@ -164,6 +132,10 @@ const config = {
   }
 };
 
+//==============================================================================
+// Production configuration overrides
+//==============================================================================
+
 if (process.env.NODE_ENV === 'production') {
   config.plugins.push(new CompressionPlugin({
     asset: '[path].gz[query]',
@@ -174,4 +146,54 @@ if (process.env.NODE_ENV === 'production') {
   }));
 }
 
-module.exports = config;
+//==============================================================================
+// Entries
+//==============================================================================
+
+// Applies the base configuration to the following entries.
+const applyConfig = (entries, root = {}) => _.merge({}, config, {
+  entry: entries.reduce((entry, {name, path}) => {
+    entry[name] = [
+      'babel-polyfill',
+      path
+    ];
+
+    return entry;
+  }, {})
+}, root);
+
+module.exports = [
+  applyConfig([
+
+    // Load in the root embed.
+    {
+      name: 'embed',
+      path: path.join(__dirname, 'client/coral-embed/src/index')
+    }
+
+  ], {
+    output: {
+      library: 'Coral'
+    }
+  }),
+  applyConfig([
+
+    // Load in all the targets.
+    ...buildTargets.map((target) => ({
+      name: `${target}/bundle`,
+      path: path.join(__dirname, 'client/', target, '/src/index')
+    })),
+
+    // Load in all the embeds.
+    ...buildEmbeds.map((embed) => ({
+      name: `embed/${embed}/bundle`,
+      path: path.join(__dirname, 'client/', `coral-embed-${embed}`, '/src/index')
+    })),
+
+    // Load in all the plugin entries.
+    ...targetPlugins.map(({name, path}) => ({
+      name: `${name}/bundle`,
+      path
+    }))
+  ])
+];

From 8d2c1b72472e3d0d3db5c02182a53fd60d1ab99e Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 8 Jun 2017 17:25:27 -0600
Subject: [PATCH 066/264] changed bundle format

---
 webpack.config.js | 88 ++++++++++++++++++++++++++++++++---------------
 1 file changed, 61 insertions(+), 27 deletions(-)

diff --git a/webpack.config.js b/webpack.config.js
index c580a0c13..59fe9607a 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,4 +1,5 @@
 const path = require('path');
+const fs = require('fs');
 const CompressionPlugin = require('compression-webpack-plugin');
 const autoprefixer = require('autoprefixer');
 const precss = require('precss');
@@ -163,37 +164,70 @@ const applyConfig = (entries, root = {}) => _.merge({}, config, {
 }, root);
 
 module.exports = [
+
+  // Coral Embed
+  // applyConfig([
+
+  //   // Load in the root embed.
+  //   {
+  //     name: 'embed',
+  //     path: path.join(__dirname, 'client/coral-embed/src/index')
+  //   }
+
+  // ], {
+  //   output: {
+  //     library: 'Coral'
+  //   }
+  // }),
+
+  // All framework targets/embeds/plugins.
   applyConfig([
 
-    // Load in the root embed.
-    {
-      name: 'embed',
-      path: path.join(__dirname, 'client/coral-embed/src/index')
-    }
+    // // Load in all the targets.
+    // ...buildTargets.map((target) => ({
+    //   name: `${target}/bundle`,
+    //   path: path.join(__dirname, 'client/', target, '/src/index')
+    // })),
 
-  ], {
-    output: {
-      library: 'Coral'
-    }
-  }),
-  applyConfig([
-
-    // Load in all the targets.
-    ...buildTargets.map((target) => ({
-      name: `${target}/bundle`,
-      path: path.join(__dirname, 'client/', target, '/src/index')
-    })),
-
-    // Load in all the embeds.
-    ...buildEmbeds.map((embed) => ({
-      name: `embed/${embed}/bundle`,
-      path: path.join(__dirname, 'client/', `coral-embed-${embed}`, '/src/index')
-    })),
+    // // Load in all the embeds.
+    // ...buildEmbeds.map((embed) => ({
+    //   name: `embed/${embed}/bundle`,
+    //   path: path.join(__dirname, 'client/', `coral-embed-${embed}`, '/src/index')
+    // })),
 
     // Load in all the plugin entries.
-    ...targetPlugins.map(({name, path}) => ({
-      name: `${name}/bundle`,
-      path
-    }))
+    ...targetPlugins.reduce((entries, plugin) => {
+
+      // Introspect the path to find a targets folder.
+      let folder = path.dirname(plugin.path);
+      let files = fs.readdirSync(folder);
+
+      // While the folder does not contain the targets folder...
+      while (!files.includes('targets')) {
+
+        // Try to go up a folder.
+        folder = path.normalize(path.join(folder, '..'));
+
+        // And as long as we haven't gone too high
+        if (!(folder.includes(path.join(__dirname, 'node_modules')) || !folder.includes(path.join(__dirname, 'plugins')))) {
+          throw new Error(`target plugin ${plugin.name} does not have a 'targets' folder`);
+        }
+
+        files = fs.readdirSync(folder);
+      }
+
+      // List all targets available in that folder.
+      folder = path.join(folder, 'targets');
+
+      let targets = fs.readdirSync(folder);
+      if (targets.length === 0) {
+        throw new Error(`target plugin ${plugin.name} has no targets in it's target folder ${folder}`);
+      }
+
+      return entries.concat(targets.map((target) => ({
+        name: `plugin/${plugin.name}/${target}/bundle`,
+        path: path.join(folder, target, 'index')
+      })));
+    }, [])
   ])
 ];

From 99174565faa5d0c797bc30242909622e3fc6f31b Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 8 Jun 2017 17:32:01 -0600
Subject: [PATCH 067/264] fixes to webpack config (uncommenting)

---
 webpack.config.js | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/webpack.config.js b/webpack.config.js
index 59fe9607a..94ecad27a 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -166,34 +166,34 @@ const applyConfig = (entries, root = {}) => _.merge({}, config, {
 module.exports = [
 
   // Coral Embed
-  // applyConfig([
+  applyConfig([
 
-  //   // Load in the root embed.
-  //   {
-  //     name: 'embed',
-  //     path: path.join(__dirname, 'client/coral-embed/src/index')
-  //   }
+    // Load in the root embed.
+    {
+      name: 'embed',
+      path: path.join(__dirname, 'client/coral-embed/src/index')
+    }
 
-  // ], {
-  //   output: {
-  //     library: 'Coral'
-  //   }
-  // }),
+  ], {
+    output: {
+      library: 'Coral'
+    }
+  }),
 
   // All framework targets/embeds/plugins.
   applyConfig([
 
     // // Load in all the targets.
-    // ...buildTargets.map((target) => ({
-    //   name: `${target}/bundle`,
-    //   path: path.join(__dirname, 'client/', target, '/src/index')
-    // })),
+    ...buildTargets.map((target) => ({
+      name: `${target}/bundle`,
+      path: path.join(__dirname, 'client/', target, '/src/index')
+    })),
 
-    // // Load in all the embeds.
-    // ...buildEmbeds.map((embed) => ({
-    //   name: `embed/${embed}/bundle`,
-    //   path: path.join(__dirname, 'client/', `coral-embed-${embed}`, '/src/index')
-    // })),
+    // Load in all the embeds.
+    ...buildEmbeds.map((embed) => ({
+      name: `embed/${embed}/bundle`,
+      path: path.join(__dirname, 'client/', `coral-embed-${embed}`, '/src/index')
+    })),
 
     // Load in all the plugin entries.
     ...targetPlugins.reduce((entries, plugin) => {

From 1d3cc906eb61115b709e84e7161046ecdfebd89f Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 8 Jun 2017 17:34:01 -0600
Subject: [PATCH 068/264] small fix

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c7ff21cdd..70dfc61c4 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ alternative methods of loading configuration during development.
 
 ### Running Migrations
 
-We have a migration tool that can be run using `bin/cli-migration run`. This will detect new migrations available and prompt you to backup your database before proceeding with the migration. Migrations are required with major version releases.
+We have a migration tool that can be run using `bin/cli migration run`. This will detect new migrations available and prompt you to backup your database before proceeding with the migration. Migrations are required with major version releases.
 
 ### Using Trust
 

From c7ca3c5e4a33100d87fd0e6f24bd72b8337aefb4 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 9 Jun 2017 17:26:42 +0700
Subject: [PATCH 069/264] Reset websocket after successful login

---
 client/coral-framework/actions/auth.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js
index fe6546296..e212af99b 100644
--- a/client/coral-framework/actions/auth.js
+++ b/client/coral-framework/actions/auth.js
@@ -119,11 +119,6 @@ export const handleAuthToken = (token) => (dispatch) => {
   Storage.setItem('exp', jwtDecode(token).exp);
   Storage.setItem('token', token);
 
-  alert('handled the auth token!');
-
-  // Reset the websocket.
-  resetWebsocket();
-
   dispatch({type: 'HANDLE_AUTH_TOKEN'});
 };
 
@@ -318,6 +313,9 @@ export const checkLogin = () => (dispatch) => {
 
       dispatch(checkLoginSuccess(result.user));
 
+      // Reset the websocket.
+      resetWebsocket();
+
       // Display create username dialog if necessary.
       if (result.user.canEditName && result.user.status !== 'BANNED') {
         dispatch(showCreateUsernameDialog());

From f929059daf38d6b9539b26abd23a94659cd1b283 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 9 Jun 2017 13:23:16 -0600
Subject: [PATCH 070/264] added asset merging + url updates

---
 bin/cli-assets                 | 156 +++++++++++++++++++++++----------
 errors.js                      |  10 ++-
 services/assets.js             |  59 ++++++++++++-
 test/server/services/assets.js |  94 ++++++++++++++++++--
 4 files changed, 261 insertions(+), 58 deletions(-)

diff --git a/bin/cli-assets b/bin/cli-assets
index 97b5b043c..4805bead0 100755
--- a/bin/cli-assets
+++ b/bin/cli-assets
@@ -8,9 +8,12 @@ const program = require('./commander');
 const parseDuration = require('ms');
 const Table = require('cli-table');
 const AssetModel = require('../models/asset');
+const CommentModel = require('../models/comment');
+const AssetsService = require('../services/assets');
 const mongoose = require('../services/mongoose');
 const scraper = require('../services/scraper');
 const util = require('./util');
+const inquirer = require('inquirer');
 
 // Register the shutdown criteria.
 util.onshutdown([
@@ -20,65 +23,112 @@ util.onshutdown([
 /**
  * Lists all the assets registered in the database.
  */
-function listAssets() {
-  AssetModel
-    .find({})
-    .sort({'created_at': 1})
-    .then((asset) => {
-      let table = new Table({
-        head: [
-          'ID',
-          'Title',
-          'URL'
-        ]
-      });
+async function listAssets() {
+  try {
+    let assets = await AssetModel.find({}).sort({'created_at': 1});
 
-      asset.forEach((asset) => {
-        table.push([
-          asset.id,
-          asset.title ? asset.title : '',
-          asset.url ? asset.url : ''
-        ]);
-      });
-
-      console.log(table.toString());
-      util.shutdown();
-    })
-    .catch((err) => {
-      console.error(err);
-      util.shutdown(1);
+    let table = new Table({
+      head: [
+        'ID',
+        'Title',
+        'URL'
+      ]
     });
+
+    assets.forEach((asset) => {
+      table.push([
+        asset.id,
+        asset.title ? asset.title : '',
+        asset.url ? asset.url : ''
+      ]);
+    });
+
+    console.log(table.toString());
+    util.shutdown();
+  } catch (e) {
+    console.error(e);
+    util.shutdown(1);
+  }
 }
 
-function refreshAssets(ageString) {
-  const now = new Date().getTime();
-  const ageMs = parseDuration(ageString);
-  const age = new Date(now - ageMs);
+async function refreshAssets(ageString) {
+  try {
+    const now = new Date().getTime();
+    const ageMs = parseDuration(ageString);
+    const age = new Date(now - ageMs);
 
-  AssetModel.find({
-    $or: [
-      {
-        scraped: {
-          $lte: age
+    let assets = await AssetModel.find({
+      $or: [
+        {
+          scraped: {
+            $lte: age
+          }
+        },
+        {
+          scraped: null
         }
-      },
-      {
-        scraped: null
-      }
-    ]
-  })
+      ]
+    });
 
-  // Queue all the assets for scraping.
-  .then((assets) => Promise.all(assets.map(scraper.create)))
+    // Queue all the assets for scraping.
+    await Promise.all(assets.map(scraper.create));
 
-  .then(() => {
     console.log('Assets were queued to be scraped');
     util.shutdown();
-  })
-  .catch((err) => {
-    console.error(err);
+  } catch (e) {
+    console.error(e);
     util.shutdown(1);
-  });
+  }
+}
+
+async function updateURL(assetID, assetURL) {
+  try {
+    await AssetsService.updateURL(assetID, assetURL);
+
+    console.log(`Asset ${assetID} was updated to have url ${assetURL}.`);
+    util.shutdown();
+  } catch (e) {
+    console.error(e);
+    util.shutdown(1);
+  }
+}
+
+async function merge(srcID, dstID) {
+  try {
+
+    // Grab the assets...
+    let [srcAsset, dstAsset] = await AssetsService.findByIDs([srcID, dstID]);
+    if (!srcAsset || !dstAsset) {
+      throw new Error('Not all assets indicated by id exist, cannot merge');
+    }
+
+    // Count the affected resources...
+    let srcCommentCount = await CommentModel.find({asset_id: srcID}).count();
+
+    console.log(`Now going to update ${srcCommentCount} comments and delete the source Asset[${srcID}].`);
+
+    let {confirm} = await inquirer.prompt([
+      {
+        type: 'confirm',
+        name: 'confirm',
+        message: 'Proceed with merge',
+        default: false
+      }
+    ]);
+
+    if (confirm) {
+
+      // Perform the merge!
+      await AssetsService.merge(srcID, dstID);
+    } else {
+      console.warn('Aborting merge');
+    }
+
+    util.shutdown(0);
+  } catch (e) {
+    console.error(e);
+    util.shutdown(1);
+  }
 }
 
 //==============================================================================
@@ -95,6 +145,16 @@ program
   .description('queues the assets that exceed the age requested')
   .action(refreshAssets);
 
+program
+  .command('update-url <assetID> <url>')
+  .description('update the URL of an asset')
+  .action(updateURL);
+
+program
+  .command('merge <srcID> <dstID>')
+  .description('merges two assets together by moving comments from src to dst and deleting the src asset')
+  .action(merge);
+
 program.parse(process.argv);
 
 // If there is no command listed, output help.
diff --git a/errors.js b/errors.js
index c203b1d25..87c3a2a65 100644
--- a/errors.js
+++ b/errors.js
@@ -168,6 +168,13 @@ const ErrCommentTooShort = new APIError('Comment was too short', {
   status: 400
 });
 
+// ErrAssetURLAlreadyExists is returned when a rename operation is requested
+// but an asset already exists with the new url.
+const ErrAssetURLAlreadyExists = new APIError('Asset URL already exists, cannot rename', {
+  translation_key: 'ASSET_URL_ALREADY_EXISTS',
+  status: 409
+});
+
 module.exports = {
   ExtendableError,
   APIError,
@@ -191,5 +198,6 @@ module.exports = {
   ErrInstallLock,
   ErrLoginAttemptMaximumExceeded,
   ErrEditWindowHasEnded,
-  ErrCommentTooShort
+  ErrCommentTooShort,
+  ErrAssetURLAlreadyExists
 };
diff --git a/services/assets.js b/services/assets.js
index a86c4281f..b81513b72 100644
--- a/services/assets.js
+++ b/services/assets.js
@@ -1,3 +1,4 @@
+const CommentModel = require('../models/comment');
 const AssetModel = require('../models/asset');
 const SettingsService = require('./settings');
 const domainlist = require('./domainlist');
@@ -128,9 +129,61 @@ module.exports = class AssetsService {
    * @param  {Array} ids an array of Strings of asset_id
    * @return {Promise}     resolves to list of Assets
    */
-  static findMultipleById(ids) {
-    const query = ids.map((id) => ({id}));
-    return AssetModel.find(query);
+  static async findByIDs(ids) {
+
+    // Find the assets.
+    let assets = await AssetModel.find({
+      id: {
+        $in: ids
+      }
+    });
+
+    // Return them in the right order.
+    return ids.map((id) => assets.find((asset) => asset.id === id));
+  }
+
+  static async updateURL(id, url) {
+
+    // Try to see if an asset already exists with the given url.
+    let asset = await AssetsService.findByUrl(url);
+    if (asset !== null) {
+      throw errors.ErrAssetURLAlreadyExists;
+    }
+
+    // Seems that there was no other asset with the same url, try and perform
+    // the rename operation! An error may be thrown from this if the operation
+    // fails. This is ok.
+    await AssetModel.update({id}, {$set: {url}});
+  }
+
+  static async merge(srcAssetID, dstAssetID) {
+
+    // Fetch both assets.
+    let [srcAsset, dstAsset] = await AssetsService.findByIDs([srcAssetID, dstAssetID]);
+    if (!srcAsset || !dstAsset) {
+      throw errors.ErrNotFound;
+    }
+
+    // Resolve the merge operation, this invloves moving all resources attached
+    // to the src asset to the dst asset, and then removing the src asset.
+
+    // First, update all the old comments to the new asset.
+    await CommentModel.update({
+      asset_id: srcAssetID
+    }, {
+      $set: {
+        asset_id: dstAssetID
+      }
+    }, {
+      multi: true
+    });
+
+    // Second remove the old asset.
+    await AssetModel.remove({
+      id: srcAssetID
+    });
+
+    // That's it!
   }
 
   static all(skip = null, limit = null) {
diff --git a/test/server/services/assets.js b/test/server/services/assets.js
index e46e75576..748e177e0 100644
--- a/test/server/services/assets.js
+++ b/test/server/services/assets.js
@@ -1,22 +1,29 @@
 const AssetModel = require('../../../models/asset');
+const CommentModel = require('../../../models/comment');
 const AssetsService = require('../../../services/assets');
+const CommentsService = require('../../../services/comments');
 const SettingsService = require('../../../services/settings');
 
+const url = require('url');
 const chai = require('chai');
 const expect = chai.expect;
+const chaiAsPromised = require('chai-as-promised');
+
+chai.use(chaiAsPromised);
 
 // Use the chai should.
 chai.should();
 
+const settings = {id: '1', moderation: 'PRE', domains: {whitelist: ['new.test.com', 'test.com', 'override.test.com']}};
+const defaults = {url:'http://test.com'};
+
 describe('services.AssetsService', () => {
 
-  beforeEach(() => {
-    const settings = {id: '1', moderation: 'PRE', domains: {whitelist: ['new.test.com', 'test.com', 'override.test.com']}};
-    const defaults = {url:'http://test.com'};
+  let asset;
+  beforeEach(async () => {
+    await SettingsService.init(settings);
 
-    return SettingsService.init(settings).then(() => {
-      return AssetModel.update({id: '1'}, {$setOnInsert: defaults}, {upsert: true});
-    });
+    asset = await AssetModel.findOneAndUpdate({id: '1'}, {$setOnInsert: defaults}, {upsert: true, new: true});
   });
 
   describe('#findById', ()=> {
@@ -120,4 +127,79 @@ describe('services.AssetsService', () => {
         });
     });
   });
+
+  describe('#updateURL', () => {
+
+    it('should change the url if the asset was found, and there was no conflict', async () => {
+      let newURL = url.resolve(asset.url, '/new-url');
+
+      // Update the asset.
+      await AssetsService.updateURL(asset.id, newURL);
+
+      // Check that the url was updated.
+      let {url: databaseURL} = await AssetsService.findById(asset.id);
+
+      expect(databaseURL).to.equal(newURL);
+    });
+
+    it('should error if the new url already exists', async () => {
+      let newURL = url.resolve(asset.url, '/new-url');
+
+      // Create a new asset with our new URL.
+      await AssetModel.findOneAndUpdate({id: '2'}, {$setOnInsert: {url: newURL}}, {upsert: true, new: true});
+
+      return AssetsService.updateURL(asset.id, newURL).should.eventually.be.rejected;
+    });
+
+  });
+
+  describe('#merge', () => {
+
+    it('should error if either the src or the dst is missing', () => {
+      return AssetsService.merge('not-found', asset.id).should.eventually.be.rejected;
+    });
+
+    it('should merge the assets', async () => {
+      let newURL = url.resolve(asset.url, '/new-url');
+
+      // Create a new asset with our new URL.
+      await AssetModel.findOneAndUpdate({id: '2'}, {$setOnInsert: {url: newURL}}, {upsert: true, new: true});
+
+      // Create some comments on both assets.
+      await CommentsService.publicCreate([
+        {
+          asset_id: '1',
+          body: 'This is a comment!',
+          status: 'ACCEPTED'
+        },
+        {
+          asset_id: '1',
+          body: 'This is a comment!',
+          status: 'ACCEPTED'
+        },
+        {
+          asset_id: '2',
+          body: 'This is a comment!',
+          status: 'ACCEPTED'
+        },
+        {
+          asset_id: '2',
+          body: 'This is a comment!',
+          status: 'ACCEPTED'
+        }
+      ]);
+
+      // Merge all the comments from asset 1 into asset 2, followed by deleting
+      // asset 1.
+      await AssetsService.merge('1', '2');
+
+      // Check to see if the comments are moved.
+      expect(await CommentModel.find({asset_id: '1'}).count()).to.equal(0);
+      expect(await CommentModel.find({asset_id: '2'}).count()).to.equal(4);
+
+      // Check to see if the asset was removed.
+      expect(await AssetModel.findOne({id: '1'})).to.equal(null);
+    });
+
+  });
 });

From de665b3a0d85b8ecce41e9ef7e9f6fc0e4d106b4 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Fri, 9 Jun 2017 14:10:21 -0600
Subject: [PATCH 071/264] show stories in dropdown

---
 client/coral-admin/src/actions/moderation.js  |  2 +
 .../coral-admin/src/constants/moderation.js   |  1 +
 client/coral-admin/src/reducers/moderation.js |  2 +
 .../Moderation/components/Moderation.js       |  2 +
 .../src/routes/Moderation/components/Story.js | 22 ++++++
 .../Moderation/components/StorySearch.css     | 69 +++++++++++++++++++
 .../Moderation/components/StorySearch.js      | 47 +++++++++++++
 .../Moderation/containers/Moderation.js       |  2 +-
 .../Moderation/containers/StorySearch.js      | 60 ++++++++++++++++
 graph/loaders/assets.js                       | 12 ++++
 graph/resolvers/root_query.js                 |  6 +-
 graph/typeDefs.graphql                        | 12 +++-
 12 files changed, 233 insertions(+), 4 deletions(-)
 create mode 100644 client/coral-admin/src/routes/Moderation/components/Story.js
 create mode 100644 client/coral-admin/src/routes/Moderation/components/StorySearch.css
 create mode 100644 client/coral-admin/src/routes/Moderation/components/StorySearch.js
 create mode 100644 client/coral-admin/src/routes/Moderation/containers/StorySearch.js

diff --git a/client/coral-admin/src/actions/moderation.js b/client/coral-admin/src/actions/moderation.js
index 9f1c40c94..0833c856e 100644
--- a/client/coral-admin/src/actions/moderation.js
+++ b/client/coral-admin/src/actions/moderation.js
@@ -53,3 +53,5 @@ export const toggleSelectCommentInUserDetail = (id, active) => {
 };
 
 export const toggleStorySearch = (active) => ({type: active ? actions.SHOW_STORY_SEARCH : actions.HIDE_STORY_SEARCH});
+
+export const storySearchChange = (e) => ({type: actions.CHANGE_ASSET_SEARCH_STRING, value: e.target.value});
diff --git a/client/coral-admin/src/constants/moderation.js b/client/coral-admin/src/constants/moderation.js
index 29cf03143..37f048e23 100644
--- a/client/coral-admin/src/constants/moderation.js
+++ b/client/coral-admin/src/constants/moderation.js
@@ -14,3 +14,4 @@ export const UNSELECT_USER_DETAIL_COMMENT = 'UNSELECT_USER_DETAIL_COMMENT';
 export const CLEAR_USER_DETAIL_SELECTIONS = 'CLEAR_USER_DETAIL_SELECTIONS';
 export const SHOW_STORY_SEARCH = 'SHOW_STORY_SEARCH';
 export const HIDE_STORY_SEARCH = 'HIDE_STORY_SEARCH';
+export const CHANGE_ASSET_SEARCH_STRING = 'CHANGE_ASSET_SEARCH_STRING';
diff --git a/client/coral-admin/src/reducers/moderation.js b/client/coral-admin/src/reducers/moderation.js
index 4bab9eda1..349ff517a 100644
--- a/client/coral-admin/src/reducers/moderation.js
+++ b/client/coral-admin/src/reducers/moderation.js
@@ -86,6 +86,8 @@ export default function moderation (state = initialState, action) {
     return state.set('storySearchVisible', true);
   case actions.HIDE_STORY_SEARCH:
     return state.set('storySearchVisible', false);
+  case actions.CHANGE_ASSET_SEARCH_STRING:
+    return state.set('storySearchString', action.value);
   case actions.SET_SORT_ORDER:
     return state.set('sortOrder', action.order);
   default :
diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js
index f7338cf6b..7582d10d1 100644
--- a/client/coral-admin/src/routes/Moderation/components/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js
@@ -10,6 +10,7 @@ import ModerationHeader from './ModerationHeader';
 import NotFoundAsset from './NotFoundAsset';
 import ModerationKeysModal from '../../../components/ModerationKeysModal';
 import UserDetail from '../containers/UserDetail';
+import StorySearch from '../containers/StorySearch';
 
 export default class Moderation extends Component {
   state = {
@@ -209,6 +210,7 @@ export default class Moderation extends Component {
             acceptComment={props.acceptComment}
             rejectComment={props.rejectComment} />
         )}
+        <StorySearch />
       </div>
     );
   }
diff --git a/client/coral-admin/src/routes/Moderation/components/Story.js b/client/coral-admin/src/routes/Moderation/components/Story.js
new file mode 100644
index 000000000..ee9d462d3
--- /dev/null
+++ b/client/coral-admin/src/routes/Moderation/components/Story.js
@@ -0,0 +1,22 @@
+import React, {PropTypes} from 'react';
+import styles from './StorySearch.css';
+
+const Story = ({author, title, createdAt, open}) => {
+  return (
+    <li className={styles.story}>
+      <p className={styles.title}>{title}</p>
+      <p className={styles.meta}>
+        <span className={styles.author}>By {author}</span><span className={styles.createdAt}>{createdAt}</span><span className={styles.status}>{open ? 'Open' : 'Closed'}</span>
+      </p>
+    </li>
+  );
+};
+
+Story.propTypes = {
+  author: PropTypes.string.isRequired,
+  title: PropTypes.string.isRequired,
+  createdAt: PropTypes.string.isRequired,
+  open: PropTypes.bool.isRequired
+};
+
+export default Story;
diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.css b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
new file mode 100644
index 000000000..e5b6e4a93
--- /dev/null
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
@@ -0,0 +1,69 @@
+.container {
+  position: fixed;
+  background-color: white;
+  top: 100px;
+  left: 0;
+  right: 0;
+  margin-left: auto;
+  margin-right: auto;
+  width: 50%;
+  box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.15);
+}
+
+.positionShim {
+  left: -50%;
+}
+
+.headInput {
+  background-color: #efefef;
+  padding: 10px 30px;
+}
+
+.searchInput {
+  width: calc(100% - 100px);
+  padding: 8px;
+  height: 100%;
+  font-size: 16px;
+  margin-right: 10px;
+  position: relative;
+  top: 2px;
+}
+
+.cta {
+  padding: 15px;
+  font-weight: bold;
+  font-size: 14px;
+  margin: 0;
+}
+
+.storyList {
+  padding: 10px;
+  margin: 0;
+  list-style: none;
+  border-top: 1px solid #ddd;
+}
+
+.story {
+  padding: 10px;
+  border-bottom: 1px solid #ddd;
+}
+
+.title, .meta {
+  margin: 0;
+}
+
+.author, .createdAt, .status {
+  display: inline-block;
+  font-size: .8em;
+  color: #aaa;
+}
+
+.author {
+  display: inline-block;
+  width: 200px;
+}
+
+.createdAt {
+  display: inline-block;
+  width: 200px;
+}
diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.js b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
new file mode 100644
index 000000000..ce16e5b15
--- /dev/null
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
@@ -0,0 +1,47 @@
+import React, {PropTypes} from 'react';
+import styles from './StorySearch.css';
+import {Button, Spinner} from 'coral-ui';
+import Story from './Story';
+
+const StorySearch = (props) => {
+
+  const {
+    root: {assets = []},
+    data: {loading}
+  } = props;
+
+  return (
+    <div className={styles.container}>
+      <div className={styles.positionShim}>
+        <div className={styles.headInput}>
+          <input className={styles.searchInput} onChange={props.storySearchChange} />
+          <Button cStyle='facebook'>Search</Button>
+        </div>
+        <div className={styles.results}>
+          <p className={styles.cta}>Moderate comments on All Stories</p>
+          <ul className={styles.storyList}>
+            {
+              loading
+              ? <Spinner />
+              : assets.map((story, i) => {
+                const storyOpen = story.closedAt === null || new Date(story.closedAt) > new Date();
+                return <Story
+                  key={i}
+                  title={story.title}
+                  createdAt={new Date(story.created_at).toISOString()}
+                  open={storyOpen}
+                  author={story.author} />;
+              })
+            }
+          </ul>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+StorySearch.propTypes = {
+  storySearchChange: PropTypes.func.isRequired
+};
+
+export default StorySearch;
diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index 31ac05450..24a3d748d 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -209,7 +209,7 @@ const withModQueueQuery = withQuery(gql`
     }) {
       ...CoralAdmin_Moderation_CommentConnection
     }
-    assets: assets {
+    assets: assets(query: {}) {
       id
       title
       url
diff --git a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
new file mode 100644
index 000000000..cfe2a5bea
--- /dev/null
+++ b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
@@ -0,0 +1,60 @@
+import React from 'react';
+import {connect} from 'react-redux';
+import {bindActionCreators} from 'redux';
+import {compose, gql} from 'react-apollo';
+import StorySearch from '../components/StorySearch';
+import withQuery from 'coral-framework/hocs/withQuery';
+import {storySearchChange} from 'coral-admin/src/actions/moderation';
+
+class StorySearchContainer extends React.Component {
+  searchChange = (e) => {
+    this.props.storySearchChange(e.target.value);
+    this.props.data.refetch();
+  }
+
+  componentDidUpdate (prevProps) {
+    if (prevProps.moderation.storySearchString !== this.props.moderation.storySearchString) {
+      this.props.data.refetch();
+    }
+  }
+
+  render () {
+    return <StorySearch searchChange={this.searchChange} {...this.props} />;
+  }
+}
+
+export const withAssetSearchQuery = withQuery(gql`
+  query SearchStories($value: String = "") {
+    assets(query: {value: $value}) {
+      id
+      title
+      url
+      created_at
+      closedAt
+      author
+    }
+  }
+`, {
+  options: ({moderation: {storySearchString = ''}}) => {
+    return {
+      variables: {
+        value: storySearchString
+      }
+    };
+  }
+});
+
+const mapStateToProps = (state) => ({
+  moderation: state.moderation.toJS()
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  ...bindActionCreators({
+    storySearchChange
+  }, dispatch)
+});
+
+export default compose(
+  connect(mapStateToProps, mapDispatchToProps),
+  withAssetSearchQuery
+)(StorySearchContainer);
diff --git a/graph/loaders/assets.js b/graph/loaders/assets.js
index 11f77df60..b32b37b60 100644
--- a/graph/loaders/assets.js
+++ b/graph/loaders/assets.js
@@ -19,6 +19,17 @@ const genAssetsByID = (context, ids) => AssetModel.find({
   }
 }).then(util.singleJoinBy(ids, 'id'));
 
+/**
+ * [getAssetsByQuery description]
+ * @param  {Object} context  the context of the request
+ * @param  {String} value    text string to search agains the documents
+ * @param  {Number} limit    limit the number of results
+ * @return {Promise}         resolves the assets
+ */
+const getAssetsByQuery = (context, value, limit) => {
+  return AssetsService.search(value, null, limit);
+};
+
 /**
  * This endpoint find or creates an asset at the given url when it is loaded.
  * @param   {Object} context   the context of the request
@@ -65,6 +76,7 @@ module.exports = (context) => ({
     // this operation create a new asset if one isn't found.
     getByURL: (url) => findOrCreateAssetByURL(context, url),
 
+    search: (value, limit) => getAssetsByQuery(context, value, limit),
     getByID: new DataLoader((ids) => genAssetsByID(context, ids)),
     getForMetrics: () => getAssetsForMetrics(context),
     getAll: new util.SingletonResolver(() => AssetModel.find({}))
diff --git a/graph/resolvers/root_query.js b/graph/resolvers/root_query.js
index e2cd58828..637af9018 100644
--- a/graph/resolvers/root_query.js
+++ b/graph/resolvers/root_query.js
@@ -6,12 +6,14 @@ const {
 } = require('../../perms/constants');
 
 const RootQuery = {
-  assets(_, args, {loaders: {Assets}, user}) {
+  assets(_, {query}, {loaders: {Assets}, user}) {
     if (user == null || !user.can(SEARCH_ASSETS)) {
       return null;
     }
 
-    return Assets.getAll.load();
+    const {value = '', limit} = query;
+
+    return Assets.search(value, limit);
   },
   asset(_, query, {loaders: {Assets}}) {
     if (query.id) {
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 187e5bba5..2da5dca12 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -112,6 +112,16 @@ input UsersQuery {
   sort: SORT_ORDER = REVERSE_CHRONOLOGICAL
 }
 
+# AssetsQuery allows teh ability to query assets by specific fields
+input AssetsQuery {
+
+  # a search string to match against titles, authors, urls, etc.
+  value: String = ""
+
+  # Limit the number of results to be returned
+  limit: Int = 10
+}
+
 ################################################################################
 ## Comments
 ################################################################################
@@ -586,7 +596,7 @@ type RootQuery {
   comment(id: ID!): Comment
 
   # All assets. Requires the `ADMIN` role.
-  assets: [Asset]
+  assets(query: AssetsQuery!): [Asset]
 
   # Find or create an asset by url, or just find with the ID.
   asset(id: ID, url: String): Asset

From aa289ecbfec038c3ae7786102f1e56aaaf947111 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Fri, 9 Jun 2017 14:32:12 -0600
Subject: [PATCH 072/264] less terrible looking

---
 .../src/routes/Moderation/components/Moderation.js  |  2 +-
 .../Moderation/components/ModerationHeader.js       |  4 ++--
 .../src/routes/Moderation/components/Story.js       |  8 +++++---
 .../routes/Moderation/components/StorySearch.css    | 13 ++++++++++---
 .../src/routes/Moderation/components/StorySearch.js |  9 +++++++--
 .../src/routes/Moderation/components/styles.css     |  1 -
 6 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js
index 7582d10d1..511d3f089 100644
--- a/client/coral-admin/src/routes/Moderation/components/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js
@@ -210,7 +210,7 @@ export default class Moderation extends Component {
             acceptComment={props.acceptComment}
             rejectComment={props.rejectComment} />
         )}
-        <StorySearch />
+        <StorySearch visible={this.props.moderation.storySearchVisible} />
       </div>
     );
   }
diff --git a/client/coral-admin/src/routes/Moderation/components/ModerationHeader.js b/client/coral-admin/src/routes/Moderation/components/ModerationHeader.js
index 9aa9788fb..0ab2eb762 100644
--- a/client/coral-admin/src/routes/Moderation/components/ModerationHeader.js
+++ b/client/coral-admin/src/routes/Moderation/components/ModerationHeader.js
@@ -14,8 +14,8 @@ const ModerationHeader = ({asset, searchVisible, openSearch, closeSearch}) => {
     : <a className="mdl-tabs__tab" />;
 
   const title = asset
-    ? <span onClick={trigger} className="mdl-tabs__tab">{asset.title} {searchTriggerIcon}</span>
-    : <span onClick={trigger} className="mdl-tabs__tab">{t('modqueue.all_streams')} {searchTriggerIcon}</span>;
+    ? <a onClick={trigger} className="mdl-tabs__tab">{asset.title} {searchTriggerIcon}</a>
+    : <a onClick={trigger} className="mdl-tabs__tab">{t('modqueue.all_streams')} {searchTriggerIcon}</a>;
 
   return (
     <div className=''>
diff --git a/client/coral-admin/src/routes/Moderation/components/Story.js b/client/coral-admin/src/routes/Moderation/components/Story.js
index ee9d462d3..59f6d6fa1 100644
--- a/client/coral-admin/src/routes/Moderation/components/Story.js
+++ b/client/coral-admin/src/routes/Moderation/components/Story.js
@@ -1,18 +1,20 @@
 import React, {PropTypes} from 'react';
+import {Link} from 'react-router';
 import styles from './StorySearch.css';
 
-const Story = ({author, title, createdAt, open}) => {
+const Story = ({author, title, createdAt, open, id}) => {
   return (
-    <li className={styles.story}>
+    <Link className={styles.story} to={`/admin/moderate/${id}`}>
       <p className={styles.title}>{title}</p>
       <p className={styles.meta}>
         <span className={styles.author}>By {author}</span><span className={styles.createdAt}>{createdAt}</span><span className={styles.status}>{open ? 'Open' : 'Closed'}</span>
       </p>
-    </li>
+    </Link>
   );
 };
 
 Story.propTypes = {
+  id: PropTypes.string.isRequired,
   author: PropTypes.string.isRequired,
   title: PropTypes.string.isRequired,
   createdAt: PropTypes.string.isRequired,
diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.css b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
index e5b6e4a93..ccccd210b 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.css
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
@@ -38,32 +38,39 @@
 
 .storyList {
   padding: 10px;
-  margin: 0;
-  list-style: none;
   border-top: 1px solid #ddd;
 }
 
 .story {
   padding: 10px;
   border-bottom: 1px solid #ddd;
+  cursor: pointer;
+  display: block;
+  text-decoration: none;
+
+  &:hover {
+    background-color: #efefef;
+  }
 }
 
 .title, .meta {
   margin: 0;
+  color: black;
 }
 
 .author, .createdAt, .status {
   display: inline-block;
   font-size: .8em;
-  color: #aaa;
 }
 
 .author {
   display: inline-block;
   width: 200px;
+  color: #aaa;
 }
 
 .createdAt {
   display: inline-block;
   width: 200px;
+  color: #aaa;
 }
diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.js b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
index ce16e5b15..a841fd96d 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
@@ -10,6 +10,10 @@ const StorySearch = (props) => {
     data: {loading}
   } = props;
 
+  if (!props.visible) {
+    return null;
+  }
+
   return (
     <div className={styles.container}>
       <div className={styles.positionShim}>
@@ -19,7 +23,7 @@ const StorySearch = (props) => {
         </div>
         <div className={styles.results}>
           <p className={styles.cta}>Moderate comments on All Stories</p>
-          <ul className={styles.storyList}>
+          <div className={styles.storyList}>
             {
               loading
               ? <Spinner />
@@ -27,13 +31,14 @@ const StorySearch = (props) => {
                 const storyOpen = story.closedAt === null || new Date(story.closedAt) > new Date();
                 return <Story
                   key={i}
+                  id={story.id}
                   title={story.title}
                   createdAt={new Date(story.created_at).toISOString()}
                   open={storyOpen}
                   author={story.author} />;
               })
             }
-          </ul>
+          </div>
         </div>
       </div>
     </div>
diff --git a/client/coral-admin/src/routes/Moderation/components/styles.css b/client/coral-admin/src/routes/Moderation/components/styles.css
index a6bf7e89e..b0c2cc5ac 100644
--- a/client/coral-admin/src/routes/Moderation/components/styles.css
+++ b/client/coral-admin/src/routes/Moderation/components/styles.css
@@ -471,5 +471,4 @@ span {
 .searchTrigger {
   position: relative;
   top: .3em;
-  background-color: blue;
 }

From cc4c943a21c7c6950b194c891b7b9ad347dfdbe5 Mon Sep 17 00:00:00 2001
From: IAmSamHankins <samantha.hankins@icloud.com>
Date: Fri, 9 Jun 2017 17:27:35 -0400
Subject: [PATCH 073/264] hover states, link styling, alignment fixes

---
 .../coral-admin/src/components/ui/Header.css  |  2 +-
 .../routes/Dashboard/components/Widget.css    | 22 +++++-----
 .../Moderation/components/CommentCount.css    |  1 +
 .../Moderation/components/UserDetail.css      |  4 +-
 .../routes/Moderation/components/styles.css   | 44 ++++++++++++-------
 locales/en.yml                                |  4 +-
 6 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/client/coral-admin/src/components/ui/Header.css b/client/coral-admin/src/components/ui/Header.css
index 7cb68ecbf..d99a7f295 100644
--- a/client/coral-admin/src/components/ui/Header.css
+++ b/client/coral-admin/src/components/ui/Header.css
@@ -77,7 +77,7 @@
   letter-spacing: .8;
 
   &:hover {
-    background-color: #232323;
+    background-color: #404040;
   }
 
   &.active {
diff --git a/client/coral-admin/src/routes/Dashboard/components/Widget.css b/client/coral-admin/src/routes/Dashboard/components/Widget.css
index 587c51ada..cf83fcbdc 100644
--- a/client/coral-admin/src/routes/Dashboard/components/Widget.css
+++ b/client/coral-admin/src/routes/Dashboard/components/Widget.css
@@ -17,8 +17,9 @@
 .heading {
   margin: 0;
   padding-left: 10px;
-  font-size: 1.5rem;
-  font-weight: bold;
+  font-size: 1.3rem;
+  font-weight: 600;
+  color: #2c2c2c;
 }
 
 .widgetTable {
@@ -32,7 +33,8 @@
 }
 
 .widgetHead p {
-  color: rgb(35, 102, 223);
+  color: #2c2c2c;
+  font-weight: 500;
   padding: 10px;
   text-align: left;
   text-transform: capitalize;
@@ -47,11 +49,11 @@
 }
 
 .rowLinkify {
-  cursor: pointer;
   border-bottom: 1px solid lightgrey;
   color: #555;
   height: var(--row-height);
   padding: 10px;
+  transition: background-color 200ms;
 }
 
 .rowLinkify:last-child {
@@ -60,6 +62,7 @@
 
 .rowLinkify:hover {
   background-color: #f8f8f8;
+  pointer: default;
 }
 
 .linkToAsset {
@@ -68,16 +71,17 @@
 }
 
 .linkToModerate {
-  background-color: #e0e0e0;
+  background-color: #BDBDBD;
   padding: 10px 14px;
   text-decoration: none;
   color: black;
   float: right;
   margin-left: 15px;
+  transition: background-color 200ms;
 }
 
 .linkToModerate:hover {
-  background-color: #ccc;
+  background-color: #9E9E9E;
 }
 
 .lede {
@@ -89,14 +93,10 @@
   color: #555;
   text-decoration: none;
   font-size: 1.2em;
-  font-weight: normal;
+  font-weight: 500;
   margin: 0;
 }
 
-.assetTitle:hover {
-  text-decoration: underline;
-}
-
 .widgetCount {
   color: #555;
   font-size: 1.3em;
diff --git a/client/coral-admin/src/routes/Moderation/components/CommentCount.css b/client/coral-admin/src/routes/Moderation/components/CommentCount.css
index b684d0f4a..4d24d5702 100644
--- a/client/coral-admin/src/routes/Moderation/components/CommentCount.css
+++ b/client/coral-admin/src/routes/Moderation/components/CommentCount.css
@@ -12,4 +12,5 @@
   right: 0;
   margin-top: -2px;
   font-size: 12px;
+  color: white;
 }
diff --git a/client/coral-admin/src/routes/Moderation/components/UserDetail.css b/client/coral-admin/src/routes/Moderation/components/UserDetail.css
index d4b5f0db7..710f84759 100644
--- a/client/coral-admin/src/routes/Moderation/components/UserDetail.css
+++ b/client/coral-admin/src/routes/Moderation/components/UserDetail.css
@@ -15,7 +15,7 @@
   display: flex;
 
   .stat {
-    margin: 0 4px 12px;
+    margin: 0 4px 10px 0px;
   }
 
   .stat:last-child {
@@ -49,7 +49,7 @@
 
   li {
     display: inline-block;
-    margin: 0 10px;
+    margin-right: 10px;
     cursor: pointer;
     padding: 0 10px;
   }
diff --git a/client/coral-admin/src/routes/Moderation/components/styles.css b/client/coral-admin/src/routes/Moderation/components/styles.css
index d10311f74..fc825eccb 100644
--- a/client/coral-admin/src/routes/Moderation/components/styles.css
+++ b/client/coral-admin/src/routes/Moderation/components/styles.css
@@ -18,14 +18,20 @@
 
 .tab {
   flex: 1;
-  color: #EEEEEE;
+  color: #C0C0C0;
   text-transform: capitalize;
   font-weight: 100;
-  font-size: 15px;
+  font-size: 14px;
   letter-spacing: 1px;
   transition: border-bottom 200ms;
-  padding: 0px 5px;
-  margin-right: 30px;
+  transition: color 200ms;
+  padding: 0px 10px;
+  margin-right: 20px;
+  &:hover {
+    color: white;
+    border-bottom: solid 2px #F36451;
+    box-sizing: border-box;
+  }
 }
 
 .active {
@@ -33,6 +39,10 @@
   box-sizing: border-box;
   border-bottom: solid 4px #F36451;
   font-weight: 400;
+  &:hover {
+    border-bottom: solid 4px #F36451;
+    font-weight: 400;
+  }
 }
 
 .active > span {
@@ -103,19 +113,18 @@ span {
       font-weight: 400;
       font-size: 15px;
       letter-spacing: 1px;
-      transition: opacity 200ms;
+      transition: background-color 200ms;
       opacity: 1;
 
-      &:hover {
-          opacity: .8;
-         cursor: pointer;
-      }
-
       &:first-child {
         text-align: left;
       }
 
       &:nth-child(2) {
+        &:hover {
+           cursor: pointer;
+           background-color: #212121;
+        }
         span {
           text-align: center;
           text-overflow: ellipsis;
@@ -245,7 +254,6 @@ span {
     padding: 5px;
     color: #262626;
     font-size: 14px;
-    margin-left: 15px;
     line-height: 1px;
     font-weight: 300;
   }
@@ -421,17 +429,21 @@ span {
 
 .tabIcon {
   position: relative;
-  top: 2px;
+  top: 3px;
   font-size: 16px;
 }
 
 .username {
-  color: blue;
-  text-decoration: underline;
+  color: #393B44;
+  text-decoration: none;
   cursor: pointer;
-
+  font-weight: 600;
+  padding: 2px 5px;
+  border-radius: 2px;
+  margin-left: -5px;
+  transition: background-color 200ms ease;
   &:hover {
-    background-color: rgba(255, 0, 0, .1);
+    background-color: #E0E0E0;
   }
 }
 
diff --git a/locales/en.yml b/locales/en.yml
index ce9abdce5..930a4eadb 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -144,8 +144,8 @@ en:
     auto_update: "Data automatically updates every five minutes or when you Reload."
     comment_count: comments
     flags: Flags
-    most_flags: "Articles with the most flags"
-    most_conversations: "Articles with the most conversations"
+    most_flags: "Stories with the most flags"
+    most_conversations: "Stories with the most conversations"
     next_update: "{0} minutes until next update."
     no_activity: "There haven't been any comments anywhere in the last five minutes."
     no_flags: "There have been no flags in the last 5 minutes! Hooray!"

From 74ad3c3a35bc11ca806ba9db3285a0edc3230937 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 9 Jun 2017 18:35:53 +0700
Subject: [PATCH 074/264] Refactor all reactions and encapsulate server code

---
 plugin-api/beta/server/getReactionConfig.js   | 113 +++++++++++
 plugin-api/beta/server/index.js               |   3 +
 .../coral-plugin-like/client/LikeButton.js    |  55 ++++++
 .../client/components/LikeButton.js           |  86 --------
 .../client/containers/LikeButton.js           | 186 ------------------
 plugins/coral-plugin-like/client/index.js     |   4 +-
 .../{components/style.css => styles.css}      |   9 +-
 .../client/translations.json                  |  10 -
 .../coral-plugin-like/client/translations.yml |   9 +
 plugins/coral-plugin-like/index.js            |  38 +---
 .../coral-plugin-like/server/typeDefs.graphql |  70 -------
 .../coral-plugin-love/client/LoveButton.js    |  23 ++-
 plugins/coral-plugin-love/client/index.js     |   2 +-
 plugins/coral-plugin-love/client/styles.css   |  37 ++--
 .../client/translations.json                  |  10 -
 .../coral-plugin-love/client/translations.yml |   9 +
 plugins/coral-plugin-love/index.js            |  38 +---
 .../coral-plugin-love/server/typeDefs.graphql |  70 -------
 .../client}/Icon.js                           |   0
 .../client/RespectButton.js                   |  57 ++++++
 .../client/components/Icon.js                 |   6 -
 .../client/components/RespectButton.js        |  69 -------
 .../client/containers/RespectButton.js        | 163 ---------------
 plugins/coral-plugin-respect/client/index.js  |   6 +-
 .../{components/style.css => styles.css}      |   4 +-
 .../client/translations.json                  |  10 -
 .../client/translations.yml                   |   9 +
 plugins/coral-plugin-respect/index.js         |  43 +---
 .../server/typeDefs.graphql                   |  54 -----
 29 files changed, 303 insertions(+), 890 deletions(-)
 create mode 100644 plugin-api/beta/server/getReactionConfig.js
 create mode 100644 plugin-api/beta/server/index.js
 create mode 100644 plugins/coral-plugin-like/client/LikeButton.js
 delete mode 100644 plugins/coral-plugin-like/client/components/LikeButton.js
 delete mode 100644 plugins/coral-plugin-like/client/containers/LikeButton.js
 rename plugins/coral-plugin-like/client/{components/style.css => styles.css} (89%)
 delete mode 100644 plugins/coral-plugin-like/client/translations.json
 create mode 100644 plugins/coral-plugin-like/client/translations.yml
 delete mode 100644 plugins/coral-plugin-like/server/typeDefs.graphql
 delete mode 100644 plugins/coral-plugin-love/client/translations.json
 create mode 100644 plugins/coral-plugin-love/client/translations.yml
 delete mode 100644 plugins/coral-plugin-love/server/typeDefs.graphql
 rename plugins/{coral-plugin-like/client/components => coral-plugin-respect/client}/Icon.js (100%)
 create mode 100644 plugins/coral-plugin-respect/client/RespectButton.js
 delete mode 100644 plugins/coral-plugin-respect/client/components/Icon.js
 delete mode 100644 plugins/coral-plugin-respect/client/components/RespectButton.js
 delete mode 100644 plugins/coral-plugin-respect/client/containers/RespectButton.js
 rename plugins/coral-plugin-respect/client/{components/style.css => styles.css} (95%)
 delete mode 100644 plugins/coral-plugin-respect/client/translations.json
 create mode 100644 plugins/coral-plugin-respect/client/translations.yml
 delete mode 100644 plugins/coral-plugin-respect/server/typeDefs.graphql

diff --git a/plugin-api/beta/server/getReactionConfig.js b/plugin-api/beta/server/getReactionConfig.js
new file mode 100644
index 000000000..101c86782
--- /dev/null
+++ b/plugin-api/beta/server/getReactionConfig.js
@@ -0,0 +1,113 @@
+const wrapResponse = require('../../../graph/helpers/response');
+
+function getReactionConfig(reaction) {
+  const Reaction = reaction.charAt(0).toUpperCase() + reaction.slice(1);
+  const REACTION = reaction.toUpperCase();
+  const typeDefs = `
+    enum ACTION_TYPE {
+
+        # Represents a ${Reaction}.
+        ${REACTION}
+    }
+
+    enum ASSET_METRICS_SORT {
+
+        # Represents a ${Reaction}Action.
+        ${REACTION}
+    }
+
+    input Create${Reaction}Input {
+
+        # The item's id for which we are to create a ${reaction}.
+        item_id: ID!
+
+        # The type of the item for which we are to create the ${reaction}.
+        item_type: ACTION_ITEM_TYPE!
+    }
+
+    # ${Reaction}Action is used by users who "${reaction}" a specific entity.
+    type ${Reaction}Action implements Action {
+
+        # The ID of the action.
+        id: ID!
+
+        # The author of the action.
+        user: User
+
+        # The time when the Action was updated.
+        updated_at: Date
+
+        # The time when the Action was created.
+        created_at: Date
+    }
+
+    type ${Reaction}ActionSummary implements ActionSummary {
+
+        # The count of actions with this group.
+        count: Int
+
+        # The current user's action.
+        current_user: ${Reaction}Action
+    }
+
+    # A summary of counts related to all the ${Reaction}s on an Asset.
+    type ${Reaction}AssetActionSummary implements AssetActionSummary {
+
+        # Number of ${reaction}s associated with actionable types on this this Asset.
+        actionCount: Int
+
+        # Number of unique actionable types that are referenced by the ${reaction}s.
+        actionableItemCount: Int
+    }
+
+    type Create${Reaction}Response implements Response {
+
+        # The ${reaction} that was created.
+        ${reaction}: ${Reaction}Action
+
+        # An array of errors relating to the mutation that occurred.
+        errors: [UserError!]
+    }
+
+    type RootMutation {
+
+        # Creates a ${reaction} on an entity.
+        create${Reaction}(${reaction}: Create${Reaction}Input!): Create${Reaction}Response
+    }
+  `;
+
+  return {
+    typeDefs,
+    resolvers: {
+      RootMutation: {
+        [`create${Reaction}`]: (_, {[reaction]: {item_id, item_type}}, {mutators: {Action}}) => {
+          return wrapResponse(reaction)(Action.create({item_id, item_type, action_type: REACTION}));
+        }
+      },
+    },
+    hooks: {
+      Action: {
+        __resolveType: {
+          post({action_type}) {
+            switch (action_type) {
+            case REACTION:
+              return `${Reaction}Action`;
+            }
+          }
+        }
+      },
+      ActionSummary: {
+        __resolveType: {
+          post({action_type}) {
+            switch (action_type) {
+            case REACTION:
+              return `${Reaction}ActionSummary`;
+            }
+          }
+        }
+      }
+    }
+  };
+}
+
+module.exports = getReactionConfig;
diff --git a/plugin-api/beta/server/index.js b/plugin-api/beta/server/index.js
new file mode 100644
index 000000000..b32d78a45
--- /dev/null
+++ b/plugin-api/beta/server/index.js
@@ -0,0 +1,3 @@
+module.exports = {
+  getReactionConfig: require('./getReactionConfig'),
+};
diff --git a/plugins/coral-plugin-like/client/LikeButton.js b/plugins/coral-plugin-like/client/LikeButton.js
new file mode 100644
index 000000000..fac4fdfca
--- /dev/null
+++ b/plugins/coral-plugin-like/client/LikeButton.js
@@ -0,0 +1,55 @@
+import React from 'react';
+import styles from './styles.css';
+import {withReaction} from 'plugin-api/beta/client/hocs';
+import {t, can} from 'plugin-api/beta/client/services';
+import {Icon} from 'plugin-api/beta/client/components';
+import cn from 'classnames';
+
+const plugin = 'coral-plugin-like';
+
+class LikeButton extends React.Component {
+  handleClick = () => {
+    const {
+      postReaction,
+      deleteReaction,
+      showSignInDialog,
+      alreadyReacted,
+      user,
+    } = this.props;
+
+    // If the current user does not exist, trigger sign in dialog.
+    if (!user) {
+      showSignInDialog();
+      return;
+    }
+
+    // If the current user is suspended, do nothing.
+    if (!can(user, 'INTERACT_WITH_COMMUNITY')) {
+      return;
+    }
+
+    if (alreadyReacted()) {
+      deleteReaction();
+    } else {
+      postReaction();
+    }
+  };
+
+  render() {
+    const {count, alreadyReacted} = this.props;
+    return (
+      <div className={cn(styles.container, `${plugin}-container`)}>
+        <button
+          className={cn(styles.button, {[styles.liked]: alreadyReacted()}, `${plugin}-button`)}
+          onClick={this.handleClick}
+        >
+          <span>{t(alreadyReacted() ? 'coral-plugin-like.liked' : 'coral-plugin-like.like')}</span>
+          <Icon name="thumb_up" className={`${plugin}-icon`} />
+          <span className={`${plugin}-count`}>{count > 0 && count}</span>
+        </button>
+      </div>
+    );
+  }
+}
+
+export default withReaction('like')(LikeButton);
diff --git a/plugins/coral-plugin-like/client/components/LikeButton.js b/plugins/coral-plugin-like/client/components/LikeButton.js
deleted file mode 100644
index 7b66a11d4..000000000
--- a/plugins/coral-plugin-like/client/components/LikeButton.js
+++ /dev/null
@@ -1,86 +0,0 @@
-import React, {Component} from 'react';
-import styles from './style.css';
-
-import cn from 'classnames';
-import {getMyActionSummary, getTotalActionCount} from 'coral-framework/utils';
-import t from 'coral-framework/services/i18n';
-
-const name = 'coral-plugin-like';
-
-class LikeButton extends Component {
-  handleClick = () => {
-    const {postLike, showSignInDialog, deleteAction} = this.props;
-    const {root: {me}, comment} = this.props;
-
-    const myLikeActionSummary = getMyActionSummary(
-      'LikeActionSummary',
-      comment
-    );
-
-    // If the current user does not exist, trigger sign in dialog.
-    if (!me) {
-      showSignInDialog();
-      return;
-    }
-
-    // If the current user is banned, do nothing.
-    if (me.status === 'BANNED') {
-      return;
-    }
-
-    if (myLikeActionSummary) {
-      deleteAction(myLikeActionSummary.current_user.id, comment.id);
-    } else {
-      postLike({
-        item_id: comment.id,
-        item_type: 'COMMENTS'
-      });
-    }
-  };
-
-  render() {
-    const {comment} = this.props;
-
-    if (!comment) {
-      return null;
-    }
-
-    const myLike = getMyActionSummary('LikeActionSummary', comment);
-    let count = getTotalActionCount('LikeActionSummary', comment);
-
-    return (
-      <div className={cn(styles.like, `${name}-container`)}>
-        <button
-          className={cn(
-            styles.button,
-            {[styles.liked]: myLike},
-            `${name}-button`
-          )}
-          onClick={this.handleClick}
-        >
-          <span className={`${name}-button-text`}>
-            {t(myLike ? 'liked' : 'like')}
-          </span>
-          <i
-            className={cn(
-              styles.icon,
-              'material-icons',
-              {[styles.liked]: myLike},
-              `${name}-icon`
-            )}
-            aria-hidden={true}
-          >
-            thumb_up
-          </i>
-          <span className={`${name}-count`}>{count > 0 && count}</span>
-        </button>
-      </div>
-    );
-  }
-}
-
-LikeButton.propTypes = {
-  data: React.PropTypes.object.isRequired
-};
-
-export default LikeButton;
diff --git a/plugins/coral-plugin-like/client/containers/LikeButton.js b/plugins/coral-plugin-like/client/containers/LikeButton.js
deleted file mode 100644
index 51bee1b40..000000000
--- a/plugins/coral-plugin-like/client/containers/LikeButton.js
+++ /dev/null
@@ -1,186 +0,0 @@
-import get from 'lodash/get';
-import {connect} from 'react-redux';
-import {bindActionCreators} from 'redux';
-import {compose, gql, graphql} from 'react-apollo';
-import LikeButton from '../components/LikeButton';
-import withFragments from 'coral-framework/hocs/withFragments';
-import{showSignInDialog} from 'coral-framework/actions/auth';
-
-const isLikeAction = (a) => a.__typename === 'LikeActionSummary';
-
-const COMMENT_FRAGMENT = gql`
-  fragment LikeButton_updateFragment on Comment {
-    action_summaries {
-      ... on LikeActionSummary {
-        count
-        current_user {
-          id
-        }
-      }
-    }
-  }
-`;
-
-const withDeleteAction = graphql(
-  gql`
-  mutation deleteAction($id: ID!) {
-      deleteAction(id:$id) {
-        errors {
-          translation_key
-        }
-      }
-  }
-`,
-  {
-    props: ({mutate}) => ({
-      deleteAction: (id, commentId) => {
-        return mutate({
-          variables: {id},
-          optimisticResponse: {
-            deleteAction: {
-              __typename: 'DeleteActionResponse',
-              errors: null
-            }
-          },
-          update: (proxy) => {
-            const fragmentId = `Comment_${commentId}`;
-
-            // Read the data from our cache for this query.
-            const data = proxy.readFragment({
-              fragment: COMMENT_FRAGMENT,
-              id: fragmentId
-            });
-
-            // Check whether we liked this comment.
-            const idx = data.action_summaries.findIndex(isLikeAction);
-            if (
-              idx < 0 ||
-              get(data.action_summaries[idx], 'current_user.id') !== id
-            ) {
-              return;
-            }
-
-            data.action_summaries[idx] = {
-              ...data.action_summaries[idx],
-              count: data.action_summaries[idx].count - 1,
-              current_user: null
-            };
-
-            // Write our data back to the cache.
-            proxy.writeFragment({
-              fragment: COMMENT_FRAGMENT,
-              id: fragmentId,
-              data
-            });
-          }
-        });
-      }
-    })
-  }
-);
-
-const withPostLike = graphql(
-  gql`
-  mutation createLike($like: CreateLikeInput!) {
-    createLike(like: $like) {
-      like {
-        id
-      }
-      errors {
-        translation_key
-      }
-    }
-  }
-`,
-  {
-    props: ({mutate}) => ({
-      postLike: (like) => {
-        return mutate({
-          variables: {like},
-          optimisticResponse: {
-            createLike: {
-              __typename: 'CreateLikeResponse',
-              errors: null,
-              like: {
-                __typename: 'LikeAction',
-                id: 'pending'
-              }
-            }
-          },
-          update: (proxy, mutationResult) => {
-            const fragmentId = `Comment_${like.item_id}`;
-
-            // Read the data from our cache for this query.
-            const data = proxy.readFragment({
-              fragment: COMMENT_FRAGMENT,
-              id: fragmentId
-            });
-
-            // Add our comment from the mutation to the end.
-            let idx = data.action_summaries.findIndex(isLikeAction);
-
-            // Check whether we already liked this comment.
-            if (idx >= 0 && data.action_summaries[idx].current_user) {
-              return;
-            }
-
-            if (idx < 0) {
-
-              // Add initial action when it doesn't exist.
-              data.action_summaries.push({
-                __typename: 'LikeActionSummary',
-                count: 0,
-                current_user: null
-              });
-              idx = data.action_summaries.length - 1;
-            }
-
-            data.action_summaries[idx] = {
-              ...data.action_summaries[idx],
-              count: data.action_summaries[idx].count + 1,
-              current_user: mutationResult.data.createLike.like
-            };
-
-            // Write our data back to the cache.
-            proxy.writeFragment({
-              fragment: COMMENT_FRAGMENT,
-              id: fragmentId,
-              data
-            });
-          }
-        });
-      }
-    })
-  }
-);
-
-const mapDispatchToProps = (dispatch) =>
-  bindActionCreators({showSignInDialog}, dispatch);
-
-const enhance = compose(
-  withFragments({
-    root: gql`
-      fragment LikeButton_root on RootQuery {
-        me {
-          status
-        }
-      }
-    `,
-    comment: gql`
-      fragment LikeButton_comment on Comment {
-        action_summaries {
-          ... on LikeActionSummary {
-            count
-            current_user {
-              id
-            }
-          }
-        }
-      }`
-  }),
-  connect(null, mapDispatchToProps),
-  withDeleteAction,
-  withPostLike
-);
-
-export default enhance(LikeButton);
diff --git a/plugins/coral-plugin-like/client/index.js b/plugins/coral-plugin-like/client/index.js
index 86d20863a..68b7a2c46 100644
--- a/plugins/coral-plugin-like/client/index.js
+++ b/plugins/coral-plugin-like/client/index.js
@@ -1,5 +1,5 @@
-import LikeButton from './containers/LikeButton';
-import translations from './translations.json';
+import LikeButton from './LikeButton';
+import translations from './translations.yml';
 
 export default {
   translations,
diff --git a/plugins/coral-plugin-like/client/components/style.css b/plugins/coral-plugin-like/client/styles.css
similarity index 89%
rename from plugins/coral-plugin-like/client/components/style.css
rename to plugins/coral-plugin-like/client/styles.css
index f45df86ef..cb372fa47 100644
--- a/plugins/coral-plugin-like/client/components/style.css
+++ b/plugins/coral-plugin-like/client/styles.css
@@ -1,6 +1,6 @@
-.like {
+.container {
   display: inline-block;
- }
+}
 
 .button {
   color: #2a2a2a;
@@ -17,14 +17,9 @@
 
   &.liked {
     color: rgb(0,134,227);
-
     &:hover {
       color: rgb(0,134,227);
       cursor: pointer;
     }
   }
 }
-
-.icon {
-  padding: 0 5px;
-}
diff --git a/plugins/coral-plugin-like/client/translations.json b/plugins/coral-plugin-like/client/translations.json
deleted file mode 100644
index 93d73d3a2..000000000
--- a/plugins/coral-plugin-like/client/translations.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "en": {
-    "like": "Like",
-    "liked": "Liked"
-  },
-  "es": {
-    "like": "Me Gusta",
-    "liked": "Me Gustó"
-  }
-}
diff --git a/plugins/coral-plugin-like/client/translations.yml b/plugins/coral-plugin-like/client/translations.yml
new file mode 100644
index 000000000..c534663af
--- /dev/null
+++ b/plugins/coral-plugin-like/client/translations.yml
@@ -0,0 +1,9 @@
+en:
+  coral-plugin-like:
+    like: Like
+    liked: Liked
+es:
+  coral-plugin-like:
+    like: Me Gusta
+    liked: Me Gustó
+
diff --git a/plugins/coral-plugin-like/index.js b/plugins/coral-plugin-like/index.js
index 4fc0285f4..690577bed 100644
--- a/plugins/coral-plugin-like/index.js
+++ b/plugins/coral-plugin-like/index.js
@@ -1,36 +1,2 @@
-const {readFileSync} = require('fs');
-const path = require('path');
-const wrapResponse = require('../../graph/helpers/response');
-
-module.exports = {
-  typeDefs: readFileSync(path.join(__dirname, 'server/typeDefs.graphql'), 'utf8'),
-  resolvers: {
-    RootMutation: {
-      createLike(_, {like: {item_id, item_type}}, {mutators: {Action}}) {
-        return wrapResponse('like')(Action.create({item_id, item_type, action_type: 'LIKE'}));
-      }
-    }
-  },
-  hooks: {
-    Action: {
-      __resolveType: {
-        post({action_type}) {
-          switch (action_type) {
-          case 'LIKE':
-            return 'LikeAction';
-          }
-        }
-      }
-    },
-    ActionSummary: {
-      __resolveType: {
-        post({action_type}) {
-          switch (action_type) {
-          case 'LIKE':
-            return 'LikeActionSummary';
-          }
-        }
-      }
-    }
-  }
-};
+const {getReactionConfig} = require('../../plugin-api/beta/server');
+module.exports = getReactionConfig('like');
diff --git a/plugins/coral-plugin-like/server/typeDefs.graphql b/plugins/coral-plugin-like/server/typeDefs.graphql
deleted file mode 100644
index 40c600f2f..000000000
--- a/plugins/coral-plugin-like/server/typeDefs.graphql
+++ /dev/null
@@ -1,70 +0,0 @@
-enum ACTION_TYPE {
-
-  # Represents a Like.
-  LIKE
-}
-
-enum ASSET_METRICS_SORT {
-
-  # Represents a LikeAction.
-  LIKE
-}
-
-input CreateLikeInput {
-
-  # The item's id for which we are to create a like.
-  item_id: ID!
-
-  # The type of the item for which we are to create the like.
-  item_type: ACTION_ITEM_TYPE!
-}
-
-# LikeAction is used by users who "like" a specific entity.
-type LikeAction implements Action {
-
-  # The ID of the action.
-  id: ID!
-
-  # The author of the action.
-  user: User
-
-  # The time when the Action was updated.
-  updated_at: Date
-
-  # The time when the Action was created.
-  created_at: Date
-}
-
-type LikeActionSummary implements ActionSummary {
-
-  # The count of actions with this group.
-  count: Int
-
-  # The current user's action.
-  current_user: LikeAction
-}
-
-# A summary of counts related to all the Likes on an Asset.
-type LikeAssetActionSummary implements AssetActionSummary {
-
-  # Number of likes associated with actionable types on this this Asset.
-  actionCount: Int
-
-  # Number of unique actionable types that are referenced by the likes.
-  actionableItemCount: Int
-}
-
-type CreateLikeResponse implements Response {
-
-  # The like that was created.
-  like: LikeAction
-
-  # An array of errors relating to the mutation that occurred.
-  errors: [UserError!]
-}
-
-type RootMutation {
-
-  # Creates a like on an entity.
-  createLike(like: CreateLikeInput!): CreateLikeResponse
-}
diff --git a/plugins/coral-plugin-love/client/LoveButton.js b/plugins/coral-plugin-love/client/LoveButton.js
index de4c4c9e7..8dbf51a6e 100644
--- a/plugins/coral-plugin-love/client/LoveButton.js
+++ b/plugins/coral-plugin-love/client/LoveButton.js
@@ -1,8 +1,11 @@
 import React from 'react';
-import {Icon} from 'coral-ui';
 import styles from './styles.css';
 import {withReaction} from 'plugin-api/beta/client/hocs';
 import {t, can} from 'plugin-api/beta/client/services';
+import {Icon} from 'plugin-api/beta/client/components';
+import cn from 'classnames';
+
+const plugin = 'coral-plugin-love';
 
 class LoveButton extends React.Component {
   handleClick = () => {
@@ -35,14 +38,16 @@ class LoveButton extends React.Component {
   render() {
     const {count, alreadyReacted} = this.props;
     return (
-      <button
-        className={`${styles.button} ${alreadyReacted() ? styles.loved : ''}`}
-        onClick={this.handleClick}
-      >
-        <span>{t(alreadyReacted() ? 'loved' : 'love')}</span>
-        <Icon name="favorite" />
-        <span>{count > 0 && count}</span>
-      </button>
+      <div className={cn(styles.container, `${plugin}-container`)}>
+        <button
+          className={cn(styles.button, {[styles.loved]: alreadyReacted()}, `${plugin}-button`)}
+          onClick={this.handleClick}
+        >
+          <span>{t(alreadyReacted() ? 'coral-plugin-love.loved' : 'coral-plugin-love.love')}</span>
+          <Icon name="favorite" className={`${plugin}-icon`} />
+          <span className={`${plugin}-count`}>{count > 0 && count}</span>
+        </button>
+      </div>
     );
   }
 }
diff --git a/plugins/coral-plugin-love/client/index.js b/plugins/coral-plugin-love/client/index.js
index fa2f71159..fd7174d81 100644
--- a/plugins/coral-plugin-love/client/index.js
+++ b/plugins/coral-plugin-love/client/index.js
@@ -1,5 +1,5 @@
 import LoveButton from './LoveButton';
-import translations from './translations.json';
+import translations from './translations.yml';
 
 export default {
   translations,
diff --git a/plugins/coral-plugin-love/client/styles.css b/plugins/coral-plugin-love/client/styles.css
index d48e7e28c..e16e17ca4 100644
--- a/plugins/coral-plugin-love/client/styles.css
+++ b/plugins/coral-plugin-love/client/styles.css
@@ -1,26 +1,25 @@
-.respect {
-    display: inline-block;
+.container {
+  display: inline-block;
 }
 
 .button {
-    color: #2a2a2a;
-    margin: 5px 10px 5px 0px;
-    background: none;
-    padding: 0px;
-    border: none;
-    font-size: inherit;
+  color: #2a2a2a;
+  margin: 5px 10px 5px 0px;
+  background: none;
+  padding: 0px;
+  border: none;
+  font-size: inherit;
 
+  &:hover {
+   color: #767676;
+   cursor: pointer;
+  }
+
+  &.loved {
+    color: #e52338;
     &:hover {
-         color: #767676;
-         cursor: pointer;
-     }
-
-    &.loved {
-         color: #e52338;
-
-        &:hover {
-             color: #e52839;
-             cursor: pointer;
-         }
+      color: #e52839;
+      cursor: pointer;
     }
+  }
 }
diff --git a/plugins/coral-plugin-love/client/translations.json b/plugins/coral-plugin-love/client/translations.json
deleted file mode 100644
index a015efa77..000000000
--- a/plugins/coral-plugin-love/client/translations.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "en": {
-    "love": "Love",
-    "loved": "Loved"
-  },
-  "es": {
-    "love": "Amo",
-    "loved": "Amé"
-  }
-}
diff --git a/plugins/coral-plugin-love/client/translations.yml b/plugins/coral-plugin-love/client/translations.yml
new file mode 100644
index 000000000..06b6e5257
--- /dev/null
+++ b/plugins/coral-plugin-love/client/translations.yml
@@ -0,0 +1,9 @@
+en:
+  coral-plugin-love:
+    love: Love
+    loved: Loved
+es:
+  coral-plugin-love:
+    love: Amo
+    loved: Amé
+
diff --git a/plugins/coral-plugin-love/index.js b/plugins/coral-plugin-love/index.js
index 543c2a099..b57fdec39 100644
--- a/plugins/coral-plugin-love/index.js
+++ b/plugins/coral-plugin-love/index.js
@@ -1,36 +1,2 @@
-const {readFileSync} = require('fs');
-const path = require('path');
-const wrapResponse = require('../../graph/helpers/response');
-
-module.exports = {
-  typeDefs: readFileSync(path.join(__dirname, 'server/typeDefs.graphql'), 'utf8'),
-  resolvers: {
-    RootMutation: {
-      createLove(_, {love: {item_id, item_type}}, {mutators: {Action}}) {
-        return wrapResponse('love')(Action.create({item_id, item_type, action_type: 'LOVE'}));
-      }
-    }
-  },
-  hooks: {
-    Action: {
-      __resolveType: {
-        post({action_type}) {
-          switch (action_type) {
-          case 'LOVE':
-            return 'LoveAction';
-          }
-        }
-      }
-    },
-    ActionSummary: {
-      __resolveType: {
-        post({action_type}) {
-          switch (action_type) {
-          case 'LOVE':
-            return 'LoveActionSummary';
-          }
-        }
-      }
-    }
-  }
-};
+const {getReactionConfig} = require('../../plugin-api/beta/server');
+module.exports = getReactionConfig('love');
diff --git a/plugins/coral-plugin-love/server/typeDefs.graphql b/plugins/coral-plugin-love/server/typeDefs.graphql
deleted file mode 100644
index edc45e20b..000000000
--- a/plugins/coral-plugin-love/server/typeDefs.graphql
+++ /dev/null
@@ -1,70 +0,0 @@
-enum ACTION_TYPE {
-
-    # Represents a Love.
-    LOVE
-}
-
-enum ASSET_METRICS_SORT {
-
-    # Represents a LoveAction.
-    LOVE
-}
-
-input CreateLoveInput {
-
-    # The item's id for which we are to create a love.
-    item_id: ID!
-
-    # The type of the item for which we are to create the love.
-    item_type: ACTION_ITEM_TYPE!
-}
-
-# LoveAction is used by users who "love" a specific entity.
-type LoveAction implements Action {
-
-    # The ID of the action.
-    id: ID!
-
-    # The author of the action.
-    user: User
-
-    # The time when the Action was updated.
-    updated_at: Date
-
-    # The time when the Action was created.
-    created_at: Date
-}
-
-type LoveActionSummary implements ActionSummary {
-
-    # The count of actions with this group.
-    count: Int
-
-    # The current user's action.
-    current_user: LoveAction
-}
-
-# A summary of counts related to all the Loves on an Asset.
-type LoveAssetActionSummary implements AssetActionSummary {
-
-    # Number of loves associated with actionable types on this this Asset.
-    actionCount: Int
-
-    # Number of unique actionable types that are referenced by the loves.
-    actionableItemCount: Int
-}
-
-type CreateLoveResponse implements Response {
-
-    # The love that was created.
-    love: LoveAction
-
-    # An array of errors relating to the mutation that occurred.
-    errors: [UserError!]
-}
-
-type RootMutation {
-
-    # Creates a love on an entity.
-    createLove(love: CreateLoveInput!): CreateLoveResponse
-}
diff --git a/plugins/coral-plugin-like/client/components/Icon.js b/plugins/coral-plugin-respect/client/Icon.js
similarity index 100%
rename from plugins/coral-plugin-like/client/components/Icon.js
rename to plugins/coral-plugin-respect/client/Icon.js
diff --git a/plugins/coral-plugin-respect/client/RespectButton.js b/plugins/coral-plugin-respect/client/RespectButton.js
new file mode 100644
index 000000000..14b0ec057
--- /dev/null
+++ b/plugins/coral-plugin-respect/client/RespectButton.js
@@ -0,0 +1,57 @@
+import React from 'react';
+import Icon from './Icon';
+import styles from './styles.css';
+import {withReaction} from 'plugin-api/beta/client/hocs';
+import {t, can} from 'plugin-api/beta/client/services';
+import cn from 'classnames';
+
+const plugin = 'coral-plugin-respect';
+
+class RespectButton extends React.Component {
+  handleClick = () => {
+    const {
+      postReaction,
+      deleteReaction,
+      showSignInDialog,
+      alreadyReacted,
+      user,
+    } = this.props;
+
+    // If the current user does not exist, trigger sign in dialog.
+    if (!user) {
+      showSignInDialog();
+      return;
+    }
+
+    // If the current user is suspended, do nothing.
+    if (!can(user, 'INTERACT_WITH_COMMUNITY')) {
+      return;
+    }
+
+    if (alreadyReacted()) {
+      deleteReaction();
+    } else {
+      postReaction();
+    }
+  };
+
+  render() {
+    const {count, alreadyReacted} = this.props;
+    return (
+      <div className={cn(styles.container, `${plugin}-container`)}>
+        <button
+          className={cn(styles.button, {[styles.respected]: alreadyReacted()}, `${plugin}-button`)}
+          onClick={this.handleClick}
+        >
+          <span className={`${plugin}-button-text`}>
+            {t(alreadyReacted() ? 'coral-plugin-respect.respected' : 'coral-plugin-respect.respect')}
+          </span>
+          <Icon className={cn(styles.icon, `${plugin}-icon`)} />
+          <span className={cn(styles.icon, `${plugin}-count`)}>{count > 0 && count}</span>
+        </button>
+      </div>
+    );
+  }
+}
+
+export default withReaction('respect')(RespectButton);
diff --git a/plugins/coral-plugin-respect/client/components/Icon.js b/plugins/coral-plugin-respect/client/components/Icon.js
deleted file mode 100644
index c24841e97..000000000
--- a/plugins/coral-plugin-respect/client/components/Icon.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import React from 'react';
-import cn from 'classnames';
-
-export default ({className}) => (
-  <i className={cn('fa', 'fa-handshake-o', className)} aria-hidden="true"/>
-);
diff --git a/plugins/coral-plugin-respect/client/components/RespectButton.js b/plugins/coral-plugin-respect/client/components/RespectButton.js
deleted file mode 100644
index 58bb35e9c..000000000
--- a/plugins/coral-plugin-respect/client/components/RespectButton.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import React, {Component} from 'react';
-import styles from './style.css';
-import Icon from './Icon';
-
-import t from 'coral-framework/services/i18n';
-import cn from 'classnames';
-
-import {getMyActionSummary, getTotalActionCount} from 'coral-framework/utils';
-
-const name = 'coral-plugin-respect';
-
-class RespectButton extends Component {
-
-  handleClick = () => {
-    const {postRespect, showSignInDialog, deleteAction} = this.props;
-    const {root: {me}, comment} = this.props;
-
-    const myRespectActionSummary = getMyActionSummary('RespectActionSummary', comment);
-
-    // If the current user does not exist, trigger sign in dialog.
-    if (!me) {
-      showSignInDialog();
-      return;
-    }
-
-    // If the current user is banned, do nothing.
-    if (me.status === 'BANNED') {
-      return;
-    }
-
-    if (myRespectActionSummary) {
-      deleteAction(myRespectActionSummary.current_user.id, comment.id);
-    } else {
-      postRespect({
-        item_id: comment.id,
-        item_type: 'COMMENTS'
-      });
-    }
-  }
-
-  render() {
-    const {comment} = this.props;
-
-    if (!comment) {
-      return null;
-    }
-
-    const myRespect = getMyActionSummary('RespectActionSummary', comment);
-    let count = getTotalActionCount('RespectActionSummary', comment);
-
-    return (
-      <div className={cn(styles.respect, `${name}-container`)}>
-        <button
-          className={cn(styles.button, {[styles.respected]: myRespect}, `${name}-button`)}
-          onClick={this.handleClick} >
-          <span className={`${name}-button-text`}>{t(myRespect ? 'respected' : 'respect')}</span>
-          <Icon className={cn(styles.icon, {[styles.respected]: myRespect}, `${name}-icon`)} />
-          <span className={`${name}-count`}>{count > 0 && count}</span>
-        </button>
-      </div>
-    );
-  }
-}
-
-RespectButton.propTypes = {
-  data: React.PropTypes.object.isRequired
-};
-
-export default RespectButton;
diff --git a/plugins/coral-plugin-respect/client/containers/RespectButton.js b/plugins/coral-plugin-respect/client/containers/RespectButton.js
deleted file mode 100644
index 296ca9a1f..000000000
--- a/plugins/coral-plugin-respect/client/containers/RespectButton.js
+++ /dev/null
@@ -1,163 +0,0 @@
-import {compose, gql} from 'react-apollo';
-import {connect} from 'react-redux';
-import {bindActionCreators} from 'redux';
-import get from 'lodash/get';
-import {withFragments, withMutation} from 'coral-framework/hocs';
-import {showSignInDialog} from 'coral-framework/actions/auth';
-import RespectButton from '../components/RespectButton';
-
-const isRespectAction = (a) => a.__typename === 'RespectActionSummary';
-
-const COMMENT_FRAGMENT = gql`
-  fragment CoralRespect_UpdateFragment on Comment {
-    action_summaries {
-      ... on RespectActionSummary {
-        count
-        current_user {
-          id
-        }
-      }
-    }
-  }
-`;
-
-const withDeleteAction = withMutation(gql`
-  mutation CoralRespect_DeleteAction($id: ID!) {
-      deleteAction(id:$id) {
-        errors {
-          translation_key
-        }
-      }
-  }
-`, {
-  props: ({mutate}) => ({
-    deleteAction: (id, commentId) => {
-      return mutate({
-        variables: {id},
-        optimisticResponse: {
-          deleteAction: {
-            __typename: 'DeleteActionResponse',
-            errors: null,
-          }
-        },
-        update: (proxy) => {
-          const fragmentId = `Comment_${commentId}`;
-
-          // Read the data from our cache for this query.
-          const data = proxy.readFragment({fragment: COMMENT_FRAGMENT, id: fragmentId});
-
-          // Check whether we respected this comment.
-          const idx = data.action_summaries.findIndex(isRespectAction);
-          if (idx < 0 || get(data.action_summaries[idx], 'current_user.id') !== id) {
-            return;
-          }
-
-          data.action_summaries[idx] = {
-            ...data.action_summaries[idx],
-            count: data.action_summaries[idx].count - 1,
-            current_user: null,
-          };
-
-          // Write our data back to the cache.
-          proxy.writeFragment({fragment: COMMENT_FRAGMENT, id: fragmentId, data});
-        },
-      });
-    },
-  }),
-});
-
-const withPostRespect = withMutation(gql`
-  mutation CoralRespect_CreateRespect($respect: CreateRespectInput!) {
-    createRespect(respect: $respect) {
-      respect {
-        id
-      }
-      errors {
-        translation_key
-      }
-    }
-  }
-`, {
-  props: ({mutate}) => ({
-    postRespect: (respect) => {
-      return mutate({
-        variables: {respect},
-        optimisticResponse: {
-          createRespect: {
-            __typename: 'CreateRespectResponse',
-            errors: null,
-            respect: {
-              __typename: 'RespectAction',
-              id: 'pending',
-            },
-          }
-        },
-        update: (proxy, mutationResult) => {
-          const fragmentId = `Comment_${respect.item_id}`;
-
-          // Read the data from our cache for this query.
-          const data = proxy.readFragment({fragment: COMMENT_FRAGMENT, id: fragmentId});
-
-          // Add our comment from the mutation to the end.
-          let idx = data.action_summaries.findIndex(isRespectAction);
-
-          // Check whether we already respected this comment.
-          if (idx >= 0 && data.action_summaries[idx].current_user) {
-            return;
-          }
-
-          if (idx < 0) {
-
-            // Add initial action when it doesn't exist.
-            data.action_summaries.push({
-              __typename: 'RespectActionSummary',
-              count: 0,
-              current_user: null,
-            });
-            idx = data.action_summaries.length - 1;
-          }
-
-          data.action_summaries[idx] = {
-            ...data.action_summaries[idx],
-            count: data.action_summaries[idx].count + 1,
-            current_user: mutationResult.data.createRespect.respect,
-          };
-
-          // Write our data back to the cache.
-          proxy.writeFragment({fragment: COMMENT_FRAGMENT, id: fragmentId, data});
-        },
-      });
-    },
-  }),
-});
-
-const mapDispatchToProps = (dispatch) =>
-  bindActionCreators({showSignInDialog}, dispatch);
-
-const enhance = compose(
-  withFragments({
-    root: gql`
-      fragment CoralRespect_RespectButton_root on RootQuery {
-        me {
-          status
-        }
-      }
-    `,
-    comment: gql`
-      fragment CoralRespect_RespectButton_comment on Comment {
-        action_summaries {
-          ... on RespectActionSummary {
-            count
-            current_user {
-              id
-            }
-          }
-        }
-      }`,
-  }),
-  connect(null, mapDispatchToProps),
-  withDeleteAction,
-  withPostRespect,
-);
-
-export default enhance(RespectButton);
diff --git a/plugins/coral-plugin-respect/client/index.js b/plugins/coral-plugin-respect/client/index.js
index 4df7c66ec..0a1b58a0a 100644
--- a/plugins/coral-plugin-respect/client/index.js
+++ b/plugins/coral-plugin-respect/client/index.js
@@ -1,9 +1,9 @@
-import RespectButton from './containers/RespectButton';
-import translations from './translations.json';
+import RespectButton from './RespectButton';
+import translations from './translations.yml';
 
 export default {
   translations,
   slots: {
-    commentActions: [RespectButton],
+    commentReactions: [RespectButton]
   }
 };
diff --git a/plugins/coral-plugin-respect/client/components/style.css b/plugins/coral-plugin-respect/client/styles.css
similarity index 95%
rename from plugins/coral-plugin-respect/client/components/style.css
rename to plugins/coral-plugin-respect/client/styles.css
index 32f9a8959..f0b780b86 100644
--- a/plugins/coral-plugin-respect/client/components/style.css
+++ b/plugins/coral-plugin-respect/client/styles.css
@@ -1,6 +1,6 @@
-.respect {
+.container {
   display: inline-block;
- }
+}
 
 .button {
   color: #2a2a2a;
diff --git a/plugins/coral-plugin-respect/client/translations.json b/plugins/coral-plugin-respect/client/translations.json
deleted file mode 100644
index a74e04b3f..000000000
--- a/plugins/coral-plugin-respect/client/translations.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "en": {
-    "respect": "Respect",
-    "respected": "Respected"
-  },
-  "es": {
-    "respect": "Respetar",
-    "respected": "Respetado"
-  }
-}
diff --git a/plugins/coral-plugin-respect/client/translations.yml b/plugins/coral-plugin-respect/client/translations.yml
new file mode 100644
index 000000000..f30ed5719
--- /dev/null
+++ b/plugins/coral-plugin-respect/client/translations.yml
@@ -0,0 +1,9 @@
+en:
+  coral-plugin-respect:
+    respect: Respect
+    respected: Respected
+es:
+  coral-plugin-respect:
+    respect: Respetar
+    respected: Respetado
+
diff --git a/plugins/coral-plugin-respect/index.js b/plugins/coral-plugin-respect/index.js
index 019f0ef11..97f0e5a7c 100644
--- a/plugins/coral-plugin-respect/index.js
+++ b/plugins/coral-plugin-respect/index.js
@@ -1,41 +1,2 @@
-const {readFileSync} = require('fs');
-const path = require('path');
-const wrapResponse = require('../../graph/helpers/response');
-
-module.exports = {
-  typeDefs: readFileSync(
-    path.join(__dirname, 'server/typeDefs.graphql'),
-    'utf8'
-  ),
-  resolvers: {
-    RootMutation: {
-      createRespect(_, {respect: {item_id, item_type}}, {mutators: {Action}}) {
-        return wrapResponse('respect')(
-          Action.create({item_id, item_type, action_type: 'RESPECT'})
-        );
-      }
-    }
-  },
-  hooks: {
-    Action: {
-      __resolveType: {
-        post({action_type}) {
-          switch (action_type) {
-          case 'RESPECT':
-            return 'RespectAction';
-          }
-        }
-      }
-    },
-    ActionSummary: {
-      __resolveType: {
-        post({action_type}) {
-          switch (action_type) {
-          case 'RESPECT':
-            return 'RespectActionSummary';
-          }
-        }
-      }
-    }
-  }
-};
+const {getReactionConfig} = require('../../plugin-api/beta/server');
+module.exports = getReactionConfig('respect');
diff --git a/plugins/coral-plugin-respect/server/typeDefs.graphql b/plugins/coral-plugin-respect/server/typeDefs.graphql
deleted file mode 100644
index 56734e543..000000000
--- a/plugins/coral-plugin-respect/server/typeDefs.graphql
+++ /dev/null
@@ -1,54 +0,0 @@
-enum ACTION_TYPE {
-
-  # Represents a Respect.
-  RESPECT
-}
-
-input CreateRespectInput {
-
-  # The item's id for which we are to create a respect.
-  item_id: ID!
-
-  # The type of the item for which we are to create the respect.
-  item_type: ACTION_ITEM_TYPE!
-}
-
-# RespectAction is used by users who "respect" a specific entity.
-type RespectAction implements Action {
-
-  # The ID of the action.
-  id: ID!
-
-  # The author of the action.
-  user: User
-
-  # The time when the Action was updated.
-  updated_at: Date
-
-  # The time when the Action was created.
-  created_at: Date
-}
-
-type RespectActionSummary implements ActionSummary {
-
-  # The count of actions with this group.
-  count: Int
-
-  # The current user's action.
-  current_user: RespectAction
-}
-
-type CreateRespectResponse implements Response {
-
-  # The respect that was created.
-  respect: RespectAction
-
-  # An array of errors relating to the mutation that occurred.
-  errors: [UserError!]
-}
-
-type RootMutation {
-
-  # Creates a respect on an entity.
-  createRespect(respect: CreateRespectInput!): CreateRespectResponse
-}

From 2a283a9a5a9754a8a7040e8488353d3011377a79 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Mon, 12 Jun 2017 23:01:38 +0700
Subject: [PATCH 075/264] Support live updates

---
 .../src/containers/Stream.js                  |   2 +-
 client/coral-framework/actions/auth.js        |   4 +-
 client/coral-framework/hocs/index.js          |   1 -
 client/coral-framework/hocs/withReaction.js   | 240 -------------
 client/coral-framework/services/client.js     |  24 +-
 graph/mutators/action.js                      |   2 +-
 graph/resolvers/action.js                     |   1 +
 graph/subscriptions.js                        |   8 +-
 package.json                                  |   4 +-
 plugin-api/beta/client/hocs/index.js          |   2 +-
 plugin-api/beta/client/hocs/withReaction.js   | 337 ++++++++++++++++++
 plugin-api/beta/server/getReactionConfig.js   | 143 ++++++--
 .../coral-plugin-like/client/LikeButton.js    |   6 +-
 .../coral-plugin-love/client/LoveButton.js    |   6 +-
 .../client/RespectButton.js                   |   6 +-
 yarn.lock                                     |  81 +++--
 16 files changed, 528 insertions(+), 339 deletions(-)
 delete mode 100644 client/coral-framework/hocs/withReaction.js
 create mode 100644 plugin-api/beta/client/hocs/withReaction.js

diff --git a/client/coral-embed-stream/src/containers/Stream.js b/client/coral-embed-stream/src/containers/Stream.js
index f6e1fd9ec..32b9c33c7 100644
--- a/client/coral-embed-stream/src/containers/Stream.js
+++ b/client/coral-embed-stream/src/containers/Stream.js
@@ -83,7 +83,7 @@ class StreamContainer extends React.Component {
       }
     });
 
-    this.subscriptions.push(sub1, sub2);
+    this.subscriptions = [sub1, sub2];
   }
 
   unsubscribe() {
diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js
index e212af99b..eaaee3034 100644
--- a/client/coral-framework/actions/auth.js
+++ b/client/coral-framework/actions/auth.js
@@ -311,11 +311,11 @@ export const checkLogin = () => (dispatch) => {
         throw new Error('Not logged in');
       }
 
-      dispatch(checkLoginSuccess(result.user));
-
       // Reset the websocket.
       resetWebsocket();
 
+      dispatch(checkLoginSuccess(result.user));
+
       // Display create username dialog if necessary.
       if (result.user.canEditName && result.user.status !== 'BANNED') {
         dispatch(showCreateUsernameDialog());
diff --git a/client/coral-framework/hocs/index.js b/client/coral-framework/hocs/index.js
index ef4c2ac74..01b3daff4 100644
--- a/client/coral-framework/hocs/index.js
+++ b/client/coral-framework/hocs/index.js
@@ -1,5 +1,4 @@
 export {default as withFragments} from './withFragments';
 export {default as withMutation} from './withMutation';
 export {default as withQuery} from './withQuery';
-export {default as withReaction} from './withReaction';
 
diff --git a/client/coral-framework/hocs/withReaction.js b/client/coral-framework/hocs/withReaction.js
deleted file mode 100644
index ca373b6bd..000000000
--- a/client/coral-framework/hocs/withReaction.js
+++ /dev/null
@@ -1,240 +0,0 @@
-import React from 'react';
-import get from 'lodash/get';
-import uuid from 'uuid/v4';
-import {connect} from 'react-redux';
-import {bindActionCreators} from 'redux';
-import {getDisplayName} from '../helpers/hoc';
-import {compose, gql, graphql} from 'react-apollo';
-import withFragments from 'coral-framework/hocs/withFragments';
-import {showSignInDialog} from 'coral-framework/actions/auth';
-import {capitalize} from 'coral-framework/helpers/strings';
-import {getMyActionSummary, getTotalActionCount} from 'coral-framework/utils';
-
-export default (reaction) => (WrappedComponent) => {
-  if (typeof reaction !== 'string') {
-    console.error('Reaction must be a valid string');
-    return null;
-  }
-
-  reaction = reaction.toLowerCase();
-
-  class WithReactions extends React.Component {
-    render() {
-      const {comment} = this.props;
-
-      const reactionSummary = getMyActionSummary(
-        `${capitalize(reaction)}ActionSummary`,
-        comment
-      );
-
-      const count = getTotalActionCount(
-        `${capitalize(reaction)}ActionSummary`,
-        comment
-      );
-
-      const alreadyReacted = () => !!reactionSummary;
-
-      const withReactionProps = {reactionSummary, count, alreadyReacted};
-
-      return <WrappedComponent {...this.props} {...withReactionProps} />;
-    }
-  }
-
-  const isReaction = (a) =>
-    a.__typename === `${capitalize(reaction)}ActionSummary`;
-
-  const COMMENT_FRAGMENT = gql`
-      fragment ${capitalize(reaction)}Button_updateFragment on Comment {
-          action_summaries {
-          ... on ${capitalize(reaction)}ActionSummary {
-              count
-              current_user {
-                  id
-              }
-          }
-        }
-      }
-  `;
-
-  const withDeleteReaction = graphql(
-    gql`
-        mutation deleteReaction($id: ID!) {
-            deleteAction(id:$id) {
-                errors {
-                    translation_key
-                }
-            }
-        }
-    `,
-    {
-      props: ({mutate, ownProps}) => ({
-        deleteReaction: () => {
-
-          const reactionSummary = getMyActionSummary(
-            `${capitalize(reaction)}ActionSummary`,
-            ownProps.comment
-          );
-
-          const reactionData = {
-            id: reactionSummary.current_user.id,
-            commentId: ownProps.comment.id
-          };
-
-          return mutate({
-            variables: {id: reactionData.id},
-            optimisticResponse: {
-              deleteAction: {
-                __typename: 'DeleteActionResponse',
-                errors: null
-              }
-            },
-            update: (proxy) => {
-              const fragmentId = `Comment_${reactionData.commentId}`;
-
-              // Read the data from our cache for this query.
-              const data = proxy.readFragment({
-                fragment: COMMENT_FRAGMENT,
-                id: fragmentId
-              });
-
-              // Check whether we liked this comment.
-              const idx = data.action_summaries.findIndex(isReaction);
-              if (
-                idx < 0 ||
-                get(data.action_summaries[idx], 'current_user.id') !== reactionData.id
-              ) {
-                return;
-              }
-
-              data.action_summaries[idx] = {
-                ...data.action_summaries[idx],
-                count: data.action_summaries[idx].count - 1,
-                current_user: null
-              };
-
-              // Write our data back to the cache.
-              proxy.writeFragment({
-                fragment: COMMENT_FRAGMENT,
-                id: fragmentId,
-                data
-              });
-            }
-          });
-        }
-      })
-    }
-  );
-
-  const withPostReaction = graphql(
-    gql`
-        mutation create${capitalize(reaction)}($${reaction}: Create${capitalize(reaction)}Input!) {
-            create${capitalize(reaction)}(${reaction}: $${reaction}) {
-                ${reaction} {
-                id
-            }
-            errors {
-                translation_key
-            }
-          }
-        }
-    `,
-    {
-      props: ({mutate, ownProps}) => ({
-        postReaction: () => {
-
-          const reactionData = {
-            item_id: ownProps.comment.id,
-            item_type: 'COMMENTS'
-          };
-
-          return mutate({
-            variables: {[reaction]: reactionData},
-            optimisticResponse: {
-              [`create${capitalize(reaction)}`]: {
-                __typename: `Create${capitalize(reaction)}Response`,
-                errors: null,
-                [reaction]: {
-                  __typename: `${capitalize(reaction)}Action`,
-                  id: uuid()
-                }
-              }
-            },
-            update: (proxy, mutationResult) => {
-              const fragmentId = `Comment_${reactionData.item_id}`;
-
-              // Read the data from our cache for this query.
-              const data = proxy.readFragment({
-                fragment: COMMENT_FRAGMENT,
-                id: fragmentId
-              });
-
-              // Add our comment from the mutation to the end.
-              let idx = data.action_summaries.findIndex(isReaction);
-
-              // Check whether we already reactioned this comment.
-              if (idx >= 0 && data.action_summaries[idx].current_user) {
-                return;
-              }
-
-              if (idx < 0) {
-
-                // Add initial action when it doesn't exist.
-                data.action_summaries.push({
-                  __typename: `${capitalize(reaction)}ActionSummary`,
-                  count: 0,
-                  current_user: null
-                });
-                idx = data.action_summaries.length - 1;
-              }
-
-              data.action_summaries[idx] = {
-                ...data.action_summaries[idx],
-                count: data.action_summaries[idx].count + 1,
-                current_user: mutationResult.data[
-                  `create${capitalize(reaction)}`
-                ][reaction]
-              };
-
-              // Write our data back to the cache.
-              proxy.writeFragment({
-                fragment: COMMENT_FRAGMENT,
-                id: fragmentId,
-                data
-              });
-            }
-          });
-        }
-      })
-    }
-  );
-
-  const mapStateToProps = (state) => ({
-    user: state.auth.toJS().user,
-  });
-
-  const mapDispatchToProps = (dispatch) =>
-    bindActionCreators({showSignInDialog}, dispatch);
-
-  const enhance = compose(
-    withFragments({
-      comment: gql`
-          fragment ${capitalize(reaction)}Button_comment on Comment {
-            action_summaries {
-              ... on ${capitalize(reaction)}ActionSummary {
-                  count
-                  current_user {
-                      id
-                  }
-              }
-            }
-          }`
-    }),
-    connect(mapStateToProps, mapDispatchToProps),
-    withDeleteReaction,
-    withPostReaction
-  );
-
-  WithReactions.displayName = `WithReactions(${getDisplayName(WrappedComponent)})`;
-
-  return enhance(WithReactions);
-};
diff --git a/client/coral-framework/services/client.js b/client/coral-framework/services/client.js
index 70408248c..26d8e391f 100644
--- a/client/coral-framework/services/client.js
+++ b/client/coral-framework/services/client.js
@@ -1,7 +1,7 @@
 import ApolloClient, {addTypename} from 'apollo-client';
 import {networkInterface} from './transport';
 import {SubscriptionClient, addGraphQLSubscriptions} from 'subscriptions-transport-ws';
-import {SUBSCRIPTION_END} from 'subscriptions-transport-ws/dist/messageTypes';
+import MessageTypes from 'subscriptions-transport-ws/dist/message-types';
 import {getAuthToken} from '../helpers/request';
 
 let client, wsClient = null, wsClientToken = null;
@@ -13,18 +13,17 @@ export function resetWebsocket() {
     return;
   }
 
-  // Unsubscribe from all the active subscriptions.
-  Object.keys(wsClient.subscriptions).forEach((id) => {
-
-    // Create the message.
-    let message = {id: parseInt(id), type: SUBSCRIPTION_END};
-
-    // Send the unsubscribe message.
-    wsClient.client.send(JSON.stringify(message));
-  });
-
-  // Close the client, this will trigger a reconnect.
+  // Close socket connection which will also unregister subscriptions on the server-side.
   wsClient.close();
+
+  // Reconnect to the server.
+  wsClient.connect();
+
+  // Reregister all subscriptions (uses non public api).
+  // See: https://github.com/apollographql/subscriptions-transport-ws/issues/171
+  Object.keys(wsClient.operations).forEach((id) => {
+    wsClient.sendMessage(id, MessageTypes.GQL_START, wsClient.operations[id].options);
+  });
 }
 
 export function getClient() {
@@ -35,6 +34,7 @@ export function getClient() {
   const protocol = location.protocol === 'https:' ? 'wss' : 'ws';
   wsClient = new SubscriptionClient(`${protocol}://${location.host}/api/v1/live`, {
     reconnect: true,
+    lazy: true,
     connectionParams: {
       get token() {
 
diff --git a/graph/mutators/action.js b/graph/mutators/action.js
index 0d1cd49f8..de9efea1a 100644
--- a/graph/mutators/action.js
+++ b/graph/mutators/action.js
@@ -39,7 +39,7 @@ const createAction = async ({user = {}}, {item_id, item_type, action_type, group
  * @return {Promise}     resolves when the action is deleted
  */
 const deleteAction = ({user}, {id}) => {
-  return ActionModel.remove({
+  return ActionModel.findOneAndRemove({
     id,
     user_id: user.id
   });
diff --git a/graph/resolvers/action.js b/graph/resolvers/action.js
index 8ca05daf8..ce89b9d5c 100644
--- a/graph/resolvers/action.js
+++ b/graph/resolvers/action.js
@@ -13,6 +13,7 @@ const Action = {
   // This will load the user for the specific action. We'll limit this to the
   // admin users only or the current logged in user.
   user({user_id}, _, {loaders: {Users}, user}) {
+    console.log(user);
     if (user && (user.can(SEARCH_OTHER_USERS) || user_id === user.id)) {
       return Users.getByID.load(user_id);
     }
diff --git a/graph/subscriptions.js b/graph/subscriptions.js
index 0cc37e841..3a61b6b39 100644
--- a/graph/subscriptions.js
+++ b/graph/subscriptions.js
@@ -50,7 +50,7 @@ const createSubscriptionManager = (server) => new SubscriptionServer({
       connection.upgradeReq.headers['authorization'] = `Bearer ${token}`;
     }
   },
-  onSubscribe: (parsedMessage, baseParams, connection) => {
+  onOperation: (parsedMessage, baseParams, connection) => {
 
     // Cache the upgrade request.
     let upgradeReq = connection.upgradeReq;
@@ -58,15 +58,15 @@ const createSubscriptionManager = (server) => new SubscriptionServer({
     // Attach the context per request.
     baseParams.context = async () => {
       let req;
-      
+
       try {
         req = await deserializeUser(upgradeReq);
       } catch (e) {
-        console.error(e);
+        console.error(connection);
 
         return new Context({}, pubsub);
       }
-      
+
       return new Context(req, pubsub);
     };
 
diff --git a/package.json b/package.json
index d78ba8713..f623b94ed 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
     "graphql-errors": "^2.1.0",
     "graphql-redis-subscriptions": "^1.1.5",
     "graphql-server-express": "^0.6.0",
-    "graphql-subscriptions": "^0.3.1",
+    "graphql-subscriptions": "^0.4.3",
     "graphql-tools": "^0.10.1",
     "helmet": "^3.5.0",
     "immutability-helper": "^2.2.0",
@@ -116,7 +116,7 @@
     "semver": "^5.3.0",
     "simplemde": "^1.11.2",
     "snake-case": "^2.1.0",
-    "subscriptions-transport-ws": "^0.5.5-alpha.0",
+    "subscriptions-transport-ws": "^0.7.1",
     "timekeeper": "^1.0.0",
     "uuid": "^3.0.1",
     "yaml-loader": "^0.4.0",
diff --git a/plugin-api/beta/client/hocs/index.js b/plugin-api/beta/client/hocs/index.js
index 7ec875656..7be682670 100644
--- a/plugin-api/beta/client/hocs/index.js
+++ b/plugin-api/beta/client/hocs/index.js
@@ -1 +1 @@
-export {withReaction} from 'coral-framework/hocs';
+export {default as withReaction} from './withReaction';
diff --git a/plugin-api/beta/client/hocs/withReaction.js b/plugin-api/beta/client/hocs/withReaction.js
new file mode 100644
index 000000000..67a042081
--- /dev/null
+++ b/plugin-api/beta/client/hocs/withReaction.js
@@ -0,0 +1,337 @@
+import React from 'react';
+import get from 'lodash/get';
+import uuid from 'uuid/v4';
+import {connect} from 'react-redux';
+import {bindActionCreators} from 'redux';
+import {getDisplayName} from 'coral-framework/helpers/hoc';
+import {compose, gql, graphql} from 'react-apollo';
+import withFragments from 'coral-framework/hocs/withFragments';
+import {showSignInDialog} from 'coral-framework/actions/auth';
+import {capitalize} from 'coral-framework/helpers/strings';
+import {getMyActionSummary, getTotalActionCount} from 'coral-framework/utils';
+import * as PropTypes from 'prop-types';
+
+export default (reaction) => (WrappedComponent) => {
+  if (typeof reaction !== 'string') {
+    console.error('Reaction must be a valid string');
+    return null;
+  }
+
+  let instances = 0;
+  let createdSubscription = null;
+  let deletedSubscription = null;
+
+  reaction = reaction.toLowerCase();
+  const Reaction = capitalize(reaction);
+
+  const COMMENT_FRAGMENT = gql`
+    fragment ${Reaction}Button_updateFragment on Comment {
+        action_summaries {
+        ... on ${Reaction}ActionSummary {
+          count
+          current_user {
+            id
+          }
+        }
+      }
+    }
+  `;
+
+  const isReaction = (a) =>
+    a.__typename === `${Reaction}ActionSummary`;
+
+  const addReactionToStore = (proxy, {action, self}) => {
+    const fragmentId = `Comment_${action.item_id}`;
+
+    // Read the data from our cache for this query.
+    const data = proxy.readFragment({
+      fragment: COMMENT_FRAGMENT,
+      id: fragmentId
+    });
+
+    // Add our comment from the mutation to the end.
+    let idx = data.action_summaries.findIndex(isReaction);
+
+    // Check whether we already reactioned this comment.
+    if (self && idx >= 0 && data.action_summaries[idx].current_user) {
+      return;
+    }
+
+    if (idx < 0) {
+
+      // Add initial action when it doesn't exist.
+      data.action_summaries.push({
+        __typename: `${Reaction}ActionSummary`,
+        count: 0,
+        current_user: null
+      });
+      idx = data.action_summaries.length - 1;
+    }
+
+    data.action_summaries[idx] = {
+      ...data.action_summaries[idx],
+      count: data.action_summaries[idx].count + 1,
+      current_user: self ? action : data.action_summaries[idx].current_user
+    };
+
+    // Write our data back to the cache.
+    proxy.writeFragment({
+      fragment: COMMENT_FRAGMENT,
+      id: fragmentId,
+      data
+    });
+  };
+
+  const deleteReactionFromStore = (proxy, {action, self}) => {
+    const fragmentId = `Comment_${action.item_id}`;
+
+    // Read the data from our cache for this query.
+    const data = proxy.readFragment({
+      fragment: COMMENT_FRAGMENT,
+      id: fragmentId
+    });
+
+    // Check whether we liked this comment.
+    const idx = data.action_summaries.findIndex(isReaction);
+
+    if (
+      self &&
+      (idx < 0 || get(data.action_summaries[idx], 'current_user.id') !== action.id)
+    ) {
+      return;
+    }
+
+    data.action_summaries[idx] = {
+      ...data.action_summaries[idx],
+      count: data.action_summaries[idx].count - 1,
+      current_user: self ? null : data.action_summaries[idx].current_user,
+    };
+
+    // Write our data back to the cache.
+    proxy.writeFragment({
+      fragment: COMMENT_FRAGMENT,
+      id: fragmentId,
+      data
+    });
+  };
+
+  const REACTION_CREATED_SUBSCRIPTION = gql`
+    subscription ${Reaction}ActionCreated($assetId: ID!) {
+      ${reaction}ActionCreated(asset_id: $assetId) {
+        id
+        user {
+          id
+        }
+        item_id
+      }
+    }
+  `;
+
+  const REACTION_DELETED_SUBSCRIPTION = gql`
+    subscription ${Reaction}ActionDeleted($assetId: ID!) {
+      ${reaction}ActionDeleted(asset_id: $assetId) {
+        id
+        user {
+          id
+        }
+        item_id
+      }
+    }
+  `;
+
+  class WithReactions extends React.Component {
+
+    static contextTypes = {
+      client: PropTypes.object.isRequired,
+    };
+
+    constructor(props, context) {
+      super(props, context);
+      if (instances === 0) {
+        createdSubscription = context.client.subscribe({
+          query: REACTION_CREATED_SUBSCRIPTION,
+          variables: {
+            assetId: this.props.root.asset.id,
+          },
+        }).subscribe({
+          next: this.onReactionCreated,
+          error(err) { console.error('err', err); },
+        });
+
+        deletedSubscription = context.client.subscribe({
+          query: REACTION_DELETED_SUBSCRIPTION,
+          variables: {
+            assetId: this.props.root.asset.id,
+          },
+        }).subscribe({
+          next: this.onReactionDeleted,
+          error(err) { console.error('err', err); },
+        });
+      }
+      instances++;
+    }
+
+    onReactionCreated = ({[`${reaction}ActionCreated`]: action}) => {
+      if (this.props.user && action.user && this.props.user.id === action.user.id) {
+        return;
+      }
+      addReactionToStore(this.context.client, {action, self: false});
+    };
+
+    onReactionDeleted = ({[`${reaction}ActionDeleted`]: action}) => {
+      if (this.props.user && action.user && this.props.user.id === action.user.id) {
+        return;
+      }
+      deleteReactionFromStore(this.context.client, {action, self: false});
+    };
+
+    componentWillUnmount() {
+      instances--;
+      if (instances === 0) {
+        try {
+          createdSubscription.unsubscribe();
+          deletedSubscription.unsubscribe();
+        }
+        catch(e) {
+          console.warn(e);
+        }
+      }
+    }
+
+    render() {
+      const {comment} = this.props;
+
+      const reactionSummary = getMyActionSummary(
+        `${Reaction}ActionSummary`,
+        comment
+      );
+
+      const count = getTotalActionCount(
+        `${Reaction}ActionSummary`,
+        comment
+      );
+
+      const alreadyReacted = !!reactionSummary;
+
+      const withReactionProps = {reactionSummary, count, alreadyReacted};
+
+      return <WrappedComponent {...this.props} {...withReactionProps} />;
+    }
+  }
+
+  const withDeleteReaction = graphql(
+    gql`
+      mutation Delete${Reaction}Action($input: Delete${Reaction}ActionInput!) {
+        delete${Reaction}Action(input: $input) {
+          errors {
+            translation_key
+          }
+        }
+      }
+    `,
+    {
+      props: ({mutate, ownProps}) => ({
+        deleteReaction: () => {
+
+          const reactionSummary = getMyActionSummary(
+            `${Reaction}ActionSummary`,
+            ownProps.comment
+          );
+
+          const id = reactionSummary.current_user.id;
+          const item_id = ownProps.comment.id;
+
+          const input = {id};
+          return mutate({
+            variables: {input},
+            optimisticResponse: {
+              [`delete${Reaction}Action`]: {
+                __typename: `Delete${Reaction}ActionResponse`,
+                errors: null
+              }
+            },
+            update: (proxy) => {
+              deleteReactionFromStore(proxy, {action: {item_id, id}, self: true});
+            }
+          });
+        }
+      })
+    }
+  );
+
+  const withPostReaction = graphql(
+    gql`
+        mutation Create${Reaction}Action($input: Create${Reaction}ActionInput!) {
+          create${Reaction}Action(input: $input) {
+            ${reaction} {
+              id
+            }
+            errors {
+              translation_key
+            }
+          }
+        }
+    `,
+    {
+      props: ({mutate, ownProps}) => ({
+        postReaction: () => {
+
+          const input = {
+            item_id: ownProps.comment.id,
+          };
+
+          return mutate({
+            variables: {input},
+            optimisticResponse: {
+              [`create${Reaction}Action`]: {
+                __typename: `Create${Reaction}ActionResponse`,
+                errors: null,
+                [reaction]: {
+                  __typename: `${Reaction}Action`,
+                  id: uuid()
+                }
+              }
+            },
+            update: (proxy, {data: {[`create${Reaction}Action`]: {[reaction]: action}}}) => {
+              const a = {
+                ...action,
+                item_id: input.item_id,
+              };
+              addReactionToStore(proxy, {action: a, self: true});
+            }
+          });
+        }
+      })
+    }
+  );
+
+  const mapStateToProps = (state) => ({
+    user: state.auth.toJS().user,
+  });
+
+  const mapDispatchToProps = (dispatch) =>
+    bindActionCreators({showSignInDialog}, dispatch);
+
+  const enhance = compose(
+    withFragments({
+      comment: gql`
+        fragment ${Reaction}Button_comment on Comment {
+          action_summaries {
+            ... on ${Reaction}ActionSummary {
+              count
+              current_user {
+                id
+              }
+            }
+          }
+        }`
+    }),
+    connect(mapStateToProps, mapDispatchToProps),
+    withDeleteReaction,
+    withPostReaction
+  );
+
+  WithReactions.displayName = `WithReactions(${getDisplayName(WrappedComponent)})`;
+
+  return enhance(WithReactions);
+};
diff --git a/plugin-api/beta/server/getReactionConfig.js b/plugin-api/beta/server/getReactionConfig.js
index 101c86782..b157742ad 100644
--- a/plugin-api/beta/server/getReactionConfig.js
+++ b/plugin-api/beta/server/getReactionConfig.js
@@ -1,4 +1,5 @@
 const wrapResponse = require('../../../graph/helpers/response');
+const {SEARCH_OTHER_USERS} = require('../../../perms/constants');
 
 function getReactionConfig(reaction) {
   const Reaction = reaction.charAt(0).toUpperCase() + reaction.slice(1);
@@ -6,82 +7,142 @@ function getReactionConfig(reaction) {
   const typeDefs = `
     enum ACTION_TYPE {
 
-        # Represents a ${Reaction}.
-        ${REACTION}
+      # Represents a ${Reaction}.
+      ${REACTION}
     }
 
     enum ASSET_METRICS_SORT {
 
-        # Represents a ${Reaction}Action.
-        ${REACTION}
+      # Represents a ${Reaction}Action.
+      ${REACTION}
     }
 
-    input Create${Reaction}Input {
+    input Create${Reaction}ActionInput {
 
-        # The item's id for which we are to create a ${reaction}.
-        item_id: ID!
+      # The item's id for which we are to create a ${reaction}.
+      item_id: ID!
+    }
 
-        # The type of the item for which we are to create the ${reaction}.
-        item_type: ACTION_ITEM_TYPE!
+    input Delete${Reaction}ActionInput {
+
+      # The item's id for which we are deleting a ${reaction}.
+      id: ID!
     }
 
     # ${Reaction}Action is used by users who "${reaction}" a specific entity.
     type ${Reaction}Action implements Action {
 
-        # The ID of the action.
-        id: ID!
+      # The ID of the action.
+      id: ID!
 
-        # The author of the action.
-        user: User
+      # The author of the action.
+      user: User
 
-        # The time when the Action was updated.
-        updated_at: Date
+      # The time when the Action was updated.
+      updated_at: Date
 
-        # The time when the Action was created.
-        created_at: Date
+      # The time when the Action was created.
+      created_at: Date
+
+      # The item's id for which the Action was created.
+      item_id: ID!
     }
 
     type ${Reaction}ActionSummary implements ActionSummary {
 
-        # The count of actions with this group.
-        count: Int
+      # The count of actions with this group.
+      count: Int
 
-        # The current user's action.
-        current_user: ${Reaction}Action
+      # The current user's action.
+      current_user: ${Reaction}Action
     }
 
     # A summary of counts related to all the ${Reaction}s on an Asset.
     type ${Reaction}AssetActionSummary implements AssetActionSummary {
 
-        # Number of ${reaction}s associated with actionable types on this this Asset.
-        actionCount: Int
+      # Number of ${reaction}s associated with actionable types on this this Asset.
+      actionCount: Int
 
-        # Number of unique actionable types that are referenced by the ${reaction}s.
-        actionableItemCount: Int
+      # Number of unique actionable types that are referenced by the ${reaction}s.
+      actionableItemCount: Int
     }
 
-    type Create${Reaction}Response implements Response {
+    type Create${Reaction}ActionResponse implements Response {
 
-        # The ${reaction} that was created.
-        ${reaction}: ${Reaction}Action
+      # The ${reaction} that was created.
+      ${reaction}: ${Reaction}Action
 
-        # An array of errors relating to the mutation that occurred.
-        errors: [UserError!]
+      # An array of errors relating to the mutation that occurred.
+      errors: [UserError!]
+    }
+
+    type Delete${Reaction}ActionResponse implements Response {
+
+      # The ${reaction} that was created.
+      ${reaction}: ${Reaction}Action
+
+      # An array of errors relating to the mutation that occurred.
+      errors: [UserError!]
     }
 
     type RootMutation {
 
-        # Creates a ${reaction} on an entity.
-        create${Reaction}(${reaction}: Create${Reaction}Input!): Create${Reaction}Response
+      # Creates a ${reaction} on an entity.
+      create${Reaction}Action(input: Create${Reaction}ActionInput!): Create${Reaction}ActionResponse
+      delete${Reaction}Action(input: Delete${Reaction}ActionInput!): Delete${Reaction}ActionResponse
+    }
+
+    type Subscription {
+
+      # Subscribe to ${reaction}s.
+      ${reaction}ActionCreated(asset_id: ID!): ${Reaction}Action
+
+      # Subscribe to ${reaction} removals.
+      ${reaction}ActionDeleted(asset_id: ID!): ${Reaction}Action
     }
   `;
 
   return {
     typeDefs,
     resolvers: {
+      Subscription: {
+        [`${reaction}ActionCreated`]: ({action}) => {
+          return action;
+        },
+        [`${reaction}ActionDeleted`]: ({action}) => {
+          return action;
+        },
+      },
+      [`${Reaction}Action`]: {
+
+        // This will load the user for the specific action. We'll limit this to the
+        // admin users only or the current logged in user.
+        user({user_id}, _, {loaders: {Users}, user}) {
+          if (user && (user.can(SEARCH_OTHER_USERS) || user_id === user.id)) {
+            return Users.getByID.load(user_id);
+          }
+        }
+      },
       RootMutation: {
-        [`create${Reaction}`]: (_, {[reaction]: {item_id, item_type}}, {mutators: {Action}}) => {
-          return wrapResponse(reaction)(Action.create({item_id, item_type, action_type: REACTION}));
+        [`create${Reaction}Action`]: (_, {input: {item_id}}, {mutators: {Action}, pubsub, loaders: {Comments}}) => {
+          const response = Comments.get.load(item_id).then((comment) => {
+            return Action.create({item_id, item_type: 'COMMENTS', action_type: REACTION})
+              .then((action) => {
+                pubsub.publish(`${reaction}ActionCreated`, {action, comment});
+                return Promise.resolve(action);
+              });
+          });
+          return wrapResponse(reaction)(response);
+        },
+        [`delete${Reaction}Action`]: (_, {input: {id}}, {mutators: {Action}, pubsub, loaders: {Comments}}) => {
+          const response = Action.delete({id})
+            .then((action) => {
+              return Comments.get.load(action.item_id).then((comment) => {
+                pubsub.publish(`${reaction}ActionDeleted`, {action, comment});
+                return Promise.resolve(action);
+              });
+            });
+          return wrapResponse(reaction)(response);
         }
       },
     },
@@ -106,7 +167,19 @@ function getReactionConfig(reaction) {
           }
         }
       }
-    }
+    },
+    setupFunctions: {
+      [`${reaction}ActionCreated`]: (options, args) => ({
+        [`${reaction}ActionCreated`]: {
+          filter: ({comment}) => comment.asset_id === args.asset_id,
+        },
+      }),
+      [`${reaction}ActionDeleted`]: (options, args) => ({
+        [`${reaction}ActionDeleted`]: {
+          filter: ({comment}) => comment.asset_id === args.asset_id,
+        },
+      }),
+    },
   };
 }
 
diff --git a/plugins/coral-plugin-like/client/LikeButton.js b/plugins/coral-plugin-like/client/LikeButton.js
index fac4fdfca..5b99f7df4 100644
--- a/plugins/coral-plugin-like/client/LikeButton.js
+++ b/plugins/coral-plugin-like/client/LikeButton.js
@@ -28,7 +28,7 @@ class LikeButton extends React.Component {
       return;
     }
 
-    if (alreadyReacted()) {
+    if (alreadyReacted) {
       deleteReaction();
     } else {
       postReaction();
@@ -40,10 +40,10 @@ class LikeButton extends React.Component {
     return (
       <div className={cn(styles.container, `${plugin}-container`)}>
         <button
-          className={cn(styles.button, {[styles.liked]: alreadyReacted()}, `${plugin}-button`)}
+          className={cn(styles.button, {[styles.liked]: alreadyReacted}, `${plugin}-button`)}
           onClick={this.handleClick}
         >
-          <span>{t(alreadyReacted() ? 'coral-plugin-like.liked' : 'coral-plugin-like.like')}</span>
+          <span>{t(alreadyReacted ? 'coral-plugin-like.liked' : 'coral-plugin-like.like')}</span>
           <Icon name="thumb_up" className={`${plugin}-icon`} />
           <span className={`${plugin}-count`}>{count > 0 && count}</span>
         </button>
diff --git a/plugins/coral-plugin-love/client/LoveButton.js b/plugins/coral-plugin-love/client/LoveButton.js
index 8dbf51a6e..0e2b9ff01 100644
--- a/plugins/coral-plugin-love/client/LoveButton.js
+++ b/plugins/coral-plugin-love/client/LoveButton.js
@@ -28,7 +28,7 @@ class LoveButton extends React.Component {
       return;
     }
 
-    if (alreadyReacted()) {
+    if (alreadyReacted) {
       deleteReaction();
     } else {
       postReaction();
@@ -40,10 +40,10 @@ class LoveButton extends React.Component {
     return (
       <div className={cn(styles.container, `${plugin}-container`)}>
         <button
-          className={cn(styles.button, {[styles.loved]: alreadyReacted()}, `${plugin}-button`)}
+          className={cn(styles.button, {[styles.loved]: alreadyReacted}, `${plugin}-button`)}
           onClick={this.handleClick}
         >
-          <span>{t(alreadyReacted() ? 'coral-plugin-love.loved' : 'coral-plugin-love.love')}</span>
+          <span>{t(alreadyReacted ? 'coral-plugin-love.loved' : 'coral-plugin-love.love')}</span>
           <Icon name="favorite" className={`${plugin}-icon`} />
           <span className={`${plugin}-count`}>{count > 0 && count}</span>
         </button>
diff --git a/plugins/coral-plugin-respect/client/RespectButton.js b/plugins/coral-plugin-respect/client/RespectButton.js
index 14b0ec057..bde8c9669 100644
--- a/plugins/coral-plugin-respect/client/RespectButton.js
+++ b/plugins/coral-plugin-respect/client/RespectButton.js
@@ -28,7 +28,7 @@ class RespectButton extends React.Component {
       return;
     }
 
-    if (alreadyReacted()) {
+    if (alreadyReacted) {
       deleteReaction();
     } else {
       postReaction();
@@ -40,11 +40,11 @@ class RespectButton extends React.Component {
     return (
       <div className={cn(styles.container, `${plugin}-container`)}>
         <button
-          className={cn(styles.button, {[styles.respected]: alreadyReacted()}, `${plugin}-button`)}
+          className={cn(styles.button, {[styles.respected]: alreadyReacted}, `${plugin}-button`)}
           onClick={this.handleClick}
         >
           <span className={`${plugin}-button-text`}>
-            {t(alreadyReacted() ? 'coral-plugin-respect.respected' : 'coral-plugin-respect.respect')}
+            {t(alreadyReacted ? 'coral-plugin-respect.respected' : 'coral-plugin-respect.respect')}
           </span>
           <Icon className={cn(styles.icon, `${plugin}-icon`)} />
           <span className={cn(styles.icon, `${plugin}-count`)}>{count > 0 && count}</span>
diff --git a/yarn.lock b/yarn.lock
index 7fcee99c5..7c7907176 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -34,6 +34,10 @@
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/@types/graphql/-/graphql-0.9.0.tgz#fccf859f0d2817687f210737dc3be48a18b1d754"
 
+"@types/graphql@^0.9.1":
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/@types/graphql/-/graphql-0.9.1.tgz#b04ebe84bc997cc60dbea2ed4d0d4342c737f99d"
+
 "@types/isomorphic-fetch@0.0.33":
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/@types/isomorphic-fetch/-/isomorphic-fetch-0.0.33.tgz#3ea1b86f8b73e6a7430d01d4dbd5b1f63fd72718"
@@ -53,9 +57,9 @@
     "@types/express-serve-static-core" "*"
     "@types/mime" "*"
 
-"@types/ws@0.0.38":
-  version "0.0.38"
-  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-0.0.38.tgz#42106fff4b422ca956734e29f0d73a6d893194d3"
+"@types/ws@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-3.0.0.tgz#4682a04d385484e73f7d8275cabc8b672d66143c"
   dependencies:
     "@types/node" "*"
 
@@ -2704,6 +2708,10 @@ es6-promise@^3.0.2, es6-promise@^3.2.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.3.1.tgz#a08cdde84ccdbf34d027a1451bc91d4bcd28a613"
 
+es6-promise@^4.0.5:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.1.0.tgz#dda03ca8f9f89bc597e689842929de7ba8cebdf0"
+
 es6-set@~0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
@@ -2941,7 +2949,7 @@ event-stream@~3.3.0:
     stream-combiner "~0.0.4"
     through "~2.3.1"
 
-eventemitter3@^2.0.2:
+eventemitter3@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-2.0.3.tgz#b5e1079b59fb5e1ba2771c0a993be060a58c99ba"
 
@@ -3631,13 +3639,23 @@ graphql-subscriptions@^0.2.0:
   dependencies:
     es6-promise "^3.2.1"
 
-graphql-subscriptions@^0.3.0, graphql-subscriptions@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/graphql-subscriptions/-/graphql-subscriptions-0.3.1.tgz#0cedc2d507420cf26cf414080b079f05402f0303"
+graphql-subscriptions@^0.4.1:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/graphql-subscriptions/-/graphql-subscriptions-0.4.2.tgz#a1a41cebdb95103be348c409d0ed6096ad858455"
   dependencies:
-    es6-promise "^3.2.1"
+    "@types/graphql" "^0.9.1"
+    es6-promise "^4.0.5"
+    iterall "^1.1.1"
 
-graphql-tag@^1.2.3, graphql-tag@^1.2.4:
+graphql-subscriptions@^0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/graphql-subscriptions/-/graphql-subscriptions-0.4.3.tgz#2aed6ba87551cc747742b793497ff24b22991867"
+  dependencies:
+    "@types/graphql" "^0.9.1"
+    es6-promise "^4.0.5"
+    iterall "^1.1.1"
+
+graphql-tag@^1.2.3:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-1.3.2.tgz#7abb3a8fd9f3415d07163314ed237061c785b759"
 
@@ -4456,6 +4474,10 @@ iterall@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.0.3.tgz#e0b31958f835013c323ff0b10943829ac69aa4b7"
 
+iterall@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.1.1.tgz#f7f0af11e9a04ec6426260f5019d9fcca4d50214"
+
 jju@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jju/-/jju-1.3.0.tgz#dadd9ef01924bc728b03f2f7979bdbd62f7a2aaa"
@@ -5777,10 +5799,6 @@ optionator@^0.8.1, optionator@^0.8.2:
     type-check "~0.3.2"
     wordwrap "~1.0.0"
 
-options@>=0.0.5:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f"
-
 os-browserify@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.2.1.tgz#63fc4ccee5d2d7763d26bbf8601078e6c2e0044f"
@@ -7386,7 +7404,7 @@ rx@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
 
-safe-buffer@^5.0.1:
+safe-buffer@^5.0.1, safe-buffer@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
 
@@ -7834,19 +7852,20 @@ stylus@0.54.5, stylus@~0.54.5:
     sax "0.5.x"
     source-map "0.1.x"
 
-subscriptions-transport-ws@^0.5.5-alpha.0:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.5.5.tgz#7715ed4306f532a9dd53c02cbd789d2ee8871bb9"
+subscriptions-transport-ws@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.7.1.tgz#32d6a0ab2e29e2246b48952a6ff431774c08c93d"
   dependencies:
-    "@types/ws" "0.0.38"
+    "@types/ws" "^3.0.0"
     backo2 "^1.0.2"
-    eventemitter3 "^2.0.2"
-    graphql "^0.9.1"
-    graphql-subscriptions "^0.3.0"
-    graphql-tag "^1.2.4"
+    eventemitter3 "^2.0.3"
+    graphql-subscriptions "^0.4.1"
+    graphql-tag "^2.0.0"
+    iterall "^1.1.1"
+    lodash.assign "^4.2.0"
     lodash.isobject "^3.0.2"
     lodash.isstring "^4.0.1"
-    ws "^1.1.0"
+    ws "^3.0.0"
 
 sugarss@^0.2.0:
   version "0.2.0"
@@ -8190,9 +8209,9 @@ uid-safe@2.1.4, uid-safe@~2.1.4:
   dependencies:
     random-bytes "~1.0.0"
 
-ultron@1.0.x:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa"
+ultron@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.0.tgz#b07a2e6a541a815fc6a34ccd4533baec307ca864"
 
 undefsafe@0.0.3:
   version "0.0.3"
@@ -8510,12 +8529,12 @@ write@^0.2.1:
   dependencies:
     mkdirp "^0.5.1"
 
-ws@^1.1.0:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.4.tgz#57f40d036832e5f5055662a397c4de76ed66bf61"
+ws@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-3.0.0.tgz#98ddb00056c8390cb751e7788788497f99103b6c"
   dependencies:
-    options ">=0.0.5"
-    ultron "1.0.x"
+    safe-buffer "~5.0.1"
+    ultron "~1.1.0"
 
 x-xss-protection@1.0.0:
   version "1.0.0"

From d628c26693af86124aef4c5d4ec29f29897005a1 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Mon, 12 Jun 2017 23:25:58 +0700
Subject: [PATCH 076/264] Wrap mutations into framework

---
 plugin-api/beta/client/hocs/withReaction.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugin-api/beta/client/hocs/withReaction.js b/plugin-api/beta/client/hocs/withReaction.js
index 67a042081..4512d3ac5 100644
--- a/plugin-api/beta/client/hocs/withReaction.js
+++ b/plugin-api/beta/client/hocs/withReaction.js
@@ -4,8 +4,9 @@ import uuid from 'uuid/v4';
 import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
 import {getDisplayName} from 'coral-framework/helpers/hoc';
-import {compose, gql, graphql} from 'react-apollo';
+import {compose, gql} from 'react-apollo';
 import withFragments from 'coral-framework/hocs/withFragments';
+import withMutation from 'coral-framework/hocs/withMutation';
 import {showSignInDialog} from 'coral-framework/actions/auth';
 import {capitalize} from 'coral-framework/helpers/strings';
 import {getMyActionSummary, getTotalActionCount} from 'coral-framework/utils';
@@ -219,7 +220,7 @@ export default (reaction) => (WrappedComponent) => {
     }
   }
 
-  const withDeleteReaction = graphql(
+  const withDeleteReaction = withMutation(
     gql`
       mutation Delete${Reaction}Action($input: Delete${Reaction}ActionInput!) {
         delete${Reaction}Action(input: $input) {
@@ -259,7 +260,7 @@ export default (reaction) => (WrappedComponent) => {
     }
   );
 
-  const withPostReaction = graphql(
+  const withPostReaction = withMutation(
     gql`
         mutation Create${Reaction}Action($input: Create${Reaction}ActionInput!) {
           create${Reaction}Action(input: $input) {

From 70177d3a2c85df82f13896199c861fbb7a8fb5c0 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Mon, 12 Jun 2017 23:45:46 +0700
Subject: [PATCH 077/264] Cleanup

---
 client/coral-embed-stream/src/containers/Stream.js | 2 +-
 graph/resolvers/action.js                          | 1 -
 graph/subscriptions.js                             | 2 +-
 plugin-api/beta/server/getReactionConfig.js        | 2 ++
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/coral-embed-stream/src/containers/Stream.js b/client/coral-embed-stream/src/containers/Stream.js
index 32b9c33c7..f6e1fd9ec 100644
--- a/client/coral-embed-stream/src/containers/Stream.js
+++ b/client/coral-embed-stream/src/containers/Stream.js
@@ -83,7 +83,7 @@ class StreamContainer extends React.Component {
       }
     });
 
-    this.subscriptions = [sub1, sub2];
+    this.subscriptions.push(sub1, sub2);
   }
 
   unsubscribe() {
diff --git a/graph/resolvers/action.js b/graph/resolvers/action.js
index ce89b9d5c..8ca05daf8 100644
--- a/graph/resolvers/action.js
+++ b/graph/resolvers/action.js
@@ -13,7 +13,6 @@ const Action = {
   // This will load the user for the specific action. We'll limit this to the
   // admin users only or the current logged in user.
   user({user_id}, _, {loaders: {Users}, user}) {
-    console.log(user);
     if (user && (user.can(SEARCH_OTHER_USERS) || user_id === user.id)) {
       return Users.getByID.load(user_id);
     }
diff --git a/graph/subscriptions.js b/graph/subscriptions.js
index 3a61b6b39..7d97d3521 100644
--- a/graph/subscriptions.js
+++ b/graph/subscriptions.js
@@ -62,7 +62,7 @@ const createSubscriptionManager = (server) => new SubscriptionServer({
       try {
         req = await deserializeUser(upgradeReq);
       } catch (e) {
-        console.error(connection);
+        console.error(e);
 
         return new Context({}, pubsub);
       }
diff --git a/plugin-api/beta/server/getReactionConfig.js b/plugin-api/beta/server/getReactionConfig.js
index b157742ad..077b51261 100644
--- a/plugin-api/beta/server/getReactionConfig.js
+++ b/plugin-api/beta/server/getReactionConfig.js
@@ -2,6 +2,8 @@ const wrapResponse = require('../../../graph/helpers/response');
 const {SEARCH_OTHER_USERS} = require('../../../perms/constants');
 
 function getReactionConfig(reaction) {
+  reaction = reaction.toLowerCase();
+
   const Reaction = reaction.charAt(0).toUpperCase() + reaction.slice(1);
   const REACTION = reaction.toUpperCase();
   const typeDefs = `

From ce76335fdabf428ce21e15b2a838b5b7d670710f Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Mon, 12 Jun 2017 23:50:09 +0700
Subject: [PATCH 078/264] Add some comments

---
 plugin-api/beta/client/hocs/withReaction.js | 9 +++++++++
 plugin-api/beta/server/getReactionConfig.js | 4 ++++
 2 files changed, 13 insertions(+)

diff --git a/plugin-api/beta/client/hocs/withReaction.js b/plugin-api/beta/client/hocs/withReaction.js
index 4512d3ac5..42ac79ec5 100644
--- a/plugin-api/beta/client/hocs/withReaction.js
+++ b/plugin-api/beta/client/hocs/withReaction.js
@@ -18,7 +18,10 @@ export default (reaction) => (WrappedComponent) => {
     return null;
   }
 
+  // Global instance counter for each `reaction` type.
   let instances = 0;
+
+  // Track current subscriptions.
   let createdSubscription = null;
   let deletedSubscription = null;
 
@@ -148,6 +151,8 @@ export default (reaction) => (WrappedComponent) => {
 
     constructor(props, context) {
       super(props, context);
+
+      // Start subscriptions when it is first needed.
       if (instances === 0) {
         createdSubscription = context.client.subscribe({
           query: REACTION_CREATED_SUBSCRIPTION,
@@ -172,6 +177,7 @@ export default (reaction) => (WrappedComponent) => {
       instances++;
     }
 
+    // onReactionCreated handles live updates through the subscriptions.
     onReactionCreated = ({[`${reaction}ActionCreated`]: action}) => {
       if (this.props.user && action.user && this.props.user.id === action.user.id) {
         return;
@@ -179,6 +185,7 @@ export default (reaction) => (WrappedComponent) => {
       addReactionToStore(this.context.client, {action, self: false});
     };
 
+    // onReactionDeleted handles live updates through the subscriptions.
     onReactionDeleted = ({[`${reaction}ActionDeleted`]: action}) => {
       if (this.props.user && action.user && this.props.user.id === action.user.id) {
         return;
@@ -188,6 +195,8 @@ export default (reaction) => (WrappedComponent) => {
 
     componentWillUnmount() {
       instances--;
+
+      // End subscriptions when last component will be unmounted.
       if (instances === 0) {
         try {
           createdSubscription.unsubscribe();
diff --git a/plugin-api/beta/server/getReactionConfig.js b/plugin-api/beta/server/getReactionConfig.js
index 077b51261..83c45dcb5 100644
--- a/plugin-api/beta/server/getReactionConfig.js
+++ b/plugin-api/beta/server/getReactionConfig.js
@@ -130,6 +130,8 @@ function getReactionConfig(reaction) {
           const response = Comments.get.load(item_id).then((comment) => {
             return Action.create({item_id, item_type: 'COMMENTS', action_type: REACTION})
               .then((action) => {
+
+                // The comment is needed to allow better filtering e.g. by asset_id.
                 pubsub.publish(`${reaction}ActionCreated`, {action, comment});
                 return Promise.resolve(action);
               });
@@ -140,6 +142,8 @@ function getReactionConfig(reaction) {
           const response = Action.delete({id})
             .then((action) => {
               return Comments.get.load(action.item_id).then((comment) => {
+
+                // The comment is needed to allow better filtering e.g. by asset_id.
                 pubsub.publish(`${reaction}ActionDeleted`, {action, comment});
                 return Promise.resolve(action);
               });

From e2fdba48987be03a330f06c1a9e1f7e19880b7a1 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 13 Jun 2017 00:00:40 +0700
Subject: [PATCH 079/264] Upgrade subscriptions-transport-ws

---
 package.json |  2 +-
 yarn.lock    | 22 +++++-----------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index f623b94ed..f6a969de9 100644
--- a/package.json
+++ b/package.json
@@ -116,7 +116,7 @@
     "semver": "^5.3.0",
     "simplemde": "^1.11.2",
     "snake-case": "^2.1.0",
-    "subscriptions-transport-ws": "^0.7.1",
+    "subscriptions-transport-ws": "^0.7.2",
     "timekeeper": "^1.0.0",
     "uuid": "^3.0.1",
     "yaml-loader": "^0.4.0",
diff --git a/yarn.lock b/yarn.lock
index 7c7907176..6013a3e49 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -30,11 +30,7 @@
   version "0.8.6"
   resolved "https://registry.yarnpkg.com/@types/graphql/-/graphql-0.8.6.tgz#b34fb880493ba835b0c067024ee70130d6f9bb68"
 
-"@types/graphql@^0.9.0":
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/@types/graphql/-/graphql-0.9.0.tgz#fccf859f0d2817687f210737dc3be48a18b1d754"
-
-"@types/graphql@^0.9.1":
+"@types/graphql@^0.9.0", "@types/graphql@^0.9.1":
   version "0.9.1"
   resolved "https://registry.yarnpkg.com/@types/graphql/-/graphql-0.9.1.tgz#b04ebe84bc997cc60dbea2ed4d0d4342c737f99d"
 
@@ -3639,14 +3635,6 @@ graphql-subscriptions@^0.2.0:
   dependencies:
     es6-promise "^3.2.1"
 
-graphql-subscriptions@^0.4.1:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/graphql-subscriptions/-/graphql-subscriptions-0.4.2.tgz#a1a41cebdb95103be348c409d0ed6096ad858455"
-  dependencies:
-    "@types/graphql" "^0.9.1"
-    es6-promise "^4.0.5"
-    iterall "^1.1.1"
-
 graphql-subscriptions@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/graphql-subscriptions/-/graphql-subscriptions-0.4.3.tgz#2aed6ba87551cc747742b793497ff24b22991867"
@@ -7852,14 +7840,14 @@ stylus@0.54.5, stylus@~0.54.5:
     sax "0.5.x"
     source-map "0.1.x"
 
-subscriptions-transport-ws@^0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.7.1.tgz#32d6a0ab2e29e2246b48952a6ff431774c08c93d"
+subscriptions-transport-ws@^0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.7.2.tgz#26917fd4ba23fa37fcd28accb6fe36a040b3bbe9"
   dependencies:
     "@types/ws" "^3.0.0"
     backo2 "^1.0.2"
     eventemitter3 "^2.0.3"
-    graphql-subscriptions "^0.4.1"
+    graphql-subscriptions "^0.4.3"
     graphql-tag "^2.0.0"
     iterall "^1.1.1"
     lodash.assign "^4.2.0"

From 8a3833ec119fede559cc71513d3993c68e487c74 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 12 Jun 2017 16:30:59 -0300
Subject: [PATCH 080/264] Merge issues

---
 graph/typeDefs.graphql | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 5f2d5a8c3..a4c4b8c5c 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -112,7 +112,7 @@ input AssetsQuery {
 
   # Limit the number of results to be returned
   limit: Int = 10
-
+}
 ################################################################################
 ## Tags
 ################################################################################
@@ -155,7 +155,6 @@ type TagLink {
 
   # The date that the TagLink was created.
   created_at: Date!
->>>>>>> master
 }
 
 ################################################################################

From 65f7ee2ab3ef3cdcd1d7baec3bab33067b2eae6f Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 12 Jun 2017 19:09:42 -0300
Subject: [PATCH 081/264] coral-plugin-commnet-content

---
 .eslintignore                                 |  1 +
 .gitignore                                    |  1 +
 .../src/components/Comment.js                 |  4 +---
 .../CommentContent.js                         | 17 --------------
 .../__tests__/commentContent.spec.js          | 11 ---------
 client/coral-plugin-history/Comment.js        |  7 +++---
 .../client/components/CreateUsernameDialog.js |  2 +-
 .../client/components/FakeComment.js          |  8 +++----
 .../client/.babelrc                           | 14 +++++++++++
 .../client/.eslintrc.json                     | 23 +++++++++++++++++++
 .../client/components/CommentContent.js       | 23 +++++++++++++++++++
 .../client/components/Link.js                 | 13 +++++++++++
 .../client/components/styles.css              |  8 +++++++
 .../client/helpers/isLink.js                  |  5 ++++
 .../client/index.js                           |  7 ++++++
 plugins/coral-plugin-comment-content/index.js |  1 +
 16 files changed, 106 insertions(+), 39 deletions(-)
 delete mode 100644 client/coral-plugin-commentcontent/CommentContent.js
 delete mode 100644 client/coral-plugin-commentcontent/__tests__/commentContent.spec.js
 create mode 100644 plugins/coral-plugin-comment-content/client/.babelrc
 create mode 100644 plugins/coral-plugin-comment-content/client/.eslintrc.json
 create mode 100644 plugins/coral-plugin-comment-content/client/components/CommentContent.js
 create mode 100644 plugins/coral-plugin-comment-content/client/components/Link.js
 create mode 100644 plugins/coral-plugin-comment-content/client/components/styles.css
 create mode 100644 plugins/coral-plugin-comment-content/client/helpers/isLink.js
 create mode 100644 plugins/coral-plugin-comment-content/client/index.js
 create mode 100644 plugins/coral-plugin-comment-content/index.js

diff --git a/.eslintignore b/.eslintignore
index 6fecd9d9b..8a8c3a213 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -11,4 +11,5 @@ plugins/*
 !plugins/coral-plugin-mod
 !plugins/coral-plugin-love
 !plugins/coral-plugin-viewing-options
+!plugins/coral-plugin-comment-content
 node_modules
diff --git a/.gitignore b/.gitignore
index abd490356..b3e0eaa73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,5 +24,6 @@ plugins/*
 !plugins/coral-plugin-mod
 !plugins/coral-plugin-love
 !plugins/coral-plugin-viewing-options
+!plugins/coral-plugin-comment-content
 
 **/node_modules/*
diff --git a/client/coral-embed-stream/src/components/Comment.js b/client/coral-embed-stream/src/components/Comment.js
index 92c59d936..82befeb2a 100644
--- a/client/coral-embed-stream/src/components/Comment.js
+++ b/client/coral-embed-stream/src/components/Comment.js
@@ -3,7 +3,6 @@ import React, {PropTypes} from 'react';
 import PermalinkButton from 'coral-plugin-permalinks/PermalinkButton';
 import AuthorName from 'coral-plugin-author-name/AuthorName';
 import TagLabel from 'coral-plugin-tag-label/TagLabel';
-import Content from 'coral-plugin-commentcontent/CommentContent';
 import PubDate from 'coral-plugin-pubdate/PubDate';
 import {ReplyBox, ReplyButton} from 'coral-plugin-replies';
 import FlagComment from 'coral-plugin-flags/FlagComment';
@@ -466,8 +465,7 @@ export default class Comment extends React.Component {
                 stopEditing={this.stopEditing}
                 />
             : <div>
-                <Content body={comment.body} />
-                <Slot fill="commentContent" />
+                <Slot fill="commentContent" comment={comment} />
               </div>
           }
 
diff --git a/client/coral-plugin-commentcontent/CommentContent.js b/client/coral-plugin-commentcontent/CommentContent.js
deleted file mode 100644
index 501005b3d..000000000
--- a/client/coral-plugin-commentcontent/CommentContent.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react';
-const name = 'coral-plugin-commentcontent';
-
-const Content = ({body, styles}) => {
-  const textbreaks = body.split('\n');
-  return <div
-    className={`${name}-text`}
-    style={styles && styles.text}>
-    {
-      textbreaks.map((line, i) => <span key={i} className={`${name}-line`}>
-        {line} <br className={`${name}-linebreak`}/>
-      </span>)
-    }
-  </div>;
-};
-
-export default Content;
diff --git a/client/coral-plugin-commentcontent/__tests__/commentContent.spec.js b/client/coral-plugin-commentcontent/__tests__/commentContent.spec.js
deleted file mode 100644
index 377726b6d..000000000
--- a/client/coral-plugin-commentcontent/__tests__/commentContent.spec.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import React from 'react';
-import {shallow} from 'enzyme';
-import {expect} from 'chai';
-import CommentContent from '../CommentContent';
-
-describe('CommentContent', () => {
-  it('should render content', () => {
-    const render = shallow(<CommentContent content="test"/>);
-    expect(render.contains('test')).to.be.truthy;
-  });
-});
diff --git a/client/coral-plugin-history/Comment.js b/client/coral-plugin-history/Comment.js
index cb188e53e..d85b7fb1c 100644
--- a/client/coral-plugin-history/Comment.js
+++ b/client/coral-plugin-history/Comment.js
@@ -1,8 +1,8 @@
 import React, {PropTypes} from 'react';
 import {Icon} from '../coral-ui';
 import styles from './Comment.css';
+import Slot from 'coral-framework/components/Slot';
 import PubDate from '../coral-plugin-pubdate/PubDate';
-import Content from '../coral-plugin-commentcontent/CommentContent';
 
 import t from 'coral-framework/services/i18n';
 
@@ -10,9 +10,10 @@ const Comment = (props) => {
   return (
     <div className={styles.myComment}>
       <div>
-        <Content
+        <Slot
+          fill="commentContent"
           className={`${styles.commentBody} myCommentBody`}
-          body={props.comment.body}
+          comment={props.comment}
         />
         <p className="myCommentAsset">
           <a
diff --git a/plugins/coral-plugin-auth/client/components/CreateUsernameDialog.js b/plugins/coral-plugin-auth/client/components/CreateUsernameDialog.js
index 96df1e96f..4fdf2a7f3 100644
--- a/plugins/coral-plugin-auth/client/components/CreateUsernameDialog.js
+++ b/plugins/coral-plugin-auth/client/components/CreateUsernameDialog.js
@@ -33,7 +33,7 @@ const CreateUsernameDialog = ({
           className={styles.fakeComment}
           username={formData.username}
           created_at={Date.now()}
-          body={t('createdisplay.fake_comment_body')}
+          comment={{body:t('createdisplay.fake_comment_body')}}
         />
         <p className={styles.ifyoudont}>
           {t('createdisplay.if_you_dont_change_your_name')}
diff --git a/plugins/coral-plugin-auth/client/components/FakeComment.js b/plugins/coral-plugin-auth/client/components/FakeComment.js
index 390dd409b..5517b72aa 100644
--- a/plugins/coral-plugin-auth/client/components/FakeComment.js
+++ b/plugins/coral-plugin-auth/client/components/FakeComment.js
@@ -1,17 +1,17 @@
 import React from 'react';
+import t from 'coral-framework/services/i18n';
 import {ReplyButton} from 'coral-plugin-replies';
 import PubDate from 'coral-plugin-pubdate/PubDate';
+import Slot from 'coral-framework/components/Slot';
 import AuthorName from 'coral-plugin-author-name/AuthorName';
-import Content from 'coral-plugin-commentcontent/CommentContent';
 import styles from 'coral-embed-stream/src/components/Comment.css';
-import t from 'coral-framework/services/i18n';
 
-export const FakeComment = ({username, created_at, body}) => (
+export const FakeComment = ({username, created_at, comment}) => (
   <div className={`comment ${styles.Comment}`} style={{marginLeft: 0 * 30}}>
     <hr aria-hidden={true} />
     <AuthorName author={{name: username}} />
     <PubDate created_at={created_at} />
-    <Content body={body} />
+    <Slot comment={comment} />
     <div className="commentActionsLeft comment__action-container">
       <div className={`${'coral-plugin-likes'}-container`}>
         <button className={'coral-plugin-likes-button'}>
diff --git a/plugins/coral-plugin-comment-content/client/.babelrc b/plugins/coral-plugin-comment-content/client/.babelrc
new file mode 100644
index 000000000..60be246eb
--- /dev/null
+++ b/plugins/coral-plugin-comment-content/client/.babelrc
@@ -0,0 +1,14 @@
+{
+  "presets": [
+    "es2015"
+  ],
+  "plugins": [
+    "add-module-exports",
+    "transform-class-properties",
+    "transform-decorators-legacy",
+    "transform-object-assign",
+    "transform-object-rest-spread",
+    "transform-async-to-generator",
+    "transform-react-jsx"
+  ]
+}
\ No newline at end of file
diff --git a/plugins/coral-plugin-comment-content/client/.eslintrc.json b/plugins/coral-plugin-comment-content/client/.eslintrc.json
new file mode 100644
index 000000000..9fe56bd14
--- /dev/null
+++ b/plugins/coral-plugin-comment-content/client/.eslintrc.json
@@ -0,0 +1,23 @@
+{
+  "env": {
+    "browser": true,
+    "es6": true,
+    "mocha": true
+  },
+  "parserOptions": {
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "experimentalObjectRestSpread": true,
+      "jsx": true
+    }
+  },
+  "parser": "babel-eslint",
+  "plugins": [
+    "react"
+  ],
+  "rules": {
+    "react/jsx-uses-react": "error",
+    "react/jsx-uses-vars": "error",
+    "no-console": ["warn", { "allow": ["warn", "error"] }]
+  }
+}
diff --git a/plugins/coral-plugin-comment-content/client/components/CommentContent.js b/plugins/coral-plugin-comment-content/client/components/CommentContent.js
new file mode 100644
index 000000000..15a5bc9af
--- /dev/null
+++ b/plugins/coral-plugin-comment-content/client/components/CommentContent.js
@@ -0,0 +1,23 @@
+import React from 'react';
+import isLink from '../helpers/isLink';
+import Link from './Link';
+
+const name = 'coral-plugin-comment-content';
+
+const CommentContent = ({comment}) => {
+  const textbreaks = comment.body.split('\n');
+  return <div className={`${name}-text`}>
+    {
+      textbreaks.map((line, i) => {
+        return (
+          <span key={i} className={`${name}-line`}>
+            {line.split(' ').map((w) => isLink(w) ? <Link url={w} key={i} /> : ` ${w}`)}
+            <br className={`${name}-linebreak`}/>
+          </span>
+        );
+      })
+    }
+  </div>;
+};
+
+export default CommentContent;
diff --git a/plugins/coral-plugin-comment-content/client/components/Link.js b/plugins/coral-plugin-comment-content/client/components/Link.js
new file mode 100644
index 000000000..14b718a73
--- /dev/null
+++ b/plugins/coral-plugin-comment-content/client/components/Link.js
@@ -0,0 +1,13 @@
+import React from 'react';
+import styles from './styles.css';
+
+const Link = ({url, key}) => (
+  <span>
+    {' '}
+    <a href={`//${url}`} key={key} className={styles.link} target="_blank">
+      {url}
+    </a>
+  </span>
+);
+
+export default Link;
diff --git a/plugins/coral-plugin-comment-content/client/components/styles.css b/plugins/coral-plugin-comment-content/client/components/styles.css
new file mode 100644
index 000000000..117942223
--- /dev/null
+++ b/plugins/coral-plugin-comment-content/client/components/styles.css
@@ -0,0 +1,8 @@
+.link {
+    color: grey;
+    text-decoration: underline;
+}
+
+.link:hover {
+    cursor: pointer;
+}
\ No newline at end of file
diff --git a/plugins/coral-plugin-comment-content/client/helpers/isLink.js b/plugins/coral-plugin-comment-content/client/helpers/isLink.js
new file mode 100644
index 000000000..cf4d43bc5
--- /dev/null
+++ b/plugins/coral-plugin-comment-content/client/helpers/isLink.js
@@ -0,0 +1,5 @@
+const linkRE = /(((http|ftp|https)\:\/\/)?([\w_-]+(?:(?:\.[\w_-]+)+))([\w.,@?^=%&:/~+#-]*[\w@?^=%&/~+#-])?)/gmi;
+
+const isLink = (s) => linkRE.test(s);
+
+export default isLink;
diff --git a/plugins/coral-plugin-comment-content/client/index.js b/plugins/coral-plugin-comment-content/client/index.js
new file mode 100644
index 000000000..e61cb51f4
--- /dev/null
+++ b/plugins/coral-plugin-comment-content/client/index.js
@@ -0,0 +1,7 @@
+import CommentContent from './components/CommentContent';
+
+export default {
+  slots: {
+    commentContent: [CommentContent]
+  }
+};
diff --git a/plugins/coral-plugin-comment-content/index.js b/plugins/coral-plugin-comment-content/index.js
new file mode 100644
index 000000000..f053ebf79
--- /dev/null
+++ b/plugins/coral-plugin-comment-content/index.js
@@ -0,0 +1 @@
+module.exports = {};

From 00d1b0e6f5148edf379b0fe2ecd9f8edc3a6bec0 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 12 Jun 2017 19:11:53 -0300
Subject: [PATCH 082/264] =?UTF-8?q?=C3=81dding=20to=20plugins?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins.default.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins.default.json b/plugins.default.json
index 42515f354..7b2115421 100644
--- a/plugins.default.json
+++ b/plugins.default.json
@@ -11,6 +11,7 @@
     "coral-plugin-like",
     "coral-plugin-auth",
     "coral-plugin-offtopic",
-    "coral-plugin-viewing-options"
+    "coral-plugin-viewing-options",
+    "coral-plugin-comment-content"
   ]
 }

From aed265efcc2fbc8e69783270b6e8ef6f13667601 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 13 Jun 2017 22:01:58 +0700
Subject: [PATCH 083/264] Use correct fragment name

---
 client/coral-framework/graphql/fragments.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/coral-framework/graphql/fragments.js b/client/coral-framework/graphql/fragments.js
index 3c64090bd..110f0796b 100644
--- a/client/coral-framework/graphql/fragments.js
+++ b/client/coral-framework/graphql/fragments.js
@@ -7,7 +7,7 @@ export default {
     'SuspendUserResponse',
     'RejectUsernameResponse',
     'SetUserStatusResponse',
-    'PostCommentResponse',
+    'CreateFlagResponse',
     'EditCommentResponse',
     'PostFlagResponse',
     'CreateDontAgreeResponse',
@@ -17,3 +17,4 @@ export default {
     'StopIgnoringUserResponse',
   )
 };
+

From 7d8f2aa876c1e9c3154c2faa4fbf3f511b78dfde Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 13 Jun 2017 22:02:54 +0700
Subject: [PATCH 084/264] More robust reactions

---
 errors.js                                   | 15 +++++++
 graph/mutators/action.js                    |  2 +-
 locales/en.yml                              |  1 +
 plugin-api/beta/client/hocs/withReaction.js | 50 ++++++++++++++++-----
 plugin-api/beta/server/getReactionConfig.js | 15 ++++++-
 services/actions.js                         | 37 ++++++++++-----
 6 files changed, 98 insertions(+), 22 deletions(-)

diff --git a/errors.js b/errors.js
index c203b1d25..5d2593d66 100644
--- a/errors.js
+++ b/errors.js
@@ -104,6 +104,20 @@ class ErrAuthentication extends APIError {
   }
 }
 
+/**
+ * ErrAlreadyExists is returned when an attempt to create a resource failed due to an existing one.
+ */
+class ErrAlreadyExists extends APIError {
+  constructor(existing = null) {
+    super('authentication error occured', {
+      translation_key: 'ALREADY_EXISTS',
+      status: 400
+    }, {
+      existing
+    });
+  }
+}
+
 // ErrContainsProfanity is returned in the event that the middleware detects
 // profanity/wordlisted words in the payload.
 const ErrContainsProfanity = new APIError('This username contains elements which are not permitted in our community. If you think this is in error, please contact us or try again.', {
@@ -171,6 +185,7 @@ const ErrCommentTooShort = new APIError('Comment was too short', {
 module.exports = {
   ExtendableError,
   APIError,
+  ErrAlreadyExists,
   ErrPasswordTooShort,
   ErrSettingsNotInit,
   ErrMissingEmail,
diff --git a/graph/mutators/action.js b/graph/mutators/action.js
index de9efea1a..96bf091cf 100644
--- a/graph/mutators/action.js
+++ b/graph/mutators/action.js
@@ -36,7 +36,7 @@ const createAction = async ({user = {}}, {item_id, item_type, action_type, group
  * Deletes an action based on the user id if the user owns that action.
  * @param  {Object} user the user performing the request
  * @param  {String} id   the id of the action to delete
- * @return {Promise}     resolves when the action is deleted
+ * @return {Promise}     resolves to the deleted action, or null if not found.
  */
 const deleteAction = ({user}, {id}) => {
   return ActionModel.findOneAndRemove({
diff --git a/locales/en.yml b/locales/en.yml
index ce9abdce5..4f287e36b 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -189,6 +189,7 @@ en:
     PASSWORD_REQUIRED: "Must input a password"
     COMMENTING_CLOSED: "Commenting is already closed"
     NOT_FOUND: "Resource not found"
+    ALREADY_EXISTS: "Resource already exists"
     INVALID_ASSET_URL: "Assert URL is invalid"
     email: "Not a valid E-Mail"
     confirm_password: "Passwords don't match. Please check again"
diff --git a/plugin-api/beta/client/hocs/withReaction.js b/plugin-api/beta/client/hocs/withReaction.js
index 42ac79ec5..1ed777996 100644
--- a/plugin-api/beta/client/hocs/withReaction.js
+++ b/plugin-api/beta/client/hocs/withReaction.js
@@ -149,6 +149,9 @@ export default (reaction) => (WrappedComponent) => {
       client: PropTypes.object.isRequired,
     };
 
+    // Whether or not a mutation is currently active.
+    duringMutation = false;
+
     constructor(props, context) {
       super(props, context);
 
@@ -208,6 +211,26 @@ export default (reaction) => (WrappedComponent) => {
       }
     }
 
+    postReaction = () => {
+      if (this.duringMutation) {
+        return;
+      }
+      this.duringMutation = true;
+      return this.props.postReaction(this.props.comment)
+        .then((result) => {this.duringMutation = false; return Promise.resolve(result); })
+        .catch((err) => {this.duringMutation = false; throw err; });
+    }
+
+    deleteReaction = () => {
+      if (this.duringMutation) {
+        return;
+      }
+      this.duringMutation = true;
+      return this.props.deleteReaction(this.props.comment)
+        .then((result) => {this.duringMutation = false; return Promise.resolve(result); })
+        .catch((err) => {this.duringMutation = false; throw err; });
+    }
+
     render() {
       const {comment} = this.props;
 
@@ -223,9 +246,16 @@ export default (reaction) => (WrappedComponent) => {
 
       const alreadyReacted = !!reactionSummary;
 
-      const withReactionProps = {reactionSummary, count, alreadyReacted};
-
-      return <WrappedComponent {...this.props} {...withReactionProps} />;
+      return <WrappedComponent
+        showSignInDialog={this.props.showSignInDialog}
+        user={this.props.user}
+        comment={comment}
+        reactionSummary={reactionSummary}
+        count={count}
+        alreadyReacted={alreadyReacted}
+        postReaction={this.postReaction}
+        deleteReaction={this.deleteReaction}
+      />;
     }
   }
 
@@ -240,16 +270,16 @@ export default (reaction) => (WrappedComponent) => {
       }
     `,
     {
-      props: ({mutate, ownProps}) => ({
-        deleteReaction: () => {
+      props: ({mutate}) => ({
+        deleteReaction: (comment) => {
 
           const reactionSummary = getMyActionSummary(
             `${Reaction}ActionSummary`,
-            ownProps.comment
+            comment
           );
 
           const id = reactionSummary.current_user.id;
-          const item_id = ownProps.comment.id;
+          const item_id = comment.id;
 
           const input = {id};
           return mutate({
@@ -283,11 +313,11 @@ export default (reaction) => (WrappedComponent) => {
         }
     `,
     {
-      props: ({mutate, ownProps}) => ({
-        postReaction: () => {
+      props: ({mutate}) => ({
+        postReaction: (comment) => {
 
           const input = {
-            item_id: ownProps.comment.id,
+            item_id: comment.id,
           };
 
           return mutate({
diff --git a/plugin-api/beta/server/getReactionConfig.js b/plugin-api/beta/server/getReactionConfig.js
index 83c45dcb5..78bc45dfd 100644
--- a/plugin-api/beta/server/getReactionConfig.js
+++ b/plugin-api/beta/server/getReactionConfig.js
@@ -1,5 +1,6 @@
 const wrapResponse = require('../../../graph/helpers/response');
 const {SEARCH_OTHER_USERS} = require('../../../perms/constants');
+const errors = require('../../../errors');
 
 function getReactionConfig(reaction) {
   reaction = reaction.toLowerCase();
@@ -134,13 +135,24 @@ function getReactionConfig(reaction) {
                 // The comment is needed to allow better filtering e.g. by asset_id.
                 pubsub.publish(`${reaction}ActionCreated`, {action, comment});
                 return Promise.resolve(action);
-              });
+              })
+            .catch((err) => {
+              if (err instanceof errors.ErrAlreadyExists) {
+                return Promise.resolve(err.metadata.existing);
+              }
+              throw err;
+            });
           });
           return wrapResponse(reaction)(response);
         },
         [`delete${Reaction}Action`]: (_, {input: {id}}, {mutators: {Action}, pubsub, loaders: {Comments}}) => {
           const response = Action.delete({id})
             .then((action) => {
+
+              // Action doesn't exist or was already deleted.
+              if (!action) {
+                return Promise.resolve(null);
+              }
               return Comments.get.load(action.item_id).then((comment) => {
 
                 // The comment is needed to allow better filtering e.g. by asset_id.
@@ -148,6 +160,7 @@ function getReactionConfig(reaction) {
                 return Promise.resolve(action);
               });
             });
+
           return wrapResponse(reaction)(response);
         }
       },
diff --git a/services/actions.js b/services/actions.js
index 40bef65bb..c59b3a3f9 100644
--- a/services/actions.js
+++ b/services/actions.js
@@ -1,5 +1,6 @@
 const ActionModel = require('../models/action');
 const _ = require('lodash');
+const errors = require('../errors');
 
 module.exports = class ActionsService {
 
@@ -12,10 +13,10 @@ module.exports = class ActionsService {
   }
 
   /**
-   * Add an action.
-   * @param {String} item_id  identifier of the comment  (uuid)
+   * Inserts an action.
+   * @param {String} item_id  identifier of the item (uuid)
    * @param {String} user_id  user id of the action (uuid)
-   * @param {String} action the new action to the comment
+   * @param {String} action   the new action to the item
    * @return {Promise}
    */
   static insertUserAction(action) {
@@ -31,16 +32,32 @@ module.exports = class ActionsService {
     };
 
     // Create/Update the action.
-    return ActionModel.findOneAndUpdate(query, action, {
+    return new Promise((resolve, reject) => {
+      ActionModel.findOneAndUpdate(
+        query, {
 
-      // Ensure that if it's new, we return the new object created.
-      new: true,
+          // Only set when not existing.
+          $setOnInsert: action,
+        }, {
 
-      // Perform an upsert in the event that this doesn't exist.
-      upsert: true,
+          // Ensure that if it's new, we return the new object created.
+          new: true,
 
-      // Set the default values if not provided based on the mongoose models.
-      setDefaultsOnInsert: true
+          // Use raw result to get `updatedExisting`.
+          passRawResult: true,
+
+          // Perform an upsert in the event that this doesn't exist.
+          upsert: true,
+
+          // Set the default values if not provided based on the mongoose models.
+          setDefaultsOnInsert: true
+        }, (err, doc, raw) => {
+          if (err) { return reject(err); }
+          if (raw.lastErrorObject.updatedExisting) {
+            return reject(new errors.ErrAlreadyExists(raw.value));
+          }
+          return resolve(raw.value);
+        });
     });
   }
 

From 99745723fb670ea4ba1cb8111e527986533dee09 Mon Sep 17 00:00:00 2001
From: IAmSamHankins <samantha.hankins@icloud.com>
Date: Tue, 13 Jun 2017 12:40:07 -0400
Subject: [PATCH 085/264] style updates to flagged user names queue and updated
 translations

---
 .../routes/Community/components/Community.css | 19 ++++++++++++++-----
 .../routes/Community/components/styles.css    |  8 +++++++-
 locales/en.yml                                |  8 ++++----
 locales/es.yml                                |  6 +++---
 4 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/client/coral-admin/src/routes/Community/components/Community.css b/client/coral-admin/src/routes/Community/components/Community.css
index 28551c8a0..e65c34514 100644
--- a/client/coral-admin/src/routes/Community/components/Community.css
+++ b/client/coral-admin/src/routes/Community/components/Community.css
@@ -175,7 +175,7 @@
      right: 0;
      height: 100%;
      top: 0;
-     padding: 40px 18px;
+     padding: 50px 18px;
      box-sizing: border-box;
    }
 
@@ -310,24 +310,33 @@
 .flaggedByCount {
   display: block;
   text-align: left;
+  margin-top: 5px;
+}
+
+.flaggedByCount i {
+  font-size: 14px;
+  margin-right: 10px;
 }
 
 .flaggedBy {
   display: inline;
   padding: 3px;
-  font-size: 16px;
+  font-size: 14px;
+  margin-left: 5px;
 }
 
 .flaggedByLabel {
-  font-weight: bold;
+  font-weight: 600;
   font-size: 14px;
 }
 
 .flaggedReasons {
-  padding-top: 15px;
   margin-left: 24px;
+  margin-top: 10px;
 }
 
-.flaggedByReason {
+p.flaggedByReason {
   font-size: 1tpx;
+  margin: 0px;
+  line-height: 1.4;
 }
diff --git a/client/coral-admin/src/routes/Community/components/styles.css b/client/coral-admin/src/routes/Community/components/styles.css
index 2cd3f7b50..8e4b716af 100644
--- a/client/coral-admin/src/routes/Community/components/styles.css
+++ b/client/coral-admin/src/routes/Community/components/styles.css
@@ -52,6 +52,10 @@ span {
   }
 }
 
+.approve {
+  margin-top: 10px;
+}
+
 .notFound {
   position: relative;
   margin: 20px auto;
@@ -193,7 +197,7 @@ span {
      top: 0;
      padding: 40px 18px;
      box-sizing: border-box;
-   }
+  }
 
   .itemHeader {
     display: flex;
@@ -255,6 +259,8 @@ span {
 
 }
 
+
+
 .empty {
   color: #444;
   margin-top: 50px;
diff --git a/locales/en.yml b/locales/en.yml
index ce9abdce5..113737642 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -42,17 +42,17 @@ en:
     banned: Banned
     banned_user: "Banned User"
     cancel: Cancel
-    dont_like_username: "I don't like this username"
+    dont_like_username: "Dislike username"
     flaggedaccounts: "Flagged Usernames"
     flags: Flags
-    impersonating: "This user is impersonating"
+    impersonating: "Impersonation"
     loading: "Loading results"
     moderator: Moderator
     newsroom_role: "Newsroom Role"
-    no_flagged_accounts: "The Account Flags queue is currently empty."
+    no_flagged_accounts: "The Flagged Usernames queue is currently empty."
     no_results: "No users found with that user name or email address. They're hiding!"
     note: "Note: Banning this user will not let them edit comment or remove anything."
-    offensive: "This comment is offensive"
+    offensive: "Offensive"
     other: Other
     people: People
     role: "Select role..."
diff --git a/locales/es.yml b/locales/es.yml
index 1b483b70c..6897f6f8b 100644
--- a/locales/es.yml
+++ b/locales/es.yml
@@ -44,14 +44,14 @@ es:
     dont_like_username: "No me gusta este nombre de usuario"
     flaggedaccounts: "Nombres de Usuario Reportados"
     flags: Reportes
-    impersonating: "El usuario esta suplantando identidad"
+    impersonating: Impersonando
     loading: "Cargando resultados"
     moderator: Moderator
     newsroom_role: "Rol en la redacción"
-    no_flagged_accounts: "No hay ninguna cuenta reportada en este momento."
+    no_flagged_accounts: "No hay ningún nombre de usario reportado en este momento."
     no_results: "No se encontraron usuarios con ese nombre o correo."
     note: "Nota: Suspender a este usuario no le va a permitir (al usuario) borrar ni editar ni comentar."
-    offensive: "Este comentario es ofensivo"
+    offensive: Ofensivo
     other: Otro
     people: Gente
     role: "Seleccionar rol..."

From cdfa8379ffe9b2fbb638656da9a861096ce6a973 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Wed, 14 Jun 2017 00:38:34 +0700
Subject: [PATCH 086/264] Change text and status of ErrAlreadyExists

---
 errors.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/errors.js b/errors.js
index 5d2593d66..9b26a9359 100644
--- a/errors.js
+++ b/errors.js
@@ -109,9 +109,9 @@ class ErrAuthentication extends APIError {
  */
 class ErrAlreadyExists extends APIError {
   constructor(existing = null) {
-    super('authentication error occured', {
+    super('resource already exists', {
       translation_key: 'ALREADY_EXISTS',
-      status: 400
+      status: 409
     }, {
       existing
     });

From b8c5461b9054573cb33a56a17213c83550ab6212 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Tue, 13 Jun 2017 15:13:26 -0300
Subject: [PATCH 087/264] Adding react-linkify

---
 .../client/components/CommentContent.js       |   7 +-
 .../client/components/Link.js                 |  13 --
 .../client/components/styles.css              |   8 --
 .../client/helpers/isLink.js                  |   5 -
 .../coral-plugin-comment-content/package.json |  14 +++
 .../coral-plugin-comment-content/yarn.lock    | 112 ++++++++++++++++++
 6 files changed, 130 insertions(+), 29 deletions(-)
 delete mode 100644 plugins/coral-plugin-comment-content/client/components/Link.js
 delete mode 100644 plugins/coral-plugin-comment-content/client/components/styles.css
 delete mode 100644 plugins/coral-plugin-comment-content/client/helpers/isLink.js
 create mode 100644 plugins/coral-plugin-comment-content/package.json
 create mode 100644 plugins/coral-plugin-comment-content/yarn.lock

diff --git a/plugins/coral-plugin-comment-content/client/components/CommentContent.js b/plugins/coral-plugin-comment-content/client/components/CommentContent.js
index 15a5bc9af..199982698 100644
--- a/plugins/coral-plugin-comment-content/client/components/CommentContent.js
+++ b/plugins/coral-plugin-comment-content/client/components/CommentContent.js
@@ -1,6 +1,5 @@
 import React from 'react';
-import isLink from '../helpers/isLink';
-import Link from './Link';
+import Linkify from 'react-linkify';
 
 const name = 'coral-plugin-comment-content';
 
@@ -11,7 +10,9 @@ const CommentContent = ({comment}) => {
       textbreaks.map((line, i) => {
         return (
           <span key={i} className={`${name}-line`}>
-            {line.split(' ').map((w) => isLink(w) ? <Link url={w} key={i} /> : ` ${w}`)}
+            <Linkify>
+              {line}
+            </Linkify>
             <br className={`${name}-linebreak`}/>
           </span>
         );
diff --git a/plugins/coral-plugin-comment-content/client/components/Link.js b/plugins/coral-plugin-comment-content/client/components/Link.js
deleted file mode 100644
index 14b718a73..000000000
--- a/plugins/coral-plugin-comment-content/client/components/Link.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import React from 'react';
-import styles from './styles.css';
-
-const Link = ({url, key}) => (
-  <span>
-    {' '}
-    <a href={`//${url}`} key={key} className={styles.link} target="_blank">
-      {url}
-    </a>
-  </span>
-);
-
-export default Link;
diff --git a/plugins/coral-plugin-comment-content/client/components/styles.css b/plugins/coral-plugin-comment-content/client/components/styles.css
deleted file mode 100644
index 117942223..000000000
--- a/plugins/coral-plugin-comment-content/client/components/styles.css
+++ /dev/null
@@ -1,8 +0,0 @@
-.link {
-    color: grey;
-    text-decoration: underline;
-}
-
-.link:hover {
-    cursor: pointer;
-}
\ No newline at end of file
diff --git a/plugins/coral-plugin-comment-content/client/helpers/isLink.js b/plugins/coral-plugin-comment-content/client/helpers/isLink.js
deleted file mode 100644
index cf4d43bc5..000000000
--- a/plugins/coral-plugin-comment-content/client/helpers/isLink.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const linkRE = /(((http|ftp|https)\:\/\/)?([\w_-]+(?:(?:\.[\w_-]+)+))([\w.,@?^=%&:/~+#-]*[\w@?^=%&/~+#-])?)/gmi;
-
-const isLink = (s) => linkRE.test(s);
-
-export default isLink;
diff --git a/plugins/coral-plugin-comment-content/package.json b/plugins/coral-plugin-comment-content/package.json
new file mode 100644
index 000000000..ed668425f
--- /dev/null
+++ b/plugins/coral-plugin-comment-content/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "coral-plugin-comment-content",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "react-linkify": "^0.2.1"
+  }
+}
diff --git a/plugins/coral-plugin-comment-content/yarn.lock b/plugins/coral-plugin-comment-content/yarn.lock
new file mode 100644
index 000000000..9f312c11d
--- /dev/null
+++ b/plugins/coral-plugin-comment-content/yarn.lock
@@ -0,0 +1,112 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+asap@~2.0.3:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.5.tgz#522765b50c3510490e52d7dcfe085ef9ba96958f"
+
+core-js@^1.0.0:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
+
+encoding@^0.1.11:
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
+  dependencies:
+    iconv-lite "~0.4.13"
+
+fbjs@^0.8.9:
+  version "0.8.12"
+  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.12.tgz#10b5d92f76d45575fd63a217d4ea02bea2f8ed04"
+  dependencies:
+    core-js "^1.0.0"
+    isomorphic-fetch "^2.1.1"
+    loose-envify "^1.0.0"
+    object-assign "^4.1.0"
+    promise "^7.1.1"
+    setimmediate "^1.0.5"
+    ua-parser-js "^0.7.9"
+
+iconv-lite@~0.4.13:
+  version "0.4.18"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.18.tgz#23d8656b16aae6742ac29732ea8f0336a4789cf2"
+
+is-stream@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+
+isomorphic-fetch@^2.1.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
+  dependencies:
+    node-fetch "^1.0.1"
+    whatwg-fetch ">=0.10.0"
+
+js-tokens@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
+
+linkify-it@^1.2.0:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-1.2.4.tgz#0773526c317c8fd13bd534ee1d180ff88abf881a"
+  dependencies:
+    uc.micro "^1.0.1"
+
+loose-envify@^1.0.0, loose-envify@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
+  dependencies:
+    js-tokens "^3.0.0"
+
+node-fetch@^1.0.1:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.1.tgz#899cb3d0a3c92f952c47f1b876f4c8aeabd400d5"
+  dependencies:
+    encoding "^0.1.11"
+    is-stream "^1.0.1"
+
+object-assign@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+
+promise@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-7.1.1.tgz#489654c692616b8aa55b0724fa809bb7db49c5bf"
+  dependencies:
+    asap "~2.0.3"
+
+prop-types@^15.5.8:
+  version "15.5.10"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154"
+  dependencies:
+    fbjs "^0.8.9"
+    loose-envify "^1.3.1"
+
+react-linkify@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/react-linkify/-/react-linkify-0.2.1.tgz#b28d3f9544539a622fec8d42b4800eb9d23bf981"
+  dependencies:
+    linkify-it "^1.2.0"
+    prop-types "^15.5.8"
+    tlds "^1.57.0"
+
+setimmediate@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+
+tlds@^1.57.0:
+  version "1.189.0"
+  resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.189.0.tgz#b8cb46ea76dc2f4a01d45b8d907bf19a66e9f729"
+
+ua-parser-js@^0.7.9:
+  version "0.7.12"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb"
+
+uc.micro@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.3.tgz#7ed50d5e0f9a9fb0a573379259f2a77458d50192"
+
+whatwg-fetch@>=0.10.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84"

From fd2fcb4ed9fdc5a8b570e7917990b9fee4b221a0 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Tue, 13 Jun 2017 15:28:18 -0300
Subject: [PATCH 088/264] Parent target

---
 .../client/components/CommentContent.js                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/coral-plugin-comment-content/client/components/CommentContent.js b/plugins/coral-plugin-comment-content/client/components/CommentContent.js
index 199982698..e03887829 100644
--- a/plugins/coral-plugin-comment-content/client/components/CommentContent.js
+++ b/plugins/coral-plugin-comment-content/client/components/CommentContent.js
@@ -10,7 +10,7 @@ const CommentContent = ({comment}) => {
       textbreaks.map((line, i) => {
         return (
           <span key={i} className={`${name}-line`}>
-            <Linkify>
+            <Linkify properties={{target: '_parent'}}>
               {line}
             </Linkify>
             <br className={`${name}-linebreak`}/>

From 5633dd27fc7119751587d6da25c47e26fd639981 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Tue, 13 Jun 2017 15:53:59 -0300
Subject: [PATCH 089/264] Link should be target blank

---
 .../client/components/CommentContent.js                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/coral-plugin-comment-content/client/components/CommentContent.js b/plugins/coral-plugin-comment-content/client/components/CommentContent.js
index e03887829..3708ee42c 100644
--- a/plugins/coral-plugin-comment-content/client/components/CommentContent.js
+++ b/plugins/coral-plugin-comment-content/client/components/CommentContent.js
@@ -10,7 +10,7 @@ const CommentContent = ({comment}) => {
       textbreaks.map((line, i) => {
         return (
           <span key={i} className={`${name}-line`}>
-            <Linkify properties={{target: '_parent'}}>
+            <Linkify properties={{target: '_blank'}}>
               {line}
             </Linkify>
             <br className={`${name}-linebreak`}/>

From 60905bb99d2e3ef88ba2323f102b773fdd434bb9 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 14 Jun 2017 13:02:51 -0300
Subject: [PATCH 090/264] Default Components for Slots

---
 client/coral-embed-stream/src/components/Comment.js | 9 +++++----
 client/coral-framework/components/Slot.js           | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/client/coral-embed-stream/src/components/Comment.js b/client/coral-embed-stream/src/components/Comment.js
index 82befeb2a..a66b8a224 100644
--- a/client/coral-embed-stream/src/components/Comment.js
+++ b/client/coral-embed-stream/src/components/Comment.js
@@ -9,6 +9,7 @@ import FlagComment from 'coral-plugin-flags/FlagComment';
 import {can} from 'coral-framework/services/perms';
 import {TransitionGroup} from 'react-transition-group';
 import cn from 'classnames';
+import styles from './Comment.css';
 
 import {
   BestButton,
@@ -17,14 +18,14 @@ import {
   commentIsBest,
   BestIndicator
 } from 'coral-plugin-best/BestButton';
-import Slot from 'coral-framework/components/Slot';
 import LoadMore from './LoadMore';
+import {getEditableUntilDate} from './util';
 import {TopRightMenu} from './TopRightMenu';
+import CommentContent from './CommentContent';
+import Slot from 'coral-framework/components/Slot';
 import IgnoredCommentTombstone from './IgnoredCommentTombstone';
 import {EditableCommentContent} from './EditableCommentContent';
 import {getActionSummary, iPerformedThisAction} from 'coral-framework/utils';
-import {getEditableUntilDate} from './util';
-import styles from './Comment.css';
 
 const isStaff = (tags) => !tags.every((t) => t.tag.name !== 'STAFF');
 const hasTag = (tags, lookupTag) => !!tags.filter((t) => t.tag.name === lookupTag).length;
@@ -465,7 +466,7 @@ export default class Comment extends React.Component {
                 stopEditing={this.stopEditing}
                 />
             : <div>
-                <Slot fill="commentContent" comment={comment} />
+                <Slot fill="commentContent" comment={comment} defaultComponent={CommentContent} />
               </div>
           }
 
diff --git a/client/coral-framework/components/Slot.js b/client/coral-framework/components/Slot.js
index 22a315623..d313193e3 100644
--- a/client/coral-framework/components/Slot.js
+++ b/client/coral-framework/components/Slot.js
@@ -4,10 +4,10 @@ import styles from './Slot.css';
 import {connect} from 'react-redux';
 import {getSlotElements} from 'coral-framework/helpers/plugins';
 
-function Slot ({fill, inline = false, className, plugin_config: config, ...rest}) {
+function Slot ({fill, inline = false, className, plugin_config: config, defaultComponent = () => {}, ...rest}) {
   return (
     <div className={cn({[styles.inline]: inline, [styles.debug]: config.debug}, className)}>
-      {getSlotElements(fill, {...rest, config})}
+      {getSlotElements(fill).length ? getSlotElements(fill, {...rest, config}) : defaultComponent({...rest})}
     </div>
   );
 }

From 25376bd00ff65ae8ba8d0ebde783753aef50aca5 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 14 Jun 2017 13:22:03 -0300
Subject: [PATCH 091/264] replacing coral-ui in plugins

---
 .../src/components/CommentContent.js          | 19 +++++++++++++++++++
 client/coral-plugin-history/Comment.js        |  2 ++
 plugin-api/beta/client/components/ui/index.js |  1 +
 .../client/components/CreateUsernameDialog.js |  4 ++--
 .../client/components/ForgotContent.js        |  2 +-
 .../client/components/SignDialog.js           |  2 +-
 .../client/components/SignInButton.js         |  2 +-
 .../client/components/SignInContent.js        |  2 +-
 .../client/components/SignUpContent.js        |  2 +-
 .../client/components/Container.js            |  2 +-
 10 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 client/coral-embed-stream/src/components/CommentContent.js
 create mode 100644 plugin-api/beta/client/components/ui/index.js

diff --git a/client/coral-embed-stream/src/components/CommentContent.js b/client/coral-embed-stream/src/components/CommentContent.js
new file mode 100644
index 000000000..4d56ec0d5
--- /dev/null
+++ b/client/coral-embed-stream/src/components/CommentContent.js
@@ -0,0 +1,19 @@
+import React from 'react';
+
+const CommentContent = ({comment}) => {
+  const textbreaks = comment.body.split('\n');
+  return <div className={`${name}-text`}>
+    {
+      textbreaks.map((line, i) => {
+        return (
+          <span key={i} className={`${name}-line`}>
+            {line}
+            <br className={`${name}-linebreak`}/>
+          </span>
+        );
+      })
+    }
+  </div>;
+};
+
+export default CommentContent;
diff --git a/client/coral-plugin-history/Comment.js b/client/coral-plugin-history/Comment.js
index d85b7fb1c..888989737 100644
--- a/client/coral-plugin-history/Comment.js
+++ b/client/coral-plugin-history/Comment.js
@@ -3,6 +3,7 @@ import {Icon} from '../coral-ui';
 import styles from './Comment.css';
 import Slot from 'coral-framework/components/Slot';
 import PubDate from '../coral-plugin-pubdate/PubDate';
+import CommentContent from '../coral-embed-stream/src/components/CommentContent';
 
 import t from 'coral-framework/services/i18n';
 
@@ -12,6 +13,7 @@ const Comment = (props) => {
       <div>
         <Slot
           fill="commentContent"
+          defaultComponent={CommentContent}
           className={`${styles.commentBody} myCommentBody`}
           comment={props.comment}
         />
diff --git a/plugin-api/beta/client/components/ui/index.js b/plugin-api/beta/client/components/ui/index.js
new file mode 100644
index 000000000..06ba38393
--- /dev/null
+++ b/plugin-api/beta/client/components/ui/index.js
@@ -0,0 +1 @@
+export * from 'coral-ui';
diff --git a/plugins/coral-plugin-auth/client/components/CreateUsernameDialog.js b/plugins/coral-plugin-auth/client/components/CreateUsernameDialog.js
index 4fdf2a7f3..2dc70e57a 100644
--- a/plugins/coral-plugin-auth/client/components/CreateUsernameDialog.js
+++ b/plugins/coral-plugin-auth/client/components/CreateUsernameDialog.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import styles from './styles.css';
-import {Dialog, Alert, TextField} from 'coral-ui';
+import {Dialog, Alert, TextField} from 'plugin-api/beta/client/components/ui';
 import {FakeComment} from './FakeComment';
-import Button from 'coral-ui/components/Button';
+import {Button} from 'plugin-api/beta/client/components/ui';
 import t from 'coral-framework/services/i18n';
 
 const CreateUsernameDialog = ({
diff --git a/plugins/coral-plugin-auth/client/components/ForgotContent.js b/plugins/coral-plugin-auth/client/components/ForgotContent.js
index c0e4205a9..2e31d87e2 100644
--- a/plugins/coral-plugin-auth/client/components/ForgotContent.js
+++ b/plugins/coral-plugin-auth/client/components/ForgotContent.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import styles from './styles.css';
-import Button from 'coral-ui/components/Button';
+import {Button} from 'plugin-api/beta/client/components/ui';
 import t from 'coral-framework/services/i18n';
 
 class ForgotContent extends React.Component {
diff --git a/plugins/coral-plugin-auth/client/components/SignDialog.js b/plugins/coral-plugin-auth/client/components/SignDialog.js
index 7f05889a0..542f53f98 100644
--- a/plugins/coral-plugin-auth/client/components/SignDialog.js
+++ b/plugins/coral-plugin-auth/client/components/SignDialog.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import {Dialog} from 'coral-ui';
+import {Dialog} from 'plugin-api/beta/client/components/ui';
 import styles from './styles.css';
 
 import SignInContent from './SignInContent';
diff --git a/plugins/coral-plugin-auth/client/components/SignInButton.js b/plugins/coral-plugin-auth/client/components/SignInButton.js
index 1789a6496..944796e88 100644
--- a/plugins/coral-plugin-auth/client/components/SignInButton.js
+++ b/plugins/coral-plugin-auth/client/components/SignInButton.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import {Button} from 'coral-ui';
+import {Button} from 'plugin-api/beta/client/components/ui';
 import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
 import {showSignInDialog} from 'coral-framework/actions/auth';
diff --git a/plugins/coral-plugin-auth/client/components/SignInContent.js b/plugins/coral-plugin-auth/client/components/SignInContent.js
index dd130d8db..c92000232 100644
--- a/plugins/coral-plugin-auth/client/components/SignInContent.js
+++ b/plugins/coral-plugin-auth/client/components/SignInContent.js
@@ -1,5 +1,5 @@
 import React, {PropTypes} from 'react';
-import {Button, TextField, Spinner, Success, Alert} from 'coral-ui';
+import {Button, TextField, Spinner, Success, Alert} from 'plugin-api/beta/client/components/ui';
 import styles from './styles.css';
 import t from 'coral-framework/services/i18n';
 
diff --git a/plugins/coral-plugin-auth/client/components/SignUpContent.js b/plugins/coral-plugin-auth/client/components/SignUpContent.js
index 314e97ec7..ff90a7fd8 100644
--- a/plugins/coral-plugin-auth/client/components/SignUpContent.js
+++ b/plugins/coral-plugin-auth/client/components/SignUpContent.js
@@ -1,6 +1,6 @@
 import styles from './styles.css';
 import React from 'react';
-import {Button, TextField, Spinner, Success, Alert} from 'coral-ui';
+import {Button, TextField, Spinner, Success, Alert} from 'plugin-api/beta/client/components/ui';
 import t from 'coral-framework/services/i18n';
 
 class SignUpContent extends React.Component {
diff --git a/plugins/coral-plugin-mod/client/components/Container.js b/plugins/coral-plugin-mod/client/components/Container.js
index 25ce77a36..9ba88bdde 100644
--- a/plugins/coral-plugin-mod/client/components/Container.js
+++ b/plugins/coral-plugin-mod/client/components/Container.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import Box from './Box';
-import {Button} from 'coral-ui';
+import {Button} from 'plugin-api/beta/client/components/ui';
 import styles from './styles.css';
 
 export default class Footer extends React.Component {

From b40d592819f242853e15924f471a017fa5df84d4 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 14 Jun 2017 13:27:06 -0300
Subject: [PATCH 092/264] import lint

---
 .../client/components/CreateUsernameDialog.js                  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/coral-plugin-auth/client/components/CreateUsernameDialog.js b/plugins/coral-plugin-auth/client/components/CreateUsernameDialog.js
index 2dc70e57a..12916b4dd 100644
--- a/plugins/coral-plugin-auth/client/components/CreateUsernameDialog.js
+++ b/plugins/coral-plugin-auth/client/components/CreateUsernameDialog.js
@@ -1,8 +1,7 @@
 import React from 'react';
 import styles from './styles.css';
-import {Dialog, Alert, TextField} from 'plugin-api/beta/client/components/ui';
+import {Dialog, Alert, TextField, Button} from 'plugin-api/beta/client/components/ui';
 import {FakeComment} from './FakeComment';
-import {Button} from 'plugin-api/beta/client/components/ui';
 import t from 'coral-framework/services/i18n';
 
 const CreateUsernameDialog = ({

From 3658a804b0013380eef3aace54e2dcf31cf4d00d Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Thu, 15 Jun 2017 01:08:25 +0700
Subject: [PATCH 093/264] Implement live updates for mod actions

---
 .../src/components/ToastContainer.css         |   4 +-
 client/coral-admin/src/graphql/index.js       |  54 ---
 client/coral-admin/src/graphql/utils.js       |  62 ++++
 client/coral-admin/src/index.js               |   4 +-
 .../routes/Moderation/components/Comment.js   | 336 +++++++++---------
 .../Moderation/components/Moderation.js       |   3 +-
 .../Moderation/components/ModerationQueue.js  |  22 +-
 .../routes/Moderation/components/styles.css   |  18 +
 .../Moderation/containers/Moderation.js       |  88 +++++
 client/coral-admin/src/services/client.js     |  22 +-
 client/coral-admin/src/services/store.js      |   6 +-
 client/coral-framework/services/client.js     |   3 +-
 graph/mutators/comment.js                     |   5 +-
 graph/resolvers/root_mutation.js              |   8 +-
 graph/resolvers/subscription.js               |   5 +-
 graph/subscriptions.js                        |  14 +
 graph/typeDefs.graphql                        |   8 +
 package.json                                  |   1 -
 perms/constants.js                            |   5 +-
 perms/index.js                                |   4 +-
 perms/subscriptionReducer.js                  |  11 +
 services/comments.js                          |   4 +
 22 files changed, 432 insertions(+), 255 deletions(-)
 create mode 100644 client/coral-admin/src/graphql/utils.js
 create mode 100644 perms/subscriptionReducer.js

diff --git a/client/coral-admin/src/components/ToastContainer.css b/client/coral-admin/src/components/ToastContainer.css
index 319872ceb..57ddf3134 100644
--- a/client/coral-admin/src/components/ToastContainer.css
+++ b/client/coral-admin/src/components/ToastContainer.css
@@ -133,7 +133,7 @@
     animation-fill-mode: both; }
 
   .toastify {
-    z-index: 999;
+    z-index: 99999;
     position: fixed;
     padding: 4px;
     width: 350px;
@@ -197,7 +197,7 @@
     border-radius: 2px;
     box-shadow: 0 2px 15px 0 rgba(0, 0, 0, 0.1), 0 3px 20px 0 rgba(0, 0, 0, 0.05); }
     .toastify-content--info {
-      background: #2488cb; }
+      background: #404040; }
     .toastify-content--success {
       background: #008577; }
     .toastify-content--warning {
diff --git a/client/coral-admin/src/graphql/index.js b/client/coral-admin/src/graphql/index.js
index 59a6d7c8f..915fe2989 100644
--- a/client/coral-admin/src/graphql/index.js
+++ b/client/coral-admin/src/graphql/index.js
@@ -1,6 +1,4 @@
 import {add} from 'coral-framework/services/graphqlRegistry';
-import update from 'immutability-helper';
-const queues = ['all', 'premod', 'flagged', 'accepted', 'rejected'];
 
 const extension = {
   mutations: {
@@ -10,58 +8,6 @@ const extension = {
     RejectUsername: () => ({
       refetchQueries: ['CoralAdmin_Community'],
     }),
-    SetCommentStatus: ({variables: {commentId, status}}) => ({
-      updateQueries: {
-        CoralAdmin_Moderation: (prev) => {
-          const comment = queues.reduce((comment, queue) => {
-            return comment ? comment : prev[queue].nodes.find((c) => c.id === commentId);
-          }, null);
-
-          let acceptedNodes = prev.accepted.nodes;
-          let acceptedCount = prev.acceptedCount;
-          let rejectedNodes = prev.rejected.nodes;
-          let rejectedCount = prev.rejectedCount;
-
-          if (status !== comment.status) {
-            if (status === 'ACCEPTED') {
-              comment.status = 'ACCEPTED';
-              acceptedCount++;
-              acceptedNodes = [comment, ...acceptedNodes];
-            }
-            else if (status === 'REJECTED') {
-              comment.status = 'REJECTED';
-              rejectedCount++;
-              rejectedNodes = [comment, ...rejectedNodes];
-            }
-          }
-
-          const premodNodes = prev.premod.nodes.filter((c) => c.id !== commentId);
-          const flaggedNodes = prev.flagged.nodes.filter((c) => c.id !== commentId);
-          const premodCount = premodNodes.length < prev.premod.nodes.length ? prev.premodCount - 1 : prev.premodCount;
-          const flaggedCount = flaggedNodes.length < prev.flagged.nodes.length ? prev.flaggedCount - 1 : prev.flaggedCount;
-
-          if (status === 'REJECTED') {
-            acceptedNodes = prev.accepted.nodes.filter((c) => c.id !== commentId);
-            acceptedCount = acceptedNodes.length < prev.accepted.nodes.length ? prev.acceptedCount - 1 : prev.acceptedCount;
-          }
-          else if (status === 'ACCEPTED') {
-            rejectedNodes = prev.rejected.nodes.filter((c) => c.id !== commentId);
-            rejectedCount = rejectedNodes.length < prev.rejected.nodes.length ? prev.rejectedCount - 1 : prev.rejectedCount;
-          }
-
-          return update(prev, {
-            premodCount: {$set: Math.max(0, premodCount)},
-            flaggedCount: {$set: Math.max(0, flaggedCount)},
-            acceptedCount: {$set: Math.max(0, acceptedCount)},
-            rejectedCount: {$set: Math.max(0, rejectedCount)},
-            premod: {nodes: {$set: premodNodes}},
-            flagged: {nodes: {$set: flaggedNodes}},
-            accepted: {nodes: {$set: acceptedNodes}},
-            rejected: {nodes: {$set: rejectedNodes}},
-          });
-        }
-      }
-    }),
   },
 };
 
diff --git a/client/coral-admin/src/graphql/utils.js b/client/coral-admin/src/graphql/utils.js
new file mode 100644
index 000000000..7c8bd8875
--- /dev/null
+++ b/client/coral-admin/src/graphql/utils.js
@@ -0,0 +1,62 @@
+import update from 'immutability-helper';
+
+export function findCommentInModQueues(root, id, queues = ['all', 'premod', 'flagged', 'accepted', 'rejected']) {
+  return queues.reduce((comment, queue) => {
+    return comment ? comment : root[queue].nodes.find((c) => c.id === id);
+  }, null);
+}
+
+export function handleCommentStatusChange(root, {id, status}, previousStatus) {
+  const comment = findCommentInModQueues(root, id);
+  if (!previousStatus && comment) {
+    previousStatus = comment.status;
+  }
+
+  if (status === previousStatus) {
+    return root;
+  }
+
+  let acceptedNodes = root.accepted.nodes;
+  let acceptedCount = root.acceptedCount;
+  let rejectedNodes = root.rejected.nodes;
+  let rejectedCount = root.rejectedCount;
+
+  if (status === 'ACCEPTED') {
+    acceptedCount++;
+    if (comment) {
+      acceptedNodes = [{...comment, status}, ...acceptedNodes];
+    }
+  }
+  else if (status === 'REJECTED') {
+    rejectedCount++;
+    if (comment) {
+      rejectedNodes = [{...comment, status}, ...rejectedNodes];
+    }
+  }
+
+  const premodNodes = root.premod.nodes.filter((c) => c.id !== id);
+  const flaggedNodes = root.flagged.nodes.filter((c) => c.id !== id);
+  const premodCount = premodNodes.length < root.premod.nodes.length ? root.premodCount - 1 : root.premodCount;
+  const flaggedCount = flaggedNodes.length < root.flagged.nodes.length ? root.flaggedCount - 1 : root.flaggedCount;
+
+  if (status === 'REJECTED') {
+    acceptedNodes = root.accepted.nodes.filter((c) => c.id !== id);
+    acceptedCount = acceptedNodes.length < root.accepted.nodes.length ? root.acceptedCount - 1 : root.acceptedCount;
+  }
+  else if (status === 'ACCEPTED') {
+    rejectedNodes = root.rejected.nodes.filter((c) => c.id !== id);
+    rejectedCount = rejectedNodes.length < root.rejected.nodes.length ? root.rejectedCount - 1 : root.rejectedCount;
+  }
+
+  return update(root, {
+    premodCount: {$set: Math.max(0, premodCount)},
+    flaggedCount: {$set: Math.max(0, flaggedCount)},
+    acceptedCount: {$set: Math.max(0, acceptedCount)},
+    rejectedCount: {$set: Math.max(0, rejectedCount)},
+    premod: {nodes: {$set: premodNodes}},
+    flagged: {nodes: {$set: flaggedNodes}},
+    accepted: {nodes: {$set: acceptedNodes}},
+    rejected: {nodes: {$set: rejectedNodes}},
+  });
+}
+
diff --git a/client/coral-admin/src/index.js b/client/coral-admin/src/index.js
index 8cd7685f0..2f2e75275 100644
--- a/client/coral-admin/src/index.js
+++ b/client/coral-admin/src/index.js
@@ -2,7 +2,7 @@ import React from 'react';
 import {render} from 'react-dom';
 import {ApolloProvider} from 'react-apollo';
 
-import {client} from './services/client';
+import {getClient} from './services/client';
 import store from './services/store';
 
 import App from './components/App';
@@ -15,7 +15,7 @@ loadPluginsTranslations();
 injectPluginsReducers();
 
 render(
-  <ApolloProvider client={client} store={store}>
+  <ApolloProvider client={getClient()} store={store}>
     <App />
   </ApolloProvider>
   , document.querySelector('#root')
diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.js b/client/coral-admin/src/routes/Moderation/components/Comment.js
index 9d1019b5e..814b87c82 100644
--- a/client/coral-admin/src/routes/Moderation/components/Comment.js
+++ b/client/coral-admin/src/routes/Moderation/components/Comment.js
@@ -12,194 +12,202 @@ import {getActionSummary} from 'coral-framework/utils';
 import ActionButton from 'coral-admin/src/components/ActionButton';
 import ActionsMenu from 'coral-admin/src/components/ActionsMenu';
 import ActionsMenuItem from 'coral-admin/src/components/ActionsMenuItem';
+import cn from 'classnames';
 
 const linkify = new Linkify();
 
 import t, {timeago} from 'coral-framework/services/i18n';
 
-const Comment = ({
-  actions = [],
-  comment,
-  viewUserDetail,
-  suspectWords,
-  bannedWords,
-  minimal,
-  selected,
-  toggleSelect,
-  ...props
-}) => {
-  const links = linkify.getMatches(comment.body);
-  const linkText = links ? links.map((link) => link.raw) : [];
-  const flagActionSummaries = getActionSummary('FlagActionSummary', comment);
-  const flagActions =
-    comment.actions &&
-    comment.actions.filter((a) => a.__typename === 'FlagAction');
-  let commentType = '';
-  if (comment.status === 'PREMOD') {
-    commentType = 'premod';
-  } else if (flagActions && flagActions.length) {
-    commentType = 'flagged';
-  }
+class Comment extends React.Component {
 
-  // since words are checked against word boundaries on the backend,
-  // should be the behavior on the front end as well.
-  // currently the highlighter plugin does not support out of the box.
-  const searchWords = [...suspectWords, ...bannedWords]
-    .filter((w) => {
-      return new RegExp(`(^|\\s)${w}(\\s|$)`).test(comment.body);
-    })
-    .concat(linkText);
+  render() {
+    const {
+      actions = [],
+      comment,
+      viewUserDetail,
+      suspectWords,
+      bannedWords,
+      minimal,
+      selected,
+      toggleSelect,
+      className,
+      ...props
+    } = this.props;
 
-  let selectionStateCSS;
-  if (minimal) {
-    selectionStateCSS = selected ? styles.minimalSelection : '';
-  } else {
-    selectionStateCSS = selected ? 'mdl-shadow--16dp' : 'mdl-shadow--2dp';
-  }
+    const links = linkify.getMatches(comment.body);
+    const linkText = links ? links.map((link) => link.raw) : [];
+    const flagActionSummaries = getActionSummary('FlagActionSummary', comment);
+    const flagActions =
+      comment.actions &&
+      comment.actions.filter((a) => a.__typename === 'FlagAction');
+    let commentType = '';
+    if (comment.status === 'PREMOD') {
+      commentType = 'premod';
+    } else if (flagActions && flagActions.length) {
+      commentType = 'flagged';
+    }
 
-  return (
-    <li
-      tabIndex={props.index}
-      className={`mdl-card ${selectionStateCSS} ${styles.Comment} ${styles.listItem} ${minimal ? styles.minimal : ''}`}
-    >
-      <div className={styles.container}>
-        <div className={styles.itemHeader}>
-          <div className={styles.author}>
-            {
-              !minimal && (
-                <span className={styles.username} onClick={() => viewUserDetail(comment.user.id)}>
-                  {comment.user.name}
-                </span>
-              )
-            }
-            {
-              minimal && typeof selected === 'boolean' && typeof toggleSelect === 'function' && (
-                <input
-                  className={styles.bulkSelectInput}
-                  type='checkbox'
-                  value={comment.id}
-                  checked={selected}
-                  onChange={(e) => toggleSelect(e.target.value, e.target.checked)} />
-              )
-            }
-            <span className={styles.created}>
-              {timeago(comment.created_at || Date.now() - props.index * 60 * 1000)}
-            </span>
-            {props.currentUserId !== comment.user.id &&
-              <ActionsMenu icon="not_interested">
-                <ActionsMenuItem
-                  disabled={comment.user.status === 'BANNED'}
-                  onClick={() => props.showSuspendUserDialog(comment.user.id, comment.user.name, comment.id, comment.status)}>
-                  Suspend User</ActionsMenuItem>
-                <ActionsMenuItem
-                  disabled={comment.user.status === 'BANNED'}
-                  onClick={() => props.showBanUserDialog(comment.user, comment.id, comment.status, comment.status !== 'REJECTED')}>
-                  Ban User
-                </ActionsMenuItem>
-              </ActionsMenu>
-            }
-            <CommentType type={commentType} />
-          </div>
-          {comment.user.status === 'banned'
-            ? <span className={styles.banned}>
-                <Icon name="error_outline" />
-                {t('comment.banned_user')}
+    // since words are checked against word boundaries on the backend,
+    // should be the behavior on the front end as well.
+    // currently the highlighter plugin does not support out of the box.
+    const searchWords = [...suspectWords, ...bannedWords]
+      .filter((w) => {
+        return new RegExp(`(^|\\s)${w}(\\s|$)`).test(comment.body);
+      })
+      .concat(linkText);
+
+    let selectionStateCSS;
+    if (minimal) {
+      selectionStateCSS = selected ? styles.minimalSelection : '';
+    } else {
+      selectionStateCSS = selected ? 'mdl-shadow--16dp' : 'mdl-shadow--2dp';
+    }
+
+    return (
+      <li
+        tabIndex={props.index}
+        className={cn(className, 'mdl-card', selectionStateCSS, styles.Comment, styles.listItem, {[styles.minimal] : minimal})}
+      >
+        <div className={styles.container}>
+          <div className={styles.itemHeader}>
+            <div className={styles.author}>
+              {
+                !minimal && (
+                  <span className={styles.username} onClick={() => viewUserDetail(comment.user.id)}>
+                    {comment.user.name}
+                  </span>
+                )
+              }
+              {
+                minimal && typeof selected === 'boolean' && typeof toggleSelect === 'function' && (
+                  <input
+                    className={styles.bulkSelectInput}
+                    type='checkbox'
+                    value={comment.id}
+                    checked={selected}
+                    onChange={(e) => toggleSelect(e.target.value, e.target.checked)} />
+                )
+              }
+              <span className={styles.created}>
+                {timeago(comment.created_at || Date.now() - props.index * 60 * 1000)}
               </span>
-            : null}
-            <Slot
-              data={props.data}
-              root={props.root}
-              fill="adminCommentInfoBar"
-              comment={comment}
-            />
-        </div>
-        <div className={styles.moderateArticle}>
-          Story: {comment.asset.title}
-          {!props.currentAsset &&
-            <Link to={`/admin/moderate/${comment.asset.id}`}>{t('modqueue.moderate')}</Link>}
-        </div>
-        <div className={styles.itemBody}>
-          <p className={styles.body}>
-            <Highlighter
-              searchWords={searchWords}
-              textToHighlight={comment.body}
-            />
-            {' '}
-            <a
-              className={styles.external}
-              href={`${comment.asset.url}#${comment.id}`}
-              target="_blank"
-            >
-              <Icon name="open_in_new" /> {t('comment.view_context')}
-            </a>
-          </p>
-          <Slot
-            data={props.data}
-            root={props.root}
-            fill="adminCommentContent"
-            comment={comment}
-          />
-          <div className={styles.sideActions}>
-            {links
-              ? <span className={styles.hasLinks}>
-                  <Icon name="error_outline" /> Contains Link
+              {props.currentUserId !== comment.user.id &&
+                <ActionsMenu icon="not_interested">
+                  <ActionsMenuItem
+                    disabled={comment.user.status === 'BANNED'}
+                    onClick={() => props.showSuspendUserDialog(comment.user.id, comment.user.name, comment.id, comment.status)}>
+                    Suspend User</ActionsMenuItem>
+                  <ActionsMenuItem
+                    disabled={comment.user.status === 'BANNED'}
+                    onClick={() => props.showBanUserDialog(comment.user, comment.id, comment.status, comment.status !== 'REJECTED')}>
+                    Ban User
+                  </ActionsMenuItem>
+                </ActionsMenu>
+              }
+              <CommentType type={commentType} />
+            </div>
+            {comment.user.status === 'banned'
+              ? <span className={styles.banned}>
+                  <Icon name="error_outline" />
+                  {t('comment.banned_user')}
                 </span>
               : null}
-            <div className={`actions ${styles.actions}`}>
-              {actions.map((action, i) => {
-                const active =
-                  (action === 'REJECT' && comment.status === 'REJECTED') ||
-                  (action === 'APPROVE' && comment.status === 'ACCEPTED');
-                return (
-                  <ActionButton
-                    minimal={minimal}
-                    key={i}
-                    type={action}
-                    user={comment.user}
-                    status={comment.status}
-                    active={active}
-                    acceptComment={() =>
-                      (comment.status === 'ACCEPTED'
-                        ? null
-                        : props.acceptComment({commentId: comment.id}))}
-                    rejectComment={() =>
-                      (comment.status === 'REJECTED'
-                        ? null
-                        : props.rejectComment({commentId: comment.id}))}
-                  />
-                );
-              })}
-            </div>
+              <Slot
+                data={props.data}
+                root={props.root}
+                fill="adminCommentInfoBar"
+                comment={comment}
+              />
+          </div>
+          <div className={styles.moderateArticle}>
+            Story: {comment.asset.title}
+            {!props.currentAsset &&
+              <Link to={`/admin/moderate/${comment.asset.id}`}>{t('modqueue.moderate')}</Link>}
+          </div>
+          <div className={styles.itemBody}>
+            <p className={styles.body}>
+              <Highlighter
+                searchWords={searchWords}
+                textToHighlight={comment.body}
+              />
+              {' '}
+              <a
+                className={styles.external}
+                href={`${comment.asset.url}#${comment.id}`}
+                target="_blank"
+              >
+                <Icon name="open_in_new" /> {t('comment.view_context')}
+              </a>
+            </p>
             <Slot
               data={props.data}
               root={props.root}
-              fill="adminSideActions"
+              fill="adminCommentContent"
               comment={comment}
             />
+            <div className={styles.sideActions}>
+              {links
+                ? <span className={styles.hasLinks}>
+                    <Icon name="error_outline" /> Contains Link
+                  </span>
+                : null}
+              <div className={`actions ${styles.actions}`}>
+                {actions.map((action, i) => {
+                  const active =
+                    (action === 'REJECT' && comment.status === 'REJECTED') ||
+                    (action === 'APPROVE' && comment.status === 'ACCEPTED');
+                  return (
+                    <ActionButton
+                      minimal={minimal}
+                      key={i}
+                      type={action}
+                      user={comment.user}
+                      status={comment.status}
+                      active={active}
+                      acceptComment={() =>
+                        (comment.status === 'ACCEPTED'
+                          ? null
+                          : props.acceptComment({commentId: comment.id}))}
+                      rejectComment={() =>
+                        (comment.status === 'REJECTED'
+                          ? null
+                          : props.rejectComment({commentId: comment.id}))}
+                    />
+                  );
+                })}
+              </div>
+              <Slot
+                data={props.data}
+                root={props.root}
+                fill="adminSideActions"
+                comment={comment}
+              />
+            </div>
           </div>
         </div>
-      </div>
-      <Slot
-        data={props.data}
-        root={props.root}
-        fill="adminCommentDetailArea"
-        comment={comment}
-      />
-      {flagActions && flagActions.length
-        ? <FlagBox
-            actions={flagActions}
-            actionSummaries={flagActionSummaries}
-          />
-        : null}
-    </li>
-  );
-};
+        <Slot
+          data={props.data}
+          root={props.root}
+          fill="adminCommentDetailArea"
+          comment={comment}
+        />
+        {flagActions && flagActions.length
+          ? <FlagBox
+              actions={flagActions}
+              actionSummaries={flagActionSummaries}
+            />
+          : null}
+      </li>
+    );
+  }
+}
 
 Comment.propTypes = {
   minimal: PropTypes.bool,
   viewUserDetail: PropTypes.func.isRequired,
   acceptComment: PropTypes.func.isRequired,
   rejectComment: PropTypes.func.isRequired,
+  className: PropTypes.string,
   suspectWords: PropTypes.arrayOf(PropTypes.string).isRequired,
   bannedWords: PropTypes.arrayOf(PropTypes.string).isRequired,
   currentAsset: PropTypes.object,
diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js
index c788da993..1c1aa7690 100644
--- a/client/coral-admin/src/routes/Moderation/components/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js
@@ -92,9 +92,8 @@ export default class Moderation extends Component {
   }
 
   render () {
-    const {root, moderation, settings, assets, viewUserDetail, hideUserDetail, ...props} = this.props;
+    const {root, moderation, settings, assets, viewUserDetail, hideUserDetail, activeTab, ...props} = this.props;
     const providedAssetId = this.props.params.id;
-    const activeTab = this.props.route.path === ':id' ? 'premod' : this.props.route.path;
 
     let asset;
 
diff --git a/client/coral-admin/src/routes/Moderation/components/ModerationQueue.js b/client/coral-admin/src/routes/Moderation/components/ModerationQueue.js
index 490c2a985..399fc48ed 100644
--- a/client/coral-admin/src/routes/Moderation/components/ModerationQueue.js
+++ b/client/coral-admin/src/routes/Moderation/components/ModerationQueue.js
@@ -6,6 +6,7 @@ import EmptyCard from '../../../components/EmptyCard';
 import {actionsMap} from '../helpers/moderationQueueActionsMap';
 import LoadMore from './LoadMore';
 import t from 'coral-framework/services/i18n';
+import {CSSTransitionGroup} from 'react-transition-group';
 
 class ModerationQueue extends React.Component {
 
@@ -43,12 +44,27 @@ class ModerationQueue extends React.Component {
       commentCount,
       singleView,
       viewUserDetail,
+      activeTab,
       ...props
     } = this.props;
 
     return (
       <div id="moderationList" className={`${styles.list} ${singleView ? styles.singleView : ''}`}>
-        <ul style={{paddingLeft: 0}}>
+        <CSSTransitionGroup
+          key={activeTab}
+          component={'ul'}
+          style={{paddingLeft: 0}}
+          transitionName={{
+            enter: styles.commentEnter,
+            enterActive: styles.commentEnterActive,
+            leave: styles.commentLeave,
+            leaveActive: styles.commentLeaveActive,
+          }}
+          transitionEnter={true}
+          transitionLeave={true}
+          transitionEnterTimeout={1000}
+          transitionLeaveTimeout={1000}
+        >
           {
             comments.length
             ? comments.map((comment, i) => {
@@ -56,7 +72,7 @@ class ModerationQueue extends React.Component {
               return <Comment
                 data={this.props.data}
                 root={this.props.root}
-                key={i}
+                key={comment.id}
                 index={i}
                 comment={comment}
                 selected={i === selectedIndex}
@@ -74,7 +90,7 @@ class ModerationQueue extends React.Component {
             })
             : <EmptyCard>{t('modqueue.empty_queue')}</EmptyCard>
           }
-        </ul>
+        </CSSTransitionGroup>
         <LoadMore
           loadMore={this.loadMore}
           showLoadMore={comments.length < commentCount}
diff --git a/client/coral-admin/src/routes/Moderation/components/styles.css b/client/coral-admin/src/routes/Moderation/components/styles.css
index fc825eccb..7a5f5782c 100644
--- a/client/coral-admin/src/routes/Moderation/components/styles.css
+++ b/client/coral-admin/src/routes/Moderation/components/styles.css
@@ -479,3 +479,21 @@ span {
 .bulkSelectInput {
   cursor: pointer;
 }
+
+.commentLeave {
+  opacity: 1.0;
+  transition: opacity 800ms;
+}
+
+.commentLeaveActive {
+  opacity: 0;
+}
+
+.commentEnter {
+  opacity: 0;
+  transition: opacity 800ms;
+}
+
+.commentEnterActive {
+  opacity: 1.0;
+}
diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index 537aa1d65..6b7a9bf1b 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -10,6 +10,7 @@ import t, {timeago} from 'coral-framework/services/i18n';
 import update from 'immutability-helper';
 
 import {withSetUserStatus, withSuspendUser, withSetCommentStatus} from 'coral-framework/graphql/mutations';
+import {handleCommentStatusChange, findCommentInModQueues} from '../../../graphql/utils';
 
 import {fetchSettings} from 'actions/settings';
 import {updateAssets} from 'actions/assets';
@@ -30,9 +31,65 @@ import {Spinner} from 'coral-ui';
 import Moderation from '../components/Moderation';
 import Comment from './Comment';
 
+function truncate(s, length = 10) {
+  return (s.length > length) ? `${s.substring(0, length)}...` : s;
+}
+
 class ModerationContainer extends Component {
+  unsubscribe = null;
+
+  get activeTab() { return this.props.route.path === ':id' ? 'premod' : this.props.route.path; }
+
+  subscribeToUpdates() {
+    this.unsubscribe = this.props.data.subscribeToMore({
+      document: STATUS_CHANGED_SUBSCRIPTION,
+      variables: {
+        asset_id: this.props.data.variables.asset_id,
+      },
+      updateQuery: (prev, {subscriptionData: {data: {commentStatusChanged: {user, comment, previous}}}}) => {
+        const activeTab = this.activeTab;
+
+        // Status changed was caused by a different user.
+        if (user && user.id !== this.props.auth.user.id) {
+          if (findCommentInModQueues(prev, comment.id) && (
+              activeTab === 'all' && findCommentInModQueues(prev, comment.id, ['all'])
+              || activeTab === 'premod' && previous.status === 'PREMOD'
+              || activeTab === 'flagged' && findCommentInModQueues(prev, comment.id, ['flagged'])
+              || comment.status === 'ACCEPTED' && activeTab === 'accepted'
+              || comment.status !== 'ACCEPTED' && previous.status === 'ACCEPTED' && activeTab === 'accepted'
+              || comment.status === 'REJECTED' && activeTab === 'rejected'
+              || comment.status !== 'REJECTED' && previous.status === 'REJECTED' && activeTab === 'rejected'
+            )
+          ) {
+            const text = `${user.username} ${comment.status.toLowerCase()} comment "${truncate(comment.body, 50)}"`;
+            notification.info(text);
+          }
+        }
+        return handleCommentStatusChange(prev, comment, previous.status, user);
+      },
+    });
+  }
+
+  unsubscribe() {
+    if (!this.unsubscribe) {
+      return;
+    }
+    this.unsubscribe();
+    this.unsubscribe = null;
+  }
+
+  resubscribe() {
+    this.unsubscribe();
+    this.subscribeToUpdates();
+  }
+
   componentWillMount() {
     this.props.fetchSettings();
+    this.subscribeToUpdates();
+  }
+
+  componentWillUnmount() {
+    this.unsubscribe();
   }
 
   componentWillReceiveProps(nextProps) {
@@ -40,6 +97,11 @@ class ModerationContainer extends Component {
     if(!isEqual(nextProps.root.assets, this.props.root.assets)) {
       updateAssets(nextProps.root.assets);
     }
+
+    // Resubscribe when we change between assets.
+    if(this.props.data.variables.asset_id !== nextProps.data.variables.asset_id) {
+      this.resubscribe();
+    }
   }
 
   suspendUser = async (args) => {
@@ -113,6 +175,9 @@ class ModerationContainer extends Component {
         return update(prev, {
           [tab]: {
             nodes: {$push: comments.nodes},
+            hasNextPage: {$set: comments.hasNextPage},
+            startCursor: {$set: comments.startCursor},
+            endCursor: {$set: comments.endCursor},
           },
         });
       }
@@ -137,10 +202,30 @@ class ModerationContainer extends Component {
       acceptComment={this.acceptComment}
       rejectComment={this.rejectComment}
       suspendUser={this.suspendUser}
+      activeTab={this.activeTab}
     />;
   }
 }
 
+const STATUS_CHANGED_SUBSCRIPTION = gql`
+  subscription CommentStatusChanged($asset_id: ID){
+    commentStatusChanged(asset_id: $asset_id){
+      user {
+        id
+        username
+      }
+      comment {
+        id
+        status
+        body
+      }
+      previous {
+        status
+      }
+    }
+  }
+`;
+
 const LOAD_MORE_QUERY = gql`
   query CoralAdmin_Moderation_LoadMore($limit: Int = 10, $cursor: Date, $sort: SORT_ORDER, $asset_id: ID, $statuses:[COMMENT_STATUS!], $action_type: ACTION_TYPE) {
     comments(query: {limit: $limit, cursor: $cursor, asset_id: $asset_id, statuses: $statuses, sort: $sort, action_type: $action_type}) {
@@ -153,6 +238,9 @@ const LOAD_MORE_QUERY = gql`
           }
         }
       }
+      hasNextPage
+      startCursor
+      endCursor
     }
   }
   ${Comment.fragments.comment}
diff --git a/client/coral-admin/src/services/client.js b/client/coral-admin/src/services/client.js
index df97066bc..934de2c9e 100644
--- a/client/coral-admin/src/services/client.js
+++ b/client/coral-admin/src/services/client.js
@@ -1,20 +1,6 @@
-import ApolloClient, {addTypename} from 'apollo-client';
-import {networkInterface} from 'coral-framework/services/transport';
+import {getClient as getFrameworkClient} from 'coral-framework/services/client';
 import fragmentMatcher from './fragmentMatcher';
 
-export const client = new ApolloClient({
-  fragmentMatcher,
-  connectToDevTools: true,
-  addTypename: true,
-  queryTransformer: addTypename,
-  dataIdFromObject: (result) => {
-    if (result.id && result.__typename) { // eslint-disable-line no-underscore-dangle
-      return `${result.__typename}_${result.id}`; // eslint-disable-line no-underscore-dangle
-    }
-    return null;
-  },
-  networkInterface
-});
-
-export default client;
-
+export function getClient() {
+  return getFrameworkClient({fragmentMatcher});
+}
diff --git a/client/coral-admin/src/services/store.js b/client/coral-admin/src/services/store.js
index 9815a0f70..06cb3c758 100644
--- a/client/coral-admin/src/services/store.js
+++ b/client/coral-admin/src/services/store.js
@@ -1,10 +1,10 @@
 import {createStore, combineReducers, applyMiddleware, compose} from 'redux';
 import thunk from 'redux-thunk';
 import mainReducer from '../reducers';
-import {client} from './client';
+import {getClient} from './client';
 
 const middlewares = [
-  applyMiddleware(client.middleware()),
+  applyMiddleware(getClient().middleware()),
   applyMiddleware(thunk)
 ];
 
@@ -16,7 +16,7 @@ if (window.devToolsExtension) {
 
 const coralReducers = {
   ...mainReducer,
-  apollo: client.reducer()
+  apollo: getClient().reducer()
 };
 
 const store = createStore(
diff --git a/client/coral-framework/services/client.js b/client/coral-framework/services/client.js
index 26d8e391f..307646db0 100644
--- a/client/coral-framework/services/client.js
+++ b/client/coral-framework/services/client.js
@@ -26,7 +26,7 @@ export function resetWebsocket() {
   });
 }
 
-export function getClient() {
+export function getClient(options = {}) {
   if (client) {
     return client;
   }
@@ -56,6 +56,7 @@ export function getClient() {
   );
 
   client = new ApolloClient({
+    ...options,
     connectToDevTools: true,
     addTypename: true,
     queryTransformer: addTypename,
diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index 247eb264e..e11eaf2b9 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -326,7 +326,7 @@ const createPublicComment = async (context, commentInput) => {
  * @param {String} id          identifier of the comment  (uuid)
  * @param {String} status      the new status of the comment
  */
-const setStatus = async ({user, loaders: {Comments}}, {id, status}) => {
+const setStatus = async ({user, loaders: {Comments}, pubsub}, {id, status}) => {
   let comment = await CommentsService.pushStatus(id, status, user ? user.id : null);
 
   // If the loaders are present, clear the caches for these values because we
@@ -370,6 +370,9 @@ const edit = async (context, {id, asset_id, edit: {body}}) => {
 
     // Publish the edited comment via the subscription.
     context.pubsub.publish('commentEdited', comment);
+
+    // Publish the comment status change via the subscription.
+    context.pubsub.publish('commentStatusChanged', comment);
   }
 
   return comment;
diff --git a/graph/resolvers/root_mutation.js b/graph/resolvers/root_mutation.js
index f192405cc..087ec94bc 100644
--- a/graph/resolvers/root_mutation.js
+++ b/graph/resolvers/root_mutation.js
@@ -31,7 +31,13 @@ const RootMutation = {
   stopIgnoringUser(_, {id}, {mutators: {User}}) {
     return wrapResponse(null)(User.stopIgnoringUser({id}));
   },
-  setCommentStatus(_, {id, status}, {mutators: {Comment}}) {
+  setCommentStatus: async (_, {id, status}, {loaders: {Comments}, mutators: {Comment}, user, pubsub}) => {
+    const previous = await Comments.get.load(id);
+    const comment = await Comment.setStatus({id, status});
+
+    // Publish the comment status change via the subscription.
+    pubsub.publish('commentStatusChanged', {user, comment, previous});
+
     return wrapResponse(null)(Comment.setStatus({id, status}));
   },
   addTag(_, {tag}, {mutators: {Tag}}) {
diff --git a/graph/resolvers/subscription.js b/graph/resolvers/subscription.js
index a593c1eb6..8a989cc81 100644
--- a/graph/resolvers/subscription.js
+++ b/graph/resolvers/subscription.js
@@ -4,7 +4,10 @@ const Subscription = {
   },
   commentEdited(comment) {
     return comment;
-  }
+  },
+  commentStatusChanged(data) {
+    return data;
+  },
 };
 
 module.exports = Subscription;
diff --git a/graph/subscriptions.js b/graph/subscriptions.js
index 7d97d3521..2192dbdcf 100644
--- a/graph/subscriptions.js
+++ b/graph/subscriptions.js
@@ -10,6 +10,10 @@ const plugins = require('../services/plugins');
 
 const {deserializeUser} = require('../services/subscriptions');
 
+const {
+  SUBSCRIBE_COMMENT_STATUS,
+} = require('../perms/constants');
+
 /**
  * Plugin support requires that we merge in existing setupFunctions with our new
  * plugin based ones. This allows plugins to extend existing setupFunctions as well
@@ -30,6 +34,16 @@ const setupFunctions = plugins.get('server', 'setupFunctions').reduce((acc, {plu
       filter: (comment) => comment.asset_id === args.asset_id
     },
   }),
+  commentStatusChanged: (options, args) => ({
+    commentStatusChanged: {
+      filter: ({comment}, context) => {
+        if (!context.user || !context.user.can(SUBSCRIBE_COMMENT_STATUS)) {
+          return false;
+        }
+        return !args.asset_id || comment.asset_id === args.asset_id;
+      }
+    },
+  }),
 });
 
 /**
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 117b7e077..c1dfa0b7d 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -936,9 +936,17 @@ type RootMutation {
 ## Subscriptions
 ################################################################################
 
+# Response to ignoreUser mutation
+type CommentStatusChangedUpdate {
+  user: User
+  comment: Comment
+  previous: Comment
+}
+
 type Subscription {
   commentAdded(asset_id: ID!): Comment
   commentEdited(asset_id: ID!): Comment
+  commentStatusChanged(asset_id: ID): CommentStatusChangedUpdate
 }
 
 ################################################################################
diff --git a/package.json b/package.json
index f6a969de9..92bcd2be4 100644
--- a/package.json
+++ b/package.json
@@ -201,7 +201,6 @@
     "regenerator": "^0.8.46",
     "selenium-standalone": "^5.11.2",
     "style-loader": "^0.16.0",
-    "subscriptions-transport-ws": "^0.5.5-alpha.0",
     "supertest": "^2.0.1",
     "timeago.js": "^2.0.3",
     "webpack": "^2.3.1"
diff --git a/perms/constants.js b/perms/constants.js
index 2b5b907ac..1578946cf 100644
--- a/perms/constants.js
+++ b/perms/constants.js
@@ -21,5 +21,8 @@ module.exports = {
   SEARCH_ACTIONS: 'SEARCH_ACTIONS',
   SEARCH_NON_NULL_OR_ACCEPTED_COMMENTS: 'SEARCH_NON_NULL_OR_ACCEPTED_COMMENTS',
   SEARCH_OTHERS_COMMENTS: 'SEARCH_OTHERS_COMMENTS',
-  SEARCH_COMMENT_METRICS: 'SEARCH_COMMENT_METRICS'
+  SEARCH_COMMENT_METRICS: 'SEARCH_COMMENT_METRICS',
+
+  // subscriptions
+  SUBSCRIBE_COMMENT_STATUS: 'SUBSCRIBE_COMMENT_STATUS',
 };
diff --git a/perms/index.js b/perms/index.js
index f0e14c5fc..be6e7a2cd 100644
--- a/perms/index.js
+++ b/perms/index.js
@@ -2,11 +2,13 @@ const constants = require('./constants');
 const root = require('./rootReducer');
 const queries = require('./queryReducer');
 const mutations = require('./mutationReducer');
+const subscriptions = require('./subscriptionReducer');
 
 const reducers = [
   root,
   queries,
-  mutations
+  mutations,
+  subscriptions,
 ];
 
 // this will make 'reducer' a key in this array. hm.
diff --git a/perms/subscriptionReducer.js b/perms/subscriptionReducer.js
new file mode 100644
index 000000000..4ce817ea5
--- /dev/null
+++ b/perms/subscriptionReducer.js
@@ -0,0 +1,11 @@
+const {check} = require('./utils');
+const types = require('./constants');
+
+module.exports = (user, perm) => {
+  switch (perm) {
+  case types.SUBSCRIBE_COMMENT_STATUS:
+    return check(user, ['ADMIN', 'MODERATOR']);
+  default:
+    break;
+  }
+};
diff --git a/services/comments.js b/services/comments.js
index 3f18d55e3..af7593a8e 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -215,6 +215,10 @@ module.exports = class CommentsService {
         }
       },
       $set: {status}
+    }, {
+
+      // return modified comment.
+      new: true,
     });
   }
 

From c30d05fd6c19b9be0e97ef0ed3e66d1dc10fbaf2 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Thu, 15 Jun 2017 01:21:12 +0700
Subject: [PATCH 094/264] Switch all plugins to components/ui

---
 plugin-api/beta/client/components/index.js     | 1 -
 plugins/coral-plugin-like/client/LikeButton.js | 2 +-
 plugins/coral-plugin-love/client/LoveButton.js | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugin-api/beta/client/components/index.js b/plugin-api/beta/client/components/index.js
index 0330892bf..5d76732fc 100644
--- a/plugin-api/beta/client/components/index.js
+++ b/plugin-api/beta/client/components/index.js
@@ -1,2 +1 @@
 export {Slot} from 'coral-framework/components';
-export {Icon} from 'coral-ui';
diff --git a/plugins/coral-plugin-like/client/LikeButton.js b/plugins/coral-plugin-like/client/LikeButton.js
index 5b99f7df4..68a516c3f 100644
--- a/plugins/coral-plugin-like/client/LikeButton.js
+++ b/plugins/coral-plugin-like/client/LikeButton.js
@@ -2,7 +2,7 @@ import React from 'react';
 import styles from './styles.css';
 import {withReaction} from 'plugin-api/beta/client/hocs';
 import {t, can} from 'plugin-api/beta/client/services';
-import {Icon} from 'plugin-api/beta/client/components';
+import {Icon} from 'plugin-api/beta/client/components/ui';
 import cn from 'classnames';
 
 const plugin = 'coral-plugin-like';
diff --git a/plugins/coral-plugin-love/client/LoveButton.js b/plugins/coral-plugin-love/client/LoveButton.js
index 0e2b9ff01..0fc7bd7ca 100644
--- a/plugins/coral-plugin-love/client/LoveButton.js
+++ b/plugins/coral-plugin-love/client/LoveButton.js
@@ -2,7 +2,7 @@ import React from 'react';
 import styles from './styles.css';
 import {withReaction} from 'plugin-api/beta/client/hocs';
 import {t, can} from 'plugin-api/beta/client/services';
-import {Icon} from 'plugin-api/beta/client/components';
+import {Icon} from 'plugin-api/beta/client/components/ui';
 import cn from 'classnames';
 
 const plugin = 'coral-plugin-love';

From 035c00ee099714a7d9cd911d68fc08b1507a88ac Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Thu, 15 Jun 2017 01:28:06 +0700
Subject: [PATCH 095/264] Only create Slot elements once, support Class
 Components as defaultComponent

---
 client/coral-framework/components/Slot.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/client/coral-framework/components/Slot.js b/client/coral-framework/components/Slot.js
index d313193e3..ca246591b 100644
--- a/client/coral-framework/components/Slot.js
+++ b/client/coral-framework/components/Slot.js
@@ -4,10 +4,15 @@ import styles from './Slot.css';
 import {connect} from 'react-redux';
 import {getSlotElements} from 'coral-framework/helpers/plugins';
 
-function Slot ({fill, inline = false, className, plugin_config: config, defaultComponent = () => {}, ...rest}) {
+function Slot ({fill, inline = false, className, plugin_config: config, defaultComponent: DefaultComponent, ...rest}) {
+  let children = getSlotElements(fill, {...rest, config});
+  if (children.length === 0 && DefaultComponent) {
+    children = <DefaultComponent {...rest} />;
+  }
+
   return (
     <div className={cn({[styles.inline]: inline, [styles.debug]: config.debug}, className)}>
-      {getSlotElements(fill).length ? getSlotElements(fill, {...rest, config}) : defaultComponent({...rest})}
+      {children}
     </div>
   );
 }

From e160dfaa3e0faedceeeacd88e28883b56e889f86 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 14 Jun 2017 18:40:44 -0300
Subject: [PATCH 096/264] Style and functionality

---
 .../Moderation/components/Moderation.js       |  4 +-
 .../src/routes/Moderation/components/Story.js | 16 ++++--
 .../Moderation/components/StorySearch.css     | 57 +++++++++++++++++--
 .../Moderation/components/StorySearch.js      | 20 +++++--
 client/coral-ui/components/Button.css         | 10 ++++
 views/admin.ejs                               |  5 ++
 6 files changed, 94 insertions(+), 18 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js
index 511d3f089..3a23a1a86 100644
--- a/client/coral-admin/src/routes/Moderation/components/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js
@@ -34,12 +34,10 @@ export default class Moderation extends Component {
   }
 
   closeSearch = () => {
-    console.log('closeSearch');
     this.props.toggleStorySearch(false);
   }
 
   openSearch = () => {
-    console.log('openSearch');
     this.props.toggleStorySearch(true);
   }
 
@@ -210,7 +208,7 @@ export default class Moderation extends Component {
             acceptComment={props.acceptComment}
             rejectComment={props.rejectComment} />
         )}
-        <StorySearch visible={this.props.moderation.storySearchVisible} />
+        <StorySearch visible={this.props.moderation.storySearchVisible} closeSearch={this.closeSearch}/>
       </div>
     );
   }
diff --git a/client/coral-admin/src/routes/Moderation/components/Story.js b/client/coral-admin/src/routes/Moderation/components/Story.js
index 59f6d6fa1..b87611b24 100644
--- a/client/coral-admin/src/routes/Moderation/components/Story.js
+++ b/client/coral-admin/src/routes/Moderation/components/Story.js
@@ -1,15 +1,21 @@
 import React, {PropTypes} from 'react';
-import {Link} from 'react-router';
 import styles from './StorySearch.css';
 
-const Story = ({author, title, createdAt, open, id}) => {
+const formatDate = (date) => {
+  const d = new Date(date);
+  return `${d.getMonth() + 1}/${d.getDate()}/${d.getFullYear()}`;
+};
+
+const Story = ({author, title, createdAt, open, id, goToStory}) => {
   return (
-    <Link className={styles.story} to={`/admin/moderate/${id}`}>
+    <li className={styles.story} onClick={() => goToStory(id)}>
       <p className={styles.title}>{title}</p>
       <p className={styles.meta}>
-        <span className={styles.author}>By {author}</span><span className={styles.createdAt}>{createdAt}</span><span className={styles.status}>{open ? 'Open' : 'Closed'}</span>
+        <span className={styles.author}>By {author}</span>
+        <span className={styles.createdAt}>{formatDate(createdAt)}</span>
+        <span className={styles.status}>{open ? 'Open' : 'Closed'}</span>
       </p>
-    </Link>
+    </li>
   );
 };
 
diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.css b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
index ccccd210b..4224a38fb 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.css
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
@@ -1,5 +1,5 @@
 .container {
-  position: fixed;
+  position: absolute;
   background-color: white;
   top: 100px;
   left: 0;
@@ -8,6 +8,8 @@
   margin-right: auto;
   width: 50%;
   box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.15);
+  z-index: 100;
+  max-width: 820px;
 }
 
 .positionShim {
@@ -16,7 +18,9 @@
 
 .headInput {
   background-color: #efefef;
-  padding: 10px 30px;
+  padding: 17px 56px;
+  height: 80px;
+  box-sizing: border-box;
 }
 
 .searchInput {
@@ -27,26 +31,34 @@
   margin-right: 10px;
   position: relative;
   top: 2px;
+  box-sizing: border-box;
+  border-radius: 3px;
+  border: solid 1px #dfdfdf;
+  max-height: 45px;
+  max-width: 600px;
 }
 
 .cta {
-  padding: 15px;
+  padding: 32px 30px;
+  letter-spacing: 1px;
   font-weight: bold;
-  font-size: 14px;
+  font-size: 17px;
   margin: 0;
+  height: 74px;
+  box-sizing: border-box;
 }
 
 .storyList {
-  padding: 10px;
   border-top: 1px solid #ddd;
 }
 
 .story {
-  padding: 10px;
+  padding: 10px 63px;
   border-bottom: 1px solid #ddd;
   cursor: pointer;
   display: block;
   text-decoration: none;
+  height: 66px;
 
   &:hover {
     background-color: #efefef;
@@ -56,13 +68,20 @@
 .title, .meta {
   margin: 0;
   color: black;
+  font-size: 17px;
+  /* margin: 0 0 -4px; */
 }
 
 .author, .createdAt, .status {
+  font-size: 17px;
   display: inline-block;
   font-size: .8em;
 }
 
+.createdAt {
+  text-align: center;
+}
+
 .author {
   display: inline-block;
   width: 200px;
@@ -74,3 +93,29 @@
   width: 200px;
   color: #aaa;
 }
+
+.searchButton {
+  width: 90px;
+  height: 35px;
+}
+
+.recentStories {
+  padding: 10px 24px;
+}
+
+.recentStories i {
+  font-size: 20px;
+  line-height: 26px;
+}
+
+.accessStories {
+  font-size: 18px;
+}
+
+.headlineRecent {
+  font-size: 17px;
+  font-weight: 500;
+  padding: 17px;
+  letter-spacing: 0.7px;
+}
+
diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.js b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
index a841fd96d..4da0febbe 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
@@ -1,6 +1,7 @@
 import React, {PropTypes} from 'react';
 import styles from './StorySearch.css';
-import {Button, Spinner} from 'coral-ui';
+import {Button, Spinner, Icon} from 'coral-ui';
+import {withRouter} from 'react-router';
 import Story from './Story';
 
 const StorySearch = (props) => {
@@ -14,16 +15,25 @@ const StorySearch = (props) => {
     return null;
   }
 
+  const goToStory = (id) => {
+    props.router.push(`/admin/moderate/${id}`);
+    props.closeSearch();
+  };
+  
   return (
     <div className={styles.container}>
       <div className={styles.positionShim}>
         <div className={styles.headInput}>
           <input className={styles.searchInput} onChange={props.storySearchChange} />
-          <Button cStyle='facebook'>Search</Button>
+          <Button cStyle='blue' className={styles.searchButton} raised>Search</Button>
         </div>
         <div className={styles.results}>
           <p className={styles.cta}>Moderate comments on All Stories</p>
           <div className={styles.storyList}>
+            <div className={styles.recentStories}>
+              <Icon name="access_time" />
+              <span className={styles.headlineRecent}>Most Recent Stories</span>
+            </div>
             {
               loading
               ? <Spinner />
@@ -35,7 +45,9 @@ const StorySearch = (props) => {
                   title={story.title}
                   createdAt={new Date(story.created_at).toISOString()}
                   open={storyOpen}
-                  author={story.author} />;
+                  author={story.author}
+                  goToStory={goToStory}
+                />;
               })
             }
           </div>
@@ -49,4 +61,4 @@ StorySearch.propTypes = {
   storySearchChange: PropTypes.func.isRequired
 };
 
-export default StorySearch;
+export default withRouter(StorySearch);
diff --git a/client/coral-ui/components/Button.css b/client/coral-ui/components/Button.css
index 5100d44a4..671c55bad 100644
--- a/client/coral-ui/components/Button.css
+++ b/client/coral-ui/components/Button.css
@@ -84,6 +84,16 @@
   background: #4f5c67;
 }
 
+.type--blue {
+    color: white;
+    background: #083b97;
+}
+
+.type--blue:hover {
+    color: white;
+    background: #083b97;
+}
+
 .type--darkGrey {
   color: white;
   background: #616161;
diff --git a/views/admin.ejs b/views/admin.ejs
index 946284622..4ef4112da 100644
--- a/views/admin.ejs
+++ b/views/admin.ejs
@@ -29,6 +29,11 @@
         background-color: #FAFAFA;
         font-family: 'Roboto', sans-serif;
       }
+
+      #root > div {
+        height: 100%;
+      }
+
       /* putting this here until I can get webpack to behave */
       .react-tagsinput {
         background-color: #fff;

From 5ecdfe94cc99ceee424b03bbc6fed7d32c148ae3 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Thu, 15 Jun 2017 18:28:08 +0700
Subject: [PATCH 097/264] Refactor state updater

---
 client/coral-admin/src/graphql/utils.js       | 149 ++++++++++++------
 .../Moderation/containers/Moderation.js       |  53 ++++---
 2 files changed, 128 insertions(+), 74 deletions(-)

diff --git a/client/coral-admin/src/graphql/utils.js b/client/coral-admin/src/graphql/utils.js
index 7c8bd8875..d42029df4 100644
--- a/client/coral-admin/src/graphql/utils.js
+++ b/client/coral-admin/src/graphql/utils.js
@@ -1,62 +1,111 @@
 import update from 'immutability-helper';
+import * as notification from 'coral-admin/src/services/notification';
 
-export function findCommentInModQueues(root, id, queues = ['all', 'premod', 'flagged', 'accepted', 'rejected']) {
-  return queues.reduce((comment, queue) => {
-    return comment ? comment : root[queue].nodes.find((c) => c.id === id);
-  }, null);
+const queues = ['all', 'premod', 'flagged', 'accepted', 'rejected'];
+
+const ascending = (a, b) => {
+  const dateA = new Date(a.created_at);
+  const dateB = new Date(b.created_at);
+  if (dateA < dateB) { return -1; }
+  if (dateA > dateB) { return 1; }
+  return 0;
+};
+
+const descending = (a, b) => -ascending(a, b);
+
+function truncate(s, length = 10) {
+  return (s.length > length) ? `${s.substring(0, length)}...` : s;
 }
 
-export function handleCommentStatusChange(root, {id, status}, previousStatus) {
-  const comment = findCommentInModQueues(root, id);
-  if (!previousStatus && comment) {
-    previousStatus = comment.status;
-  }
+function queueHasComment(root, queue, id) {
+  return root[queue].nodes.find((c) => c.id === id);
+}
 
-  if (status === previousStatus) {
+function removeCommentFromQueue(root, queue, id) {
+  if (!queueHasComment(root, queue, id)) {
     return root;
   }
 
-  let acceptedNodes = root.accepted.nodes;
-  let acceptedCount = root.acceptedCount;
-  let rejectedNodes = root.rejected.nodes;
-  let rejectedCount = root.rejectedCount;
-
-  if (status === 'ACCEPTED') {
-    acceptedCount++;
-    if (comment) {
-      acceptedNodes = [{...comment, status}, ...acceptedNodes];
-    }
-  }
-  else if (status === 'REJECTED') {
-    rejectedCount++;
-    if (comment) {
-      rejectedNodes = [{...comment, status}, ...rejectedNodes];
-    }
-  }
-
-  const premodNodes = root.premod.nodes.filter((c) => c.id !== id);
-  const flaggedNodes = root.flagged.nodes.filter((c) => c.id !== id);
-  const premodCount = premodNodes.length < root.premod.nodes.length ? root.premodCount - 1 : root.premodCount;
-  const flaggedCount = flaggedNodes.length < root.flagged.nodes.length ? root.flaggedCount - 1 : root.flaggedCount;
-
-  if (status === 'REJECTED') {
-    acceptedNodes = root.accepted.nodes.filter((c) => c.id !== id);
-    acceptedCount = acceptedNodes.length < root.accepted.nodes.length ? root.acceptedCount - 1 : root.acceptedCount;
-  }
-  else if (status === 'ACCEPTED') {
-    rejectedNodes = root.rejected.nodes.filter((c) => c.id !== id);
-    rejectedCount = rejectedNodes.length < root.rejected.nodes.length ? root.rejectedCount - 1 : root.rejectedCount;
-  }
-
   return update(root, {
-    premodCount: {$set: Math.max(0, premodCount)},
-    flaggedCount: {$set: Math.max(0, flaggedCount)},
-    acceptedCount: {$set: Math.max(0, acceptedCount)},
-    rejectedCount: {$set: Math.max(0, rejectedCount)},
-    premod: {nodes: {$set: premodNodes}},
-    flagged: {nodes: {$set: flaggedNodes}},
-    accepted: {nodes: {$set: acceptedNodes}},
-    rejected: {nodes: {$set: rejectedNodes}},
+    [`${queue}Count`]: {$set: root[`${queue}Count`] - 1},
+    [queue]: {
+      nodes: {$apply: (nodes) => nodes.filter((c) => c.id !== id)},
+    },
   });
 }
 
+function isCommentInCursor(root, queue, comment, sort) {
+  const cursor = new Date(root[queue].endCursor);
+  return sort === 'CHRONOLOGICAL'
+    ? new Date(comment.created_at) <= cursor
+    : new Date(comment.created_at) >= cursor;
+}
+
+function addCommentToQueue(root, queue, comment, sort) {
+  if (queueHasComment(root, queue, comment.id)) {
+    return root;
+  }
+
+  const sortAlgo = sort === 'CHRONOLOGICAL' ? ascending : descending;
+  const changes = {
+    [`${queue}Count`]: {$set: root[`${queue}Count`] + 1},
+  };
+
+  if (isCommentInCursor(root, queue, comment, sort)) {
+    changes[queue] = {
+      nodes: {$apply: (nodes) => nodes.concat(comment).sort(sortAlgo)},
+    };
+  }
+
+  return update(root, changes);
+}
+
+function getCommentQueues(comment) {
+  const queues = ['all'];
+  if (comment.status === 'ACCEPTED') {
+    queues.push('accepted');
+  }
+  else if (comment.status === 'REJECTED') {
+    queues.push('rejected');
+  }
+  else if (comment.status === 'PREMOD') {
+    queues.push('premod');
+  }
+  if (
+    ['NONE', 'PREMOD'].indexOf(comment.status) >= 0
+    && comment.actions && comment.actions.some((a) => a.__typename === 'FlagAction')
+  ) {
+    queues.push('flagged');
+  }
+  return queues;
+}
+
+function showNotification(queue, comment, user) {
+  const text = `${user.username} ${comment.status.toLowerCase()} comment "${truncate(comment.body, 50)}"`;
+  notification.info(text);
+}
+
+export function handleCommentStatusChange(root, comment, {sort, notify, user, activeQueue}) {
+  let next = root;
+  const nextQueues = getCommentQueues(comment);
+
+  queues.forEach((queue) => {
+    if (nextQueues.indexOf(queue) >= 0 && !queueHasComment(next, queue, comment.id)) {
+      next = addCommentToQueue(next, queue, comment, sort);
+      if (notify && activeQueue === queue && isCommentInCursor(next, queue, comment, sort)) {
+        showNotification(queue, comment, user);
+      }
+    } else if(queueHasComment(next, queue, comment.id)){
+      next = removeCommentFromQueue(next, queue, comment.id);
+      if (notify && activeQueue === queue) {
+        showNotification(queue, comment, user);
+      }
+    }
+
+    // TODO: All notification
+    // TODO: Flagged notification
+    // TODO: Edited notification
+  });
+  return next;
+}
+
diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index 6b7a9bf1b..25db5f2fc 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -10,7 +10,7 @@ import t, {timeago} from 'coral-framework/services/i18n';
 import update from 'immutability-helper';
 
 import {withSetUserStatus, withSuspendUser, withSetCommentStatus} from 'coral-framework/graphql/mutations';
-import {handleCommentStatusChange, findCommentInModQueues} from '../../../graphql/utils';
+import {handleCommentStatusChange} from '../../../graphql/utils';
 
 import {fetchSettings} from 'actions/settings';
 import {updateAssets} from 'actions/assets';
@@ -31,10 +31,6 @@ import {Spinner} from 'coral-ui';
 import Moderation from '../components/Moderation';
 import Comment from './Comment';
 
-function truncate(s, length = 10) {
-  return (s.length > length) ? `${s.substring(0, length)}...` : s;
-}
-
 class ModerationContainer extends Component {
   unsubscribe = null;
 
@@ -47,25 +43,18 @@ class ModerationContainer extends Component {
         asset_id: this.props.data.variables.asset_id,
       },
       updateQuery: (prev, {subscriptionData: {data: {commentStatusChanged: {user, comment, previous}}}}) => {
-        const activeTab = this.activeTab;
-
-        // Status changed was caused by a different user.
-        if (user && user.id !== this.props.auth.user.id) {
-          if (findCommentInModQueues(prev, comment.id) && (
-              activeTab === 'all' && findCommentInModQueues(prev, comment.id, ['all'])
-              || activeTab === 'premod' && previous.status === 'PREMOD'
-              || activeTab === 'flagged' && findCommentInModQueues(prev, comment.id, ['flagged'])
-              || comment.status === 'ACCEPTED' && activeTab === 'accepted'
-              || comment.status !== 'ACCEPTED' && previous.status === 'ACCEPTED' && activeTab === 'accepted'
-              || comment.status === 'REJECTED' && activeTab === 'rejected'
-              || comment.status !== 'REJECTED' && previous.status === 'REJECTED' && activeTab === 'rejected'
-            )
-          ) {
-            const text = `${user.username} ${comment.status.toLowerCase()} comment "${truncate(comment.body, 50)}"`;
-            notification.info(text);
-          }
-        }
-        return handleCommentStatusChange(prev, comment, previous.status, user);
+        const extraParams = this.props.auth.user.id === user.id
+          ? {}
+          : {
+            notify: true,
+            user,
+            activeQueue: this.activeTab,
+            previous,
+          };
+        return handleCommentStatusChange(prev, comment, {
+          sort: this.props.moderation.sortOrder,
+          ...extraParams,
+        });
       },
     });
   }
@@ -218,6 +207,22 @@ const STATUS_CHANGED_SUBSCRIPTION = gql`
         id
         status
         body
+        created_at
+        action_summaries {
+          count
+          ... on FlagActionSummary {
+            reason
+          }
+        }
+        actions {
+          ... on FlagAction {
+            reason
+            message
+            user {
+              username
+            }
+          }
+        }
       }
       previous {
         status

From a0888275688f53c2fbbf534c1aac8149fe5e1c70 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Thu, 15 Jun 2017 18:31:53 +0700
Subject: [PATCH 098/264] Use new import path for coral-ui

---
 .../client/components/ViewingOptions.js                        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/coral-plugin-viewing-options/client/components/ViewingOptions.js b/plugins/coral-plugin-viewing-options/client/components/ViewingOptions.js
index 513d9340b..dc63a2373 100644
--- a/plugins/coral-plugin-viewing-options/client/components/ViewingOptions.js
+++ b/plugins/coral-plugin-viewing-options/client/components/ViewingOptions.js
@@ -1,7 +1,8 @@
 import React from 'react';
 import cn from 'classnames';
 import styles from './ViewingOptions.css';
-import {Slot, Icon} from 'plugin-api/beta/client/components';
+import {Slot} from 'plugin-api/beta/client/components';
+import {Icon} from 'plugin-api/beta/client/components/ui';
 
 const ViewingOptions = (props) => {
   const toggleOpen = () => {

From 303b3ea0f50fd11bd1e095ef31a647b53825f023 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Thu, 15 Jun 2017 22:46:38 +0700
Subject: [PATCH 099/264] Support live comment edit update

---
 client/coral-admin/src/graphql/utils.js       |  29 +++-
 .../routes/Moderation/components/Comment.js   | 130 ++++++++++--------
 .../Moderation/components/ModerationQueue.js  |  14 +-
 .../routes/Moderation/components/styles.css   |  33 +++++
 .../routes/Moderation/containers/Comment.js   |   4 +
 .../Moderation/containers/Moderation.js       |  50 +++++--
 graph/mutators/comment.js                     |   4 -
 graph/resolvers/root_mutation.js              |  12 +-
 graph/subscriptions.js                        |   8 +-
 graph/typeDefs.graphql                        |   3 +-
 package.json                                  |   1 +
 perms/constants.js                            |   2 +
 perms/subscriptionReducer.js                  |   4 +
 plugin-api/beta/server/getReactionConfig.js   |  14 +-
 yarn.lock                                     |   4 +
 15 files changed, 221 insertions(+), 91 deletions(-)

diff --git a/client/coral-admin/src/graphql/utils.js b/client/coral-admin/src/graphql/utils.js
index d42029df4..62126f1af 100644
--- a/client/coral-admin/src/graphql/utils.js
+++ b/client/coral-admin/src/graphql/utils.js
@@ -90,10 +90,12 @@ export function handleCommentStatusChange(root, comment, {sort, notify, user, ac
   const nextQueues = getCommentQueues(comment);
 
   queues.forEach((queue) => {
-    if (nextQueues.indexOf(queue) >= 0 && !queueHasComment(next, queue, comment.id)) {
-      next = addCommentToQueue(next, queue, comment, sort);
-      if (notify && activeQueue === queue && isCommentInCursor(next, queue, comment, sort)) {
-        showNotification(queue, comment, user);
+    if (nextQueues.indexOf(queue) >= 0) {
+      if (!queueHasComment(next, queue, comment.id)) {
+        next = addCommentToQueue(next, queue, comment, sort);
+        if (notify && activeQueue === queue && isCommentInCursor(next, queue, comment, sort)) {
+          showNotification(queue, comment, user);
+        }
       }
     } else if(queueHasComment(next, queue, comment.id)){
       next = removeCommentFromQueue(next, queue, comment.id);
@@ -102,10 +104,27 @@ export function handleCommentStatusChange(root, comment, {sort, notify, user, ac
       }
     }
 
-    // TODO: All notification
+    if (
+      queue === 'all'
+      && queueHasComment(next, queue, comment.id)
+      && notify
+      && activeQueue === queue
+    ) {
+      showNotification(queue, comment, user);
+    }
+
     // TODO: Flagged notification
     // TODO: Edited notification
   });
   return next;
 }
 
+export function handleCommentEdit(root, comment, {sort, activeQueue}) {
+  if (
+    queueHasComment(root, activeQueue, comment.id)
+  ) {
+    const text = `${comment.user.username} edited comment to "${truncate(comment.body, 50)}"`;
+    notification.info(text);
+  }
+  return handleCommentStatusChange(root, comment, {sort, activeQueue});
+}
diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.js b/client/coral-admin/src/routes/Moderation/components/Comment.js
index 814b87c82..18f3aa057 100644
--- a/client/coral-admin/src/routes/Moderation/components/Comment.js
+++ b/client/coral-admin/src/routes/Moderation/components/Comment.js
@@ -13,6 +13,8 @@ import ActionButton from 'coral-admin/src/components/ActionButton';
 import ActionsMenu from 'coral-admin/src/components/ActionsMenu';
 import ActionsMenuItem from 'coral-admin/src/components/ActionsMenuItem';
 import cn from 'classnames';
+import {murmur3} from 'murmurhash-js';
+import {CSSTransitionGroup} from 'react-transition-group';
 
 const linkify = new Linkify();
 
@@ -91,6 +93,11 @@ class Comment extends React.Component {
               <span className={styles.created}>
                 {timeago(comment.created_at || Date.now() - props.index * 60 * 1000)}
               </span>
+              {
+                (comment.editing && comment.editing.edited)
+                ? <span>&nbsp;<span className={styles.editedMarker}>(Edited)</span></span>
+                : null
+              }
               {props.currentUserId !== comment.user.id &&
                 <ActionsMenu icon="not_interested">
                   <ActionsMenuItem
@@ -124,66 +131,81 @@ class Comment extends React.Component {
             {!props.currentAsset &&
               <Link to={`/admin/moderate/${comment.asset.id}`}>{t('modqueue.moderate')}</Link>}
           </div>
-          <div className={styles.itemBody}>
-            <p className={styles.body}>
-              <Highlighter
-                searchWords={searchWords}
-                textToHighlight={comment.body}
-              />
-              {' '}
-              <a
-                className={styles.external}
-                href={`${comment.asset.url}#${comment.id}`}
-                target="_blank"
-              >
-                <Icon name="open_in_new" /> {t('comment.view_context')}
-              </a>
-            </p>
-            <Slot
-              data={props.data}
-              root={props.root}
-              fill="adminCommentContent"
-              comment={comment}
-            />
-            <div className={styles.sideActions}>
-              {links
-                ? <span className={styles.hasLinks}>
-                    <Icon name="error_outline" /> Contains Link
-                  </span>
-                : null}
-              <div className={`actions ${styles.actions}`}>
-                {actions.map((action, i) => {
-                  const active =
-                    (action === 'REJECT' && comment.status === 'REJECTED') ||
-                    (action === 'APPROVE' && comment.status === 'ACCEPTED');
-                  return (
-                    <ActionButton
-                      minimal={minimal}
-                      key={i}
-                      type={action}
-                      user={comment.user}
-                      status={comment.status}
-                      active={active}
-                      acceptComment={() =>
-                        (comment.status === 'ACCEPTED'
-                          ? null
-                          : props.acceptComment({commentId: comment.id}))}
-                      rejectComment={() =>
-                        (comment.status === 'REJECTED'
-                          ? null
-                          : props.rejectComment({commentId: comment.id}))}
-                    />
-                  );
-                })}
-              </div>
+          <CSSTransitionGroup
+            component={'div'}
+            style={{position: 'relative'}}
+            transitionName={{
+              enter: styles.bodyEnter,
+              enterActive: styles.bodyEnterActive,
+              leave: styles.bodyLeave,
+              leaveActive: styles.bodyLeaveActive,
+            }}
+            transitionEnter={true}
+            transitionLeave={true}
+            transitionEnterTimeout={3600}
+            transitionLeaveTimeout={2800}
+          >
+            <div className={styles.itemBody} key={murmur3(comment.body)}>
+              <p className={styles.body}>
+                <Highlighter
+                  searchWords={searchWords}
+                  textToHighlight={comment.body}
+                />
+                {' '}
+                <a
+                  className={styles.external}
+                  href={`${comment.asset.url}#${comment.id}`}
+                  target="_blank"
+                >
+                  <Icon name="open_in_new" /> {t('comment.view_context')}
+                </a>
+              </p>
               <Slot
                 data={props.data}
                 root={props.root}
-                fill="adminSideActions"
+                fill="adminCommentContent"
                 comment={comment}
               />
+              <div className={styles.sideActions}>
+                {links
+                  ? <span className={styles.hasLinks}>
+                      <Icon name="error_outline" /> Contains Link
+                    </span>
+                  : null}
+                <div className={`actions ${styles.actions}`}>
+                  {actions.map((action, i) => {
+                    const active =
+                      (action === 'REJECT' && comment.status === 'REJECTED') ||
+                      (action === 'APPROVE' && comment.status === 'ACCEPTED');
+                    return (
+                      <ActionButton
+                        minimal={minimal}
+                        key={i}
+                        type={action}
+                        user={comment.user}
+                        status={comment.status}
+                        active={active}
+                        acceptComment={() =>
+                          (comment.status === 'ACCEPTED'
+                            ? null
+                            : props.acceptComment({commentId: comment.id}))}
+                        rejectComment={() =>
+                          (comment.status === 'REJECTED'
+                            ? null
+                            : props.rejectComment({commentId: comment.id}))}
+                      />
+                    );
+                  })}
+                </div>
+                <Slot
+                  data={props.data}
+                  root={props.root}
+                  fill="adminSideActions"
+                  comment={comment}
+                />
+              </div>
             </div>
-          </div>
+          </CSSTransitionGroup>
         </div>
         <Slot
           data={props.data}
diff --git a/client/coral-admin/src/routes/Moderation/components/ModerationQueue.js b/client/coral-admin/src/routes/Moderation/components/ModerationQueue.js
index 399fc48ed..2e039c635 100644
--- a/client/coral-admin/src/routes/Moderation/components/ModerationQueue.js
+++ b/client/coral-admin/src/routes/Moderation/components/ModerationQueue.js
@@ -26,6 +26,14 @@ class ModerationQueue extends React.Component {
     this.props.loadMore(this.props.activeTab);
   }
 
+  constructor(props) {
+    super(props);
+
+    if (props.comments.length === 0 && props.commentCount > 0) {
+      this.loadMore();
+    }
+  }
+
   componentDidUpdate (prev) {
     const {comments, commentCount} = this.props;
 
@@ -66,8 +74,7 @@ class ModerationQueue extends React.Component {
           transitionLeaveTimeout={1000}
         >
           {
-            comments.length
-            ? comments.map((comment, i) => {
+            comments.map((comment, i) => {
               const status = comment.action_summaries ? 'FLAGGED' : comment.status;
               return <Comment
                 data={this.props.data}
@@ -88,9 +95,10 @@ class ModerationQueue extends React.Component {
                 currentUserId={this.props.currentUserId}
                 />;
             })
-            : <EmptyCard>{t('modqueue.empty_queue')}</EmptyCard>
           }
         </CSSTransitionGroup>
+        {comments.length === 0 && <p><EmptyCard>{t('modqueue.empty_queue')}</EmptyCard></p>}
+
         <LoadMore
           loadMore={this.loadMore}
           showLoadMore={comments.length < commentCount}
diff --git a/client/coral-admin/src/routes/Moderation/components/styles.css b/client/coral-admin/src/routes/Moderation/components/styles.css
index 7a5f5782c..3a438e6bd 100644
--- a/client/coral-admin/src/routes/Moderation/components/styles.css
+++ b/client/coral-admin/src/routes/Moderation/components/styles.css
@@ -497,3 +497,36 @@ span {
 .commentEnterActive {
   opacity: 1.0;
 }
+
+.bodyLeave {
+  position: absolute;
+  width: 100%;
+  top: 0;
+  background-color: white;
+  opacity: 1.0;
+  transition: background 400ms, opacity 800ms 1600ms;
+  pointer-events: none;
+}
+
+.bodyLeaveActive {
+  opacity: 0;
+  background-color: rgba(255,255,0, 0.2);
+}
+
+.bodyEnter {
+  opacity: 0;
+  pointer-events: none;
+}
+
+.bodyEnterActive {
+  opacity: 1.0;
+  transition: opacity 800ms 2400ms;
+}
+
+.editedMarker {
+  font-style: italic;
+  color: #666;
+  font-size: 12px;
+  line-height: 1px;
+  font-weight: 300;
+}
diff --git a/client/coral-admin/src/routes/Moderation/containers/Comment.js b/client/coral-admin/src/routes/Moderation/containers/Comment.js
index 462040903..ab77ec7bb 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Comment.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Comment.js
@@ -49,6 +49,10 @@ export default withFragments({
           }
         }
       }
+      editing {
+        edited
+        editableUntil
+      }
       ${pluginFragments.spreads('comment')}
     }
     ${pluginFragments.definitions('comment')}
diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index 25db5f2fc..706f7a5ee 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -10,7 +10,7 @@ import t, {timeago} from 'coral-framework/services/i18n';
 import update from 'immutability-helper';
 
 import {withSetUserStatus, withSuspendUser, withSetCommentStatus} from 'coral-framework/graphql/mutations';
-import {handleCommentStatusChange} from '../../../graphql/utils';
+import {handleCommentStatusChange, handleCommentEdit} from '../../../graphql/utils';
 
 import {fetchSettings} from 'actions/settings';
 import {updateAssets} from 'actions/assets';
@@ -32,24 +32,23 @@ import Moderation from '../components/Moderation';
 import Comment from './Comment';
 
 class ModerationContainer extends Component {
-  unsubscribe = null;
+  subscriptions = [];
 
   get activeTab() { return this.props.route.path === ':id' ? 'premod' : this.props.route.path; }
 
   subscribeToUpdates() {
-    this.unsubscribe = this.props.data.subscribeToMore({
+    const sub1 = this.props.data.subscribeToMore({
       document: STATUS_CHANGED_SUBSCRIPTION,
       variables: {
         asset_id: this.props.data.variables.asset_id,
       },
-      updateQuery: (prev, {subscriptionData: {data: {commentStatusChanged: {user, comment, previous}}}}) => {
+      updateQuery: (prev, {subscriptionData: {data: {commentStatusChanged: {user, comment}}}}) => {
         const extraParams = this.props.auth.user.id === user.id
           ? {}
           : {
             notify: true,
             user,
             activeQueue: this.activeTab,
-            previous,
           };
         return handleCommentStatusChange(prev, comment, {
           sort: this.props.moderation.sortOrder,
@@ -57,14 +56,25 @@ class ModerationContainer extends Component {
         });
       },
     });
+
+    const sub2 = this.props.data.subscribeToMore({
+      document: COMMENTS_EDITED_SUBSCRIPTION,
+      variables: {
+        asset_id: this.props.data.variables.asset_id,
+      },
+      updateQuery: (prev, {subscriptionData: {data: {commentEdited}}}) => {
+        return handleCommentEdit(prev, commentEdited, {
+          activeQueue: this.activeTab,
+        });
+      },
+    });
+
+    this.subscriptions.push(sub1, sub2);
   }
 
   unsubscribe() {
-    if (!this.unsubscribe) {
-      return;
-    }
-    this.unsubscribe();
-    this.unsubscribe = null;
+    this.subscriptions.forEach((unsubscribe) => unsubscribe());
+    this.subscriptions = [];
   }
 
   resubscribe() {
@@ -196,6 +206,23 @@ class ModerationContainer extends Component {
   }
 }
 
+const COMMENTS_EDITED_SUBSCRIPTION = gql`
+  subscription CommentEdited($asset_id: ID){
+    commentEdited(asset_id: $asset_id){
+      id
+      body
+      status
+      editing {
+        edited
+      }
+      user {
+        id
+        username
+      }
+    }
+  }
+`;
+
 const STATUS_CHANGED_SUBSCRIPTION = gql`
   subscription CommentStatusChanged($asset_id: ID){
     commentStatusChanged(asset_id: $asset_id){
@@ -224,9 +251,6 @@ const STATUS_CHANGED_SUBSCRIPTION = gql`
           }
         }
       }
-      previous {
-        status
-      }
     }
   }
 `;
diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index e11eaf2b9..d9dd47a9a 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -370,11 +370,7 @@ const edit = async (context, {id, asset_id, edit: {body}}) => {
 
     // Publish the edited comment via the subscription.
     context.pubsub.publish('commentEdited', comment);
-
-    // Publish the comment status change via the subscription.
-    context.pubsub.publish('commentStatusChanged', comment);
   }
-
   return comment;
 };
 
diff --git a/graph/resolvers/root_mutation.js b/graph/resolvers/root_mutation.js
index 087ec94bc..83886f0d1 100644
--- a/graph/resolvers/root_mutation.js
+++ b/graph/resolvers/root_mutation.js
@@ -31,14 +31,16 @@ const RootMutation = {
   stopIgnoringUser(_, {id}, {mutators: {User}}) {
     return wrapResponse(null)(User.stopIgnoringUser({id}));
   },
-  setCommentStatus: async (_, {id, status}, {loaders: {Comments}, mutators: {Comment}, user, pubsub}) => {
-    const previous = await Comments.get.load(id);
+  setCommentStatus: async (_, {id, status}, {mutators: {Comment}, user, pubsub}) => {
     const comment = await Comment.setStatus({id, status});
 
-    // Publish the comment status change via the subscription.
-    pubsub.publish('commentStatusChanged', {user, comment, previous});
+    if (pubsub) {
 
-    return wrapResponse(null)(Comment.setStatus({id, status}));
+      // Publish the comment status change via the subscription.
+      pubsub.publish('commentStatusChanged', {user, comment});
+    }
+
+    return wrapResponse(null)(comment);
   },
   addTag(_, {tag}, {mutators: {Tag}}) {
     return wrapResponse(null)(Tag.add(tag));
diff --git a/graph/subscriptions.js b/graph/subscriptions.js
index 2192dbdcf..9b3df6b0e 100644
--- a/graph/subscriptions.js
+++ b/graph/subscriptions.js
@@ -12,6 +12,7 @@ const {deserializeUser} = require('../services/subscriptions');
 
 const {
   SUBSCRIBE_COMMENT_STATUS,
+  SUBSCRIBE_ALL_COMMENT_EDITS,
 } = require('../perms/constants');
 
 /**
@@ -31,7 +32,12 @@ const setupFunctions = plugins.get('server', 'setupFunctions').reduce((acc, {plu
   }),
   commentEdited: (options, args) => ({
     commentEdited: {
-      filter: (comment) => comment.asset_id === args.asset_id
+      filter: (comment, context) => {
+        if (!args.asset_id && (!context.user || !context.user.can(SUBSCRIBE_ALL_COMMENT_EDITS))) {
+          return false;
+        }
+        return !args.asset_id || comment.asset_id === args.asset_id;
+      }
     },
   }),
   commentStatusChanged: (options, args) => ({
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index c1dfa0b7d..2bd7c0476 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -940,12 +940,11 @@ type RootMutation {
 type CommentStatusChangedUpdate {
   user: User
   comment: Comment
-  previous: Comment
 }
 
 type Subscription {
   commentAdded(asset_id: ID!): Comment
-  commentEdited(asset_id: ID!): Comment
+  commentEdited(asset_id: ID): Comment
   commentStatusChanged(asset_id: ID): CommentStatusChangedUpdate
 }
 
diff --git a/package.json b/package.json
index 92bcd2be4..5724e96ca 100644
--- a/package.json
+++ b/package.json
@@ -98,6 +98,7 @@
     "mongoose": "^4.9.8",
     "morgan": "^1.8.1",
     "ms": "^2.0.0",
+    "murmurhash-js": "^1.0.0",
     "natural": "^0.5.0",
     "node-emoji": "^1.5.1",
     "node-fetch": "^1.6.3",
diff --git a/perms/constants.js b/perms/constants.js
index 1578946cf..0b14932f3 100644
--- a/perms/constants.js
+++ b/perms/constants.js
@@ -25,4 +25,6 @@ module.exports = {
 
   // subscriptions
   SUBSCRIBE_COMMENT_STATUS: 'SUBSCRIBE_COMMENT_STATUS',
+  SUBSCRIBE_ALL_COMMENT_FLAGS: 'SUBSCRIBE_ALL_COMMENT_FLAGS',
+  SUBSCRIBE_ALL_COMMENT_EDITS: 'SUBSCRIBE_ALL_COMMENT_EDITS',
 };
diff --git a/perms/subscriptionReducer.js b/perms/subscriptionReducer.js
index 4ce817ea5..e2570b272 100644
--- a/perms/subscriptionReducer.js
+++ b/perms/subscriptionReducer.js
@@ -5,6 +5,10 @@ module.exports = (user, perm) => {
   switch (perm) {
   case types.SUBSCRIBE_COMMENT_STATUS:
     return check(user, ['ADMIN', 'MODERATOR']);
+  case types.SUBSCRIBE_ALL_COMMENT_EDITS:
+    return check(user, ['ADMIN', 'MODERATOR']);
+  case types.SUBSCRIBE_ALL_COMMENT_FLAGS:
+    return check(user, ['ADMIN', 'MODERATOR']);
   default:
     break;
   }
diff --git a/plugin-api/beta/server/getReactionConfig.js b/plugin-api/beta/server/getReactionConfig.js
index 78bc45dfd..243b8915b 100644
--- a/plugin-api/beta/server/getReactionConfig.js
+++ b/plugin-api/beta/server/getReactionConfig.js
@@ -132,8 +132,11 @@ function getReactionConfig(reaction) {
             return Action.create({item_id, item_type: 'COMMENTS', action_type: REACTION})
               .then((action) => {
 
-                // The comment is needed to allow better filtering e.g. by asset_id.
-                pubsub.publish(`${reaction}ActionCreated`, {action, comment});
+                if (pubsub) {
+
+                  // The comment is needed to allow better filtering e.g. by asset_id.
+                  pubsub.publish(`${reaction}ActionCreated`, {action, comment});
+                }
                 return Promise.resolve(action);
               })
             .catch((err) => {
@@ -155,8 +158,11 @@ function getReactionConfig(reaction) {
               }
               return Comments.get.load(action.item_id).then((comment) => {
 
-                // The comment is needed to allow better filtering e.g. by asset_id.
-                pubsub.publish(`${reaction}ActionDeleted`, {action, comment});
+                if (pubsub) {
+
+                  // The comment is needed to allow better filtering e.g. by asset_id.
+                  pubsub.publish(`${reaction}ActionDeleted`, {action, comment});
+                }
                 return Promise.resolve(action);
               });
             });
diff --git a/yarn.lock b/yarn.lock
index 6013a3e49..1633c27d1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5387,6 +5387,10 @@ muri@1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/muri/-/muri-1.2.1.tgz#ec7ea5ce6ca6a523eb1ab35bacda5fa816c9aa3c"
 
+murmurhash-js@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/murmurhash-js/-/murmurhash-js-1.0.0.tgz#b06278e21fc6c37fa5313732b0412bcb6ae15f51"
+
 mute-stream@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.4.tgz#a9219960a6d5d5d046597aee51252c6655f7177e"

From cbcb84f7ac18ab960c6b84d69552eb9e9ab75f5d Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Thu, 15 Jun 2017 22:54:29 +0700
Subject: [PATCH 100/264] No need for editableUntil

---
 client/coral-admin/src/routes/Moderation/containers/Comment.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/coral-admin/src/routes/Moderation/containers/Comment.js b/client/coral-admin/src/routes/Moderation/containers/Comment.js
index ab77ec7bb..26074065d 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Comment.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Comment.js
@@ -51,7 +51,6 @@ export default withFragments({
       }
       editing {
         edited
-        editableUntil
       }
       ${pluginFragments.spreads('comment')}
     }

From 21f95c33c2afe27175e77b879c2da6809ebe91e1 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Thu, 15 Jun 2017 22:54:36 +0700
Subject: [PATCH 101/264] Use correct comment id in UserDetail

---
 .../coral-admin/src/routes/Moderation/components/UserDetail.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/UserDetail.js b/client/coral-admin/src/routes/Moderation/components/UserDetail.js
index 688ac75d0..f416161a1 100644
--- a/client/coral-admin/src/routes/Moderation/components/UserDetail.js
+++ b/client/coral-admin/src/routes/Moderation/components/UserDetail.js
@@ -147,7 +147,7 @@ export default class UserDetail extends React.Component {
               const status = comment.action_summaries ? 'FLAGGED' : comment.status;
               const selected = selectedIds.indexOf(comment.id) !== -1;
               return <Comment
-                key={i}
+                key={comment.id}
                 index={i}
                 comment={comment}
                 selected={false}

From 312103098c9c7514bacbb53554256e98c0efe29d Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Thu, 15 Jun 2017 23:27:31 +0700
Subject: [PATCH 102/264] More mod queue fixes

---
 client/coral-admin/src/graphql/utils.js       | 20 +++++++++-----
 .../Moderation/components/ModerationQueue.js  |  4 ---
 .../Moderation/containers/Moderation.js       | 27 ++-----------------
 graph/resolvers/root_mutation.js              | 18 +++++++------
 4 files changed, 26 insertions(+), 43 deletions(-)

diff --git a/client/coral-admin/src/graphql/utils.js b/client/coral-admin/src/graphql/utils.js
index 62126f1af..9d85c6bb1 100644
--- a/client/coral-admin/src/graphql/utils.js
+++ b/client/coral-admin/src/graphql/utils.js
@@ -2,6 +2,7 @@ import update from 'immutability-helper';
 import * as notification from 'coral-admin/src/services/notification';
 
 const queues = ['all', 'premod', 'flagged', 'accepted', 'rejected'];
+const limit = 10;
 
 const ascending = (a, b) => {
   const dateA = new Date(a.created_at);
@@ -25,7 +26,6 @@ function removeCommentFromQueue(root, queue, id) {
   if (!queueHasComment(root, queue, id)) {
     return root;
   }
-
   return update(root, {
     [`${queue}Count`]: {$set: root[`${queue}Count`] - 1},
     [queue]: {
@@ -34,7 +34,12 @@ function removeCommentFromQueue(root, queue, id) {
   });
 }
 
-function isCommentInCursor(root, queue, comment, sort) {
+function shouldCommentBeAdded(root, queue, comment, sort) {
+  if (root[`${queue}Count`] < limit) {
+
+    // Adding all comments until first limit has reached.
+    return true;
+  }
   const cursor = new Date(root[queue].endCursor);
   return sort === 'CHRONOLOGICAL'
     ? new Date(comment.created_at) <= cursor
@@ -51,9 +56,12 @@ function addCommentToQueue(root, queue, comment, sort) {
     [`${queue}Count`]: {$set: root[`${queue}Count`] + 1},
   };
 
-  if (isCommentInCursor(root, queue, comment, sort)) {
+  if (shouldCommentBeAdded(root, queue, comment, sort)) {
+    const nodes = root[queue].nodes.concat(comment).sort(sortAlgo);
     changes[queue] = {
-      nodes: {$apply: (nodes) => nodes.concat(comment).sort(sortAlgo)},
+      nodes: {$set: nodes},
+      startCursor: {$set: nodes[0].created_at},
+      endCursor: {$set: nodes[nodes.length - 1].created_at},
     };
   }
 
@@ -93,7 +101,7 @@ export function handleCommentStatusChange(root, comment, {sort, notify, user, ac
     if (nextQueues.indexOf(queue) >= 0) {
       if (!queueHasComment(next, queue, comment.id)) {
         next = addCommentToQueue(next, queue, comment, sort);
-        if (notify && activeQueue === queue && isCommentInCursor(next, queue, comment, sort)) {
+        if (notify && activeQueue === queue && shouldCommentBeAdded(next, queue, comment, sort)) {
           showNotification(queue, comment, user);
         }
       }
@@ -114,7 +122,6 @@ export function handleCommentStatusChange(root, comment, {sort, notify, user, ac
     }
 
     // TODO: Flagged notification
-    // TODO: Edited notification
   });
   return next;
 }
@@ -122,6 +129,7 @@ export function handleCommentStatusChange(root, comment, {sort, notify, user, ac
 export function handleCommentEdit(root, comment, {sort, activeQueue}) {
   if (
     queueHasComment(root, activeQueue, comment.id)
+    || comment.status === 'PREMOD' && root[`${activeQueue}Count`] < limit
   ) {
     const text = `${comment.user.username} edited comment to "${truncate(comment.body, 50)}"`;
     notification.info(text);
diff --git a/client/coral-admin/src/routes/Moderation/components/ModerationQueue.js b/client/coral-admin/src/routes/Moderation/components/ModerationQueue.js
index 2e039c635..a0a11ab45 100644
--- a/client/coral-admin/src/routes/Moderation/components/ModerationQueue.js
+++ b/client/coral-admin/src/routes/Moderation/components/ModerationQueue.js
@@ -28,10 +28,6 @@ class ModerationQueue extends React.Component {
 
   constructor(props) {
     super(props);
-
-    if (props.comments.length === 0 && props.commentCount > 0) {
-      this.loadMore();
-    }
   }
 
   componentDidUpdate (prev) {
diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index 706f7a5ee..d693863e0 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -231,28 +231,11 @@ const STATUS_CHANGED_SUBSCRIPTION = gql`
         username
       }
       comment {
-        id
-        status
-        body
-        created_at
-        action_summaries {
-          count
-          ... on FlagActionSummary {
-            reason
-          }
-        }
-        actions {
-          ... on FlagAction {
-            reason
-            message
-            user {
-              username
-            }
-          }
-        }
+        ...${getDefinitionName(Comment.fragments.comment)}
       }
     }
   }
+  ${Comment.fragments.comment}
 `;
 
 const LOAD_MORE_QUERY = gql`
@@ -260,12 +243,6 @@ const LOAD_MORE_QUERY = gql`
     comments(query: {limit: $limit, cursor: $cursor, asset_id: $asset_id, statuses: $statuses, sort: $sort, action_type: $action_type}) {
       nodes {
         ...${getDefinitionName(Comment.fragments.comment)}
-        action_summaries {
-          count
-          ... on FlagActionSummary {
-            reason
-          }
-        }
       }
       hasNextPage
       startCursor
diff --git a/graph/resolvers/root_mutation.js b/graph/resolvers/root_mutation.js
index 83886f0d1..ac2fd729d 100644
--- a/graph/resolvers/root_mutation.js
+++ b/graph/resolvers/root_mutation.js
@@ -31,16 +31,18 @@ const RootMutation = {
   stopIgnoringUser(_, {id}, {mutators: {User}}) {
     return wrapResponse(null)(User.stopIgnoringUser({id}));
   },
-  setCommentStatus: async (_, {id, status}, {mutators: {Comment}, user, pubsub}) => {
-    const comment = await Comment.setStatus({id, status});
+  setCommentStatus(_, {id, status}, {mutators: {Comment}, user, pubsub}) {
+    const response = Comment.setStatus({id, status})
+      .then((comment) => {
+        if (pubsub) {
 
-    if (pubsub) {
+          // Publish the comment status change via the subscription.
+          pubsub.publish('commentStatusChanged', {user, comment});
+        }
+        return Promise.resolve(comment);
+      });
 
-      // Publish the comment status change via the subscription.
-      pubsub.publish('commentStatusChanged', {user, comment});
-    }
-
-    return wrapResponse(null)(comment);
+    return wrapResponse(null)(response);
   },
   addTag(_, {tag}, {mutators: {Tag}}) {
     return wrapResponse(null)(Tag.add(tag));

From 5a2ce0f6a7c68fa53527c7ab7c809d09ab87c7e7 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Thu, 15 Jun 2017 23:31:30 +0700
Subject: [PATCH 103/264] No div in p

---
 .../src/routes/Moderation/components/ModerationQueue.js     | 6 +++++-
 .../coral-admin/src/routes/Moderation/components/styles.css | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/ModerationQueue.js b/client/coral-admin/src/routes/Moderation/components/ModerationQueue.js
index a0a11ab45..9ccde344d 100644
--- a/client/coral-admin/src/routes/Moderation/components/ModerationQueue.js
+++ b/client/coral-admin/src/routes/Moderation/components/ModerationQueue.js
@@ -93,7 +93,11 @@ class ModerationQueue extends React.Component {
             })
           }
         </CSSTransitionGroup>
-        {comments.length === 0 && <p><EmptyCard>{t('modqueue.empty_queue')}</EmptyCard></p>}
+        {comments.length === 0 &&
+            <div className={styles.emptyCardContainer}>
+              <EmptyCard>{t('modqueue.empty_queue')}</EmptyCard>
+            </div>
+        }
 
         <LoadMore
           loadMore={this.loadMore}
diff --git a/client/coral-admin/src/routes/Moderation/components/styles.css b/client/coral-admin/src/routes/Moderation/components/styles.css
index 3a438e6bd..bd4ad31d8 100644
--- a/client/coral-admin/src/routes/Moderation/components/styles.css
+++ b/client/coral-admin/src/routes/Moderation/components/styles.css
@@ -480,6 +480,10 @@ span {
   cursor: pointer;
 }
 
+.emptyCardContainer {
+  margin-top: 16px;
+}
+
 .commentLeave {
   opacity: 1.0;
   transition: opacity 800ms;

From 685695bf4336bd50f01c8727dc79ff0516406c8d Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 15 Jun 2017 14:32:50 -0300
Subject: [PATCH 104/264] Clear search value

---
 client/coral-admin/src/actions/moderation.js       | 14 ++++++++++++--
 .../src/routes/Moderation/components/Moderation.js |  9 +++++++--
 .../routes/Moderation/components/StorySearch.js    |  2 +-
 .../src/routes/Moderation/containers/Moderation.js |  2 ++
 .../routes/Moderation/containers/StorySearch.js    |  3 ++-
 5 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/client/coral-admin/src/actions/moderation.js b/client/coral-admin/src/actions/moderation.js
index 0833c856e..2b8c1e599 100644
--- a/client/coral-admin/src/actions/moderation.js
+++ b/client/coral-admin/src/actions/moderation.js
@@ -52,6 +52,16 @@ export const toggleSelectCommentInUserDetail = (id, active) => {
   };
 };
 
-export const toggleStorySearch = (active) => ({type: active ? actions.SHOW_STORY_SEARCH : actions.HIDE_STORY_SEARCH});
+export const toggleStorySearch = (active) => ({
+  type: active ? actions.SHOW_STORY_SEARCH : actions.HIDE_STORY_SEARCH
+});
 
-export const storySearchChange = (e) => ({type: actions.CHANGE_ASSET_SEARCH_STRING, value: e.target.value});
+export const storySearchChange = (value) => ({
+  type: actions.CHANGE_ASSET_SEARCH_STRING,
+  value
+});
+
+export const storySearchClear = () => ({
+  type: actions.CHANGE_ASSET_SEARCH_STRING,
+  value: ''
+});
diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js
index 3a23a1a86..4d82803a8 100644
--- a/client/coral-admin/src/routes/Moderation/components/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js
@@ -34,7 +34,9 @@ export default class Moderation extends Component {
   }
 
   closeSearch = () => {
-    this.props.toggleStorySearch(false);
+    const {storySearchClear, toggleStorySearch} = this.props;
+    toggleStorySearch(false);
+    storySearchClear();
   }
 
   openSearch = () => {
@@ -208,7 +210,10 @@ export default class Moderation extends Component {
             acceptComment={props.acceptComment}
             rejectComment={props.rejectComment} />
         )}
-        <StorySearch visible={this.props.moderation.storySearchVisible} closeSearch={this.closeSearch}/>
+        <StorySearch
+          visible={this.props.moderation.storySearchVisible}
+          closeSearch={this.closeSearch}
+        />
       </div>
     );
   }
diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.js b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
index 4da0febbe..b1c44baff 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
@@ -19,7 +19,7 @@ const StorySearch = (props) => {
     props.router.push(`/admin/moderate/${id}`);
     props.closeSearch();
   };
-  
+
   return (
     <div className={styles.container}>
       <div className={styles.positionShim}>
diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index 24a3d748d..eac900d40 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -25,6 +25,7 @@ import {
   viewUserDetail,
   hideUserDetail,
   setSortOrder,
+  storySearchClear
 } from 'actions/moderation';
 
 import {Spinner} from 'coral-ui';
@@ -306,6 +307,7 @@ const mapDispatchToProps = (dispatch) => ({
     viewUserDetail,
     hideUserDetail,
     setSortOrder,
+    storySearchClear
   }, dispatch),
 });
 
diff --git a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
index cfe2a5bea..c2c43c6ee 100644
--- a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
@@ -8,7 +8,8 @@ import {storySearchChange} from 'coral-admin/src/actions/moderation';
 
 class StorySearchContainer extends React.Component {
   searchChange = (e) => {
-    this.props.storySearchChange(e.target.value);
+    const value = e.target.value;
+    this.props.storySearchChange(value);
     this.props.data.refetch();
   }
 

From 93c8b115f52715b60d1709d6f04f4b4fb0835506 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 16 Jun 2017 00:43:48 +0700
Subject: [PATCH 105/264] Fix some queries

---
 .../routes/Moderation/components/BanUserDialog.js    |  2 +-
 .../src/routes/Moderation/components/Comment.js      |  4 ++--
 .../src/routes/Moderation/containers/Comment.js      |  2 +-
 .../src/routes/Moderation/containers/Moderation.js   | 12 ++----------
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/BanUserDialog.js b/client/coral-admin/src/routes/Moderation/components/BanUserDialog.js
index bfca4ceb1..56507e13c 100644
--- a/client/coral-admin/src/routes/Moderation/components/BanUserDialog.js
+++ b/client/coral-admin/src/routes/Moderation/components/BanUserDialog.js
@@ -26,7 +26,7 @@ const BanUserDialog = ({open, handleClose, handleBanUser, rejectComment, user, c
         <h2>{t('bandialog.ban_user')}</h2>
       </div>
       <div className={styles.separator}>
-        <h3>{t('bandialog.are_you_sure', user.name)}</h3>
+        <h3>{t('bandialog.are_you_sure', user.username)}</h3>
         <i>{showRejectedNote && t('bandialog.note')}</i>
       </div>
       <div className={styles.buttons}>
diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.js b/client/coral-admin/src/routes/Moderation/components/Comment.js
index 18f3aa057..2a5f44f28 100644
--- a/client/coral-admin/src/routes/Moderation/components/Comment.js
+++ b/client/coral-admin/src/routes/Moderation/components/Comment.js
@@ -76,7 +76,7 @@ class Comment extends React.Component {
               {
                 !minimal && (
                   <span className={styles.username} onClick={() => viewUserDetail(comment.user.id)}>
-                    {comment.user.name}
+                    {comment.user.username}
                   </span>
                 )
               }
@@ -102,7 +102,7 @@ class Comment extends React.Component {
                 <ActionsMenu icon="not_interested">
                   <ActionsMenuItem
                     disabled={comment.user.status === 'BANNED'}
-                    onClick={() => props.showSuspendUserDialog(comment.user.id, comment.user.name, comment.id, comment.status)}>
+                    onClick={() => props.showSuspendUserDialog(comment.user.id, comment.user.username, comment.id, comment.status)}>
                     Suspend User</ActionsMenuItem>
                   <ActionsMenuItem
                     disabled={comment.user.status === 'BANNED'}
diff --git a/client/coral-admin/src/routes/Moderation/containers/Comment.js b/client/coral-admin/src/routes/Moderation/containers/Comment.js
index 26074065d..8843188b8 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Comment.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Comment.js
@@ -26,7 +26,7 @@ export default withFragments({
       status
       user {
         id
-        name: username
+        username
         status
       }
       asset {
diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index d693863e0..737afdac9 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -209,18 +209,10 @@ class ModerationContainer extends Component {
 const COMMENTS_EDITED_SUBSCRIPTION = gql`
   subscription CommentEdited($asset_id: ID){
     commentEdited(asset_id: $asset_id){
-      id
-      body
-      status
-      editing {
-        edited
-      }
-      user {
-        id
-        username
-      }
+      ...${getDefinitionName(Comment.fragments.comment)}
     }
   }
+  ${Comment.fragments.comment}
 `;
 
 const STATUS_CHANGED_SUBSCRIPTION = gql`

From f73f8d916e1ee1a5d77d042690114462fdb11b97 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 16 Jun 2017 00:50:44 +0700
Subject: [PATCH 106/264] Only show notification once

---
 client/coral-admin/src/graphql/utils.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/client/coral-admin/src/graphql/utils.js b/client/coral-admin/src/graphql/utils.js
index 9d85c6bb1..1a3262529 100644
--- a/client/coral-admin/src/graphql/utils.js
+++ b/client/coral-admin/src/graphql/utils.js
@@ -97,18 +97,27 @@ export function handleCommentStatusChange(root, comment, {sort, notify, user, ac
   let next = root;
   const nextQueues = getCommentQueues(comment);
 
+  let notificationShown = false;
+  const showNotificationOnce = (...args) => {
+    if (notificationShown) {
+      return;
+    }
+    showNotification(...args);
+    notificationShown = true;
+  };
+
   queues.forEach((queue) => {
     if (nextQueues.indexOf(queue) >= 0) {
       if (!queueHasComment(next, queue, comment.id)) {
         next = addCommentToQueue(next, queue, comment, sort);
         if (notify && activeQueue === queue && shouldCommentBeAdded(next, queue, comment, sort)) {
-          showNotification(queue, comment, user);
+          showNotificationOnce(queue, comment, user);
         }
       }
     } else if(queueHasComment(next, queue, comment.id)){
       next = removeCommentFromQueue(next, queue, comment.id);
       if (notify && activeQueue === queue) {
-        showNotification(queue, comment, user);
+        showNotificationOnce(queue, comment, user);
       }
     }
 
@@ -118,7 +127,7 @@ export function handleCommentStatusChange(root, comment, {sort, notify, user, ac
       && notify
       && activeQueue === queue
     ) {
-      showNotification(queue, comment, user);
+      showNotificationOnce(queue, comment, user);
     }
 
     // TODO: Flagged notification

From ba659b47be63360a1e48303a52a8f802f16bb176 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Thu, 15 Jun 2017 14:44:06 -0400
Subject: [PATCH 107/264] Fix typos

---
 locales/en.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/locales/en.yml b/locales/en.yml
index e667c6f23..de95ddb91 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -94,13 +94,13 @@ en:
     edit_comment_timeframe_text_pre: "Commenters will have"
     edit_comment_timeframe_text_post: "seconds to edit their comments."
     embed_comment_stream: "Embed Stream"
-    enable_premod_links_text: "Moderators must approve any comment containing a link before its published."
+    enable_premod_links_text: "Moderators must approve any comment containing a link before it is published."
     enable_pre_moderation: "Enable pre-moderation"
     enable_pre_moderation_text: "Moderators must approve any comment before it is published."
     enable_premod_links: "Pre-Moderate Comments Containing Links"
     enable_premod: "Enable Premoderation"
-    enable_premod_description: "Moderators must approve any comment before its published."
-    enable_premod_links_description: "Moderators must approve any comment containing a link before its published."
+    enable_premod_description: "Moderators must approve any comment before it is published."
+    enable_premod_links_description: "Moderators must approve any comment containing a link before it is published."
     enable_questionbox: "Ask Readers a Question"
     enable_questionbox_description: "This question will appear at the top of this comment stream. Ask readers about a certain issue in the article or pose discussion questions etc."
     hours: Hours

From ecf63ffb55b29a764b7e066259e4845f9642bda7 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 16 Jun 2017 01:49:35 +0700
Subject: [PATCH 108/264] More accurate edit notification

---
 client/coral-admin/src/graphql/utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-admin/src/graphql/utils.js b/client/coral-admin/src/graphql/utils.js
index 1a3262529..407a4e53b 100644
--- a/client/coral-admin/src/graphql/utils.js
+++ b/client/coral-admin/src/graphql/utils.js
@@ -138,7 +138,7 @@ export function handleCommentStatusChange(root, comment, {sort, notify, user, ac
 export function handleCommentEdit(root, comment, {sort, activeQueue}) {
   if (
     queueHasComment(root, activeQueue, comment.id)
-    || comment.status === 'PREMOD' && root[`${activeQueue}Count`] < limit
+    || comment.status.toLowerCase() === activeQueue && shouldCommentBeAdded(root, activeQueue, comment, sort)
   ) {
     const text = `${comment.user.username} edited comment to "${truncate(comment.body, 50)}"`;
     notification.info(text);

From 18061e3e1cd87fe3d1cf1503ca7baa7b1bd4bf38 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 15 Jun 2017 17:32:14 -0300
Subject: [PATCH 109/264] new func and style

---
 client/coral-admin/src/actions/moderation.js  |  5 ++--
 .../coral-admin/src/components/ui/Layout.js   |  2 +-
 .../coral-admin/src/constants/moderation.js   |  3 ++-
 client/coral-admin/src/reducers/moderation.js |  4 +++-
 .../Moderation/components/StorySearch.css     | 23 ++++++++++--------
 .../Moderation/components/StorySearch.js      | 19 +++++++++++----
 .../Moderation/containers/Moderation.js       |  2 --
 .../Moderation/containers/StorySearch.js      | 24 ++++++++++++++-----
 8 files changed, 53 insertions(+), 29 deletions(-)

diff --git a/client/coral-admin/src/actions/moderation.js b/client/coral-admin/src/actions/moderation.js
index 2b8c1e599..a684c6085 100644
--- a/client/coral-admin/src/actions/moderation.js
+++ b/client/coral-admin/src/actions/moderation.js
@@ -57,11 +57,10 @@ export const toggleStorySearch = (active) => ({
 });
 
 export const storySearchChange = (value) => ({
-  type: actions.CHANGE_ASSET_SEARCH_STRING,
+  type: actions.STORY_SEARCH_CHANGE_VALUE,
   value
 });
 
 export const storySearchClear = () => ({
-  type: actions.CHANGE_ASSET_SEARCH_STRING,
-  value: ''
+  type: actions.STORY_SEARCH_CLEAR
 });
diff --git a/client/coral-admin/src/components/ui/Layout.js b/client/coral-admin/src/components/ui/Layout.js
index 11432e570..10433048e 100644
--- a/client/coral-admin/src/components/ui/Layout.js
+++ b/client/coral-admin/src/components/ui/Layout.js
@@ -10,7 +10,7 @@ const Layout = ({
   toggleShortcutModal,
   restricted = false,
   ...props}) => (
-  <LayoutMDL fixedDrawer>
+  <LayoutMDL className={styles.layout} fixedDrawer>
     <Header
       handleLogout={handleLogout}
       showShortcuts={toggleShortcutModal}
diff --git a/client/coral-admin/src/constants/moderation.js b/client/coral-admin/src/constants/moderation.js
index 37f048e23..fec6b2353 100644
--- a/client/coral-admin/src/constants/moderation.js
+++ b/client/coral-admin/src/constants/moderation.js
@@ -14,4 +14,5 @@ export const UNSELECT_USER_DETAIL_COMMENT = 'UNSELECT_USER_DETAIL_COMMENT';
 export const CLEAR_USER_DETAIL_SELECTIONS = 'CLEAR_USER_DETAIL_SELECTIONS';
 export const SHOW_STORY_SEARCH = 'SHOW_STORY_SEARCH';
 export const HIDE_STORY_SEARCH = 'HIDE_STORY_SEARCH';
-export const CHANGE_ASSET_SEARCH_STRING = 'CHANGE_ASSET_SEARCH_STRING';
+export const STORY_SEARCH_CHANGE_VALUE = 'STORY_SEARCH_CHANGE_VALUE';
+export const STORY_SEARCH_CLEAR = 'STORY_SEARCH_CLEAR';
diff --git a/client/coral-admin/src/reducers/moderation.js b/client/coral-admin/src/reducers/moderation.js
index 349ff517a..858986e45 100644
--- a/client/coral-admin/src/reducers/moderation.js
+++ b/client/coral-admin/src/reducers/moderation.js
@@ -86,8 +86,10 @@ export default function moderation (state = initialState, action) {
     return state.set('storySearchVisible', true);
   case actions.HIDE_STORY_SEARCH:
     return state.set('storySearchVisible', false);
-  case actions.CHANGE_ASSET_SEARCH_STRING:
+  case actions.STORY_SEARCH_CHANGE_VALUE:
     return state.set('storySearchString', action.value);
+  case actions.STORY_SEARCH_CLEAR:
+    return state.set('storySearchString', '');
   case actions.SET_SORT_ORDER:
     return state.set('sortOrder', action.order);
   default :
diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.css b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
index 4224a38fb..796bc9266 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.css
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
@@ -28,7 +28,7 @@
   padding: 8px;
   height: 100%;
   font-size: 16px;
-  margin-right: 10px;
+  margin-right: 5px;
   position: relative;
   top: 2px;
   box-sizing: border-box;
@@ -39,13 +39,16 @@
 }
 
 .cta {
-  padding: 32px 30px;
   letter-spacing: 1px;
   font-weight: bold;
-  font-size: 17px;
+  font-size: 15px;
   margin: 0;
-  height: 74px;
+  height: 50px;
   box-sizing: border-box;
+  font-size: 15px;
+  font-weight: 500;
+  padding: 12px 30px;
+  letter-spacing: 0.7px;
 }
 
 .storyList {
@@ -58,7 +61,7 @@
   cursor: pointer;
   display: block;
   text-decoration: none;
-  height: 66px;
+  height: 50px;
 
   &:hover {
     background-color: #efefef;
@@ -69,7 +72,6 @@
   margin: 0;
   color: black;
   font-size: 17px;
-  /* margin: 0 0 -4px; */
 }
 
 .author, .createdAt, .status {
@@ -104,8 +106,8 @@
 }
 
 .recentStories i {
-  font-size: 20px;
-  line-height: 26px;
+  font-size: 16px;
+  vertical-align: middle;
 }
 
 .accessStories {
@@ -113,9 +115,10 @@
 }
 
 .headlineRecent {
-  font-size: 17px;
+  font-size: 15px;
   font-weight: 500;
-  padding: 17px;
   letter-spacing: 0.7px;
+  vertical-align: middle;
+  margin-left: 10px;
 }
 
diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.js b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
index b1c44baff..b5d746114 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
@@ -24,8 +24,17 @@ const StorySearch = (props) => {
     <div className={styles.container}>
       <div className={styles.positionShim}>
         <div className={styles.headInput}>
-          <input className={styles.searchInput} onChange={props.storySearchChange} />
-          <Button cStyle='blue' className={styles.searchButton} raised>Search</Button>
+          <input
+            className={styles.searchInput}
+            onChange={props.handleSearchChange}
+          />
+          <Button
+            cStyle='blue'
+            className={styles.searchButton}
+            onClick={props.search}
+            raised >
+            Search
+          </Button>
         </div>
         <div className={styles.results}>
           <p className={styles.cta}>Moderate comments on All Stories</p>
@@ -57,8 +66,8 @@ const StorySearch = (props) => {
   );
 };
 
-StorySearch.propTypes = {
-  storySearchChange: PropTypes.func.isRequired
-};
+// StorySearch.propTypes = {
+//   storySearchChange: PropTypes.func.isRequired
+// };
 
 export default withRouter(StorySearch);
diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index eac900d40..24a3d748d 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -25,7 +25,6 @@ import {
   viewUserDetail,
   hideUserDetail,
   setSortOrder,
-  storySearchClear
 } from 'actions/moderation';
 
 import {Spinner} from 'coral-ui';
@@ -307,7 +306,6 @@ const mapDispatchToProps = (dispatch) => ({
     viewUserDetail,
     hideUserDetail,
     setSortOrder,
-    storySearchClear
   }, dispatch),
 });
 
diff --git a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
index c2c43c6ee..0fc4a79aa 100644
--- a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
@@ -7,20 +7,32 @@ import withQuery from 'coral-framework/hocs/withQuery';
 import {storySearchChange} from 'coral-admin/src/actions/moderation';
 
 class StorySearchContainer extends React.Component {
-  searchChange = (e) => {
+
+  handleSearchChange = (e) => {
     const value = e.target.value;
     this.props.storySearchChange(value);
-    this.props.data.refetch();
   }
 
-  componentDidUpdate (prevProps) {
-    if (prevProps.moderation.storySearchString !== this.props.moderation.storySearchString) {
-      this.props.data.refetch();
+  handleEnter = (e) => {
+    if (e.key === 'Enter') {
+      e.preventDefault();
+      this.search();
     }
   }
 
+  search = () => {
+    this.props.data.refetch();
+  }
+
   render () {
-    return <StorySearch searchChange={this.searchChange} {...this.props} />;
+    return (
+      <StorySearch
+        search={this.search}
+        handleSearchChange={this.handleSearchChange}
+        onKeyDownHandler={this.handleEnter}
+        {...this.props}
+      />
+    );
   }
 }
 

From 01237362751d406c73cc1a624e7cafd0338d5f83 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 15 Jun 2017 17:42:22 -0300
Subject: [PATCH 110/264] Deleting unnecesary connects

---
 .../src/routes/Moderation/components/Moderation.js |  4 +++-
 .../routes/Moderation/components/StorySearch.js    |  7 +++++--
 .../src/routes/Moderation/containers/Moderation.js |  4 ++++
 .../routes/Moderation/containers/StorySearch.js    | 14 --------------
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js
index 4d82803a8..4833367bb 100644
--- a/client/coral-admin/src/routes/Moderation/components/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js
@@ -211,8 +211,10 @@ export default class Moderation extends Component {
             rejectComment={props.rejectComment} />
         )}
         <StorySearch
-          visible={this.props.moderation.storySearchVisible}
+          moderation={this.props.moderation}
           closeSearch={this.closeSearch}
+          storySearchChange={this.props.storySearchChange}
+          storySearchClear={this.props.storySearchClear}
         />
       </div>
     );
diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.js b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
index b5d746114..ab151f2ca 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
@@ -7,11 +7,13 @@ import Story from './Story';
 const StorySearch = (props) => {
 
   const {
-    root: {assets = []},
+    root: {
+      assets = []
+    },
     data: {loading}
   } = props;
 
-  if (!props.visible) {
+  if (!props.moderation.storySearchVisible) {
     return null;
   }
 
@@ -27,6 +29,7 @@ const StorySearch = (props) => {
           <input
             className={styles.searchInput}
             onChange={props.handleSearchChange}
+            value={props.moderation.storySearchString}
           />
           <Button
             cStyle='blue'
diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index 24a3d748d..eedb1271f 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -25,6 +25,8 @@ import {
   viewUserDetail,
   hideUserDetail,
   setSortOrder,
+  storySearchChange,
+  storySearchClear
 } from 'actions/moderation';
 
 import {Spinner} from 'coral-ui';
@@ -306,6 +308,8 @@ const mapDispatchToProps = (dispatch) => ({
     viewUserDetail,
     hideUserDetail,
     setSortOrder,
+    storySearchChange,
+    storySearchClear
   }, dispatch),
 });
 
diff --git a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
index 0fc4a79aa..8b5cb3243 100644
--- a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
@@ -1,10 +1,7 @@
 import React from 'react';
-import {connect} from 'react-redux';
-import {bindActionCreators} from 'redux';
 import {compose, gql} from 'react-apollo';
 import StorySearch from '../components/StorySearch';
 import withQuery from 'coral-framework/hocs/withQuery';
-import {storySearchChange} from 'coral-admin/src/actions/moderation';
 
 class StorySearchContainer extends React.Component {
 
@@ -57,17 +54,6 @@ export const withAssetSearchQuery = withQuery(gql`
   }
 });
 
-const mapStateToProps = (state) => ({
-  moderation: state.moderation.toJS()
-});
-
-const mapDispatchToProps = (dispatch) => ({
-  ...bindActionCreators({
-    storySearchChange
-  }, dispatch)
-});
-
 export default compose(
-  connect(mapStateToProps, mapDispatchToProps),
   withAssetSearchQuery
 )(StorySearchContainer);

From ca08efea8ad04a191317fed568abad1514162b0a Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 15 Jun 2017 18:49:05 -0300
Subject: [PATCH 111/264] Adding proptypes as a package, and linting

---
 .../src/routes/Moderation/components/Moderation.js    |  3 ++-
 .../src/routes/Moderation/components/StorySearch.js   | 11 +++++++----
 package.json                                          |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js
index 4833367bb..05e035e2e 100644
--- a/client/coral-admin/src/routes/Moderation/components/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js
@@ -143,7 +143,8 @@ export default class Moderation extends Component {
           searchVisible={this.props.moderation.storySearchVisible}
           openSearch={this.openSearch}
           closeSearch={this.closeSearch}
-          asset={asset} />
+          asset={asset}
+        />
         <ModerationMenu
           asset={asset}
           allCount={root.allCount}
diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.js b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
index ab151f2ca..0e99e1e9e 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
@@ -1,4 +1,5 @@
-import React, {PropTypes} from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import styles from './StorySearch.css';
 import {Button, Spinner, Icon} from 'coral-ui';
 import {withRouter} from 'react-router';
@@ -69,8 +70,10 @@ const StorySearch = (props) => {
   );
 };
 
-// StorySearch.propTypes = {
-//   storySearchChange: PropTypes.func.isRequired
-// };
+StorySearch.propTypes = {
+  handleSearchChange: PropTypes.func.isRequired,
+  search: PropTypes.func.isRequired,
+  moderation: PropTypes.object.isRequired
+};
 
 export default withRouter(StorySearch);
diff --git a/package.json b/package.json
index 4295f5c25..1b63d13cd 100644
--- a/package.json
+++ b/package.json
@@ -105,7 +105,7 @@
     "passport": "^0.3.2",
     "passport-jwt": "^2.2.1",
     "passport-local": "^1.0.0",
-    "prop-types": "^15.5.8",
+    "prop-types": "^15.5.10",
     "react-apollo": "^1.1.0",
     "react-recaptcha": "^2.2.6",
     "react-toastify": "^1.5.0",

From b78d4f29eacffc49518735729a25f29d95b9fb81 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 15 Jun 2017 18:12:53 -0400
Subject: [PATCH 112/264] Added PAT support

---
 bin/cli-token                    | 98 ++++++++++++++++++++++++++++++++
 graph/mutators/index.js          |  2 +
 graph/mutators/token.js          | 41 +++++++++++++
 graph/resolvers/root_mutation.js |  6 ++
 graph/resolvers/user.js          | 10 +++-
 graph/typeDefs.graphql           | 57 +++++++++++++++++++
 models/schema/token.js           | 16 ++++++
 models/user.js                   |  4 ++
 perms/constants.js               |  5 +-
 perms/mutationReducer.js         |  4 ++
 perms/queryReducer.js            |  2 +
 services/passport.js             | 18 ++++++
 services/tokens.js               | 82 ++++++++++++++++++++++++++
 13 files changed, 343 insertions(+), 2 deletions(-)
 create mode 100644 bin/cli-token
 create mode 100644 graph/mutators/token.js
 create mode 100644 models/schema/token.js
 create mode 100644 services/tokens.js

diff --git a/bin/cli-token b/bin/cli-token
new file mode 100644
index 000000000..f6b4570a7
--- /dev/null
+++ b/bin/cli-token
@@ -0,0 +1,98 @@
+#!/usr/bin/env node
+
+/**
+ * Module dependencies.
+ */
+
+const program = require('./commander');
+const mongoose = require('../services/mongoose');
+const TokensService = require('../services/tokens');
+const util = require('./util');
+const Table = require('cli-table');
+
+// Regeister the shutdown criteria.
+util.onshutdown([
+  () => mongoose.disconnect()
+]);
+
+async function listTokens(userID) {
+  try {
+    let tokens = await TokensService.list(userID);
+
+    let table = new Table({
+      head: [
+        'ID',
+        'Name',
+        'Status'
+      ]
+    });
+
+    tokens.forEach((token) => {
+      table.push([
+        token.id,
+        token.name,
+        token.active ? 'Active' : 'Revoked'
+      ]);
+    });
+
+    console.log(table.toString());
+
+    util.shutdown();
+  } catch (e) {
+    console.error(e);
+    util.shutdown(1);
+  }
+}
+
+async function revokeToken(tokenID) {
+  try {
+
+    await TokensService.revoke(null, tokenID);
+
+    util.shutdown();
+  } catch (e) {
+    console.error(e);
+    util.shutdown(1);
+  }
+}
+
+async function createToken(userID, tokenName) {
+  try {
+
+    let {pat: {id}, jwt} = await TokensService.create(userID, tokenName);
+
+    console.log(`Created Token[${id}] for User[${userID}] = ${jwt}`);
+
+    util.shutdown();
+  } catch (e) {
+    console.error(e);
+    util.shutdown(1);
+  }
+}
+
+//==============================================================================
+// Setting up the program command line arguments.
+//==============================================================================
+
+program
+  .command('list <userID>')
+  .description('list tokens for a user')
+  .action(listTokens);
+
+program
+  .command('revoke <tokenID>')
+  .description('revokes a token with a given id')
+  .action(revokeToken);
+
+program
+  .command('create <userID> <tokenName>')
+  .description('create a token for a user with a given name')
+  .action(createToken);
+
+program.parse(process.argv);
+
+// If there is no command listed, output help.
+if (!process.argv.slice(2).length) {
+  program.outputHelp();
+  util.shutdown();
+}
diff --git a/graph/mutators/index.js b/graph/mutators/index.js
index 0076a5e8f..e7e5df9e7 100644
--- a/graph/mutators/index.js
+++ b/graph/mutators/index.js
@@ -4,6 +4,7 @@ const debug = require('debug')('talk:graph:mutators');
 const Comment = require('./comment');
 const Action = require('./action');
 const Tag = require('./tag');
+const Token = require('./token');
 const User = require('./user');
 
 const plugins = require('../../services/plugins');
@@ -14,6 +15,7 @@ let mutators = [
   Comment,
   Action,
   Tag,
+  Token,
   User,
 
   // Load the plugin mutators from the manager.
diff --git a/graph/mutators/token.js b/graph/mutators/token.js
new file mode 100644
index 000000000..2a1028596
--- /dev/null
+++ b/graph/mutators/token.js
@@ -0,0 +1,41 @@
+const errors = require('../../errors');
+const TokensService = require('../../services/tokens');
+const {
+  CREATE_TOKEN,
+  REVOKE_TOKEN
+} = require('../../perms/constants');
+
+// Creates a new token for a user.
+const createToken = async ({user}, {name}) => {
+  let {pat, jwt} = await TokensService.create(user.id, name);
+
+  // Attach the token to the PAT.
+  pat.jwt = jwt;
+
+  // Return that PAT!
+  return pat;
+};
+
+// Revokes the token from the user.
+const revokeToken = async ({user}, {id}) => {
+  return TokensService.revoke(user.id, id);
+};
+
+module.exports = (context) => {
+  let mutators = {
+    Token: {
+      create: () => Promise.reject(errors.ErrNotAuthorized),
+      revoke: () => Promise.reject(errors.ErrNotAuthorized)
+    }
+  };
+
+  if (context.user && context.user.can(CREATE_TOKEN)) {
+    mutators.Token.create = (input) => createToken(context, input);
+  }
+
+  if (context.user && context.user.can(REVOKE_TOKEN)) {
+    mutators.Token.revoke = (input) => revokeToken(context, input);
+  }
+
+  return mutators;
+};
diff --git a/graph/resolvers/root_mutation.js b/graph/resolvers/root_mutation.js
index f192405cc..dec0553a4 100644
--- a/graph/resolvers/root_mutation.js
+++ b/graph/resolvers/root_mutation.js
@@ -39,6 +39,12 @@ const RootMutation = {
   },
   removeTag(_, {tag}, {mutators: {Tag}}) {
     return wrapResponse(null)(Tag.remove(tag));
+  },
+  createToken(_, {input}, {mutators: {Token}}) {
+    return wrapResponse('token')(Token.create(input));
+  },
+  revokeToken(_, {input}, {mutators: {Token}}) {
+    return wrapResponse(null)(Token.revoke(input));
   }
 };
 
diff --git a/graph/resolvers/user.js b/graph/resolvers/user.js
index 5f6fc52a1..035af22cb 100644
--- a/graph/resolvers/user.js
+++ b/graph/resolvers/user.js
@@ -5,7 +5,8 @@ const {
   SEARCH_OTHER_USERS,
   SEARCH_OTHERS_COMMENTS,
   UPDATE_USER_ROLES,
-  SEARCH_COMMENT_METRICS
+  SEARCH_COMMENT_METRICS,
+  LIST_OWN_TOKENS
 } = require('../../perms/constants');
 
 const User = {
@@ -46,6 +47,13 @@ const User = {
 
     return null;
   },
+  tokens({id, tokens}, args, {user}) {
+    if (!user ||  ((user.id !== id) && !user.can(LIST_OWN_TOKENS))) {
+      return null;
+    }
+
+    return tokens;
+  },
   ignoredUsers({id}, args, {user, loaders: {Users}}) {
 
     // Only allow a logged in user that is either the current user or is a staff
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 117b7e077..b69051697 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -36,6 +36,23 @@ enum USER_ROLES {
   MODERATOR
 }
 
+# Token is a personal access token associated with a given user.
+type Token {
+
+  # ID is the unique identifier for the token.
+  id: ID!
+
+  # Name is the description for the token.
+  name: String!
+
+  # Active determines if the token is available to hit the API.
+  active: Boolean!
+
+  # JWT is the actual token to use for authentication, this is only available
+  # on token creation, otherwise it will be null.
+  jwt: String
+}
+
 type UserProfile {
   # the id is an identifier for the user profile (email, facebook id, etc)
   id: String!
@@ -78,6 +95,9 @@ type User {
   # ignored users.
   ignoredUsers: [User!]
 
+  # Tokens are the personal access tokens for a given user.
+  tokens: [Token!]
+
   # returns all comments based on a query.
   comments(query: CommentsQuery): CommentConnection!
 
@@ -889,6 +909,37 @@ type EditCommentResponse implements Response {
   errors: [UserError!]
 }
 
+# CreateTokenInput contains the input to create the token.
+input CreateTokenInput {
+
+  # Name is the description for the token.
+  name: String!
+}
+
+# CreateTokenResponse contains the errors related to creating a token.
+type CreateTokenResponse implements Response {
+
+  # Token is the Token that was created, or null if it failed.
+  token: Token
+
+  # An array of errors relating to the mutation that occured.
+  errors: [UserError!]
+}
+
+# RevokeTokenInput contains the input to revoke the token.
+input RevokeTokenInput {
+
+  # ID is the JTI for the token.
+  id: ID!
+}
+
+# RevokeTokenResponse contains the errors related to revoking a token.
+type RevokeTokenResponse implements Response {
+
+  # An array of errors relating to the mutation that occured.
+  errors: [UserError!]
+}
+
 # All mutations for the application are defined on this object.
 type RootMutation {
 
@@ -928,6 +979,12 @@ type RootMutation {
   # Ignore comments by another user
   ignoreUser(id: ID!): IgnoreUserResponse
 
+  # CreateToken will create a token that is attached to the current user.
+  createToken(input: CreateTokenInput!): CreateTokenResponse!
+
+  # RevokeToken will revoke an existing token.
+  revokeToken(input: RevokeTokenInput!): RevokeTokenResponse!
+
   # Stop Ignoring comments by another user
   stopIgnoringUser(id: ID!): StopIgnoringUserResponse
 }
diff --git a/models/schema/token.js b/models/schema/token.js
new file mode 100644
index 000000000..83b6cc049
--- /dev/null
+++ b/models/schema/token.js
@@ -0,0 +1,16 @@
+const mongoose = require('../../services/mongoose');
+const Schema = mongoose.Schema;
+
+const TokenSchema = new Schema({
+
+  // ID is the JTI of a given JWT's identifier.
+  id: String,
+
+  // Name is given by the user on token creation.
+  name: String,
+
+  // Active is used to determine if the token is valid.
+  active: Boolean
+});
+
+module.exports = TokenSchema;
diff --git a/models/user.js b/models/user.js
index fb05a5e28..b19a87b0a 100644
--- a/models/user.js
+++ b/models/user.js
@@ -3,6 +3,7 @@ const bcrypt = require('bcrypt');
 const Schema = mongoose.Schema;
 const uuid = require('uuid');
 const TagLinkSchema = require('./schema/tag_link');
+const TokenSchema = require('./schema/token');
 const intersection = require('lodash/intersection');
 const can = require('../perms');
 
@@ -86,6 +87,9 @@ const UserSchema = new Schema({
   // addresses.
   profiles: [ProfileSchema],
 
+  // Tokens are the individual personal access tokens for a given user.
+  tokens: [TokenSchema],
+
   // Roles provides an array of roles (as strings) that is associated with a
   // user.
   roles: [{
diff --git a/perms/constants.js b/perms/constants.js
index 2b5b907ac..e843a17c7 100644
--- a/perms/constants.js
+++ b/perms/constants.js
@@ -14,6 +14,8 @@ module.exports = {
   REMOVE_COMMENT_TAG: 'REMOVE_COMMENT_TAG',
   UPDATE_USER_ROLES: 'UPDATE_USER_ROLES',
   UPDATE_CONFIG: 'UPDATE_CONFIG',
+  CREATE_TOKEN: 'CREATE_TOKEN',
+  REVOKE_TOKEN: 'REVOKE_TOKEN',
 
   // queries
   SEARCH_ASSETS: 'SEARCH_ASSETS',
@@ -21,5 +23,6 @@ module.exports = {
   SEARCH_ACTIONS: 'SEARCH_ACTIONS',
   SEARCH_NON_NULL_OR_ACCEPTED_COMMENTS: 'SEARCH_NON_NULL_OR_ACCEPTED_COMMENTS',
   SEARCH_OTHERS_COMMENTS: 'SEARCH_OTHERS_COMMENTS',
-  SEARCH_COMMENT_METRICS: 'SEARCH_COMMENT_METRICS'
+  SEARCH_COMMENT_METRICS: 'SEARCH_COMMENT_METRICS',
+  LIST_OWN_TOKENS: 'LIST_OWN_TOKENS'
 };
diff --git a/perms/mutationReducer.js b/perms/mutationReducer.js
index 53cece51f..897217348 100644
--- a/perms/mutationReducer.js
+++ b/perms/mutationReducer.js
@@ -29,6 +29,10 @@ module.exports = (user, perm) => {
     return check(user, ['ADMIN', 'MODERATOR']);
   case types.UPDATE_CONFIG:
     return check(user, ['ADMIN', 'MODERATOR']);
+  case types.CREATE_TOKEN:
+    return check(user, ['ADMIN']);
+  case types.REVOKE_TOKEN:
+    return check(user, ['ADMIN']);
   default:
     break;
   }
diff --git a/perms/queryReducer.js b/perms/queryReducer.js
index 0e5054788..ba7e2b206 100644
--- a/perms/queryReducer.js
+++ b/perms/queryReducer.js
@@ -15,6 +15,8 @@ module.exports = (user, perm) => {
     return check(user, ['ADMIN', 'MODERATOR']);
   case types.SEARCH_COMMENT_METRICS:
     return check(user, ['ADMIN', 'MODERATOR']);
+  case types.LIST_OWN_TOKENS:
+    return check(user, ['ADMIN']);
   default:
     break;
   }
diff --git a/services/passport.js b/services/passport.js
index 1d031c39c..bfd6bca45 100644
--- a/services/passport.js
+++ b/services/passport.js
@@ -34,6 +34,23 @@ const GenerateToken = (user) => JWT.sign({}, JWT_SECRET, {
   audience: JWT_AUDIENCE
 });
 
+// GeneratePersonalAccessToken will sign a token to include all the
+// authorization information needed for the front end for headless access.
+const GeneratePersonalAccessToken = (userID) => {
+  const payload = {
+    jti: uuid.v4(),
+    iss: JWT_ISSUER,
+    aud: JWT_AUDIENCE,
+    sub: userID,
+    pat: true
+  };
+
+  // Sign the payload.
+  const jwt = JWT.sign(payload, JWT_SECRET, {});
+
+  return {payload, jwt};
+};
+
 // SetTokenForSafari sends the token in a cookie for Safari clients.
 const SetTokenForSafari = (req, res, token) => {
   const browser = bowser._detect(req.headers['user-agent']);
@@ -474,5 +491,6 @@ module.exports = {
   HandleAuthPopupCallback,
   HandleGenerateCredentials,
   HandleLogout,
+  GeneratePersonalAccessToken,
   CheckBlacklisted
 };
diff --git a/services/tokens.js b/services/tokens.js
new file mode 100644
index 000000000..eeefce175
--- /dev/null
+++ b/services/tokens.js
@@ -0,0 +1,82 @@
+const UserModel = require('../models/user');
+const {GeneratePersonalAccessToken} = require('./passport');
+
+/**
+ * TokenService manages Personal Access Tokens for users. These tokens are
+ * persisted in the database and attached to the user.
+ */
+module.exports = class TokenService {
+
+  /**
+   * Creates a token for a user with a given name.
+   *
+   * @param {String} userID     the id of the user owning the token
+   * @param {String} tokenName  the name of the token to be created
+   */
+  static async create(userID, tokenName) {
+
+    // Create the token.
+    let {payload, jwt} = GeneratePersonalAccessToken(userID);
+
+    // Create the PAT.
+    let pat = {
+      id: payload.jti,
+      name: tokenName,
+      active: true
+    };
+
+    // Wait to update the user model with the new PAT.
+    await UserModel.update({id: userID}, {
+      $push: {
+        tokens: pat
+      }
+    });
+
+    return {payload, jwt, pat};
+  }
+
+  /**
+   * Revokes a token and prevents the token from being used. Once a token has
+   * been revoked, it cannot be re-enabled.
+   *
+   * @param {String} userID     the id of the user owning the token
+   * @param {String} tokenID    the jti of the token to revoke
+   */
+  static async revoke(userID, tokenID) {
+    let query = {
+      tokens: {
+        $elemMatch: {
+          id: tokenID
+        }
+      }
+    };
+
+    if (userID) {
+      query.id = userID;
+    }
+
+    // Revoke the token id.
+    await UserModel.update(query, {
+      $set: {
+        'tokens.$.active': false
+      }
+    });
+  }
+
+  /**
+   * Lists the tokens owned by the user.
+   *
+   * @param {String} userID     the id of the user owning the token
+   */
+  static async list(userID) {
+
+    // Get the user specified by the id.
+    let user = await UserModel.findOne({id: userID}).select('tokens');
+    if (!user || !user.tokens) {
+      return [];
+    }
+
+    return user.tokens;
+  }
+
+};

From fe74f4a8d2016b97750701bc67d59e8b11d3e8b6 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 15 Jun 2017 20:24:22 -0300
Subject: [PATCH 113/264] Search on enter, removed unused links

---
 client/coral-admin/src/actions/moderation.js  |  4 +--
 .../coral-admin/src/constants/moderation.js   |  2 +-
 client/coral-admin/src/reducers/moderation.js |  4 +--
 .../routes/Community/components/styles.css    | 15 ++-------
 .../Moderation/components/Moderation.js       |  3 +-
 .../Moderation/components/ModerationHeader.js |  6 ----
 .../Moderation/components/StorySearch.js      |  3 +-
 .../routes/Moderation/components/styles.css   | 33 +++++++------------
 .../Moderation/containers/Moderation.js       |  5 +--
 .../Moderation/containers/StorySearch.js      | 19 ++++++++---
 yarn.lock                                     |  9 ++++-
 11 files changed, 48 insertions(+), 55 deletions(-)

diff --git a/client/coral-admin/src/actions/moderation.js b/client/coral-admin/src/actions/moderation.js
index a684c6085..08dadd8ee 100644
--- a/client/coral-admin/src/actions/moderation.js
+++ b/client/coral-admin/src/actions/moderation.js
@@ -61,6 +61,6 @@ export const storySearchChange = (value) => ({
   value
 });
 
-export const storySearchClear = () => ({
-  type: actions.STORY_SEARCH_CLEAR
+export const clearState = () => ({
+  type: actions.MODERATION_CLEAR_STATE
 });
diff --git a/client/coral-admin/src/constants/moderation.js b/client/coral-admin/src/constants/moderation.js
index fec6b2353..6fefcccfb 100644
--- a/client/coral-admin/src/constants/moderation.js
+++ b/client/coral-admin/src/constants/moderation.js
@@ -15,4 +15,4 @@ export const CLEAR_USER_DETAIL_SELECTIONS = 'CLEAR_USER_DETAIL_SELECTIONS';
 export const SHOW_STORY_SEARCH = 'SHOW_STORY_SEARCH';
 export const HIDE_STORY_SEARCH = 'HIDE_STORY_SEARCH';
 export const STORY_SEARCH_CHANGE_VALUE = 'STORY_SEARCH_CHANGE_VALUE';
-export const STORY_SEARCH_CLEAR = 'STORY_SEARCH_CLEAR';
+export const MODERATION_CLEAR_STATE = 'MODERATION_CLEAR_STATE';
diff --git a/client/coral-admin/src/reducers/moderation.js b/client/coral-admin/src/reducers/moderation.js
index 858986e45..fd6f7c0ea 100644
--- a/client/coral-admin/src/reducers/moderation.js
+++ b/client/coral-admin/src/reducers/moderation.js
@@ -27,6 +27,8 @@ const initialState = fromJS({
 
 export default function moderation (state = initialState, action) {
   switch (action.type) {
+  case actions.MODERATION_CLEAR_STATE:
+    return initialState;
   case actions.HIDE_BANUSER_DIALOG:
     return state
       .set('banDialog', false)
@@ -88,8 +90,6 @@ export default function moderation (state = initialState, action) {
     return state.set('storySearchVisible', false);
   case actions.STORY_SEARCH_CHANGE_VALUE:
     return state.set('storySearchString', action.value);
-  case actions.STORY_SEARCH_CLEAR:
-    return state.set('storySearchString', '');
   case actions.SET_SORT_ORDER:
     return state.set('sortOrder', action.order);
   default :
diff --git a/client/coral-admin/src/routes/Community/components/styles.css b/client/coral-admin/src/routes/Community/components/styles.css
index 8e4b716af..8581c4c7d 100644
--- a/client/coral-admin/src/routes/Community/components/styles.css
+++ b/client/coral-admin/src/routes/Community/components/styles.css
@@ -91,6 +91,7 @@ span {
 
   .moderateAsset {
     a {
+      text-align: center;
       -webkit-box-flex: 1;
       -ms-flex: 1;
       flex: 1;
@@ -103,21 +104,9 @@ span {
       opacity: 1;
 
       &:hover {
-          opacity: .8;
+         opacity: .8;
          cursor: pointer;
       }
-
-      &:first-child {
-        text-align: left;
-      }
-
-      &:nth-child(2) {
-       text-align: center;
-      }
-
-      &:last-child {
-        text-align: right;
-      }
     }
   }
 }
diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js
index 05e035e2e..59a5a70e7 100644
--- a/client/coral-admin/src/routes/Moderation/components/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js
@@ -34,9 +34,8 @@ export default class Moderation extends Component {
   }
 
   closeSearch = () => {
-    const {storySearchClear, toggleStorySearch} = this.props;
+    const {toggleStorySearch} = this.props;
     toggleStorySearch(false);
-    storySearchClear();
   }
 
   openSearch = () => {
diff --git a/client/coral-admin/src/routes/Moderation/components/ModerationHeader.js b/client/coral-admin/src/routes/Moderation/components/ModerationHeader.js
index 0ab2eb762..9e50f4dbb 100644
--- a/client/coral-admin/src/routes/Moderation/components/ModerationHeader.js
+++ b/client/coral-admin/src/routes/Moderation/components/ModerationHeader.js
@@ -9,10 +9,6 @@ const ModerationHeader = ({asset, searchVisible, openSearch, closeSearch}) => {
   const trigger = searchVisible ? closeSearch : openSearch;
   const searchTriggerIcon = <Icon className={styles.searchTrigger} name={searchVisible ? 'arrow_drop_up' : 'arrow_drop_down'} />;
 
-  const allStreams = asset
-    ? <Link className="mdl-tabs__tab" to="/admin/moderate">{t('modqueue.all_streams')}</Link>
-    : <a className="mdl-tabs__tab" />;
-
   const title = asset
     ? <a onClick={trigger} className="mdl-tabs__tab">{asset.title} {searchTriggerIcon}</a>
     : <a onClick={trigger} className="mdl-tabs__tab">{t('modqueue.all_streams')} {searchTriggerIcon}</a>;
@@ -21,9 +17,7 @@ const ModerationHeader = ({asset, searchVisible, openSearch, closeSearch}) => {
     <div className=''>
       <div className={`mdl-tabs ${styles.header}`}>
         <div className={`mdl-tabs__tab-bar ${styles.moderateAsset}`}>
-          {allStreams}
           {title}
-          <Link className="mdl-tabs__tab" to="/admin/stories">{t('modqueue.select_stream')}</Link>
         </div>
       </div>
     </div>
diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.js b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
index 0e99e1e9e..38f8057db 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
@@ -30,7 +30,8 @@ const StorySearch = (props) => {
           <input
             className={styles.searchInput}
             onChange={props.handleSearchChange}
-            value={props.moderation.storySearchString}
+            onKeyDown={props.handleEnter}
+            value={props.searchValue}
           />
           <Button
             cStyle='blue'
diff --git a/client/coral-admin/src/routes/Moderation/components/styles.css b/client/coral-admin/src/routes/Moderation/components/styles.css
index b14e656f5..9fa343762 100644
--- a/client/coral-admin/src/routes/Moderation/components/styles.css
+++ b/client/coral-admin/src/routes/Moderation/components/styles.css
@@ -116,29 +116,20 @@ span {
       transition: background-color 200ms;
       opacity: 1;
 
-      &:first-child {
-        text-align: left;
+      &:hover {
+         cursor: pointer;
+         background-color: #212121;
+      }
+      span {
+        text-align: center;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        max-width: 344px;
+        display: inline-block;
+        vertical-align: top;
       }
 
-      &:nth-child(2) {
-        &:hover {
-           cursor: pointer;
-           background-color: #212121;
-        }
-        span {
-          text-align: center;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-          overflow: hidden;
-          max-width: 344px;
-          display: inline-block;
-          vertical-align: top;
-        }
-      }
-
-      &:last-child {
-        text-align: right;
-      }
     }
   }
 }
diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index eedb1271f..e60a6b914 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -26,7 +26,7 @@ import {
   hideUserDetail,
   setSortOrder,
   storySearchChange,
-  storySearchClear
+  clearState
 } from 'actions/moderation';
 
 import {Spinner} from 'coral-ui';
@@ -35,6 +35,7 @@ import Comment from './Comment';
 
 class ModerationContainer extends Component {
   componentWillMount() {
+    this.props.clearState();
     this.props.fetchSettings();
   }
 
@@ -309,7 +310,7 @@ const mapDispatchToProps = (dispatch) => ({
     hideUserDetail,
     setSortOrder,
     storySearchChange,
-    storySearchClear
+    clearState
   }, dispatch),
 });
 
diff --git a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
index 8b5cb3243..c7c3863db 100644
--- a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
@@ -4,10 +4,19 @@ import StorySearch from '../components/StorySearch';
 import withQuery from 'coral-framework/hocs/withQuery';
 
 class StorySearchContainer extends React.Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      searchValue: props.moderation.storySearchString
+    };
+  }
 
   handleSearchChange = (e) => {
-    const value = e.target.value;
-    this.props.storySearchChange(value);
+    const {value} = e.target;
+    this.setState({
+      searchValue: value
+    });
   }
 
   handleEnter = (e) => {
@@ -18,15 +27,17 @@ class StorySearchContainer extends React.Component {
   }
 
   search = () => {
-    this.props.data.refetch();
+    const {searchValue} = this.state;
+    this.props.storySearchChange(searchValue);
   }
 
   render () {
     return (
       <StorySearch
         search={this.search}
+        searchValue={this.state.searchValue}
+        handleEnter={this.handleEnter}
         handleSearchChange={this.handleSearchChange}
-        onKeyDownHandler={this.handleEnter}
         {...this.props}
       />
     );
diff --git a/yarn.lock b/yarn.lock
index 6013a3e49..fe99eec83 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5064,7 +5064,7 @@ longest@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
 
-loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0:
+loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
   dependencies:
@@ -6575,6 +6575,13 @@ prop-types@^15.5.0, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7,
   dependencies:
     fbjs "^0.8.9"
 
+prop-types@^15.5.10:
+  version "15.5.10"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154"
+  dependencies:
+    fbjs "^0.8.9"
+    loose-envify "^1.3.1"
+
 protocols@^1.1.0, protocols@^1.4.0:
   version "1.4.5"
   resolved "https://registry.yarnpkg.com/protocols/-/protocols-1.4.5.tgz#21de1f441c4ef7094408ed9f1c94f7a114b87557"

From b518358ea8b69578385e6245124494ab619a2213 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 15 Jun 2017 22:51:15 -0300
Subject: [PATCH 114/264] Lintin

---
 .../src/routes/Moderation/components/ModerationHeader.js         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/ModerationHeader.js b/client/coral-admin/src/routes/Moderation/components/ModerationHeader.js
index 9e50f4dbb..9cc0bfed9 100644
--- a/client/coral-admin/src/routes/Moderation/components/ModerationHeader.js
+++ b/client/coral-admin/src/routes/Moderation/components/ModerationHeader.js
@@ -1,5 +1,4 @@
 import React, {PropTypes} from 'react';
-import {Link} from 'react-router';
 import {Icon} from 'coral-ui';
 import styles from './styles.css';
 import t from 'coral-framework/services/i18n';

From 5604aa8525fea1e7beadf3840ac962a54b4e912a Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 16 Jun 2017 07:33:22 -0300
Subject: [PATCH 115/264] Overlay and Container

---
 .../Moderation/components/Moderation.js       |  1 -
 .../Moderation/components/StorySearch.css     | 11 +++
 .../Moderation/components/StorySearch.js      | 94 +++++++++----------
 .../Moderation/containers/StorySearch.js      | 13 ++-
 4 files changed, 68 insertions(+), 51 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js
index 59a5a70e7..a0a5b3705 100644
--- a/client/coral-admin/src/routes/Moderation/components/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js
@@ -214,7 +214,6 @@ export default class Moderation extends Component {
           moderation={this.props.moderation}
           closeSearch={this.closeSearch}
           storySearchChange={this.props.storySearchChange}
-          storySearchClear={this.props.storySearchClear}
         />
       </div>
     );
diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.css b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
index 796bc9266..d161b4efd 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.css
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
@@ -1,3 +1,14 @@
+.overlay {
+  position: absolute;
+  background-color: transparent;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  width: 100%;
+  z-index: 99;
+}
+
 .container {
   position: absolute;
   background-color: white;
diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.js b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
index 38f8057db..8989f8ed3 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
@@ -2,7 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import styles from './StorySearch.css';
 import {Button, Spinner, Icon} from 'coral-ui';
-import {withRouter} from 'react-router';
 import Story from './Story';
 
 const StorySearch = (props) => {
@@ -18,52 +17,49 @@ const StorySearch = (props) => {
     return null;
   }
 
-  const goToStory = (id) => {
-    props.router.push(`/admin/moderate/${id}`);
-    props.closeSearch();
-  };
-
   return (
-    <div className={styles.container}>
-      <div className={styles.positionShim}>
-        <div className={styles.headInput}>
-          <input
-            className={styles.searchInput}
-            onChange={props.handleSearchChange}
-            onKeyDown={props.handleEnter}
-            value={props.searchValue}
-          />
-          <Button
-            cStyle='blue'
-            className={styles.searchButton}
-            onClick={props.search}
-            raised >
-            Search
-          </Button>
-        </div>
-        <div className={styles.results}>
-          <p className={styles.cta}>Moderate comments on All Stories</p>
-          <div className={styles.storyList}>
-            <div className={styles.recentStories}>
-              <Icon name="access_time" />
-              <span className={styles.headlineRecent}>Most Recent Stories</span>
+    <div className={styles.overlay} onClick={props.closeSearch}>
+      <div className={styles.container}>
+        <div className={styles.positionShim}>
+          <div className={styles.headInput}>
+            <input
+              className={styles.searchInput}
+              onChange={props.handleSearchChange}
+              onKeyDown={props.handleEnter}
+              value={props.searchValue}
+            />
+            <Button
+              cStyle='blue'
+              className={styles.searchButton}
+              onClick={props.search}
+              raised >
+              Search
+            </Button>
+          </div>
+          <div className={styles.results}>
+            <p className={styles.cta}>Moderate comments on All Stories</p>
+            <div className={styles.storyList}>
+              <div className={styles.recentStories}>
+                <Icon name="access_time" />
+                <span className={styles.headlineRecent}>Most Recent Stories</span>
+              </div>
+              {
+                loading
+                ? <Spinner />
+                : assets.map((story, i) => {
+                  const storyOpen = story.closedAt === null || new Date(story.closedAt) > new Date();
+                  return <Story
+                    key={i}
+                    id={story.id}
+                    title={story.title}
+                    createdAt={new Date(story.created_at).toISOString()}
+                    open={storyOpen}
+                    author={story.author}
+                    goToStory={props.goToStory}
+                  />;
+                })
+              }
             </div>
-            {
-              loading
-              ? <Spinner />
-              : assets.map((story, i) => {
-                const storyOpen = story.closedAt === null || new Date(story.closedAt) > new Date();
-                return <Story
-                  key={i}
-                  id={story.id}
-                  title={story.title}
-                  createdAt={new Date(story.created_at).toISOString()}
-                  open={storyOpen}
-                  author={story.author}
-                  goToStory={goToStory}
-                />;
-              })
-            }
           </div>
         </div>
       </div>
@@ -72,9 +68,11 @@ const StorySearch = (props) => {
 };
 
 StorySearch.propTypes = {
-  handleSearchChange: PropTypes.func.isRequired,
   search: PropTypes.func.isRequired,
-  moderation: PropTypes.object.isRequired
+  goToStory: PropTypes.func.isRequired,
+  closeSearch: PropTypes.func.isRequired,
+  moderation: PropTypes.object.isRequired,
+  handleSearchChange: PropTypes.func.isRequired
 };
 
-export default withRouter(StorySearch);
+export default StorySearch;
diff --git a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
index c7c3863db..d2790eccf 100644
--- a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import {compose, gql} from 'react-apollo';
 import StorySearch from '../components/StorySearch';
+import {withRouter} from 'react-router';
 import withQuery from 'coral-framework/hocs/withQuery';
 
 class StorySearchContainer extends React.Component {
@@ -31,12 +32,19 @@ class StorySearchContainer extends React.Component {
     this.props.storySearchChange(searchValue);
   }
 
+  goToStory = (id) => {
+    const {router, closeSearch} = this.props;
+    router.push(`/admin/moderate/${id}`);
+    closeSearch();
+  }
+
   render () {
     return (
       <StorySearch
         search={this.search}
-        searchValue={this.state.searchValue}
+        goToStory={this.goToStory}
         handleEnter={this.handleEnter}
+        searchValue={this.state.searchValue}
         handleSearchChange={this.handleSearchChange}
         {...this.props}
       />
@@ -66,5 +74,6 @@ export const withAssetSearchQuery = withQuery(gql`
 });
 
 export default compose(
-  withAssetSearchQuery
+  withAssetSearchQuery,
+  withRouter
 )(StorySearchContainer);

From d386316f8af484da28cd66753ad4a69aaee6804e Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 16 Jun 2017 08:19:22 -0300
Subject: [PATCH 116/264] Styles, copy, funtionality, state changes and clicks.
 Ready to be tested.

---
 .../Moderation/components/StorySearch.css     | 16 ++++++++---
 .../Moderation/components/StorySearch.js      | 27 ++++++++++++++-----
 .../Moderation/containers/StorySearch.js      |  4 +--
 3 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.css b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
index d161b4efd..9ea56df0d 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.css
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
@@ -1,12 +1,12 @@
 .overlay {
   position: absolute;
-  background-color: transparent;
-  top: 0;
+  top: 58px;
   left: 0;
   right: 0;
   bottom: 0;
   width: 100%;
   z-index: 99;
+  opacity: 0;
 }
 
 .container {
@@ -77,6 +77,10 @@
   &:hover {
     background-color: #efefef;
   }
+
+  &:last-child {
+    border-bottom: none;
+  }
 }
 
 .title, .meta {
@@ -112,11 +116,11 @@
   height: 35px;
 }
 
-.recentStories {
+.searchResults {
   padding: 10px 24px;
 }
 
-.recentStories i {
+.searchResults i {
   font-size: 16px;
   vertical-align: middle;
 }
@@ -133,3 +137,7 @@
   margin-left: 10px;
 }
 
+.noResults {
+  padding: 10px 24px 15px 49px;
+}
+
diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.js b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
index 8989f8ed3..c174c892f 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
@@ -18,8 +18,8 @@ const StorySearch = (props) => {
   }
 
   return (
-    <div className={styles.overlay} onClick={props.closeSearch}>
-      <div className={styles.container}>
+    <div>
+      <div className={styles.container} role='alertdialog'>
         <div className={styles.positionShim}>
           <div className={styles.headInput}>
             <input
@@ -27,6 +27,7 @@ const StorySearch = (props) => {
               onChange={props.handleSearchChange}
               onKeyDown={props.handleEnter}
               value={props.searchValue}
+              autoFocus
             />
             <Button
               cStyle='blue'
@@ -39,10 +40,21 @@ const StorySearch = (props) => {
           <div className={styles.results}>
             <p className={styles.cta}>Moderate comments on All Stories</p>
             <div className={styles.storyList}>
-              <div className={styles.recentStories}>
-                <Icon name="access_time" />
-                <span className={styles.headlineRecent}>Most Recent Stories</span>
-              </div>
+
+              {
+                props.moderation.storySearchString ? (
+                  <div className={styles.searchResults}>
+                    <Icon name="search" />
+                    <span className={styles.headlineRecent}>Search Results</span>
+                  </div>
+                ) : (
+                  <div className={styles.searchResults}>
+                    <Icon name="access_time" />
+                    <span className={styles.headlineRecent}>Most Recent Stories</span>
+                  </div>
+                )
+              }
+
               {
                 loading
                 ? <Spinner />
@@ -59,10 +71,13 @@ const StorySearch = (props) => {
                   />;
                 })
               }
+
+              {assets.length === 0 && <div className={styles.noResults}>No results</div>}
             </div>
           </div>
         </div>
       </div>
+      <div className={styles.overlay} onClick={props.closeSearch} />
     </div>
   );
 };
diff --git a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
index d2790eccf..f52c290b5 100644
--- a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
@@ -74,6 +74,6 @@ export const withAssetSearchQuery = withQuery(gql`
 });
 
 export default compose(
-  withAssetSearchQuery,
-  withRouter
+  withRouter,
+  withAssetSearchQuery
 )(StorySearchContainer);

From 5f450adbaf28eb2d454af67409bfe6552014a3b3 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 16 Jun 2017 19:18:21 +0700
Subject: [PATCH 117/264] Simplify subscription

---
 client/coral-admin/src/graphql/utils.js       | 11 +++++----
 .../Moderation/containers/Moderation.js       | 19 ++++++++-------
 graph/mutators/comment.js                     |  6 +++++
 graph/resolvers/comment_status_history.js     | 11 +++++++++
 graph/resolvers/index.js                      |  2 ++
 graph/resolvers/root_mutation.js              | 14 ++---------
 graph/resolvers/subscription.js               |  4 ++--
 graph/typeDefs.graphql                        | 23 +++++++++++++------
 perms/constants.js                            |  1 +
 perms/queryReducer.js                         |  2 ++
 10 files changed, 59 insertions(+), 34 deletions(-)
 create mode 100644 graph/resolvers/comment_status_history.js

diff --git a/client/coral-admin/src/graphql/utils.js b/client/coral-admin/src/graphql/utils.js
index 407a4e53b..0b7384622 100644
--- a/client/coral-admin/src/graphql/utils.js
+++ b/client/coral-admin/src/graphql/utils.js
@@ -93,7 +93,7 @@ function showNotification(queue, comment, user) {
   notification.info(text);
 }
 
-export function handleCommentStatusChange(root, comment, {sort, notify, user, activeQueue}) {
+export function handleCommentStatusChange(root, comment, {sort, notify, activeQueue}) {
   let next = root;
   const nextQueues = getCommentQueues(comment);
 
@@ -102,7 +102,8 @@ export function handleCommentStatusChange(root, comment, {sort, notify, user, ac
     if (notificationShown) {
       return;
     }
-    showNotification(...args);
+    const user = comment.status_history[comment.status_history.length - 1].assigned_by;
+    showNotification(...[...args, user]);
     notificationShown = true;
   };
 
@@ -111,13 +112,13 @@ export function handleCommentStatusChange(root, comment, {sort, notify, user, ac
       if (!queueHasComment(next, queue, comment.id)) {
         next = addCommentToQueue(next, queue, comment, sort);
         if (notify && activeQueue === queue && shouldCommentBeAdded(next, queue, comment, sort)) {
-          showNotificationOnce(queue, comment, user);
+          showNotificationOnce(queue, comment);
         }
       }
     } else if(queueHasComment(next, queue, comment.id)){
       next = removeCommentFromQueue(next, queue, comment.id);
       if (notify && activeQueue === queue) {
-        showNotificationOnce(queue, comment, user);
+        showNotificationOnce(queue, comment);
       }
     }
 
@@ -127,7 +128,7 @@ export function handleCommentStatusChange(root, comment, {sort, notify, user, ac
       && notify
       && activeQueue === queue
     ) {
-      showNotificationOnce(queue, comment, user);
+      showNotificationOnce(queue, comment);
     }
 
     // TODO: Flagged notification
diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index 737afdac9..ede004c87 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -42,12 +42,13 @@ class ModerationContainer extends Component {
       variables: {
         asset_id: this.props.data.variables.asset_id,
       },
-      updateQuery: (prev, {subscriptionData: {data: {commentStatusChanged: {user, comment}}}}) => {
+      updateQuery: (prev, {subscriptionData: {data: {commentStatusChanged: comment}}}) => {
+        const user = comment.status_history[comment.status_history.length - 1].assigned_by;
+
         const extraParams = this.props.auth.user.id === user.id
           ? {}
           : {
             notify: true,
-            user,
             activeQueue: this.activeTab,
           };
         return handleCommentStatusChange(prev, comment, {
@@ -218,12 +219,14 @@ const COMMENTS_EDITED_SUBSCRIPTION = gql`
 const STATUS_CHANGED_SUBSCRIPTION = gql`
   subscription CommentStatusChanged($asset_id: ID){
     commentStatusChanged(asset_id: $asset_id){
-      user {
-        id
-        username
-      }
-      comment {
-        ...${getDefinitionName(Comment.fragments.comment)}
+      ...${getDefinitionName(Comment.fragments.comment)}
+      status_history {
+        type
+        created_at
+        assigned_by {
+          id
+          username
+        }
       }
     }
   }
diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index d9dd47a9a..8d01ededf 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -346,6 +346,12 @@ const setStatus = async ({user, loaders: {Comments}, pubsub}, {id, status}) => {
   // adjust the affected user's karma in the next tick.
   process.nextTick(adjustKarma(Comments, id, status));
 
+  if (pubsub) {
+
+    // Publish the comment status change via the subscription.
+    pubsub.publish('commentStatusChanged', comment);
+  }
+
   return comment;
 };
 
diff --git a/graph/resolvers/comment_status_history.js b/graph/resolvers/comment_status_history.js
new file mode 100644
index 000000000..2e1676d90
--- /dev/null
+++ b/graph/resolvers/comment_status_history.js
@@ -0,0 +1,11 @@
+const {SEARCH_OTHER_USERS} = require('../../perms/constants');
+
+const CommentStatusHistory = {
+  assigned_by({assigned_by}, _, {user, loaders: {Users}}) {
+    if (user && user.can(SEARCH_OTHER_USERS) && assigned_by != null) {
+      return Users.getByID.load(assigned_by);
+    }
+  }
+};
+
+module.exports = CommentStatusHistory;
diff --git a/graph/resolvers/index.js b/graph/resolvers/index.js
index f2707bcc8..850a2f15a 100644
--- a/graph/resolvers/index.js
+++ b/graph/resolvers/index.js
@@ -6,6 +6,7 @@ const Action = require('./action');
 const AssetActionSummary = require('./asset_action_summary');
 const Asset = require('./asset');
 const Comment = require('./comment');
+const CommentStatusHistory = require('./comment_status_history');
 const Date = require('./date');
 const FlagActionSummary = require('./flag_action_summary');
 const FlagAction = require('./flag_action');
@@ -31,6 +32,7 @@ let resolvers = {
   AssetActionSummary,
   Asset,
   Comment,
+  CommentStatusHistory,
   Date,
   FlagActionSummary,
   FlagAction,
diff --git a/graph/resolvers/root_mutation.js b/graph/resolvers/root_mutation.js
index ac2fd729d..f192405cc 100644
--- a/graph/resolvers/root_mutation.js
+++ b/graph/resolvers/root_mutation.js
@@ -31,18 +31,8 @@ const RootMutation = {
   stopIgnoringUser(_, {id}, {mutators: {User}}) {
     return wrapResponse(null)(User.stopIgnoringUser({id}));
   },
-  setCommentStatus(_, {id, status}, {mutators: {Comment}, user, pubsub}) {
-    const response = Comment.setStatus({id, status})
-      .then((comment) => {
-        if (pubsub) {
-
-          // Publish the comment status change via the subscription.
-          pubsub.publish('commentStatusChanged', {user, comment});
-        }
-        return Promise.resolve(comment);
-      });
-
-    return wrapResponse(null)(response);
+  setCommentStatus(_, {id, status}, {mutators: {Comment}}) {
+    return wrapResponse(null)(Comment.setStatus({id, status}));
   },
   addTag(_, {tag}, {mutators: {Tag}}) {
     return wrapResponse(null)(Tag.add(tag));
diff --git a/graph/resolvers/subscription.js b/graph/resolvers/subscription.js
index 8a989cc81..cc98b19da 100644
--- a/graph/resolvers/subscription.js
+++ b/graph/resolvers/subscription.js
@@ -5,8 +5,8 @@ const Subscription = {
   commentEdited(comment) {
     return comment;
   },
-  commentStatusChanged(data) {
-    return data;
+  commentStatusChanged(comment) {
+    return comment;
   },
 };
 
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 2bd7c0476..d2c927995 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -247,6 +247,12 @@ type EditInfo {
   editableUntil: Date
 }
 
+type CommentStatusHistory {
+  type: COMMENT_STATUS!
+  created_at: Date!
+  assigned_by: User
+}
+
 # Comment is the base representation of user interaction in Talk.
 type Comment {
 
@@ -286,6 +292,9 @@ type Comment {
   # The current status of a comment.
   status: COMMENT_STATUS!
 
+  # The status history of the comment. Requires the `ADMIN` or `MODERATOR` role.
+  status_history: [CommentStatusHistory!]
+
   # The time when the comment was created
   created_at: Date!
 
@@ -936,16 +945,16 @@ type RootMutation {
 ## Subscriptions
 ################################################################################
 
-# Response to ignoreUser mutation
-type CommentStatusChangedUpdate {
-  user: User
-  comment: Comment
-}
-
 type Subscription {
+
+  # Get an update whenever a comment was added.
   commentAdded(asset_id: ID!): Comment
+
+  # Get an update whenever a comment was edited.
   commentEdited(asset_id: ID): Comment
-  commentStatusChanged(asset_id: ID): CommentStatusChangedUpdate
+
+  # Get an update whenever the status of a comment changed due to a moderator action.
+  commentStatusChanged(asset_id: ID): Comment
 }
 
 ################################################################################
diff --git a/perms/constants.js b/perms/constants.js
index 0b14932f3..37c5c3814 100644
--- a/perms/constants.js
+++ b/perms/constants.js
@@ -22,6 +22,7 @@ module.exports = {
   SEARCH_NON_NULL_OR_ACCEPTED_COMMENTS: 'SEARCH_NON_NULL_OR_ACCEPTED_COMMENTS',
   SEARCH_OTHERS_COMMENTS: 'SEARCH_OTHERS_COMMENTS',
   SEARCH_COMMENT_METRICS: 'SEARCH_COMMENT_METRICS',
+  SEARCH_COMMENT_STATUS_HISTORY: 'SEARCH_COMMENT_STATUS_HISTORY',
 
   // subscriptions
   SUBSCRIBE_COMMENT_STATUS: 'SUBSCRIBE_COMMENT_STATUS',
diff --git a/perms/queryReducer.js b/perms/queryReducer.js
index 0e5054788..2bee02110 100644
--- a/perms/queryReducer.js
+++ b/perms/queryReducer.js
@@ -15,6 +15,8 @@ module.exports = (user, perm) => {
     return check(user, ['ADMIN', 'MODERATOR']);
   case types.SEARCH_COMMENT_METRICS:
     return check(user, ['ADMIN', 'MODERATOR']);
+  case types.SEARCH_COMMENT_STATUS_HISTORY:
+    return check(user, ['ADMIN', 'MODERATOR']);
   default:
     break;
   }

From 2625b372e197e44e510797a832afec48cca0d03c Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 16 Jun 2017 20:06:13 +0700
Subject: [PATCH 118/264] Handle comment flags

---
 client/coral-admin/src/graphql/utils.js       | 45 ++++------------
 .../Moderation/containers/Moderation.js       | 51 +++++++++++++++----
 graph/mutators/action.js                      | 15 +++++-
 graph/resolvers/subscription.js               |  3 ++
 graph/subscriptions.js                        | 19 ++++++-
 graph/typeDefs.graphql                        |  9 +++-
 perms/constants.js                            |  3 +-
 perms/subscriptionReducer.js                  |  4 +-
 8 files changed, 101 insertions(+), 48 deletions(-)

diff --git a/client/coral-admin/src/graphql/utils.js b/client/coral-admin/src/graphql/utils.js
index 0b7384622..8d4418806 100644
--- a/client/coral-admin/src/graphql/utils.js
+++ b/client/coral-admin/src/graphql/utils.js
@@ -14,10 +14,6 @@ const ascending = (a, b) => {
 
 const descending = (a, b) => -ascending(a, b);
 
-function truncate(s, length = 10) {
-  return (s.length > length) ? `${s.substring(0, length)}...` : s;
-}
-
 function queueHasComment(root, queue, id) {
   return root[queue].nodes.find((c) => c.id === id);
 }
@@ -88,22 +84,16 @@ function getCommentQueues(comment) {
   return queues;
 }
 
-function showNotification(queue, comment, user) {
-  const text = `${user.username} ${comment.status.toLowerCase()} comment "${truncate(comment.body, 50)}"`;
-  notification.info(text);
-}
-
-export function handleCommentStatusChange(root, comment, {sort, notify, activeQueue}) {
+export function handleCommentStatusChange(root, comment, {sort, notify}) {
   let next = root;
   const nextQueues = getCommentQueues(comment);
 
   let notificationShown = false;
-  const showNotificationOnce = (...args) => {
+  const showNotificationOnce = () => {
     if (notificationShown) {
       return;
     }
-    const user = comment.status_history[comment.status_history.length - 1].assigned_by;
-    showNotification(...[...args, user]);
+    notification.info(notify.text);
     notificationShown = true;
   };
 
@@ -111,38 +101,25 @@ export function handleCommentStatusChange(root, comment, {sort, notify, activeQu
     if (nextQueues.indexOf(queue) >= 0) {
       if (!queueHasComment(next, queue, comment.id)) {
         next = addCommentToQueue(next, queue, comment, sort);
-        if (notify && activeQueue === queue && shouldCommentBeAdded(next, queue, comment, sort)) {
-          showNotificationOnce(queue, comment);
+        if (notify && notify.activeQueue === queue && shouldCommentBeAdded(next, queue, comment, sort)) {
+          showNotificationOnce(comment);
         }
       }
     } else if(queueHasComment(next, queue, comment.id)){
       next = removeCommentFromQueue(next, queue, comment.id);
-      if (notify && activeQueue === queue) {
-        showNotificationOnce(queue, comment);
+      if (notify && notify.activeQueue === queue) {
+        showNotificationOnce(comment);
       }
     }
 
     if (
-      queue === 'all'
+      notify
+      && (queue === 'all' || notify.anyQueue)
       && queueHasComment(next, queue, comment.id)
-      && notify
-      && activeQueue === queue
+      && notify.activeQueue === queue
     ) {
-      showNotificationOnce(queue, comment);
+      showNotificationOnce(comment);
     }
-
-    // TODO: Flagged notification
   });
   return next;
 }
-
-export function handleCommentEdit(root, comment, {sort, activeQueue}) {
-  if (
-    queueHasComment(root, activeQueue, comment.id)
-    || comment.status.toLowerCase() === activeQueue && shouldCommentBeAdded(root, activeQueue, comment, sort)
-  ) {
-    const text = `${comment.user.username} edited comment to "${truncate(comment.body, 50)}"`;
-    notification.info(text);
-  }
-  return handleCommentStatusChange(root, comment, {sort, activeQueue});
-}
diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index ede004c87..e1bd18435 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -8,9 +8,10 @@ import {getDefinitionName} from 'coral-framework/utils';
 import * as notification from 'coral-admin/src/services/notification';
 import t, {timeago} from 'coral-framework/services/i18n';
 import update from 'immutability-helper';
+import truncate from 'lodash/truncate';
 
 import {withSetUserStatus, withSuspendUser, withSetCommentStatus} from 'coral-framework/graphql/mutations';
-import {handleCommentStatusChange, handleCommentEdit} from '../../../graphql/utils';
+import {handleCommentStatusChange} from '../../../graphql/utils';
 
 import {fetchSettings} from 'actions/settings';
 import {updateAssets} from 'actions/assets';
@@ -44,16 +45,16 @@ class ModerationContainer extends Component {
       },
       updateQuery: (prev, {subscriptionData: {data: {commentStatusChanged: comment}}}) => {
         const user = comment.status_history[comment.status_history.length - 1].assigned_by;
-
-        const extraParams = this.props.auth.user.id === user.id
+        const notify = this.props.auth.user.id === user.id
           ? {}
           : {
-            notify: true,
             activeQueue: this.activeTab,
+            text: `${user.username} ${comment.status.toLowerCase()} comment "${truncate(comment.body, {lenght: 50})}"`,
+            anyQueue: false,
           };
         return handleCommentStatusChange(prev, comment, {
           sort: this.props.moderation.sortOrder,
-          ...extraParams,
+          notify,
         });
       },
     });
@@ -63,14 +64,37 @@ class ModerationContainer extends Component {
       variables: {
         asset_id: this.props.data.variables.asset_id,
       },
-      updateQuery: (prev, {subscriptionData: {data: {commentEdited}}}) => {
-        return handleCommentEdit(prev, commentEdited, {
-          activeQueue: this.activeTab,
+      updateQuery: (prev, {subscriptionData: {data: {commentEdited: comment}}}) => {
+        return handleCommentStatusChange(prev, comment, {
+          sort: this.props.moderation.sortOrder,
+          notify: {
+            activeQueue: this.activeTab,
+            text: `${comment.user.username} edited comment to "${truncate(comment.body, {lenght: 50})}"`,
+            anyQueue: false,
+          },
         });
       },
     });
 
-    this.subscriptions.push(sub1, sub2);
+    const sub3 = this.props.data.subscribeToMore({
+      document: COMMENTS_FLAGGED_SUBSCRIPTION,
+      variables: {
+        asset_id: this.props.data.variables.asset_id,
+      },
+      updateQuery: (prev, {subscriptionData: {data: {commentFlagged: comment}}}) => {
+        const user = comment.actions[comment.actions.length - 1].user;
+        return handleCommentStatusChange(prev, comment, {
+          sort: this.props.moderation.sortOrder,
+          notify: {
+            activeQueue: this.activeTab,
+            text: `${user.username} flagged comment "${truncate(comment.body, {lenght: 50})}"`,
+            anyQueue: true,
+          },
+        });
+      },
+    });
+
+    this.subscriptions.push(sub1, sub2, sub3);
   }
 
   unsubscribe() {
@@ -216,6 +240,15 @@ const COMMENTS_EDITED_SUBSCRIPTION = gql`
   ${Comment.fragments.comment}
 `;
 
+const COMMENTS_FLAGGED_SUBSCRIPTION = gql`
+  subscription CommentFlagged($asset_id: ID){
+    commentFlagged(asset_id: $asset_id){
+      ...${getDefinitionName(Comment.fragments.comment)}
+    }
+  }
+  ${Comment.fragments.comment}
+`;
+
 const STATUS_CHANGED_SUBSCRIPTION = gql`
   subscription CommentStatusChanged($asset_id: ID){
     commentStatusChanged(asset_id: $asset_id){
diff --git a/graph/mutators/action.js b/graph/mutators/action.js
index 96bf091cf..19db33183 100644
--- a/graph/mutators/action.js
+++ b/graph/mutators/action.js
@@ -13,7 +13,16 @@ const {CREATE_ACTION, DELETE_ACTION} = require('../../perms/constants');
  * @param  {String} action_type type of the action
  * @return {Promise}            resolves to the action created
  */
-const createAction = async ({user = {}}, {item_id, item_type, action_type, group_id, metadata = {}}) => {
+const createAction = async ({user = {}, pubsub, loaders: {Comments}}, {item_id, item_type, action_type, group_id, metadata = {}}) => {
+
+  let comment;
+  if (pubsub && item_type === 'COMMENTS') {
+    comment = await Comments.get.load(item_id);
+    if (!comment) {
+      throw new Error('Comment not found');
+    }
+  }
+
   let action = await ActionsService.insertUserAction({
     item_id,
     item_type,
@@ -29,6 +38,10 @@ const createAction = async ({user = {}}, {item_id, item_type, action_type, group
     await UsersService.setStatus(item_id, 'PENDING');
   }
 
+  if (pubsub && comment) {
+    pubsub.publish('commentFlagged', comment);
+  }
+
   return action;
 };
 
diff --git a/graph/resolvers/subscription.js b/graph/resolvers/subscription.js
index cc98b19da..3c2130ff1 100644
--- a/graph/resolvers/subscription.js
+++ b/graph/resolvers/subscription.js
@@ -8,6 +8,9 @@ const Subscription = {
   commentStatusChanged(comment) {
     return comment;
   },
+  commentFlagged(comment) {
+    return comment;
+  },
 };
 
 module.exports = Subscription;
diff --git a/graph/subscriptions.js b/graph/subscriptions.js
index 9b3df6b0e..494345319 100644
--- a/graph/subscriptions.js
+++ b/graph/subscriptions.js
@@ -12,7 +12,9 @@ const {deserializeUser} = require('../services/subscriptions');
 
 const {
   SUBSCRIBE_COMMENT_STATUS,
+  SUBSCRIBE_COMMENT_FLAGS,
   SUBSCRIBE_ALL_COMMENT_EDITS,
+  SUBSCRIBE_ALL_COMMENT_ADDITIONS,
 } = require('../perms/constants');
 
 /**
@@ -27,7 +29,12 @@ const setupFunctions = plugins.get('server', 'setupFunctions').reduce((acc, {plu
 }, {
   commentAdded: (options, args) => ({
     commentAdded: {
-      filter: (comment) => comment.asset_id === args.asset_id
+      filter: (comment, context) => {
+        if (!args.asset_id && (!context.user || !context.user.can(SUBSCRIBE_ALL_COMMENT_ADDITIONS))) {
+          return false;
+        }
+        return !args.asset_id || comment.asset_id === args.asset_id;
+      }
     },
   }),
   commentEdited: (options, args) => ({
@@ -40,6 +47,16 @@ 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)) {
+          return false;
+        }
+        return !args.asset_id || comment.asset_id === args.asset_id;
+      }
+    },
+  }),
   commentStatusChanged: (options, args) => ({
     commentStatusChanged: {
       filter: ({comment}, context) => {
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index d2c927995..948d0672f 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -948,12 +948,19 @@ type RootMutation {
 type Subscription {
 
   # Get an update whenever a comment was added.
-  commentAdded(asset_id: ID!): Comment
+  # `asset_id` is required except for users with the `ADMIN` or `MODERATOR` role.
+  commentAdded(asset_id: ID): Comment
 
   # Get an update whenever a comment was edited.
+  # `asset_id` is required except for users with the `ADMIN` or `MODERATOR` role.
   commentEdited(asset_id: ID): Comment
 
+  # Get an update whenever a comment was flagged.
+  # Requires the `ADMIN` or `MODERATOR` role.
+  commentFlagged(asset_id: ID): Comment
+
   # Get an update whenever the status of a comment changed due to a moderator action.
+  # Requires the `ADMIN` or `MODERATOR` role.
   commentStatusChanged(asset_id: ID): Comment
 }
 
diff --git a/perms/constants.js b/perms/constants.js
index 37c5c3814..8f92c09a3 100644
--- a/perms/constants.js
+++ b/perms/constants.js
@@ -26,6 +26,7 @@ module.exports = {
 
   // subscriptions
   SUBSCRIBE_COMMENT_STATUS: 'SUBSCRIBE_COMMENT_STATUS',
-  SUBSCRIBE_ALL_COMMENT_FLAGS: 'SUBSCRIBE_ALL_COMMENT_FLAGS',
+  SUBSCRIBE_COMMENT_FLAGS: 'SUBSCRIBE_COMMENT_FLAGS',
+  SUBSCRIBE_ALL_COMMENT_ADDITIONS: 'SUBSCRIBE_ALL_COMMENT_ADDITIONS',
   SUBSCRIBE_ALL_COMMENT_EDITS: 'SUBSCRIBE_ALL_COMMENT_EDITS',
 };
diff --git a/perms/subscriptionReducer.js b/perms/subscriptionReducer.js
index e2570b272..218443ead 100644
--- a/perms/subscriptionReducer.js
+++ b/perms/subscriptionReducer.js
@@ -3,11 +3,13 @@ const types = require('./constants');
 
 module.exports = (user, perm) => {
   switch (perm) {
+  case types.SUBSCRIBE_COMMENT_FLAGS:
+    return check(user, ['ADMIN', 'MODERATOR']);
   case types.SUBSCRIBE_COMMENT_STATUS:
     return check(user, ['ADMIN', 'MODERATOR']);
   case types.SUBSCRIBE_ALL_COMMENT_EDITS:
     return check(user, ['ADMIN', 'MODERATOR']);
-  case types.SUBSCRIBE_ALL_COMMENT_FLAGS:
+  case types.SUBSCRIBE_ALL_COMMENT_ADDITIONS:
     return check(user, ['ADMIN', 'MODERATOR']);
   default:
     break;

From 1dec8bfaab20ad59edb90ab975d347044ae90b1d Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 16 Jun 2017 09:45:26 -0400
Subject: [PATCH 119/264] small fix

---
 bin/cli-users | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/bin/cli-users b/bin/cli-users
index fccb4b8bb..057c0a806 100755
--- a/bin/cli-users
+++ b/bin/cli-users
@@ -8,6 +8,7 @@ const program = require('./commander');
 const inquirer = require('inquirer');
 const UsersService = require('../services/users');
 const UserModel = require('../models/user');
+const USER_ROLES = require('../models/enum/user_roles');
 const mongoose = require('../services/mongoose');
 const util = require('./util');
 const Table = require('cli-table');
@@ -36,7 +37,7 @@ function getUserCreateAnswers(options) {
       roles: []
     };
 
-    if (options.role && UserModel.USER_ROLES.indexOf(options.role) > -1) {
+    if (options.role && USER_ROLES.indexOf(options.role) > -1) {
       user.roles = [options.role];
     }
 
@@ -89,7 +90,7 @@ function getUserCreateAnswers(options) {
       name: 'roles',
       message: 'User Role',
       type: 'checkbox',
-      choices: UserModel.USER_ROLES
+      choices: USER_ROLES
     }
   ]);
 }
@@ -291,8 +292,8 @@ function mergeUsers(dstUserID, srcUserID) {
  */
 function addRole(userID, role) {
 
-  if (UserModel.USER_ROLES.indexOf(role) === -1) {
-    console.error(`Role '${role}' is not supported. Supported roles are ${UserModel.USER_ROLES.join(', ')}.`);
+  if (USER_ROLES.indexOf(role) === -1) {
+    console.error(`Role '${role}' is not supported. Supported roles are ${USER_ROLES.join(', ')}.`);
     util.shutdown(1);
     return;
   }
@@ -316,8 +317,8 @@ function addRole(userID, role) {
  */
 function removeRole(userID, role) {
 
-  if (UserModel.USER_ROLES.indexOf(role) === -1) {
-    console.error(`Role '${role}' is not supported. Supported roles are ${UserModel.USER_ROLES.join(', ')}.`);
+  if (USER_ROLES.indexOf(role) === -1) {
+    console.error(`Role '${role}' is not supported. Supported roles are ${USER_ROLES.join(', ')}.`);
     util.shutdown(1);
     return;
   }

From 9573c9a7afd006ff57296148def24e0d8eabb18d Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 16 Jun 2017 20:49:17 +0700
Subject: [PATCH 120/264] Refactor & docs

---
 client/coral-admin/src/graphql/utils.js       | 14 ++++++-
 .../Moderation/containers/Moderation.js       | 38 +++++++++----------
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/client/coral-admin/src/graphql/utils.js b/client/coral-admin/src/graphql/utils.js
index 8d4418806..331fd876a 100644
--- a/client/coral-admin/src/graphql/utils.js
+++ b/client/coral-admin/src/graphql/utils.js
@@ -84,7 +84,19 @@ function getCommentQueues(comment) {
   return queues;
 }
 
-export function handleCommentStatusChange(root, comment, {sort, notify}) {
+/**
+ * Assimilate comment changes into current store.
+ * @param  {Object} root               current state of the store
+ * @param  {Object} comment            comment that was changed
+ * @param  {string} sort               current sort order of the queues
+ * @param  {Object} [notify]           show know notifications if set
+ * @param  {string} notify.activeQueue current active queue
+ * @param  {string} notify.text        notification text to show
+ * @param  {bool}   notify.anyQueue    if true show the notification when the comment is shown
+ *                                     in the current active queue besides the 'all' queue.
+ * @return {Object}                    next state of the store
+ */
+export function handleCommentChange(root, comment, sort, notify) {
   let next = root;
   const nextQueues = getCommentQueues(comment);
 
diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index e1bd18435..1d75b3838 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -11,7 +11,7 @@ import update from 'immutability-helper';
 import truncate from 'lodash/truncate';
 
 import {withSetUserStatus, withSuspendUser, withSetCommentStatus} from 'coral-framework/graphql/mutations';
-import {handleCommentStatusChange} from '../../../graphql/utils';
+import {handleCommentChange} from '../../../graphql/utils';
 
 import {fetchSettings} from 'actions/settings';
 import {updateAssets} from 'actions/assets';
@@ -45,6 +45,7 @@ class ModerationContainer extends Component {
       },
       updateQuery: (prev, {subscriptionData: {data: {commentStatusChanged: comment}}}) => {
         const user = comment.status_history[comment.status_history.length - 1].assigned_by;
+        const sort = this.props.moderation.sortOrder;
         const notify = this.props.auth.user.id === user.id
           ? {}
           : {
@@ -52,10 +53,7 @@ class ModerationContainer extends Component {
             text: `${user.username} ${comment.status.toLowerCase()} comment "${truncate(comment.body, {lenght: 50})}"`,
             anyQueue: false,
           };
-        return handleCommentStatusChange(prev, comment, {
-          sort: this.props.moderation.sortOrder,
-          notify,
-        });
+        return handleCommentChange(prev, comment, sort, notify);
       },
     });
 
@@ -65,14 +63,13 @@ class ModerationContainer extends Component {
         asset_id: this.props.data.variables.asset_id,
       },
       updateQuery: (prev, {subscriptionData: {data: {commentEdited: comment}}}) => {
-        return handleCommentStatusChange(prev, comment, {
-          sort: this.props.moderation.sortOrder,
-          notify: {
-            activeQueue: this.activeTab,
-            text: `${comment.user.username} edited comment to "${truncate(comment.body, {lenght: 50})}"`,
-            anyQueue: false,
-          },
-        });
+        const sort = this.props.moderation.sortOrder;
+        const notify = {
+          activeQueue: this.activeTab,
+          text: `${comment.user.username} edited comment to "${truncate(comment.body, {lenght: 50})}"`,
+          anyQueue: false,
+        };
+        return handleCommentChange(prev, comment, sort, notify);
       },
     });
 
@@ -83,14 +80,13 @@ class ModerationContainer extends Component {
       },
       updateQuery: (prev, {subscriptionData: {data: {commentFlagged: comment}}}) => {
         const user = comment.actions[comment.actions.length - 1].user;
-        return handleCommentStatusChange(prev, comment, {
-          sort: this.props.moderation.sortOrder,
-          notify: {
-            activeQueue: this.activeTab,
-            text: `${user.username} flagged comment "${truncate(comment.body, {lenght: 50})}"`,
-            anyQueue: true,
-          },
-        });
+        const sort = this.props.moderation.sortOrder;
+        const notify = {
+          activeQueue: this.activeTab,
+          text: `${user.username} flagged comment "${truncate(comment.body, {lenght: 50})}"`,
+          anyQueue: true,
+        };
+        return handleCommentChange(prev, comment, sort, notify);
       },
     });
 

From 74fbadcc0f85223fde5629d6820badeeaddfcc95 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 16 Jun 2017 22:55:22 +0700
Subject: [PATCH 121/264] Refactor subscriptions

---
 .../Moderation/containers/Moderation.js       | 60 +++++++++++++++----
 graph/mutators/comment.js                     | 11 +++-
 graph/resolvers/subscription.js               |  5 +-
 graph/subscriptions.js                        | 14 ++++-
 graph/typeDefs.graphql                        |  8 ++-
 5 files changed, 79 insertions(+), 19 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index 1d75b3838..021ac3ceb 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -39,18 +39,18 @@ class ModerationContainer extends Component {
 
   subscribeToUpdates() {
     const sub1 = this.props.data.subscribeToMore({
-      document: STATUS_CHANGED_SUBSCRIPTION,
+      document: COMMENT_ACCEPTED_SUBSCRIPTION,
       variables: {
         asset_id: this.props.data.variables.asset_id,
       },
-      updateQuery: (prev, {subscriptionData: {data: {commentStatusChanged: comment}}}) => {
+      updateQuery: (prev, {subscriptionData: {data: {commentAccepted: comment}}}) => {
         const user = comment.status_history[comment.status_history.length - 1].assigned_by;
         const sort = this.props.moderation.sortOrder;
         const notify = this.props.auth.user.id === user.id
           ? {}
           : {
             activeQueue: this.activeTab,
-            text: `${user.username} ${comment.status.toLowerCase()} comment "${truncate(comment.body, {lenght: 50})}"`,
+            text: `${user.username} accepted comment "${truncate(comment.body, {lenght: 50})}"`,
             anyQueue: false,
           };
         return handleCommentChange(prev, comment, sort, notify);
@@ -58,7 +58,26 @@ class ModerationContainer extends Component {
     });
 
     const sub2 = this.props.data.subscribeToMore({
-      document: COMMENTS_EDITED_SUBSCRIPTION,
+      document: COMMENT_REJECTED_SUBSCRIPTION,
+      variables: {
+        asset_id: this.props.data.variables.asset_id,
+      },
+      updateQuery: (prev, {subscriptionData: {data: {commentRejected: comment}}}) => {
+        const user = comment.status_history[comment.status_history.length - 1].assigned_by;
+        const sort = this.props.moderation.sortOrder;
+        const notify = this.props.auth.user.id === user.id
+          ? {}
+          : {
+            activeQueue: this.activeTab,
+            text: `${user.username} rejected comment "${truncate(comment.body, {lenght: 50})}"`,
+            anyQueue: false,
+          };
+        return handleCommentChange(prev, comment, sort, notify);
+      },
+    });
+
+    const sub3 = this.props.data.subscribeToMore({
+      document: COMMENT_EDITED_SUBSCRIPTION,
       variables: {
         asset_id: this.props.data.variables.asset_id,
       },
@@ -73,8 +92,8 @@ class ModerationContainer extends Component {
       },
     });
 
-    const sub3 = this.props.data.subscribeToMore({
-      document: COMMENTS_FLAGGED_SUBSCRIPTION,
+    const sub4 = this.props.data.subscribeToMore({
+      document: COMMENT_FLAGGED_SUBSCRIPTION,
       variables: {
         asset_id: this.props.data.variables.asset_id,
       },
@@ -90,7 +109,7 @@ class ModerationContainer extends Component {
       },
     });
 
-    this.subscriptions.push(sub1, sub2, sub3);
+    this.subscriptions.push(sub1, sub2, sub3, sub4);
   }
 
   unsubscribe() {
@@ -227,7 +246,7 @@ class ModerationContainer extends Component {
   }
 }
 
-const COMMENTS_EDITED_SUBSCRIPTION = gql`
+const COMMENT_EDITED_SUBSCRIPTION = gql`
   subscription CommentEdited($asset_id: ID){
     commentEdited(asset_id: $asset_id){
       ...${getDefinitionName(Comment.fragments.comment)}
@@ -236,7 +255,7 @@ const COMMENTS_EDITED_SUBSCRIPTION = gql`
   ${Comment.fragments.comment}
 `;
 
-const COMMENTS_FLAGGED_SUBSCRIPTION = gql`
+const COMMENT_FLAGGED_SUBSCRIPTION = gql`
   subscription CommentFlagged($asset_id: ID){
     commentFlagged(asset_id: $asset_id){
       ...${getDefinitionName(Comment.fragments.comment)}
@@ -245,9 +264,26 @@ const COMMENTS_FLAGGED_SUBSCRIPTION = gql`
   ${Comment.fragments.comment}
 `;
 
-const STATUS_CHANGED_SUBSCRIPTION = gql`
-  subscription CommentStatusChanged($asset_id: ID){
-    commentStatusChanged(asset_id: $asset_id){
+const COMMENT_ACCEPTED_SUBSCRIPTION = gql`
+  subscription CommentAccepted($asset_id: ID){
+    commentAccepted(asset_id: $asset_id){
+      ...${getDefinitionName(Comment.fragments.comment)}
+      status_history {
+        type
+        created_at
+        assigned_by {
+          id
+          username
+        }
+      }
+    }
+  }
+  ${Comment.fragments.comment}
+`;
+
+const COMMENT_REJECTED_SUBSCRIPTION = gql`
+  subscription CommentRejected($asset_id: ID){
+    commentRejected(asset_id: $asset_id){
       ...${getDefinitionName(Comment.fragments.comment)}
       status_history {
         type
diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index 8d01ededf..df6ed71ce 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -348,8 +348,15 @@ const setStatus = async ({user, loaders: {Comments}, pubsub}, {id, status}) => {
 
   if (pubsub) {
 
-    // Publish the comment status change via the subscription.
-    pubsub.publish('commentStatusChanged', comment);
+    if (status === 'ACCEPTED') {
+
+      // Publish the comment status change via the subscription.
+      pubsub.publish('commentAccepted', comment);
+    } else if (status === 'REJECTED') {
+
+      // Publish the comment status change via the subscription.
+      pubsub.publish('commentRejected', comment);
+    }
   }
 
   return comment;
diff --git a/graph/resolvers/subscription.js b/graph/resolvers/subscription.js
index 3c2130ff1..1f26d5ff3 100644
--- a/graph/resolvers/subscription.js
+++ b/graph/resolvers/subscription.js
@@ -5,7 +5,10 @@ const Subscription = {
   commentEdited(comment) {
     return comment;
   },
-  commentStatusChanged(comment) {
+  commentAccepted(comment) {
+    return comment;
+  },
+  commentRejected(comment) {
     return comment;
   },
   commentFlagged(comment) {
diff --git a/graph/subscriptions.js b/graph/subscriptions.js
index 494345319..47899e1e3 100644
--- a/graph/subscriptions.js
+++ b/graph/subscriptions.js
@@ -57,8 +57,18 @@ const setupFunctions = plugins.get('server', 'setupFunctions').reduce((acc, {plu
       }
     },
   }),
-  commentStatusChanged: (options, args) => ({
-    commentStatusChanged: {
+  commentAccepted: (options, args) => ({
+    commentAccepted: {
+      filter: ({comment}, context) => {
+        if (!context.user || !context.user.can(SUBSCRIBE_COMMENT_STATUS)) {
+          return false;
+        }
+        return !args.asset_id || comment.asset_id === args.asset_id;
+      }
+    },
+  }),
+  commentRejected: (options, args) => ({
+    commentRejected: {
       filter: ({comment}, context) => {
         if (!context.user || !context.user.can(SUBSCRIBE_COMMENT_STATUS)) {
           return false;
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 948d0672f..9cd147605 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -959,9 +959,13 @@ type Subscription {
   # Requires the `ADMIN` or `MODERATOR` role.
   commentFlagged(asset_id: ID): Comment
 
-  # Get an update whenever the status of a comment changed due to a moderator action.
+  # Get an update whenever a comment has been accepted.
   # Requires the `ADMIN` or `MODERATOR` role.
-  commentStatusChanged(asset_id: ID): Comment
+  commentAccepted(asset_id: ID): Comment
+
+  # Get an update whenever a comment has been rejected.
+  # Requires the `ADMIN` or `MODERATOR` role.
+  commentRejected(asset_id: ID): Comment
 }
 
 ################################################################################

From 6da00282581351f81b55dbe34a30be4970e58dc6 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 16 Jun 2017 23:00:40 +0700
Subject: [PATCH 122/264] Reset websocket after login change

---
 client/coral-admin/src/actions/auth.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/client/coral-admin/src/actions/auth.js b/client/coral-admin/src/actions/auth.js
index ca48764f1..3a9e282ff 100644
--- a/client/coral-admin/src/actions/auth.js
+++ b/client/coral-admin/src/actions/auth.js
@@ -3,6 +3,7 @@ import * as actions from '../constants/auth';
 import coralApi from 'coral-framework/helpers/request';
 import * as Storage from 'coral-framework/helpers/storage';
 import {handleAuthToken} from 'coral-framework/actions/auth';
+import {resetWebsocket} from 'coral-framework/services/client';
 
 //==============================================================================
 // SIGN IN
@@ -36,6 +37,7 @@ export const handleLogin = (email, password, recaptchaResponse) => (dispatch) =>
       }
 
       dispatch(handleAuthToken(token));
+      resetWebsocket();
       dispatch(checkLoginSuccess(user));
     })
     .catch((error) => {
@@ -105,6 +107,7 @@ export const checkLogin = () => (dispatch) => {
         return dispatch(checkLoginFailure('not logged in'));
       }
 
+      resetWebsocket();
       dispatch(checkLoginSuccess(user));
     })
     .catch((error) => {

From c14c3fbe2305ecb1e62e74b0cdb1d6a285817026 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Sat, 17 Jun 2017 00:03:33 +0700
Subject: [PATCH 123/264] Streamline perm names

---
 graph/subscriptions.js       | 19 ++++++++++---------
 perms/constants.js           |  9 +++++----
 perms/subscriptionReducer.js | 10 ++++++----
 3 files changed, 21 insertions(+), 17 deletions(-)

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;

From 613982884479bb53ff55f220973c36868f13cc88 Mon Sep 17 00:00:00 2001
From: Max Eddy <max@alleyinteractive.com>
Date: Tue, 6 Jun 2017 15:31:50 -0400
Subject: [PATCH 124/264] Send post message with auth state to parent window.

---
 client/coral-embed/src/index.js        | 4 ++++
 client/coral-framework/actions/auth.js | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/client/coral-embed/src/index.js b/client/coral-embed/src/index.js
index 65e77ad1d..47c761bd3 100644
--- a/client/coral-embed/src/index.js
+++ b/client/coral-embed/src/index.js
@@ -54,6 +54,10 @@ function configurePymParent(pymParent, opts) {
     pymParent.sendMessage('config', JSON.stringify(config));
   }
 
+  pymParent.onMessage('checkLogin', function(result) {
+    console.log(JSON.parse(result));
+  });
+
   // Sends config to the child
   pymParent.onMessage('getConfig', function() {
     sendConfig(opts || {});
diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js
index eaaee3034..e4871a7e2 100644
--- a/client/coral-framework/actions/auth.js
+++ b/client/coral-framework/actions/auth.js
@@ -3,6 +3,7 @@ import bowser from 'bowser';
 import * as actions from '../constants/auth';
 import * as Storage from '../helpers/storage';
 import coralApi, {base} from '../helpers/request';
+import pym from '../services/PymConnection';
 
 import {resetWebsocket} from 'coral-framework/services/client';
 import t from 'coral-framework/services/i18n';
@@ -300,7 +301,7 @@ const checkLoginSuccess = (user, isAdmin) => ({
   isAdmin
 });
 
-export const checkLogin = () => (dispatch) => {
+export const checkLogin = () => (dispatch, getState) => {
   dispatch(checkLoginRequest());
   coralApi('/auth')
     .then((result) => {
@@ -324,6 +325,9 @@ export const checkLogin = () => (dispatch) => {
     .catch((error) => {
       console.error(error);
       dispatch(checkLoginFailure(`${error.translation_key}`));
+    })
+    .then(() => {
+      pym.sendMessage('checkLogin', JSON.stringify(getState().auth));
     });
 };
 

From fd9b14a560fb306db7459f59d90ea15fd423bcc4 Mon Sep 17 00:00:00 2001
From: Max Eddy <max@alleyinteractive.com>
Date: Tue, 6 Jun 2017 15:54:28 -0400
Subject: [PATCH 125/264] cb option for auth change event

---
 client/coral-embed/src/index.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/coral-embed/src/index.js b/client/coral-embed/src/index.js
index 47c761bd3..d90591f2f 100644
--- a/client/coral-embed/src/index.js
+++ b/client/coral-embed/src/index.js
@@ -55,7 +55,9 @@ function configurePymParent(pymParent, opts) {
   }
 
   pymParent.onMessage('checkLogin', function(result) {
-    console.log(JSON.parse(result));
+    if (opts.onAuthChange) {
+      opts.onAuthChange(JSON.parse(result));
+    }
   });
 
   // Sends config to the child

From 4982d8a9adbf9f20fb56547d35cc49de94bbf42b Mon Sep 17 00:00:00 2001
From: Max Eddy <max@alleyinteractive.com>
Date: Thu, 8 Jun 2017 11:22:07 -0400
Subject: [PATCH 126/264] Use REST API result for check login message.

---
 client/coral-embed/src/index.js        | 6 +++---
 client/coral-framework/actions/auth.js | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/client/coral-embed/src/index.js b/client/coral-embed/src/index.js
index d90591f2f..c6c29c30e 100644
--- a/client/coral-embed/src/index.js
+++ b/client/coral-embed/src/index.js
@@ -54,9 +54,9 @@ function configurePymParent(pymParent, opts) {
     pymParent.sendMessage('config', JSON.stringify(config));
   }
 
-  pymParent.onMessage('checkLogin', function(result) {
-    if (opts.onAuthChange) {
-      opts.onAuthChange(JSON.parse(result));
+  pymParent.onMessage('coral-check-login', function(result) {
+    if (opts.onCheckLogin) {
+      opts.onCheckLogin(JSON.parse(result));
     }
   });
 
diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js
index e4871a7e2..13a1bc24e 100644
--- a/client/coral-framework/actions/auth.js
+++ b/client/coral-framework/actions/auth.js
@@ -301,10 +301,12 @@ const checkLoginSuccess = (user, isAdmin) => ({
   isAdmin
 });
 
-export const checkLogin = () => (dispatch, getState) => {
+export const checkLogin = () => (dispatch) => {
   dispatch(checkLoginRequest());
   coralApi('/auth')
     .then((result) => {
+      pym.sendMessage('coral-check-login', JSON.stringify(result));
+
       if (!result.user) {
         if (!bowser.safari && !bowser.ios) {
           Storage.removeItem('token');
@@ -325,9 +327,6 @@ export const checkLogin = () => (dispatch, getState) => {
     .catch((error) => {
       console.error(error);
       dispatch(checkLoginFailure(`${error.translation_key}`));
-    })
-    .then(() => {
-      pym.sendMessage('checkLogin', JSON.stringify(getState().auth));
     });
 };
 

From fe0c581ea926ee49dd5f2e91098965937a164c70 Mon Sep 17 00:00:00 2001
From: Max Eddy <max@alleyinteractive.com>
Date: Thu, 8 Jun 2017 13:05:34 -0400
Subject: [PATCH 127/264] Note logout action as well for onAuthChanged event.

---
 client/coral-embed/src/index.js        | 12 ++++++++----
 client/coral-framework/actions/auth.js |  3 ++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/client/coral-embed/src/index.js b/client/coral-embed/src/index.js
index c6c29c30e..0a901c341 100644
--- a/client/coral-embed/src/index.js
+++ b/client/coral-embed/src/index.js
@@ -54,11 +54,15 @@ function configurePymParent(pymParent, opts) {
     pymParent.sendMessage('config', JSON.stringify(config));
   }
 
-  pymParent.onMessage('coral-check-login', function(result) {
-    if (opts.onCheckLogin) {
-      opts.onCheckLogin(JSON.parse(result));
+  function onAuthChanged(message) {
+    if (opts.onAuthChanged) {
+      opts.onAuthChanged(message ? JSON.parse(message) : null);
     }
-  });
+  }
+
+  pymParent.onMessage('coral-login', onAuthChanged);
+
+  pymParent.onMessage('coral-logout', onAuthChanged);
 
   // Sends config to the child
   pymParent.onMessage('getConfig', function() {
diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js
index 13a1bc24e..b7ec4ee4c 100644
--- a/client/coral-framework/actions/auth.js
+++ b/client/coral-framework/actions/auth.js
@@ -285,6 +285,7 @@ export const logout = () => (dispatch) => {
     resetWebsocket();
 
     dispatch({type: actions.LOGOUT});
+    pym.sendMessage('coral-logout');
   });
 };
 
@@ -305,7 +306,6 @@ export const checkLogin = () => (dispatch) => {
   dispatch(checkLoginRequest());
   coralApi('/auth')
     .then((result) => {
-      pym.sendMessage('coral-check-login', JSON.stringify(result));
 
       if (!result.user) {
         if (!bowser.safari && !bowser.ios) {
@@ -318,6 +318,7 @@ export const checkLogin = () => (dispatch) => {
       resetWebsocket();
 
       dispatch(checkLoginSuccess(result.user));
+      pym.sendMessage('coral-login', JSON.stringify(result.user));
 
       // Display create username dialog if necessary.
       if (result.user.canEditName && result.user.status !== 'BANNED') {

From 64174b97aff710d10b61a945a6c6919be1078b5b Mon Sep 17 00:00:00 2001
From: Max Eddy <max@alleyinteractive.com>
Date: Thu, 8 Jun 2017 13:20:30 -0400
Subject: [PATCH 128/264] Cleanup

---
 client/coral-embed/src/index.js        | 8 ++------
 client/coral-framework/actions/auth.js | 5 ++---
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/client/coral-embed/src/index.js b/client/coral-embed/src/index.js
index 0a901c341..14de2756e 100644
--- a/client/coral-embed/src/index.js
+++ b/client/coral-embed/src/index.js
@@ -54,15 +54,11 @@ function configurePymParent(pymParent, opts) {
     pymParent.sendMessage('config', JSON.stringify(config));
   }
 
-  function onAuthChanged(message) {
+  pymParent.onMessage('coral-auth-changed', function(message) {
     if (opts.onAuthChanged) {
       opts.onAuthChanged(message ? JSON.parse(message) : null);
     }
-  }
-
-  pymParent.onMessage('coral-login', onAuthChanged);
-
-  pymParent.onMessage('coral-logout', onAuthChanged);
+  });
 
   // Sends config to the child
   pymParent.onMessage('getConfig', function() {
diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js
index b7ec4ee4c..614b87632 100644
--- a/client/coral-framework/actions/auth.js
+++ b/client/coral-framework/actions/auth.js
@@ -285,7 +285,7 @@ export const logout = () => (dispatch) => {
     resetWebsocket();
 
     dispatch({type: actions.LOGOUT});
-    pym.sendMessage('coral-logout');
+    pym.sendMessage('coral-auth-changed');
   });
 };
 
@@ -306,7 +306,6 @@ export const checkLogin = () => (dispatch) => {
   dispatch(checkLoginRequest());
   coralApi('/auth')
     .then((result) => {
-
       if (!result.user) {
         if (!bowser.safari && !bowser.ios) {
           Storage.removeItem('token');
@@ -318,7 +317,7 @@ export const checkLogin = () => (dispatch) => {
       resetWebsocket();
 
       dispatch(checkLoginSuccess(result.user));
-      pym.sendMessage('coral-login', JSON.stringify(result.user));
+      pym.sendMessage('coral-auth-changed', JSON.stringify(result.user));
 
       // Display create username dialog if necessary.
       if (result.user.canEditName && result.user.status !== 'BANNED') {

From 89cf13b4cf872628090d16f9028fd328698f4ea1 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 16 Jun 2017 15:05:22 -0300
Subject: [PATCH 129/264] Updates

---
 graph/loaders/assets.js       | 4 ++--
 graph/resolvers/root_query.js | 4 +---
 graph/typeDefs.graphql        | 2 +-
 services/assets.js            | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/graph/loaders/assets.js b/graph/loaders/assets.js
index b32b37b60..7e924e14a 100644
--- a/graph/loaders/assets.js
+++ b/graph/loaders/assets.js
@@ -26,8 +26,8 @@ const genAssetsByID = (context, ids) => AssetModel.find({
  * @param  {Number} limit    limit the number of results
  * @return {Promise}         resolves the assets
  */
-const getAssetsByQuery = (context, value, limit) => {
-  return AssetsService.search(value, null, limit);
+const getAssetsByQuery = (context, query) => {
+  return AssetsService.search(query);
 };
 
 /**
diff --git a/graph/resolvers/root_query.js b/graph/resolvers/root_query.js
index 637af9018..9889b62f2 100644
--- a/graph/resolvers/root_query.js
+++ b/graph/resolvers/root_query.js
@@ -11,9 +11,7 @@ const RootQuery = {
       return null;
     }
 
-    const {value = '', limit} = query;
-
-    return Assets.search(value, limit);
+    return Assets.search(query);
   },
   asset(_, query, {loaders: {Assets}}) {
     if (query.id) {
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index a4c4b8c5c..c946cca94 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -634,7 +634,7 @@ type RootQuery {
   comment(id: ID!): Comment
 
   # All assets. Requires the `ADMIN` role.
-  assets(query: AssetsQuery!): [Asset]
+  assets(query: AssetsQuery): [Asset]
 
   # Find or create an asset by url, or just find with the ID.
   asset(id: ID, url: String): Asset
diff --git a/services/assets.js b/services/assets.js
index b81513b72..5a5b924f3 100644
--- a/services/assets.js
+++ b/services/assets.js
@@ -109,7 +109,7 @@ module.exports = class AssetsService {
    * @param  {String} value string to search by.
    * @return {Promise}
    */
-  static search(value = '', skip = null, limit = null) {
+  static search({value = '', skip = null, limit = null}) {
     if (value.length === 0) {
       return AssetsService.all(skip, limit);
     } else {

From fe94a5a6d144984cda1f631d737274228c6674b9 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 16 Jun 2017 15:08:10 -0300
Subject: [PATCH 130/264] Limit 10

---
 .../coral-admin/src/routes/Moderation/containers/Moderation.js  | 2 +-
 .../coral-admin/src/routes/Moderation/containers/StorySearch.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index e60a6b914..822db3d08 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -212,7 +212,7 @@ const withModQueueQuery = withQuery(gql`
     }) {
       ...CoralAdmin_Moderation_CommentConnection
     }
-    assets: assets(query: {}) {
+    assets: assets(query: {limit: 10}) {
       id
       title
       url
diff --git a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
index f52c290b5..334248e33 100644
--- a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
@@ -54,7 +54,7 @@ class StorySearchContainer extends React.Component {
 
 export const withAssetSearchQuery = withQuery(gql`
   query SearchStories($value: String = "") {
-    assets(query: {value: $value}) {
+    assets(query: {value: $value, limit: 10}) {
       id
       title
       url

From e30d5a9c627a27435134a37fe6ab88e6a88da28b Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 16 Jun 2017 15:41:32 -0300
Subject: [PATCH 131/264] Sizing

---
 .../coral-admin/src/routes/Moderation/components/Story.js  | 6 +++---
 .../src/routes/Moderation/components/StorySearch.css       | 7 ++++---
 .../src/routes/Moderation/containers/Moderation.js         | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/Story.js b/client/coral-admin/src/routes/Moderation/components/Story.js
index b87611b24..6c3a4b02f 100644
--- a/client/coral-admin/src/routes/Moderation/components/Story.js
+++ b/client/coral-admin/src/routes/Moderation/components/Story.js
@@ -9,12 +9,12 @@ const formatDate = (date) => {
 const Story = ({author, title, createdAt, open, id, goToStory}) => {
   return (
     <li className={styles.story} onClick={() => goToStory(id)}>
-      <p className={styles.title}>{title}</p>
-      <p className={styles.meta}>
+      <span className={styles.title}>{title}</span>
+      <div className={styles.meta}>
         <span className={styles.author}>By {author}</span>
         <span className={styles.createdAt}>{formatDate(createdAt)}</span>
         <span className={styles.status}>{open ? 'Open' : 'Closed'}</span>
-      </p>
+      </div>
     </li>
   );
 };
diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.css b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
index 9ea56df0d..cbca8e17d 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.css
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
@@ -67,12 +67,13 @@
 }
 
 .story {
-  padding: 10px 63px;
+  padding: 5px 63px;
   border-bottom: 1px solid #ddd;
   cursor: pointer;
   display: block;
   text-decoration: none;
   height: 50px;
+  box-sizing: border-box;
 
   &:hover {
     background-color: #efefef;
@@ -86,7 +87,7 @@
 .title, .meta {
   margin: 0;
   color: black;
-  font-size: 17px;
+  font-size: 15px;
 }
 
 .author, .createdAt, .status {
@@ -117,7 +118,7 @@
 }
 
 .searchResults {
-  padding: 10px 24px;
+  padding: 7px 24px;
 }
 
 .searchResults i {
diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index 822db3d08..e60a6b914 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -212,7 +212,7 @@ const withModQueueQuery = withQuery(gql`
     }) {
       ...CoralAdmin_Moderation_CommentConnection
     }
-    assets: assets(query: {limit: 10}) {
+    assets: assets(query: {}) {
       id
       title
       url

From 4403decbe9d031c6f5b449159d7f1ff696c8764c Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 16 Jun 2017 15:50:58 -0300
Subject: [PATCH 132/264] Handling dropdown on Esc <3

---
 .../src/routes/Moderation/components/StorySearch.css      | 2 +-
 .../src/routes/Moderation/components/StorySearch.js       | 2 +-
 .../src/routes/Moderation/containers/StorySearch.js       | 8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.css b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
index cbca8e17d..6dd5b1071 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.css
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
@@ -67,7 +67,7 @@
 }
 
 .story {
-  padding: 5px 63px;
+  padding: 7px 63px;
   border-bottom: 1px solid #ddd;
   cursor: pointer;
   display: block;
diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.js b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
index c174c892f..f42ceaadd 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
@@ -19,7 +19,7 @@ const StorySearch = (props) => {
 
   return (
     <div>
-      <div className={styles.container} role='alertdialog'>
+      <div className={styles.container} role='alertdialog' onKeyDown={props.handleEsc}>
         <div className={styles.positionShim}>
           <div className={styles.headInput}>
             <input
diff --git a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
index 334248e33..cf47ca662 100644
--- a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
@@ -20,6 +20,13 @@ class StorySearchContainer extends React.Component {
     });
   }
 
+  handleEsc = (e) => {
+    if (e.key === 'Escape') {
+      e.preventDefault();
+      this.props.closeSearch();
+    }
+  }
+
   handleEnter = (e) => {
     if (e.key === 'Enter') {
       e.preventDefault();
@@ -43,6 +50,7 @@ class StorySearchContainer extends React.Component {
       <StorySearch
         search={this.search}
         goToStory={this.goToStory}
+        handleEsc={this.handleEsc}
         handleEnter={this.handleEnter}
         searchValue={this.state.searchValue}
         handleSearchChange={this.handleSearchChange}

From dcee2a44389666bee56349e5dcf6b6e736677e01 Mon Sep 17 00:00:00 2001
From: IAmSamHankins <samantha.hankins@icloud.com>
Date: Fri, 16 Jun 2017 15:00:42 -0400
Subject: [PATCH 133/264] adjust comment stream sizing to allow for chrome
 focus state

---
 client/coral-embed-stream/style/default.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css
index c2371b25c..7e6f9b2bd 100644
--- a/client/coral-embed-stream/style/default.css
+++ b/client/coral-embed-stream/style/default.css
@@ -17,6 +17,10 @@ body {
   height: auto !important;
 }
 
+#coralStream {
+  padding: 4px;
+}
+
 .expandForSignin {
   min-height: 600px;
 }

From 991bdc608973f0056afc26b24d2d356459ca7f77 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 16 Jun 2017 16:18:02 -0300
Subject: [PATCH 134/264] Updated BE

---
 graph/loaders/assets.js                | 5 ++---
 routes/api/assets/index.js             | 4 ++--
 test/server/routes/api/assets/index.js | 1 +
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/graph/loaders/assets.js b/graph/loaders/assets.js
index 7e924e14a..020eafbcb 100644
--- a/graph/loaders/assets.js
+++ b/graph/loaders/assets.js
@@ -22,8 +22,7 @@ const genAssetsByID = (context, ids) => AssetModel.find({
 /**
  * [getAssetsByQuery description]
  * @param  {Object} context  the context of the request
- * @param  {String} value    text string to search agains the documents
- * @param  {Number} limit    limit the number of results
+ * @param  {Object} query    the query
  * @return {Promise}         resolves the assets
  */
 const getAssetsByQuery = (context, query) => {
@@ -76,7 +75,7 @@ module.exports = (context) => ({
     // this operation create a new asset if one isn't found.
     getByURL: (url) => findOrCreateAssetByURL(context, url),
 
-    search: (value, limit) => getAssetsByQuery(context, value, limit),
+    search: (query) => getAssetsByQuery(context, query),
     getByID: new DataLoader((ids) => genAssetsByID(context, ids)),
     getForMetrics: () => getAssetsForMetrics(context),
     getAll: new util.SingletonResolver(() => AssetModel.find({}))
diff --git a/routes/api/assets/index.js b/routes/api/assets/index.js
index 3bb3ef778..f02b49f7e 100644
--- a/routes/api/assets/index.js
+++ b/routes/api/assets/index.js
@@ -48,13 +48,13 @@ router.get('/', (req, res, next) => {
   Promise.all([
 
     // Find the actuall assets.
-    FilterOpenAssets(AssetsService.search(search), filter)
+    FilterOpenAssets(AssetsService.search({value: search}), filter)
       .sort({[field]: (sort === 'asc') ? 1 : -1})
       .skip(parseInt(skip))
       .limit(parseInt(limit)),
 
     // Get the count of actual assets.
-    FilterOpenAssets(AssetsService.search(search), filter)
+    FilterOpenAssets(AssetsService.search({value: search}), filter)
       .count()
   ])
   .then(([result, count]) => {
diff --git a/test/server/routes/api/assets/index.js b/test/server/routes/api/assets/index.js
index 80708688b..62c4cdb47 100644
--- a/test/server/routes/api/assets/index.js
+++ b/test/server/routes/api/assets/index.js
@@ -43,6 +43,7 @@ describe('/api/v1/assets', () => {
         .set(passport.inject({roles: ['ADMIN']}))
         .then((res) => {
           const body = res.body;
+          console.log(body)
 
           expect(body).to.have.property('count', 2);
           expect(body).to.have.property('result');

From 367c5707472c57471659019e5103881bd5918a8b Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 16 Jun 2017 16:21:39 -0300
Subject: [PATCH 135/264] ModQueue query

---
 .../coral-admin/src/routes/Moderation/containers/Moderation.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index e60a6b914..167064834 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -212,7 +212,7 @@ const withModQueueQuery = withQuery(gql`
     }) {
       ...CoralAdmin_Moderation_CommentConnection
     }
-    assets: assets(query: {}) {
+    assets: assets(query: {limit: 0}) {
       id
       title
       url

From 61591a9716c7c04377325c16285f0a02783b86ae Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 16 Jun 2017 16:24:00 -0300
Subject: [PATCH 136/264] Removing extra log

---
 test/server/routes/api/assets/index.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/server/routes/api/assets/index.js b/test/server/routes/api/assets/index.js
index 62c4cdb47..63d3acb75 100644
--- a/test/server/routes/api/assets/index.js
+++ b/test/server/routes/api/assets/index.js
@@ -43,8 +43,7 @@ describe('/api/v1/assets', () => {
         .set(passport.inject({roles: ['ADMIN']}))
         .then((res) => {
           const body = res.body;
-          console.log(body)
-
+          
           expect(body).to.have.property('count', 2);
           expect(body).to.have.property('result');
 

From 614f31d0da58804d260862ef498e47588efb8993 Mon Sep 17 00:00:00 2001
From: IAmSamHankins <samantha.hankins@icloud.com>
Date: Fri, 16 Jun 2017 15:39:24 -0400
Subject: [PATCH 137/264] styling of search results bar

---
 .../routes/Moderation/components/StorySearch.css    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.css b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
index 6dd5b1071..d5b1d3afb 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.css
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
@@ -62,18 +62,19 @@
   letter-spacing: 0.7px;
 }
 
-.storyList {
+/*.storyList {
   border-top: 1px solid #ddd;
-}
+}*/
 
 .story {
-  padding: 7px 63px;
+  padding: 7px 50px;
   border-bottom: 1px solid #ddd;
   cursor: pointer;
   display: block;
   text-decoration: none;
   height: 50px;
   box-sizing: border-box;
+  transition: background-color 400ms;
 
   &:hover {
     background-color: #efefef;
@@ -118,7 +119,8 @@
 }
 
 .searchResults {
-  padding: 7px 24px;
+  padding: 7px 27px;
+  background: #F5F5F5;
 }
 
 .searchResults i {
@@ -135,10 +137,9 @@
   font-weight: 500;
   letter-spacing: 0.7px;
   vertical-align: middle;
-  margin-left: 10px;
+  margin-left: 8px;
 }
 
 .noResults {
   padding: 10px 24px 15px 49px;
 }
-

From e7eb300e12ab8ecd6a816be19e9a5194d65c74e5 Mon Sep 17 00:00:00 2001
From: IAmSamHankins <samantha.hankins@icloud.com>
Date: Fri, 16 Jun 2017 15:47:45 -0400
Subject: [PATCH 138/264] search input box styling

---
 .../src/routes/Moderation/components/StorySearch.css        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.css b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
index d5b1d3afb..db1ffcfb6 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.css
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
@@ -29,8 +29,7 @@
 
 .headInput {
   background-color: #efefef;
-  padding: 17px 56px;
-  height: 80px;
+  padding: 10px 27px;
   box-sizing: border-box;
 }
 
@@ -41,12 +40,13 @@
   font-size: 16px;
   margin-right: 5px;
   position: relative;
-  top: 2px;
+  top: 3px;
   box-sizing: border-box;
   border-radius: 3px;
   border: solid 1px #dfdfdf;
   max-height: 45px;
   max-width: 600px;
+  font-weight: 300;
 }
 
 .cta {

From 6c5d94ec3b639e0722f1899dcd43841acd24c718 Mon Sep 17 00:00:00 2001
From: IAmSamHankins <samantha.hankins@icloud.com>
Date: Fri, 16 Jun 2017 16:40:17 -0400
Subject: [PATCH 139/264] adjustments to letter spacing, and container
 positioning.

---
 .../src/routes/Moderation/components/StorySearch.css        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.css b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
index db1ffcfb6..f0503f6b9 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.css
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
@@ -12,7 +12,7 @@
 .container {
   position: absolute;
   background-color: white;
-  top: 100px;
+  top: 106px;
   left: 0;
   right: 0;
   margin-left: auto;
@@ -59,7 +59,7 @@
   font-size: 15px;
   font-weight: 500;
   padding: 12px 30px;
-  letter-spacing: 0.7px;
+  letter-spacing: 0.25px;
 }
 
 /*.storyList {
@@ -135,7 +135,7 @@
 .headlineRecent {
   font-size: 15px;
   font-weight: 500;
-  letter-spacing: 0.7px;
+  letter-spacing: 0.25px;
   vertical-align: middle;
   margin-left: 8px;
 }

From dfccf962d4ea2b08dd7bbac75985b2349e6fcb3e Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Fri, 16 Jun 2017 17:30:09 -0400
Subject: [PATCH 140/264] Update version number

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4295f5c25..1109acf7b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "talk",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "A better commenting experience from Mozilla, The New York Times, and the Washington Post. https://coralproject.net",
   "main": "app.js",
   "scripts": {

From 77fddba84112b53cf48a63026d91147fe61c602c Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 19 Jun 2017 11:05:16 -0300
Subject: [PATCH 141/264] removing overflow hidden

---
 client/coral-admin/src/components/ui/Layout.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/coral-admin/src/components/ui/Layout.css b/client/coral-admin/src/components/ui/Layout.css
index 792440d97..a3cc7b7b6 100644
--- a/client/coral-admin/src/components/ui/Layout.css
+++ b/client/coral-admin/src/components/ui/Layout.css
@@ -1,6 +1,5 @@
 .layout {
     max-width: 1280px;
     margin: 0 auto;
-    overflow: hidden;
     background-color: #FAFAFA;
 }

From 853c1e407efa9633f4e8f99adb65e70e9961353a Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Mon, 19 Jun 2017 20:33:34 +0700
Subject: [PATCH 142/264] Simplify args

---
 .../src/routes/Moderation/containers/Moderation.js         | 2 +-
 services/assets.js                                         | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index 167064834..382fd5756 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -212,7 +212,7 @@ const withModQueueQuery = withQuery(gql`
     }) {
       ...CoralAdmin_Moderation_CommentConnection
     }
-    assets: assets(query: {limit: 0}) {
+    assets {
       id
       title
       url
diff --git a/services/assets.js b/services/assets.js
index 5a5b924f3..74bc1aa3a 100644
--- a/services/assets.js
+++ b/services/assets.js
@@ -104,13 +104,12 @@ module.exports = class AssetsService {
   }
 
   /**
-   * Finds assets matching keywords on the model. If `value` is an empty string,
-   * then it will not even perform a text search query.
+   * Finds assets matching keywords on the model.
    * @param  {String} value string to search by.
    * @return {Promise}
    */
-  static search({value = '', skip = null, limit = null}) {
-    if (value.length === 0) {
+  static search({value, skip, limit} = {}) {
+    if (!value) {
       return AssetsService.all(skip, limit);
     } else {
       return AssetModel

From e1bc1476ead8e85fc41087cd82f3c6cd6895a2c9 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Mon, 19 Jun 2017 21:02:44 +0700
Subject: [PATCH 143/264] Remove the need for querying all assets

---
 .../routes/Moderation/components/Moderation.js  | 17 ++++++++++-------
 .../routes/Moderation/containers/Moderation.js  | 16 +++-------------
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js
index a0a5b3705..bcd76da05 100644
--- a/client/coral-admin/src/routes/Moderation/components/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js
@@ -11,6 +11,7 @@ import NotFoundAsset from './NotFoundAsset';
 import ModerationKeysModal from '../../../components/ModerationKeysModal';
 import UserDetail from '../containers/UserDetail';
 import StorySearch from '../containers/StorySearch';
+import {Spinner} from 'coral-ui';
 
 export default class Moderation extends Component {
   state = {
@@ -102,18 +103,20 @@ export default class Moderation extends Component {
   }
 
   render () {
-    const {root, moderation, settings, assets, viewUserDetail, hideUserDetail, ...props} = this.props;
+    const {root, moderation, settings, viewUserDetail, hideUserDetail, ...props} = this.props;
     const providedAssetId = this.props.params.id;
     const activeTab = this.props.route.path === ':id' ? 'premod' : this.props.route.path;
+    const {asset} = root;
 
-    let asset;
+    if (providedAssetId && !asset) {
+      if (asset === undefined) {
 
-    if (providedAssetId) {
-      asset = assets.find((asset) => asset.id === this.props.params.id);
-
-      if (!asset) {
-        return <NotFoundAsset assetId={providedAssetId} />;
+        // Still loading.
+        return <Spinner />;
       }
+
+      // Not found.
+      return <NotFoundAsset assetId={providedAssetId} />;
     }
 
     const comments = root[activeTab];
diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index 382fd5756..c3ace0ebc 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -2,7 +2,6 @@ import React, {Component} from 'react';
 import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
 import {compose, gql} from 'react-apollo';
-import isEqual from 'lodash/isEqual';
 import withQuery from 'coral-framework/hocs/withQuery';
 import {getDefinitionName} from 'coral-framework/utils';
 import * as notification from 'coral-admin/src/services/notification';
@@ -12,7 +11,6 @@ import update from 'immutability-helper';
 import {withSetUserStatus, withSuspendUser, withSetCommentStatus} from 'coral-framework/graphql/mutations';
 
 import {fetchSettings} from 'actions/settings';
-import {updateAssets} from 'actions/assets';
 import {
   toggleModal,
   singleView,
@@ -39,13 +37,6 @@ class ModerationContainer extends Component {
     this.props.fetchSettings();
   }
 
-  componentWillReceiveProps(nextProps) {
-    const {updateAssets} = this.props;
-    if(!isEqual(nextProps.root.assets, this.props.root.assets)) {
-      updateAssets(nextProps.root.assets);
-    }
-  }
-
   suspendUser = async (args) => {
     this.props.hideSuspendUserDialog();
     try {
@@ -175,7 +166,7 @@ const commentConnectionFragment = gql`
 `;
 
 const withModQueueQuery = withQuery(gql`
-  query CoralAdmin_Moderation($asset_id: ID, $sort: SORT_ORDER) {
+  query CoralAdmin_Moderation($asset_id: ID, $sort: SORT_ORDER, $allAssets: Boolean!) {
     all: comments(query: {
       statuses: [NONE, PREMOD, ACCEPTED, REJECTED],
       asset_id: $asset_id,
@@ -212,7 +203,7 @@ const withModQueueQuery = withQuery(gql`
     }) {
       ...CoralAdmin_Moderation_CommentConnection
     }
-    assets {
+    asset(id: $asset_id) @skip(if: $allAssets) {
       id
       title
       url
@@ -248,6 +239,7 @@ const withModQueueQuery = withQuery(gql`
       variables: {
         asset_id: id,
         sort: sortOrder,
+        allAssets: id === null
       }
     };
   },
@@ -291,14 +283,12 @@ const mapStateToProps = (state) => ({
   moderation: state.moderation.toJS(),
   settings: state.settings.toJS(),
   auth: state.auth.toJS(),
-  assets: state.assets.get('assets')
 });
 
 const mapDispatchToProps = (dispatch) => ({
   ...bindActionCreators({
     toggleModal,
     singleView,
-    updateAssets,
     fetchSettings,
     showBanUserDialog,
     hideBanUserDialog,

From f954d2be903368e07bf4700236555bee55fddff7 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Mon, 19 Jun 2017 21:23:30 +0700
Subject: [PATCH 144/264] Better loading detection

---
 .../src/routes/Moderation/components/Moderation.js  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js
index bcd76da05..ec858eaed 100644
--- a/client/coral-admin/src/routes/Moderation/components/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js
@@ -108,17 +108,18 @@ export default class Moderation extends Component {
     const activeTab = this.props.route.path === ':id' ? 'premod' : this.props.route.path;
     const {asset} = root;
 
-    if (providedAssetId && !asset) {
-      if (asset === undefined) {
-
-        // Still loading.
-        return <Spinner />;
-      }
+    if (providedAssetId && asset === null) {
 
       // Not found.
       return <NotFoundAsset assetId={providedAssetId} />;
     }
 
+    if (providedAssetId && (asset === undefined || asset.id !== providedAssetId)) {
+
+      // Still loading.
+      return <Spinner />;
+    }
+
     const comments = root[activeTab];
     let activeTabCount;
     switch(activeTab) {

From 0cd3921f4467e7b4cca5f8cc7fb8183fc532f04a Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Mon, 19 Jun 2017 21:29:33 +0700
Subject: [PATCH 145/264] Simplification

---
 .../routes/Moderation/components/Moderation.js  | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js
index ec858eaed..c2036247d 100644
--- a/client/coral-admin/src/routes/Moderation/components/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js
@@ -108,16 +108,17 @@ export default class Moderation extends Component {
     const activeTab = this.props.route.path === ':id' ? 'premod' : this.props.route.path;
     const {asset} = root;
 
-    if (providedAssetId && asset === null) {
+    if (providedAssetId) {
+      if (asset === null) {
 
-      // Not found.
-      return <NotFoundAsset assetId={providedAssetId} />;
-    }
+        // Not found.
+        return <NotFoundAsset assetId={providedAssetId} />;
+      }
+      if (asset === undefined || asset.id !== providedAssetId) {
 
-    if (providedAssetId && (asset === undefined || asset.id !== providedAssetId)) {
-
-      // Still loading.
-      return <Spinner />;
+        // Still loading.
+        return <Spinner />;
+      }
     }
 
     const comments = root[activeTab];

From 393ad8530aab7b31a11d9a4db0cf48b275e9c490 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Mon, 19 Jun 2017 08:55:08 -0600
Subject: [PATCH 146/264] added tests, fixed some services

---
 bin/cli                        |  1 +
 bin/cli-token                  |  2 +
 services/passport.js           | 38 ++++++-------
 services/tokens.js             | 49 ++++++++++++++++-
 test/server/services/tokens.js | 99 ++++++++++++++++++++++++++++++++++
 5 files changed, 165 insertions(+), 24 deletions(-)
 mode change 100644 => 100755 bin/cli-token
 create mode 100644 test/server/services/tokens.js

diff --git a/bin/cli b/bin/cli
index 1f3d50ad2..33560c53b 100755
--- a/bin/cli
+++ b/bin/cli
@@ -12,6 +12,7 @@ program
   .command('assets', 'interact with assets')
   .command('setup', 'setup the application')
   .command('jobs', 'work with the job queues')
+  .command('token', 'work with the access tokens')
   .command('users', 'work with the application auth')
   .command('migration', 'provides utilities for migrating the database')
   .command('plugins', 'provides utilities for interacting with the plugin system')
diff --git a/bin/cli-token b/bin/cli-token
old mode 100644
new mode 100755
index f6b4570a7..50335d925
--- a/bin/cli-token
+++ b/bin/cli-token
@@ -49,6 +49,8 @@ async function revokeToken(tokenID) {
 
     await TokensService.revoke(null, tokenID);
 
+    console.log(`Revoked Token[${tokenID}]`);
+
     util.shutdown();
   } catch (e) {
     console.error(e);
diff --git a/services/passport.js b/services/passport.js
index bfd6bca45..92cd914b3 100644
--- a/services/passport.js
+++ b/services/passport.js
@@ -1,6 +1,7 @@
 const passport = require('passport');
 const UsersService = require('./users');
 const SettingsService = require('./settings');
+const TokensService = require('./tokens');
 const fetch = require('node-fetch');
 const FormData = require('form-data');
 const JWT = require('jsonwebtoken');
@@ -34,23 +35,6 @@ const GenerateToken = (user) => JWT.sign({}, JWT_SECRET, {
   audience: JWT_AUDIENCE
 });
 
-// GeneratePersonalAccessToken will sign a token to include all the
-// authorization information needed for the front end for headless access.
-const GeneratePersonalAccessToken = (userID) => {
-  const payload = {
-    jti: uuid.v4(),
-    iss: JWT_ISSUER,
-    aud: JWT_AUDIENCE,
-    sub: userID,
-    pat: true
-  };
-
-  // Sign the payload.
-  const jwt = JWT.sign(payload, JWT_SECRET, {});
-
-  return {payload, jwt};
-};
-
 // SetTokenForSafari sends the token in a cookie for Safari clients.
 const SetTokenForSafari = (req, res, token) => {
   const browser = bowser._detect(req.headers['user-agent']);
@@ -174,10 +158,7 @@ const HandleLogout = (req, res, next) => {
   });
 };
 
-/**
- * Check if the given token is already blacklisted, throw an error if it is.
- */
-const CheckBlacklisted = (jwt) => new Promise((resolve, reject) => {
+const checkGeneralTokenBlacklist = (jwt) => new Promise((resolve, reject) => {
   client.get(`jtir[${jwt.jti}]`, (err, expiry) => {
     if (err) {
       return reject(err);
@@ -191,6 +172,20 @@ const CheckBlacklisted = (jwt) => new Promise((resolve, reject) => {
   });
 });
 
+/**
+ * Check if the given token is already blacklisted, throw an error if it is.
+ */
+const CheckBlacklisted = async (jwt) => {
+
+  // Check to see if this is a PAT.
+  if (jwt.pat) {
+    return TokensService.validate(jwt.sub, jwt.jti);
+  }
+
+  // It wasn't a PAT! Check to see if it is valid anyways.
+  return checkGeneralTokenBlacklist(jwt);
+};
+
 const jwt = require('jsonwebtoken');
 const JwtStrategy = require('passport-jwt').Strategy;
 const ExtractJwt = require('passport-jwt').ExtractJwt;
@@ -491,6 +486,5 @@ module.exports = {
   HandleAuthPopupCallback,
   HandleGenerateCredentials,
   HandleLogout,
-  GeneratePersonalAccessToken,
   CheckBlacklisted
 };
diff --git a/services/tokens.js b/services/tokens.js
index eeefce175..3c78a0a94 100644
--- a/services/tokens.js
+++ b/services/tokens.js
@@ -1,5 +1,13 @@
+const errors = require('../errors');
 const UserModel = require('../models/user');
-const {GeneratePersonalAccessToken} = require('./passport');
+const JWT = require('jsonwebtoken');
+const uuid = require('uuid');
+
+const {
+  JWT_SECRET,
+  JWT_ISSUER,
+  JWT_AUDIENCE
+} = require('../config');
 
 /**
  * TokenService manages Personal Access Tokens for users. These tokens are
@@ -16,7 +24,16 @@ module.exports = class TokenService {
   static async create(userID, tokenName) {
 
     // Create the token.
-    let {payload, jwt} = GeneratePersonalAccessToken(userID);
+    const payload = {
+      jti: uuid.v4(),
+      iss: JWT_ISSUER,
+      aud: JWT_AUDIENCE,
+      sub: userID,
+      pat: true
+    };
+
+    // Sign the payload.
+    const jwt = JWT.sign(payload, JWT_SECRET, {});
 
     // Create the PAT.
     let pat = {
@@ -63,6 +80,34 @@ module.exports = class TokenService {
     });
   }
 
+  /**
+   * Validate that a given Token is valid.
+   *
+   * @param {String} userID the user's id that owns the token
+   * @param {String} tokenID the id of the token
+   */
+  static async validate(userID, tokenID) {
+
+    // Find the user.
+    let user = await UserModel.findOne({
+      id: userID
+    }).select('tokens');
+    if (!user || !user.tokens) {
+      throw new errors.ErrAuthentication('user does not exist');
+    }
+
+    // Extract the token from the user.
+    let token = user.tokens.find(({id}) => id === tokenID);
+    if (!token) {
+      throw new errors.ErrAuthentication('token does not exist');
+    }
+
+    // Check to see if it is active.
+    if (!token.active) {
+      throw new errors.ErrAuthentication('token is not active');
+    }
+  }
+
   /**
    * Lists the tokens owned by the user.
    *
diff --git a/test/server/services/tokens.js b/test/server/services/tokens.js
new file mode 100644
index 000000000..2aa1f291d
--- /dev/null
+++ b/test/server/services/tokens.js
@@ -0,0 +1,99 @@
+const TokensService = require('../../../services/tokens');
+const UsersService = require('../../../services/users');
+const SettingsService = require('../../../services/settings');
+
+const chai = require('chai');
+const chaiAsPromised = require('chai-as-promised');
+
+chai.use(chaiAsPromised);
+
+const expect = chai.expect;
+
+describe('services.TokensService', () => {
+
+  let user;
+  beforeEach(async () => {
+    await SettingsService.init();
+    user = await UsersService.createLocalUser('sockmonster@gmail.com', '2Coral!!', 'Sockmonster');
+  });
+
+  describe('#create', () => {
+
+    it('can create the token without error', async () => {
+      let token = await TokensService.create(user.id, 'Github Token');
+      expect(token).to.be.an.object;
+      expect(token.jwt).to.be.a.string;
+      expect(token.pat).to.be.an.object;
+
+      let pat = token.pat;
+
+      let tokens = await TokensService.list(user.id);
+      expect(tokens).to.have.length(1);
+      expect(tokens[0]).to.have.property('id', pat.id);
+      expect(tokens[0]).to.have.property('name', pat.name);
+    });
+
+  });
+
+  describe('#revoke', () => {
+
+    it('can revoke a token', async () => {
+      let {pat: {id}} = await TokensService.create(user.id, 'Github Token');
+
+      let tokens = await TokensService.list(user.id);
+      expect(tokens).to.have.length(1);
+      expect(tokens[0]).to.have.property('id', id);
+      expect(tokens[0]).to.have.property('active', true);
+
+      await TokensService.revoke(user.id, id);
+
+      tokens = await TokensService.list(user.id);
+      expect(tokens).to.have.length(1);
+      expect(tokens[0]).to.have.property('id', id);
+      expect(tokens[0]).to.have.property('active', false);
+    });
+
+  });
+
+  describe('#validate', () => {
+
+    it('will allow a valid token', async () => {
+
+      // Create a token.
+      let {pat: {id}} = await TokensService.create(user.id, 'Github Token');
+
+      // Validate it.
+      await TokensService.validate(user.id, id);
+    });
+
+    it('will not allow an invalid token', async () => {
+
+      // Create a token.
+      let {pat: {id}} = await TokensService.create(user.id, 'Github Token');
+
+      // Revoke it.
+      await TokensService.revoke(user.id, id);
+
+      // Validate it.
+      return TokensService.validate(user.id, id).should.eventually.be.rejected;
+    });
+
+  });
+
+  describe('#list', () => {
+
+    it('lists the tokens for a user', async () => {
+
+      let tokens = await TokensService.list(user.id);
+      expect(tokens).to.have.length(0);
+
+      // Create a token.
+      let {pat: {id}} = await TokensService.create(user.id, 'Github Token');
+
+      tokens = await TokensService.list(user.id);
+      expect(tokens).to.have.length(1);
+      expect(tokens[0]).to.have.property('id', id);
+    });
+
+  });
+});

From 073fccebd34114ef61b65fe0ce5b6b30925f3eb0 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 19 Jun 2017 14:30:56 -0300
Subject: [PATCH 147/264] Show likes

---
 client/coral-embed-stream/style/default.css | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css
index 7e6f9b2bd..88b682aa8 100644
--- a/client/coral-embed-stream/style/default.css
+++ b/client/coral-embed-stream/style/default.css
@@ -483,11 +483,6 @@ button.comment__action-button[disabled],
 }
 
 @media (min-device-width : 300px) and (max-device-width : 420px) {
-  .commentActionsLeft.comment__action-container .coral-plugin-likes-button-text,
-  .commentActionsLeft.comment__action-container > div span {
-    display: none;
-  }
-
   .commentActionsLeft.comment__action-container .coral-plugin-replies-reply-button {
     visibility: collapse;
     margin-left: -30px;

From 3c99b8e7fbf52144a6aef39642395c442aa14ddb Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 19 Jun 2017 14:35:26 -0300
Subject: [PATCH 148/264] Sign In Button Position

---
 client/coral-embed-stream/src/components/Stream.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/coral-embed-stream/src/components/Stream.js b/client/coral-embed-stream/src/components/Stream.js
index ea090aeb2..62a58129b 100644
--- a/client/coral-embed-stream/src/components/Stream.js
+++ b/client/coral-embed-stream/src/components/Stream.js
@@ -159,7 +159,7 @@ class Stream extends React.Component {
     };
     return (
       <div id="stream">
-        <Slot fill="stream" />
+
         {open
           ? <div id="commentBox">
               <InfoBox
@@ -203,6 +203,8 @@ class Stream extends React.Component {
             </div>
           : <p>{asset.settings.closedMessage}</p>}
 
+        <Slot fill="stream" />
+
         {loggedIn && (
           <ModerationLink
             assetId={asset.id}

From 1f2eca300af4971d03589b6e3179f35e1bedd9c4 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 19 Jun 2017 14:55:58 -0300
Subject: [PATCH 149/264] Report vbox

---
 client/coral-embed-stream/style/default.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css
index 88b682aa8..701a06fd5 100644
--- a/client/coral-embed-stream/style/default.css
+++ b/client/coral-embed-stream/style/default.css
@@ -187,7 +187,6 @@ hr {
 
 .talk-stream-comments-container {
   position: relative;
-  z-index: 0;
 }
 
 .commentStream {

From 70276c3358289bccc1f78b56cdc6755326c5362c Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 20 Jun 2017 01:01:39 +0700
Subject: [PATCH 150/264] Fix subscription issues

---
 .../Moderation/containers/Moderation.js       | 25 +++++++------------
 graph/subscriptions.js                        |  6 ++---
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index f9aa4c2c5..12a991454 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -38,12 +38,10 @@ class ModerationContainer extends Component {
 
   get activeTab() { return this.props.route.path === ':id' ? 'premod' : this.props.route.path; }
 
-  subscribeToUpdates() {
+  subscribeToUpdates(variables = this.props.data.variables) {
     const sub1 = this.props.data.subscribeToMore({
       document: COMMENT_ACCEPTED_SUBSCRIPTION,
-      variables: {
-        asset_id: this.props.data.variables.asset_id,
-      },
+      variables,
       updateQuery: (prev, {subscriptionData: {data: {commentAccepted: comment}}}) => {
         const user = comment.status_history[comment.status_history.length - 1].assigned_by;
         const sort = this.props.moderation.sortOrder;
@@ -60,9 +58,7 @@ class ModerationContainer extends Component {
 
     const sub2 = this.props.data.subscribeToMore({
       document: COMMENT_REJECTED_SUBSCRIPTION,
-      variables: {
-        asset_id: this.props.data.variables.asset_id,
-      },
+      variables,
       updateQuery: (prev, {subscriptionData: {data: {commentRejected: comment}}}) => {
         const user = comment.status_history[comment.status_history.length - 1].assigned_by;
         const sort = this.props.moderation.sortOrder;
@@ -79,9 +75,7 @@ class ModerationContainer extends Component {
 
     const sub3 = this.props.data.subscribeToMore({
       document: COMMENT_EDITED_SUBSCRIPTION,
-      variables: {
-        asset_id: this.props.data.variables.asset_id,
-      },
+      variables,
       updateQuery: (prev, {subscriptionData: {data: {commentEdited: comment}}}) => {
         const sort = this.props.moderation.sortOrder;
         const notify = {
@@ -95,9 +89,7 @@ class ModerationContainer extends Component {
 
     const sub4 = this.props.data.subscribeToMore({
       document: COMMENT_FLAGGED_SUBSCRIPTION,
-      variables: {
-        asset_id: this.props.data.variables.asset_id,
-      },
+      variables,
       updateQuery: (prev, {subscriptionData: {data: {commentFlagged: comment}}}) => {
         const user = comment.actions[comment.actions.length - 1].user;
         const sort = this.props.moderation.sortOrder;
@@ -118,9 +110,9 @@ class ModerationContainer extends Component {
     this.subscriptions = [];
   }
 
-  resubscribe() {
+  resubscribe(variables) {
     this.unsubscribe();
-    this.subscribeToUpdates();
+    this.subscribeToUpdates(variables);
   }
 
   componentWillMount() {
@@ -134,9 +126,10 @@ class ModerationContainer extends Component {
   }
 
   componentWillReceiveProps(nextProps) {
+
     // Resubscribe when we change between assets.
     if(this.props.data.variables.asset_id !== nextProps.data.variables.asset_id) {
-      this.resubscribe();
+      this.resubscribe(nextProps.data.variables);
     }
   }
 
diff --git a/graph/subscriptions.js b/graph/subscriptions.js
index 31b430523..2ba0c2c1f 100644
--- a/graph/subscriptions.js
+++ b/graph/subscriptions.js
@@ -50,7 +50,7 @@ const setupFunctions = plugins.get('server', 'setupFunctions').reduce((acc, {plu
   }),
   commentFlagged: (options, args) => ({
     commentFlagged: {
-      filter: ({comment}, context) => {
+      filter: (comment, context) => {
         if (!context.user || !context.user.can(SUBSCRIBE_COMMENT_FLAGGED)) {
           return false;
         }
@@ -60,7 +60,7 @@ const setupFunctions = plugins.get('server', 'setupFunctions').reduce((acc, {plu
   }),
   commentAccepted: (options, args) => ({
     commentAccepted: {
-      filter: ({comment}, context) => {
+      filter: (comment, context) => {
         if (!context.user || !context.user.can(SUBSCRIBE_COMMENT_ACCEPTED)) {
           return false;
         }
@@ -70,7 +70,7 @@ const setupFunctions = plugins.get('server', 'setupFunctions').reduce((acc, {plu
   }),
   commentRejected: (options, args) => ({
     commentRejected: {
-      filter: ({comment}, context) => {
+      filter: (comment, context) => {
         if (!context.user || !context.user.can(SUBSCRIBE_COMMENT_REJECTED)) {
           return false;
         }

From b8967dcdb4dd91d66fb509c5e2a69ed06f400156 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 20 Jun 2017 01:09:37 +0700
Subject: [PATCH 151/264] More accurate loading detection

---
 .../Moderation/components/Moderation.js       | 19 ++----------------
 .../Moderation/containers/Moderation.js       | 20 ++++++++++++++++---
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js
index 8c81ae18b..a5f823072 100644
--- a/client/coral-admin/src/routes/Moderation/components/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js
@@ -7,11 +7,9 @@ import SuspendUserDialog from './SuspendUserDialog';
 import ModerationQueue from './ModerationQueue';
 import ModerationMenu from './ModerationMenu';
 import ModerationHeader from './ModerationHeader';
-import NotFoundAsset from './NotFoundAsset';
 import ModerationKeysModal from '../../../components/ModerationKeysModal';
 import UserDetail from '../containers/UserDetail';
 import StorySearch from '../containers/StorySearch';
-import {Spinner} from 'coral-ui';
 
 export default class Moderation extends Component {
   state = {
@@ -105,22 +103,9 @@ export default class Moderation extends Component {
   render () {
 
     const {root, moderation, settings, viewUserDetail, hideUserDetail, activeTab, ...props} = this.props;
-    const providedAssetId = this.props.params.id;
+    const assetId = this.props.params.id;
     const {asset} = root;
 
-    if (providedAssetId) {
-      if (asset === null) {
-
-        // Not found.
-        return <NotFoundAsset assetId={providedAssetId} />;
-      }
-      if (asset === undefined || asset.id !== providedAssetId) {
-
-        // Still loading.
-        return <Spinner />;
-      }
-    }
-
     const comments = root[activeTab];
     let activeTabCount;
     switch(activeTab) {
@@ -174,7 +159,7 @@ export default class Moderation extends Component {
           acceptComment={props.acceptComment}
           rejectComment={props.rejectComment}
           loadMore={props.loadMore}
-          assetId={providedAssetId}
+          assetId={assetId}
           sort={this.props.moderation.sortOrder}
           commentCount={activeTabCount}
           currentUserId={this.props.auth.user.id}
diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index 12a991454..86c46ac30 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -8,6 +8,7 @@ import * as notification from 'coral-admin/src/services/notification';
 import t, {timeago} from 'coral-framework/services/i18n';
 import update from 'immutability-helper';
 import truncate from 'lodash/truncate';
+import NotFoundAsset from '../components/NotFoundAsset';
 
 import {withSetUserStatus, withSuspendUser, withSetCommentStatus} from 'coral-framework/graphql/mutations';
 import {handleCommentChange} from '../../../graphql/utils';
@@ -214,14 +215,27 @@ class ModerationContainer extends Component {
   };
 
   render () {
-    const {root, data} = this.props;
+    const {root, root: {asset}, data, params: {id: assetId}} = this.props;
 
     if (data.error) {
       return <div>Error</div>;
     }
 
-    if (!('premodCount' in root)) {
-      return <div><Spinner/></div>;
+    if (assetId) {
+      if (asset === null) {
+
+        // Not found.
+        return <NotFoundAsset assetId={assetId} />;
+      }
+      if (asset === undefined || asset.id !== assetId) {
+
+        // Still loading.
+        return <Spinner />;
+      }
+    } else if(asset !== undefined || !('premodCount' in root)) {
+
+      // loading.
+      return <Spinner />;
     }
 
     return <Moderation

From 523f23269b3c50ea1201f743e68da1c650508feb Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 20 Jun 2017 01:38:38 +0700
Subject: [PATCH 152/264] Translate, pep up notifications

---
 client/coral-admin/src/components/ToastContainer.css |  1 +
 .../src/routes/Moderation/components/Comment.js      |  2 +-
 .../src/routes/Moderation/containers/Moderation.js   | 12 ++++++++----
 client/coral-embed-stream/src/components/Comment.js  |  3 ++-
 locales/en.yml                                       |  5 +++++
 locales/es.yml                                       |  1 +
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/client/coral-admin/src/components/ToastContainer.css b/client/coral-admin/src/components/ToastContainer.css
index 57ddf3134..2fcbd7f7d 100644
--- a/client/coral-admin/src/components/ToastContainer.css
+++ b/client/coral-admin/src/components/ToastContainer.css
@@ -207,6 +207,7 @@
 
   .toastify__body {
     color: white;
+    overflow-x: scroll;
     font-size: 15px;
     font-weight: 400;
   }
diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.js b/client/coral-admin/src/routes/Moderation/components/Comment.js
index 2a5f44f28..41b537f74 100644
--- a/client/coral-admin/src/routes/Moderation/components/Comment.js
+++ b/client/coral-admin/src/routes/Moderation/components/Comment.js
@@ -95,7 +95,7 @@ class Comment extends React.Component {
               </span>
               {
                 (comment.editing && comment.editing.edited)
-                ? <span>&nbsp;<span className={styles.editedMarker}>(Edited)</span></span>
+                ? <span>&nbsp;<span className={styles.editedMarker}>({t('comment.edited')})</span></span>
                 : null
               }
               {props.currentUserId !== comment.user.id &&
diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index 86c46ac30..ba026abb3 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -34,6 +34,10 @@ import {Spinner} from 'coral-ui';
 import Moderation from '../components/Moderation';
 import Comment from './Comment';
 
+function prepareNotificationText(text) {
+  return truncate(text, {length: 50}).replace('\n', ' ');
+}
+
 class ModerationContainer extends Component {
   subscriptions = [];
 
@@ -50,7 +54,7 @@ class ModerationContainer extends Component {
           ? {}
           : {
             activeQueue: this.activeTab,
-            text: `${user.username} accepted comment "${truncate(comment.body, {lenght: 50})}"`,
+            text: t('modqueue.notify_accepted', user.username, prepareNotificationText(comment.body)),
             anyQueue: false,
           };
         return handleCommentChange(prev, comment, sort, notify);
@@ -67,7 +71,7 @@ class ModerationContainer extends Component {
           ? {}
           : {
             activeQueue: this.activeTab,
-            text: `${user.username} rejected comment "${truncate(comment.body, {lenght: 50})}"`,
+            text: t('modqueue.notify_rejected', user.username, prepareNotificationText(comment.body)),
             anyQueue: false,
           };
         return handleCommentChange(prev, comment, sort, notify);
@@ -81,7 +85,7 @@ class ModerationContainer extends Component {
         const sort = this.props.moderation.sortOrder;
         const notify = {
           activeQueue: this.activeTab,
-          text: `${comment.user.username} edited comment to "${truncate(comment.body, {lenght: 50})}"`,
+          text: t('modqueue.notify_edited', comment.user.username, prepareNotificationText(comment.body)),
           anyQueue: false,
         };
         return handleCommentChange(prev, comment, sort, notify);
@@ -96,7 +100,7 @@ class ModerationContainer extends Component {
         const sort = this.props.moderation.sortOrder;
         const notify = {
           activeQueue: this.activeTab,
-          text: `${user.username} flagged comment "${truncate(comment.body, {lenght: 50})}"`,
+          text: t('modqueue.notify_flagged', user.username, prepareNotificationText(comment.body)),
           anyQueue: true,
         };
         return handleCommentChange(prev, comment, sort, notify);
diff --git a/client/coral-embed-stream/src/components/Comment.js b/client/coral-embed-stream/src/components/Comment.js
index a66b8a224..8626154f4 100644
--- a/client/coral-embed-stream/src/components/Comment.js
+++ b/client/coral-embed-stream/src/components/Comment.js
@@ -26,6 +26,7 @@ import Slot from 'coral-framework/components/Slot';
 import IgnoredCommentTombstone from './IgnoredCommentTombstone';
 import {EditableCommentContent} from './EditableCommentContent';
 import {getActionSummary, iPerformedThisAction} from 'coral-framework/utils';
+import t from 'coral-framework/services/i18n';
 
 const isStaff = (tags) => !tags.every((t) => t.tag.name !== 'STAFF');
 const hasTag = (tags, lookupTag) => !!tags.filter((t) => t.tag.name === lookupTag).length;
@@ -415,7 +416,7 @@ export default class Comment extends React.Component {
             <PubDate created_at={comment.created_at} className={'talk-stream-comment-published-date'} />
             {
               (comment.editing && comment.editing.edited)
-              ? <span>&nbsp;<span className={styles.editedMarker}>(Edited)</span></span>
+              ? <span>&nbsp;<span className={styles.editedMarker}>({t('comment.edited')})</span></span>
               : null
             }
           </span>
diff --git a/locales/en.yml b/locales/en.yml
index de95ddb91..4c2ae7c76 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -13,6 +13,7 @@ en:
     anon: "Anonymous"
     ban_user: "Ban User"
     comment: "Post a comment"
+    edited: Edited
     flagged: "flagged"
     view_context: "View context"
   comment_box:
@@ -241,6 +242,10 @@ en:
     actions: Actions
     all: all
     all_streams: "All Streams"
+    notify_edited: '{0} edited comment "{1}"'
+    notify_accepted: '{0} accepted comment "{1}"'
+    notify_rejected: '{0} rejected comment "{1}"'
+    notify_flagged: '{0} flagged comment "{1}"'
     approve: "Approve"
     approved: "Approved"
     ban_user: "Ban"
diff --git a/locales/es.yml b/locales/es.yml
index 6897f6f8b..d174ed0ee 100644
--- a/locales/es.yml
+++ b/locales/es.yml
@@ -13,6 +13,7 @@ es:
     anon: Anónimo
     ban_user: "Usuario Suspendido"
     comment: "Publicar un comentario"
+    edited: Editado
     flagged: reportado
     view_context: "Ver contexto"
   comment_box:

From 16ef833fd83cd351ae139befaf67ec755dca93b6 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 19 Jun 2017 16:17:50 -0300
Subject: [PATCH 153/264] =?UTF-8?q?=C3=81dding=20Copy=20component,=20and?=
 =?UTF-8?q?=20UserDetail=20fic?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Moderation/components/UserDetail.js       | 38 +++++++++++++------
 client/coral-ui/components/Copy.js            | 38 +++++++++++++++++++
 client/coral-ui/index.js                      |  1 +
 package.json                                  |  1 +
 yarn.lock                                     | 34 +++++++++++++----
 5 files changed, 93 insertions(+), 19 deletions(-)
 create mode 100644 client/coral-ui/components/Copy.js

diff --git a/client/coral-admin/src/routes/Moderation/components/UserDetail.js b/client/coral-admin/src/routes/Moderation/components/UserDetail.js
index 688ac75d0..abc9f4440 100644
--- a/client/coral-admin/src/routes/Moderation/components/UserDetail.js
+++ b/client/coral-admin/src/routes/Moderation/components/UserDetail.js
@@ -1,11 +1,19 @@
 import React, {PropTypes} from 'react';
-import {Button, Drawer} from 'coral-ui';
+import {Button, Drawer, Copy} from 'coral-ui';
 import styles from './UserDetail.css';
 import Slot from 'coral-framework/components/Slot';
 import Comment from './Comment';
 import {actionsMap} from '../helpers/moderationQueueActionsMap';
 
 export default class UserDetail extends React.Component {
+
+  constructor() {
+    super();
+    this.state = {
+      emailCopied: false
+    };
+  }
+
   static propTypes = {
     id: PropTypes.string.isRequired,
     hideUserDetail: PropTypes.func.isRequired,
@@ -22,16 +30,6 @@ export default class UserDetail extends React.Component {
     bulkReject: PropTypes.func.isRequired,
   }
 
-  copyPermalink = () => {
-    this.profile.select();
-    try {
-      document.execCommand('copy');
-    } catch (e) {
-
-      /* nothing */
-    }
-  }
-
   rejectThenReload = (info) => {
     this.props.rejectComment(info).then(() => {
       this.props.data.refetch();
@@ -52,6 +50,16 @@ export default class UserDetail extends React.Component {
     this.props.changeStatus('rejected');
   }
 
+  showCopied() {
+    this.setState({
+      emailCopied: true
+    }, () => {
+      setTimeout(() => this.setState({
+        emailCopied: false
+      }), 3000);
+    });
+  }
+
   render () {
     const {
       root: {
@@ -90,8 +98,14 @@ export default class UserDetail extends React.Component {
     return (
       <Drawer handleClickOutside={hideUserDetail}>
         <h3>{user.username}</h3>
-        <Button className={styles.copyButton} onClick={this.copyPermalink}>Copy</Button>
         {profile && <input className={styles.profileEmail} readOnly type="text" ref={(ref) => this.profile = ref} value={profile} />}
+
+        <Copy onCopy={() => this.showCopied()} text={profile} className={styles.profileEmail}>
+          <Button className={styles.copyButton}>
+            {this.state.emailCopied ? 'Copied!' : 'Copy'}
+          </Button>
+        </Copy>
+
         <Slot
           fill="userProfile"
           data={this.props.data}
diff --git a/client/coral-ui/components/Copy.js b/client/coral-ui/components/Copy.js
new file mode 100644
index 000000000..ca7002aea
--- /dev/null
+++ b/client/coral-ui/components/Copy.js
@@ -0,0 +1,38 @@
+import React, {Component} from 'react';
+import Clipboard from 'clipboard';
+
+export default class Copy extends Component {
+
+ constructor(props) {
+   super(props);
+   this.refCopyButton = this.refCopyButton.bind(this);
+ }
+
+ componentDidMount() {
+   const clipboard = new Clipboard(this.copyButtonEl);
+
+   clipboard.on('success', (e) => {
+     this.props.onCopy();
+     e.clearSelection();
+   });
+ }
+
+ refCopyButton(button) {
+   this.copyButtonEl = button;
+ }
+
+ render() {
+   const { children, target = '', text = '' } = this.props;
+
+   return (
+     <span
+       ref={this.refCopyButton}
+       data-clipboard-action="copy"
+       data-clipboard-text={text}
+       data-clipboard-target={target}
+     >
+     {children}
+     </span>
+   );
+ }
+}
diff --git a/client/coral-ui/index.js b/client/coral-ui/index.js
index 3e9456727..d9f960eb2 100644
--- a/client/coral-ui/index.js
+++ b/client/coral-ui/index.js
@@ -24,3 +24,4 @@ export {default as Option} from './components/Option';
 export {default as SnackBar} from './components/SnackBar';
 export {default as TextArea} from './components/TextArea';
 export {default as Drawer} from './components/Drawer';
+export {default as Copy} from './components/Copy';
diff --git a/package.json b/package.json
index c1671c11e..fe0bd6117 100644
--- a/package.json
+++ b/package.json
@@ -61,6 +61,7 @@
     "body-parser": "^1.17.1",
     "bowser": "^1.7.0",
     "cli-table": "^0.3.1",
+    "clipboard": "^1.7.1",
     "colors": "^1.1.2",
     "commander": "^2.9.0",
     "compression": "^1.6.2",
diff --git a/yarn.lock b/yarn.lock
index fe99eec83..c298f6063 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1671,6 +1671,14 @@ cli-width@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.1.0.tgz#b234ca209b29ef66fc518d9b98d5847b00edf00a"
 
+clipboard@^1.7.1:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-1.7.1.tgz#360d6d6946e99a7a1fef395e42ba92b5e9b5a16b"
+  dependencies:
+    good-listener "^1.2.2"
+    select "^1.1.2"
+    tiny-emitter "^2.0.0"
+
 cliui@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
@@ -2399,6 +2407,10 @@ delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
 
+delegate@^3.1.2:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.1.3.tgz#9a8251a777d7025faa55737bc3b071742127a9fd"
+
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
@@ -3536,6 +3548,12 @@ globby@^5.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
+good-listener@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50"
+  dependencies:
+    delegate "^3.1.2"
+
 got@^3.2.0:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/got/-/got-3.3.1.tgz#e5d0ed4af55fc3eef4d56007769d98192bcb2eca"
@@ -6569,13 +6587,7 @@ promise@^7.0.1, promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
-prop-types@^15.5.0, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@~15.5.7:
-  version "15.5.8"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.8.tgz#6b7b2e141083be38c8595aa51fc55775c7199394"
-  dependencies:
-    fbjs "^0.8.9"
-
-prop-types@^15.5.10:
+prop-types@^15.5.0, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@~15.5.7:
   version "15.5.10"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154"
   dependencies:
@@ -7411,6 +7423,10 @@ sax@^1.1.4, sax@^1.2.1, sax@~1.2.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828"
 
+select@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
+
 selenium-standalone@^5.11.2:
   version "5.11.2"
   resolved "https://registry.yarnpkg.com/selenium-standalone/-/selenium-standalone-5.11.2.tgz#724ccaa72fb26f3711e0e20989e478c4133df844"
@@ -8025,6 +8041,10 @@ timers-browserify@^2.0.2:
   dependencies:
     setimmediate "^1.0.4"
 
+tiny-emitter@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.0.0.tgz#bad327adb1804b42a231afa741532bd884cd09ad"
+
 title-case-minors@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/title-case-minors/-/title-case-minors-1.0.0.tgz#51f17037c294747a1d1cda424b5004c86d8eb115"

From 30a385e03b0f6381039d15bf8a5249d2529d3a09 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 19 Jun 2017 17:09:49 -0300
Subject: [PATCH 154/264] Linting

---
 client/coral-ui/components/Copy.js | 38 +++++++++++++++---------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/client/coral-ui/components/Copy.js b/client/coral-ui/components/Copy.js
index ca7002aea..7162cd141 100644
--- a/client/coral-ui/components/Copy.js
+++ b/client/coral-ui/components/Copy.js
@@ -3,28 +3,28 @@ import Clipboard from 'clipboard';
 
 export default class Copy extends Component {
 
- constructor(props) {
-   super(props);
-   this.refCopyButton = this.refCopyButton.bind(this);
- }
+  constructor(props) {
+    super(props);
+    this.refCopyButton = this.refCopyButton.bind(this);
+  }
 
- componentDidMount() {
-   const clipboard = new Clipboard(this.copyButtonEl);
+  componentDidMount() {
+    const clipboard = new Clipboard(this.copyButtonEl);
 
-   clipboard.on('success', (e) => {
-     this.props.onCopy();
-     e.clearSelection();
-   });
- }
+    clipboard.on('success', (e) => {
+      this.props.onCopy();
+      e.clearSelection();
+    });
+  }
 
- refCopyButton(button) {
-   this.copyButtonEl = button;
- }
+  refCopyButton(button) {
+    this.copyButtonEl = button;
+  }
 
- render() {
-   const { children, target = '', text = '' } = this.props;
+  render() {
+    const {children, target = '', text = ''} = this.props;
 
-   return (
+    return (
      <span
        ref={this.refCopyButton}
        data-clipboard-action="copy"
@@ -33,6 +33,6 @@ export default class Copy extends Component {
      >
      {children}
      </span>
-   );
- }
+    );
+  }
 }

From c36a0bc9e9157cdf9a28f69ed90b7aba40b7477b Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 19 Jun 2017 17:23:57 -0300
Subject: [PATCH 155/264] d approve and f reject

---
 client/coral-admin/src/components/ModerationKeysModal.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/coral-admin/src/components/ModerationKeysModal.js b/client/coral-admin/src/components/ModerationKeysModal.js
index fabd5098c..c4f3f1e1d 100644
--- a/client/coral-admin/src/components/ModerationKeysModal.js
+++ b/client/coral-admin/src/components/ModerationKeysModal.js
@@ -16,8 +16,8 @@ const shortcuts = [
   {
     title: 'modqueue.actions',
     shortcuts: {
-      't': 'modqueue.approve',
-      'r': 'modqueue.reject'
+      'd': 'modqueue.approve',
+      'f': 'modqueue.reject'
     }
   }
 ];
@@ -40,8 +40,8 @@ export default class ModerationKeysModal extends React.Component {
           <p className={styles.ctaHeader}>{t('modqueue.mod_faster')}</p>
           <p><strong>{t('modqueue.try_these')}:</strong></p>
           <ul>
-            <li><span>{t('modqueue.approve')}</span> <span className={styles.smallKey}>t</span></li>
-            <li><span>{t('modqueue.reject')}</span> <span className={styles.smallKey}>r</span></li>
+            <li><span>{t('modqueue.approve')}</span> <span className={styles.smallKey}>d</span></li>
+            <li><span>{t('modqueue.reject')}</span> <span className={styles.smallKey}>f</span></li>
           </ul>
           <p><span>{t('modqueue.view_more_shortcuts')}</span> <span className={styles.smallKey}>{t('modqueue.shift_key')}</span> + <span className={styles.smallKey}>/</span></p>
         </div>

From dad6534011718e6fbb6cc0f71801712db13e9285 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 19 Jun 2017 17:26:57 -0300
Subject: [PATCH 156/264] Fix close modal

---
 .../coral-admin/src/routes/Moderation/components/Moderation.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js
index c2036247d..998659cd1 100644
--- a/client/coral-admin/src/routes/Moderation/components/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js
@@ -31,7 +31,7 @@ export default class Moderation extends Component {
   }
 
   onClose = () => {
-    this.toggleModal(false);
+    this.props.toggleModal(false);
   }
 
   closeSearch = () => {

From 12a5654fb88a224b27fcd5b171492ce8d89215dd Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 19 Jun 2017 17:48:20 -0300
Subject: [PATCH 157/264] Keyboard shorcuts working

---
 .../routes/Moderation/components/Comment.js   |  2 +-
 .../Moderation/components/Moderation.js       | 33 ++++++++++---------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.js b/client/coral-admin/src/routes/Moderation/components/Comment.js
index 9d1019b5e..8a23cc5ba 100644
--- a/client/coral-admin/src/routes/Moderation/components/Comment.js
+++ b/client/coral-admin/src/routes/Moderation/components/Comment.js
@@ -60,7 +60,7 @@ const Comment = ({
   return (
     <li
       tabIndex={props.index}
-      className={`mdl-card ${selectionStateCSS} ${styles.Comment} ${styles.listItem} ${minimal ? styles.minimal : ''}`}
+      className={`mdl-card ${selectionStateCSS} ${selected ? styles.selected : ''} ${styles.Comment} ${styles.listItem} ${minimal ? styles.minimal : ''}`}
     >
       <div className={styles.container}>
         <div className={styles.itemHeader}>
diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js
index 998659cd1..63c9e13ab 100644
--- a/client/coral-admin/src/routes/Moderation/components/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js
@@ -14,8 +14,13 @@ import StorySearch from '../containers/StorySearch';
 import {Spinner} from 'coral-ui';
 
 export default class Moderation extends Component {
-  state = {
-    selectedIndex: 0,
+  constructor() {
+    super();
+
+    this.state = {
+      selectedIndex: 0
+    };
+
   }
 
   componentWillMount() {
@@ -60,24 +65,22 @@ export default class Moderation extends Component {
   getComments = () => {
     const {root, route} = this.props;
     const activeTab = route.path === ':id' ? 'premod' : route.path;
-    return root[activeTab];
+    return root[activeTab].nodes;
   }
 
   select = (next) => () => {
     if (next) {
-      this.setState((prevState) =>
-        ({
-          ...prevState,
-          selectedIndex: prevState.selectedIndex < this.getComments().length - 1
-            ? prevState.selectedIndex + 1 : prevState.selectedIndex
-        }));
+      this.setState((state) => ({
+        ...state,
+        selectedIndex: state.selectedIndex < this.getComments().length - 1
+          ? state.selectedIndex + 1 : state.selectedIndex
+      }));
     } else {
-      this.setState((prevState) =>
-        ({
-          ...prevState,
-          selectedIndex: prevState.selectedIndex > 0 ?
-            prevState.selectedIndex - 1 : prevState.selectedIndex
-        }));
+      this.setState((state) => ({
+        ...state,
+        selectedIndex: state.selectedIndex > 0
+          ? state.selectedIndex - 1 : state.selectedIndex
+      }));
     }
   }
 

From 99bb4b7198bc0993d869b7e7c57e59611a432280 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 19 Jun 2017 18:09:38 -0300
Subject: [PATCH 158/264] New Links

---
 .../coral-admin/src/components/ui/Header.css  | 10 ++++++++--
 .../coral-admin/src/components/ui/Header.js   | 20 +++++++++++++++----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/client/coral-admin/src/components/ui/Header.css b/client/coral-admin/src/components/ui/Header.css
index d99a7f295..f85a7cdf9 100644
--- a/client/coral-admin/src/components/ui/Header.css
+++ b/client/coral-admin/src/components/ui/Header.css
@@ -40,12 +40,12 @@
   height: 100%;
 }
 
-.rightPanel ul {
+.rightPanel > ul {
   list-style: none;
   margin-right: 20px;
 }
 
-.rightPanel li {
+.rightPanel > ul > li {
   display: inline-block;
   float: right;
   margin-left: 15px;
@@ -54,6 +54,12 @@
   line-height: 33px;
 }
 
+.rightPanel a {
+  color: black;
+  text-decoration: none;
+  font-weight: 400;
+}
+
 .rightPanel .settings {
   line-height: 0;
 }
diff --git a/client/coral-admin/src/components/ui/Header.js b/client/coral-admin/src/components/ui/Header.js
index bbc78a321..f2a0b06e3 100644
--- a/client/coral-admin/src/components/ui/Header.js
+++ b/client/coral-admin/src/components/ui/Header.js
@@ -71,13 +71,25 @@ const CoralHeader = ({
                 <IconButton name="settings" id="menu-settings"/>
                 <Menu target="menu-settings" align="right">
                   <MenuItem onClick={() => showShortcuts(true)}>{t('configure.shortcuts')}</MenuItem>
-                  <MenuItem onClick={handleLogout}>{t('configure.sign_out')}</MenuItem>
+                  <MenuItem>
+                    <a href="https://github.com/coralproject/talk/releases" target="_blank">
+                      View latest version
+                    </a>
+                  </MenuItem>
+                  <MenuItem>
+                    <a href="https://coralproject.net/contribute.html#other-ideas-and-bug-reports" target="_blank">
+                      Report a bug or give feedback
+                    </a>
+                  </MenuItem>
+                  <MenuItem onClick={handleLogout}>
+                    {t('configure.sign_out')}
+                  </MenuItem>
+                  <MenuItem>
+                    Talk {`v${process.env.VERSION}`}
+                  </MenuItem>
                 </Menu>
               </div>
             </li>
-            <li>
-              {`v${process.env.VERSION}`}
-            </li>
           </ul>
         </div>
       </div>

From dca759a5e00c439d638b156884831f8c4cc96bae Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Tue, 20 Jun 2017 10:02:10 +0100
Subject: [PATCH 159/264] Bump version 2.1.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fe0bd6117..c2b58b112 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "talk",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "A better commenting experience from Mozilla, The New York Times, and the Washington Post. https://coralproject.net",
   "main": "app.js",
   "scripts": {

From ea12c07cd457d936ba6913210f76e4ee12d5315f Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Tue, 20 Jun 2017 10:29:39 +0100
Subject: [PATCH 160/264] Update README

---
 README.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 70dfc61c4..4ea9ff0e4 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,17 @@ endpoint when the server is running with built assets.
 
 ## Contributing to Talk
 
-See our [Contribution Guide](https://github.com/coralproject/talk/blob/master/CONTRIBUTING.md)!
+See our [Contribution Guide](https://github.com/coralproject/talk/blob/master/CONTRIBUTING.md).
+
+## Documentation
+
+### General
+
+See our [Talk Documentation & Guides](https://coralproject.github.io/talk/index.html).
+
+### Plugins
+
+See our guide to using and building [Talk Plugins](https://github.com/coralproject/talk/blob/master/PLUGINS.md).
 
 ## Usage
 

From 646b5be8c8ca7fe7b908496647b9a1a2cda98588 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Tue, 20 Jun 2017 10:48:01 +0100
Subject: [PATCH 161/264] Show version in nav

---
 client/coral-admin/src/components/ui/Header.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/coral-admin/src/components/ui/Header.js b/client/coral-admin/src/components/ui/Header.js
index f2a0b06e3..ca1cc1f30 100644
--- a/client/coral-admin/src/components/ui/Header.js
+++ b/client/coral-admin/src/components/ui/Header.js
@@ -84,12 +84,12 @@ const CoralHeader = ({
                   <MenuItem onClick={handleLogout}>
                     {t('configure.sign_out')}
                   </MenuItem>
-                  <MenuItem>
-                    Talk {`v${process.env.VERSION}`}
-                  </MenuItem>
                 </Menu>
               </div>
             </li>
+            <li>        
+             {`v${process.env.VERSION}`}        
+            </li>
           </ul>
         </div>
       </div>

From fe8f3ae4bb8dd329bca67be5e18f1036ef6b96af Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Tue, 20 Jun 2017 08:32:08 -0300
Subject: [PATCH 162/264] Moving Copy component

---
 .../Moderation/components/UserDetail.css      |  3 +--
 .../Moderation/components/UserDetail.js       | 21 +++++++++++--------
 .../components/Copy.js                        |  3 ++-
 client/coral-framework/components/index.js    |  1 +
 client/coral-ui/index.js                      |  1 -
 plugin-api/beta/client/components/index.js    |  1 +
 6 files changed, 17 insertions(+), 13 deletions(-)
 rename client/{coral-ui => coral-framework}/components/Copy.js (87%)

diff --git a/client/coral-admin/src/routes/Moderation/components/UserDetail.css b/client/coral-admin/src/routes/Moderation/components/UserDetail.css
index 710f84759..f0b08bfb7 100644
--- a/client/coral-admin/src/routes/Moderation/components/UserDetail.css
+++ b/client/coral-admin/src/routes/Moderation/components/UserDetail.css
@@ -35,9 +35,8 @@
   border: none;
   background-color: transparent;
   font-size: 16px;
-  position: absolute;
-  width: 90%;
   outline: none;
+  width: calc(100% - 90px);
 }
 
 .commentStatuses {
diff --git a/client/coral-admin/src/routes/Moderation/components/UserDetail.js b/client/coral-admin/src/routes/Moderation/components/UserDetail.js
index abc9f4440..023fb9a3f 100644
--- a/client/coral-admin/src/routes/Moderation/components/UserDetail.js
+++ b/client/coral-admin/src/routes/Moderation/components/UserDetail.js
@@ -1,8 +1,8 @@
 import React, {PropTypes} from 'react';
-import {Button, Drawer, Copy} from 'coral-ui';
-import styles from './UserDetail.css';
-import Slot from 'coral-framework/components/Slot';
 import Comment from './Comment';
+import styles from './UserDetail.css';
+import {Button, Drawer} from 'coral-ui';
+import {Slot, Copy} from 'coral-framework/components';
 import {actionsMap} from '../helpers/moderationQueueActionsMap';
 
 export default class UserDetail extends React.Component {
@@ -98,13 +98,16 @@ export default class UserDetail extends React.Component {
     return (
       <Drawer handleClickOutside={hideUserDetail}>
         <h3>{user.username}</h3>
-        {profile && <input className={styles.profileEmail} readOnly type="text" ref={(ref) => this.profile = ref} value={profile} />}
 
-        <Copy onCopy={() => this.showCopied()} text={profile} className={styles.profileEmail}>
-          <Button className={styles.copyButton}>
-            {this.state.emailCopied ? 'Copied!' : 'Copy'}
-          </Button>
-        </Copy>
+        <div>
+          {profile && <input className={styles.profileEmail} readOnly type="text" ref={(ref) => this.profile = ref} value={profile} />}
+
+          <Copy onCopy={() => this.showCopied()} text={profile} className={styles.profileEmail}>
+            <Button className={styles.copyButton}>
+              {this.state.emailCopied ? 'Copied!' : 'Copy'}
+            </Button>
+          </Copy>
+        </div>
 
         <Slot
           fill="userProfile"
diff --git a/client/coral-ui/components/Copy.js b/client/coral-framework/components/Copy.js
similarity index 87%
rename from client/coral-ui/components/Copy.js
rename to client/coral-framework/components/Copy.js
index 7162cd141..2c0a0b6ea 100644
--- a/client/coral-ui/components/Copy.js
+++ b/client/coral-framework/components/Copy.js
@@ -22,10 +22,11 @@ export default class Copy extends Component {
   }
 
   render() {
-    const {children, target = '', text = ''} = this.props;
+    const {children, target = '', text = '', className = ''} = this.props;
 
     return (
      <span
+       className={className}
        ref={this.refCopyButton}
        data-clipboard-action="copy"
        data-clipboard-text={text}
diff --git a/client/coral-framework/components/index.js b/client/coral-framework/components/index.js
index b7aaef665..6c9a3f876 100644
--- a/client/coral-framework/components/index.js
+++ b/client/coral-framework/components/index.js
@@ -1 +1,2 @@
 export {default as Slot} from './Slot';
+export {default as Copy} from './Copy';
diff --git a/client/coral-ui/index.js b/client/coral-ui/index.js
index d9f960eb2..3e9456727 100644
--- a/client/coral-ui/index.js
+++ b/client/coral-ui/index.js
@@ -24,4 +24,3 @@ export {default as Option} from './components/Option';
 export {default as SnackBar} from './components/SnackBar';
 export {default as TextArea} from './components/TextArea';
 export {default as Drawer} from './components/Drawer';
-export {default as Copy} from './components/Copy';
diff --git a/plugin-api/beta/client/components/index.js b/plugin-api/beta/client/components/index.js
index 5d76732fc..f719b9442 100644
--- a/plugin-api/beta/client/components/index.js
+++ b/plugin-api/beta/client/components/index.js
@@ -1 +1,2 @@
 export {Slot} from 'coral-framework/components';
+export {Copy} from 'coral-framework/components';

From d23d4265677ef998d1e8cd89127b474589538b7e Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Tue, 20 Jun 2017 08:37:53 -0300
Subject: [PATCH 163/264] Adding the translations

---
 .../src/routes/Moderation/components/UserDetail.js           | 5 +++--
 locales/en.yml                                               | 3 +++
 locales/es.yml                                               | 3 +++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/UserDetail.js b/client/coral-admin/src/routes/Moderation/components/UserDetail.js
index 023fb9a3f..bf8b80267 100644
--- a/client/coral-admin/src/routes/Moderation/components/UserDetail.js
+++ b/client/coral-admin/src/routes/Moderation/components/UserDetail.js
@@ -2,6 +2,7 @@ import React, {PropTypes} from 'react';
 import Comment from './Comment';
 import styles from './UserDetail.css';
 import {Button, Drawer} from 'coral-ui';
+import t from 'coral-framework/services/i18n';
 import {Slot, Copy} from 'coral-framework/components';
 import {actionsMap} from '../helpers/moderationQueueActionsMap';
 
@@ -102,9 +103,9 @@ export default class UserDetail extends React.Component {
         <div>
           {profile && <input className={styles.profileEmail} readOnly type="text" ref={(ref) => this.profile = ref} value={profile} />}
 
-          <Copy onCopy={() => this.showCopied()} text={profile} className={styles.profileEmail}>
+          <Copy onCopy={() => this.showCopied()} text={profile}>
             <Button className={styles.copyButton}>
-              {this.state.emailCopied ? 'Copied!' : 'Copy'}
+              {this.state.emailCopied ? t('common.copied') : t('common.copy')}
             </Button>
           </Copy>
         </div>
diff --git a/locales/en.yml b/locales/en.yml
index de95ddb91..0bbf594c8 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -32,6 +32,9 @@ en:
   comment_post_banned_word: "Your comment contains one or more words that are not permitted, so it will not be published. If you think this message is incorrect, please contact our moderation team."
   comment_post_notif: "Your comment has been posted."
   comment_post_notif_premod: "Thank you for posting. Our moderation team will review your comment shortly."
+  common:
+    copied: 'Copied'
+    copy: 'Copy'
   community:
     account_creation_date: "Account Creation Date"
     active: Active
diff --git a/locales/es.yml b/locales/es.yml
index 6897f6f8b..9d7e4c939 100644
--- a/locales/es.yml
+++ b/locales/es.yml
@@ -32,6 +32,9 @@ es:
   comment_post_banned_word: "Tu comentario contiene una o más palabras que no están permitidas en nuestro espacio, por lo que no será publicado. Si crees que es un error, por favor contacta a nuestro equipo de moderación."
   comment_post_notif: "Tu comentario ha sido publicado."
   comment_post_notif_premod: "Gracias por el comentario. Nuestro equipo de moderación va a revisarlo muy pronto."
+  common:
+    copied: 'Copiado'
+    copy: 'Copiar'
   community:
     account_creation_date: "Fecha de creación de la cuenta"
     active: Activa

From 7faa00c46387bce0052a01a3bce5e00d0f742d13 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Tue, 20 Jun 2017 09:05:01 -0300
Subject: [PATCH 164/264] withCopyToClipboard

---
 .../Moderation/components/UserDetail.js       | 17 ++++----
 client/coral-framework/components/Copy.js     | 39 -------------------
 client/coral-framework/components/index.js    |  1 -
 client/coral-framework/hocs/index.js          |  2 +-
 .../hocs/withCopyToClipboard.js               | 33 ++++++++++++++++
 5 files changed, 44 insertions(+), 48 deletions(-)
 delete mode 100644 client/coral-framework/components/Copy.js
 create mode 100644 client/coral-framework/hocs/withCopyToClipboard.js

diff --git a/client/coral-admin/src/routes/Moderation/components/UserDetail.js b/client/coral-admin/src/routes/Moderation/components/UserDetail.js
index bf8b80267..116e043ca 100644
--- a/client/coral-admin/src/routes/Moderation/components/UserDetail.js
+++ b/client/coral-admin/src/routes/Moderation/components/UserDetail.js
@@ -3,7 +3,8 @@ import Comment from './Comment';
 import styles from './UserDetail.css';
 import {Button, Drawer} from 'coral-ui';
 import t from 'coral-framework/services/i18n';
-import {Slot, Copy} from 'coral-framework/components';
+import {Slot} from 'coral-framework/components';
+import {withCopyToClipboard} from 'coral-framework/hocs';
 import {actionsMap} from '../helpers/moderationQueueActionsMap';
 
 export default class UserDetail extends React.Component {
@@ -96,18 +97,20 @@ export default class UserDetail extends React.Component {
       rejectedPercent = 0;
     }
 
+    const CopyToClipboard = withCopyToClipboard({ text: profile })(
+      <button className={styles.copyButton}>
+        {this.state.emailCopied ? t('common.copied') : t('common.copy')}
+      </button>
+    );
+
+    console.log(CopyToClipboard)
+
     return (
       <Drawer handleClickOutside={hideUserDetail}>
         <h3>{user.username}</h3>
 
         <div>
           {profile && <input className={styles.profileEmail} readOnly type="text" ref={(ref) => this.profile = ref} value={profile} />}
-
-          <Copy onCopy={() => this.showCopied()} text={profile}>
-            <Button className={styles.copyButton}>
-              {this.state.emailCopied ? t('common.copied') : t('common.copy')}
-            </Button>
-          </Copy>
         </div>
 
         <Slot
diff --git a/client/coral-framework/components/Copy.js b/client/coral-framework/components/Copy.js
deleted file mode 100644
index 2c0a0b6ea..000000000
--- a/client/coral-framework/components/Copy.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import React, {Component} from 'react';
-import Clipboard from 'clipboard';
-
-export default class Copy extends Component {
-
-  constructor(props) {
-    super(props);
-    this.refCopyButton = this.refCopyButton.bind(this);
-  }
-
-  componentDidMount() {
-    const clipboard = new Clipboard(this.copyButtonEl);
-
-    clipboard.on('success', (e) => {
-      this.props.onCopy();
-      e.clearSelection();
-    });
-  }
-
-  refCopyButton(button) {
-    this.copyButtonEl = button;
-  }
-
-  render() {
-    const {children, target = '', text = '', className = ''} = this.props;
-
-    return (
-     <span
-       className={className}
-       ref={this.refCopyButton}
-       data-clipboard-action="copy"
-       data-clipboard-text={text}
-       data-clipboard-target={target}
-     >
-     {children}
-     </span>
-    );
-  }
-}
diff --git a/client/coral-framework/components/index.js b/client/coral-framework/components/index.js
index 6c9a3f876..b7aaef665 100644
--- a/client/coral-framework/components/index.js
+++ b/client/coral-framework/components/index.js
@@ -1,2 +1 @@
 export {default as Slot} from './Slot';
-export {default as Copy} from './Copy';
diff --git a/client/coral-framework/hocs/index.js b/client/coral-framework/hocs/index.js
index 01b3daff4..782f840bd 100644
--- a/client/coral-framework/hocs/index.js
+++ b/client/coral-framework/hocs/index.js
@@ -1,4 +1,4 @@
 export {default as withFragments} from './withFragments';
 export {default as withMutation} from './withMutation';
 export {default as withQuery} from './withQuery';
-
+export {default as withCopyToClipboard} from './withCopyToClipboard';
diff --git a/client/coral-framework/hocs/withCopyToClipboard.js b/client/coral-framework/hocs/withCopyToClipboard.js
new file mode 100644
index 000000000..2ca9e1b13
--- /dev/null
+++ b/client/coral-framework/hocs/withCopyToClipboard.js
@@ -0,0 +1,33 @@
+import React from 'react';
+import Clipboard from 'clipboard';
+
+export default (config) => (WrappedComponent) => {
+  console.log(config, WrappedComponent)
+
+  class withCopyToClipboard extends React.Component {
+
+    componentDidMount() {
+      const node = ReactDOM.findDOMNode(WrappedComponent);
+      const clipboard = new Clipboard(node);
+
+      clipboard.on('success', (e) => {
+        this.props.onCopy();
+        e.clearSelection();
+      });
+    }
+
+    render() {
+      const {target = '', text = ''} = config;
+
+      return <WrappedComponent
+        className={className}
+        data-clipboard-action="copy"
+        data-clipboard-text={text}
+        data-clipboard-target={target}
+        {...this.props}
+      />;
+    }
+  }
+
+  return withCopyToClipboard;
+};

From d97fb0a83fa472da7efebe569eaf5cb70a8e4e51 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Tue, 20 Jun 2017 09:47:37 -0300
Subject: [PATCH 165/264] Refs by ReactDOMNode

---
 .../components/ButtonCopyToClipboard.js       | 35 ++++++++++++++++++
 .../Moderation/components/Moderation.js       |  2 +
 .../Moderation/components/UserDetail.js       | 19 +---------
 .../hocs/withCopyToClipboard.js               | 16 ++++----
 client/coral-ui/components/Button.js          | 37 ++++++++++---------
 5 files changed, 67 insertions(+), 42 deletions(-)
 create mode 100644 client/coral-admin/src/routes/Moderation/components/ButtonCopyToClipboard.js

diff --git a/client/coral-admin/src/routes/Moderation/components/ButtonCopyToClipboard.js b/client/coral-admin/src/routes/Moderation/components/ButtonCopyToClipboard.js
new file mode 100644
index 000000000..ba25d533c
--- /dev/null
+++ b/client/coral-admin/src/routes/Moderation/components/ButtonCopyToClipboard.js
@@ -0,0 +1,35 @@
+import React from 'react';
+import {Button} from 'coral-ui';
+import t from 'coral-framework/services/i18n';
+import {withCopyToClipboard} from 'coral-framework/hocs';
+
+class ButtonCopyToClipboard extends React.Component {
+
+  constructor() {
+    super();
+
+    this.state = {
+      emailCopied: false
+    };
+  }
+
+  showCopied() {
+    this.setState({
+      emailCopied: true
+    }, () => {
+      setTimeout(() => this.setState({
+        emailCopied: false
+      }), 3000);
+    });
+  }
+
+  render () {
+    return (
+      <Button {...this.props}>
+        {this.state.emailCopied ? t('common.copied') : t('common.copy')}
+      </Button>
+    );
+  }
+}
+
+export default withCopyToClipboard(ButtonCopyToClipboard);
diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js
index 63c9e13ab..6d3b975db 100644
--- a/client/coral-admin/src/routes/Moderation/components/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js
@@ -207,6 +207,7 @@ export default class Moderation extends Component {
           shortcutsNoteVisible={moderation.shortcutsNoteVisible}
           open={moderation.modalOpen}
           onClose={this.onClose}/>
+
         {moderation.userDetailId && (
           <UserDetail
             id={moderation.userDetailId}
@@ -218,6 +219,7 @@ export default class Moderation extends Component {
             acceptComment={props.acceptComment}
             rejectComment={props.rejectComment} />
         )}
+
         <StorySearch
           moderation={this.props.moderation}
           closeSearch={this.closeSearch}
diff --git a/client/coral-admin/src/routes/Moderation/components/UserDetail.js b/client/coral-admin/src/routes/Moderation/components/UserDetail.js
index 116e043ca..a591d1393 100644
--- a/client/coral-admin/src/routes/Moderation/components/UserDetail.js
+++ b/client/coral-admin/src/routes/Moderation/components/UserDetail.js
@@ -2,20 +2,12 @@ import React, {PropTypes} from 'react';
 import Comment from './Comment';
 import styles from './UserDetail.css';
 import {Button, Drawer} from 'coral-ui';
-import t from 'coral-framework/services/i18n';
 import {Slot} from 'coral-framework/components';
-import {withCopyToClipboard} from 'coral-framework/hocs';
+import ButtonCopyToClipboard from './ButtonCopyToClipboard';
 import {actionsMap} from '../helpers/moderationQueueActionsMap';
 
 export default class UserDetail extends React.Component {
 
-  constructor() {
-    super();
-    this.state = {
-      emailCopied: false
-    };
-  }
-
   static propTypes = {
     id: PropTypes.string.isRequired,
     hideUserDetail: PropTypes.func.isRequired,
@@ -97,20 +89,13 @@ export default class UserDetail extends React.Component {
       rejectedPercent = 0;
     }
 
-    const CopyToClipboard = withCopyToClipboard({ text: profile })(
-      <button className={styles.copyButton}>
-        {this.state.emailCopied ? t('common.copied') : t('common.copy')}
-      </button>
-    );
-
-    console.log(CopyToClipboard)
-
     return (
       <Drawer handleClickOutside={hideUserDetail}>
         <h3>{user.username}</h3>
 
         <div>
           {profile && <input className={styles.profileEmail} readOnly type="text" ref={(ref) => this.profile = ref} value={profile} />}
+          <ButtonCopyToClipboard className={styles.copyButton} text={profile} />
         </div>
 
         <Slot
diff --git a/client/coral-framework/hocs/withCopyToClipboard.js b/client/coral-framework/hocs/withCopyToClipboard.js
index 2ca9e1b13..17dffd715 100644
--- a/client/coral-framework/hocs/withCopyToClipboard.js
+++ b/client/coral-framework/hocs/withCopyToClipboard.js
@@ -1,30 +1,30 @@
 import React from 'react';
+import ReactDOM from 'react-dom';
 import Clipboard from 'clipboard';
 
-export default (config) => (WrappedComponent) => {
-  console.log(config, WrappedComponent)
+export default (WrappedComponent) => {
 
   class withCopyToClipboard extends React.Component {
-
     componentDidMount() {
-      const node = ReactDOM.findDOMNode(WrappedComponent);
-      const clipboard = new Clipboard(node);
+      const clipboard = new Clipboard(ReactDOM.findDOMNode(this));
 
       clipboard.on('success', (e) => {
-        this.props.onCopy();
+        if (this.props.onCopy) {
+          this.props.onCopy();
+        }
         e.clearSelection();
       });
     }
 
     render() {
-      const {target = '', text = ''} = config;
+      const {target = '', text = '', className = '', ...rest} = this.props;
 
       return <WrappedComponent
         className={className}
         data-clipboard-action="copy"
         data-clipboard-text={text}
         data-clipboard-target={target}
-        {...this.props}
+        {...rest}
       />;
     }
   }
diff --git a/client/coral-ui/components/Button.js b/client/coral-ui/components/Button.js
index 6d3dc94d2..cbfb6ad61 100644
--- a/client/coral-ui/components/Button.js
+++ b/client/coral-ui/components/Button.js
@@ -2,20 +2,23 @@ import React from 'react';
 import styles from './Button.css';
 import Icon from './Icon';
 
-const Button = ({cStyle = 'local', children, className, raised = false, full = false, icon = '', ...props}) => (
-  <button
-    className={`
-      ${styles.button}
-      ${styles[`type--${cStyle}`]}
-      ${className}
-      ${full ? styles.full : ''}
-      ${raised ? styles.raised : ''}
-    `}
-    {...props}
-  >
-    {icon && <Icon name={icon} className={styles.icon} />}
-    {children}
-  </button>
-);
-
-export default Button;
+export default class Button extends React.Component {
+  render() {
+    const {cStyle = 'local', children, className, raised = false, full = false, icon = '', ...props} = this.props;
+    return (
+      <button
+        className={`
+          ${styles.button}
+          ${styles[`type--${cStyle}`]}
+          ${className}
+          ${full ? styles.full : ''}
+          ${raised ? styles.raised : ''}
+        `}
+        {...props}
+      >
+        {icon && <Icon name={icon} className={styles.icon} />}
+        {children}
+      </button>
+    );
+  }
+}

From 23fcba4ccce569eea1d68faff49b4a5dc3dd443e Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 20 Jun 2017 19:55:53 +0700
Subject: [PATCH 166/264] Don't show caret when logged out

---
 .../src/components/Comment.js                 | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/client/coral-embed-stream/src/components/Comment.js b/client/coral-embed-stream/src/components/Comment.js
index a66b8a224..f14e4c991 100644
--- a/client/coral-embed-stream/src/components/Comment.js
+++ b/client/coral-embed-stream/src/components/Comment.js
@@ -431,28 +431,28 @@ export default class Comment extends React.Component {
             inline
           />
 
-          { (currentUser &&
-              (comment.user.id === currentUser.id))
+          { (currentUser && (comment.user.id === currentUser.id)) &&
 
-              /* User can edit/delete their own comment for a short window after posting */
-              ? <span className={cn(styles.topRight)}>
-                  {
-                    commentIsStillEditable(comment) &&
-                    <a
-                      className={cn(styles.link, {[styles.active]: this.state.isEditing})}
-                      onClick={this.onClickEdit}>Edit</a>
-                  }
-                </span>
+            /* User can edit/delete their own comment for a short window after posting */
+            <span className={cn(styles.topRight)}>
+              {
+                commentIsStillEditable(comment) &&
+                <a
+                  className={cn(styles.link, {[styles.active]: this.state.isEditing})}
+                  onClick={this.onClickEdit}>Edit</a>
+              }
+            </span>
+          }
+          { (currentUser && (comment.user.id !== currentUser.id)) &&
 
               /* TopRightMenu allows currentUser to ignore other users' comments */
-              : <span className={cn(styles.topRight, styles.topRightMenu)}>
-                  <TopRightMenu
-                    comment={comment}
-                    ignoreUser={ignoreUser}
-                    addNotification={addNotification} />
-                </span>
+              <span className={cn(styles.topRight, styles.topRightMenu)}>
+                <TopRightMenu
+                  comment={comment}
+                  ignoreUser={ignoreUser}
+                  addNotification={addNotification} />
+              </span>
           }
-
           {
             this.state.isEditing
             ? <EditableCommentContent

From 4d53a72767cb261b42313616d34159e91e68e717 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 20 Jun 2017 20:00:00 +0700
Subject: [PATCH 167/264] Always default to `all` queue

---
 client/coral-admin/src/AppRouter.js                             | 2 +-
 .../coral-admin/src/routes/Moderation/containers/StorySearch.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/AppRouter.js b/client/coral-admin/src/AppRouter.js
index 3bde5f931..385076b21 100644
--- a/client/coral-admin/src/AppRouter.js
+++ b/client/coral-admin/src/AppRouter.js
@@ -50,7 +50,7 @@ const routes = (
           <Route path=':id' components={Moderation} />
         </Route>
         <Route path=':id' components={Moderation} />
-        <IndexRedirect to='premod' />
+        <IndexRedirect to='all' />
       </Route>
     </Route>
   </div>
diff --git a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
index cf47ca662..2196e8994 100644
--- a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
@@ -41,7 +41,7 @@ class StorySearchContainer extends React.Component {
 
   goToStory = (id) => {
     const {router, closeSearch} = this.props;
-    router.push(`/admin/moderate/${id}`);
+    router.push(`/admin/moderate/all/${id}`);
     closeSearch();
   }
 

From 942ea7b9167a012fb9d4c8b606bf8d7e90d8f470 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Tue, 20 Jun 2017 10:37:10 -0300
Subject: [PATCH 168/264] ButtonCopyToClipboard

---
 .../components/ButtonCopyToClipboard.js       | 23 ++-----------------
 .../Moderation/components/UserDetail.js       | 12 +---------
 .../hocs/withCopyToClipboard.js               | 14 ++++-------
 client/coral-ui/components/Button.css         | 10 ++++++++
 locales/en.yml                                |  1 -
 locales/es.yml                                |  1 -
 6 files changed, 18 insertions(+), 43 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/ButtonCopyToClipboard.js b/client/coral-admin/src/routes/Moderation/components/ButtonCopyToClipboard.js
index ba25d533c..5bc5767ba 100644
--- a/client/coral-admin/src/routes/Moderation/components/ButtonCopyToClipboard.js
+++ b/client/coral-admin/src/routes/Moderation/components/ButtonCopyToClipboard.js
@@ -4,29 +4,10 @@ import t from 'coral-framework/services/i18n';
 import {withCopyToClipboard} from 'coral-framework/hocs';
 
 class ButtonCopyToClipboard extends React.Component {
-
-  constructor() {
-    super();
-
-    this.state = {
-      emailCopied: false
-    };
-  }
-
-  showCopied() {
-    this.setState({
-      emailCopied: true
-    }, () => {
-      setTimeout(() => this.setState({
-        emailCopied: false
-      }), 3000);
-    });
-  }
-
   render () {
     return (
-      <Button {...this.props}>
-        {this.state.emailCopied ? t('common.copied') : t('common.copy')}
+      <Button {...this.props} >
+        {t('common.copy')}
       </Button>
     );
   }
diff --git a/client/coral-admin/src/routes/Moderation/components/UserDetail.js b/client/coral-admin/src/routes/Moderation/components/UserDetail.js
index a591d1393..791f47729 100644
--- a/client/coral-admin/src/routes/Moderation/components/UserDetail.js
+++ b/client/coral-admin/src/routes/Moderation/components/UserDetail.js
@@ -44,16 +44,6 @@ export default class UserDetail extends React.Component {
     this.props.changeStatus('rejected');
   }
 
-  showCopied() {
-    this.setState({
-      emailCopied: true
-    }, () => {
-      setTimeout(() => this.setState({
-        emailCopied: false
-      }), 3000);
-    });
-  }
-
   render () {
     const {
       root: {
@@ -95,7 +85,7 @@ export default class UserDetail extends React.Component {
 
         <div>
           {profile && <input className={styles.profileEmail} readOnly type="text" ref={(ref) => this.profile = ref} value={profile} />}
-          <ButtonCopyToClipboard className={styles.copyButton} text={profile} />
+          <ButtonCopyToClipboard className={styles.copyButton} copyText={profile} />
         </div>
 
         <Slot
diff --git a/client/coral-framework/hocs/withCopyToClipboard.js b/client/coral-framework/hocs/withCopyToClipboard.js
index 17dffd715..9e8046802 100644
--- a/client/coral-framework/hocs/withCopyToClipboard.js
+++ b/client/coral-framework/hocs/withCopyToClipboard.js
@@ -3,31 +3,27 @@ import ReactDOM from 'react-dom';
 import Clipboard from 'clipboard';
 
 export default (WrappedComponent) => {
-
-  class withCopyToClipboard extends React.Component {
+  class WithCopyToClipboard extends React.Component {
     componentDidMount() {
       const clipboard = new Clipboard(ReactDOM.findDOMNode(this));
 
       clipboard.on('success', (e) => {
-        if (this.props.onCopy) {
-          this.props.onCopy();
-        }
         e.clearSelection();
       });
     }
 
     render() {
-      const {target = '', text = '', className = '', ...rest} = this.props;
+      const {copyTarget = '', copyText = '', className = '', ...rest} = this.props;
 
       return <WrappedComponent
         className={className}
         data-clipboard-action="copy"
-        data-clipboard-text={text}
-        data-clipboard-target={target}
+        data-clipboard-text={copyText}
+        data-clipboard-target={copyTarget}
         {...rest}
       />;
     }
   }
 
-  return withCopyToClipboard;
+  return WithCopyToClipboard;
 };
diff --git a/client/coral-ui/components/Button.css b/client/coral-ui/components/Button.css
index 671c55bad..409fc1bc6 100644
--- a/client/coral-ui/components/Button.css
+++ b/client/coral-ui/components/Button.css
@@ -53,6 +53,16 @@
     color: #212121;
 }
 
+.type--local:hover {
+    background: #d6d5d5;
+    color: #212121;
+}
+
+.type--local:active {
+    background: #cccccc;
+    color: #212121;
+}
+
 .type--facebook {
     background-color: #4267b2;
     border-color: #4267b2;
diff --git a/locales/en.yml b/locales/en.yml
index 0bbf594c8..73a7e82d2 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -33,7 +33,6 @@ en:
   comment_post_notif: "Your comment has been posted."
   comment_post_notif_premod: "Thank you for posting. Our moderation team will review your comment shortly."
   common:
-    copied: 'Copied'
     copy: 'Copy'
   community:
     account_creation_date: "Account Creation Date"
diff --git a/locales/es.yml b/locales/es.yml
index 9d7e4c939..4eb1ca756 100644
--- a/locales/es.yml
+++ b/locales/es.yml
@@ -33,7 +33,6 @@ es:
   comment_post_notif: "Tu comentario ha sido publicado."
   comment_post_notif_premod: "Gracias por el comentario. Nuestro equipo de moderación va a revisarlo muy pronto."
   common:
-    copied: 'Copiado'
     copy: 'Copiar'
   community:
     account_creation_date: "Fecha de creación de la cuenta"

From 644c291d7f3c42a5d2a5f0b6dc0bd81c3fe75b85 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 20 Jun 2017 21:25:20 +0700
Subject: [PATCH 169/264] Don't cut off long comment

---
 client/coral-admin/src/routes/Moderation/components/styles.css | 2 --
 1 file changed, 2 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/styles.css b/client/coral-admin/src/routes/Moderation/components/styles.css
index 9fa343762..1d449c75f 100644
--- a/client/coral-admin/src/routes/Moderation/components/styles.css
+++ b/client/coral-admin/src/routes/Moderation/components/styles.css
@@ -190,8 +190,6 @@ span {
   }
 
   &.selected {
-    max-width: 720px;
-    max-height: 410px;
   }
 
   .context {

From 49420e152e7e2991dee0a796ee4898f2747e0bca Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 20 Jun 2017 22:30:26 +0700
Subject: [PATCH 170/264] Click outside closes TopRightMenu, detect click
 outside iframe

---
 .eslintrc.json                                |   3 +-
 .../Moderation/components/UserDetail.js       | 165 +++++++++---------
 .../{TopRightMenu.css => Toggleable.css}      |   0
 .../src/components/Toggleable.js              |  39 +++++
 .../src/components/TopRightMenu.js            |  36 +---
 client/coral-embed/src/index.js               |   5 +
 .../components/ClickOutside.js                |  35 ++++
 client/coral-plugin-flags/FlagButton.js       | 132 +++++++-------
 .../PermalinkButton.js                        |  58 +++---
 client/coral-ui/components/Drawer.js          |   9 +-
 package.json                                  |   1 -
 yarn.lock                                     |   8 +-
 12 files changed, 267 insertions(+), 224 deletions(-)
 rename client/coral-embed-stream/src/components/{TopRightMenu.css => Toggleable.css} (100%)
 create mode 100644 client/coral-embed-stream/src/components/Toggleable.js
 create mode 100644 client/coral-framework/components/ClickOutside.js

diff --git a/.eslintrc.json b/.eslintrc.json
index 2186efd8b..12355ac34 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -53,7 +53,8 @@
         "no-lonely-if": [2],
         "curly": [2],
         "no-unused-vars": ["error", {
-            "argsIgnorePattern": "next"
+            "argsIgnorePattern": "^_|next",
+            "varsIgnorePattern": "^_"
         }],
         "no-multiple-empty-lines": ["error", {
             "max": 1
diff --git a/client/coral-admin/src/routes/Moderation/components/UserDetail.js b/client/coral-admin/src/routes/Moderation/components/UserDetail.js
index abc9f4440..b45f20b78 100644
--- a/client/coral-admin/src/routes/Moderation/components/UserDetail.js
+++ b/client/coral-admin/src/routes/Moderation/components/UserDetail.js
@@ -4,6 +4,7 @@ import styles from './UserDetail.css';
 import Slot from 'coral-framework/components/Slot';
 import Comment from './Comment';
 import {actionsMap} from '../helpers/moderationQueueActionsMap';
+import ClickOutside from 'coral-framework/components/ClickOutside';
 
 export default class UserDetail extends React.Component {
 
@@ -96,92 +97,94 @@ export default class UserDetail extends React.Component {
     }
 
     return (
-      <Drawer handleClickOutside={hideUserDetail}>
-        <h3>{user.username}</h3>
-        {profile && <input className={styles.profileEmail} readOnly type="text" ref={(ref) => this.profile = ref} value={profile} />}
+      <ClickOutside onClickOutside={hideUserDetail}>
+        <Drawer onClose={hideUserDetail}>
+          <h3>{user.username}</h3>
+          {profile && <input className={styles.profileEmail} readOnly type="text" ref={(ref) => this.profile = ref} value={profile} />}
 
-        <Copy onCopy={() => this.showCopied()} text={profile} className={styles.profileEmail}>
-          <Button className={styles.copyButton}>
-            {this.state.emailCopied ? 'Copied!' : 'Copy'}
-          </Button>
-        </Copy>
+          <Copy onCopy={() => this.showCopied()} text={profile} className={styles.profileEmail}>
+            <Button className={styles.copyButton}>
+              {this.state.emailCopied ? 'Copied!' : 'Copy'}
+            </Button>
+          </Copy>
 
-        <Slot
-          fill="userProfile"
-          data={this.props.data}
-          root={this.props.root}
-          user={user}
-        />
-        <p className={styles.memberSince}><strong>Member since</strong> {new Date(user.created_at).toLocaleString()}</p>
-        <hr/>
-        <p>
-          <strong>Account summary</strong>
-          <br/><small className={styles.small}>Data represents the last six months of activity</small>
-        </p>
-        <div className={styles.stats}>
-          <div className={styles.stat}>
-            <p>Total Comments</p>
-            <p>{totalComments}</p>
-          </div>
-          <div className={styles.stat}>
-            <p>Reject Rate</p>
-            <p>{`${(rejectedPercent).toFixed(1)}%`}</p>
-          </div>
-        </div>
-        {
-          selectedIds.length === 0
-          ? (
-            <ul className={styles.commentStatuses}>
-              <li className={tab === 'all' ? styles.active : ''} onClick={this.showAll}>All</li>
-              <li className={tab === 'rejected' ? styles.active : ''} onClick={this.showRejected}>Rejected</li>
-            </ul>
-          )
-          : (
-            <div className={styles.bulkActionGroup}>
-              <Button
-                onClick={bulkAccept}
-                className={styles.bulkAction}
-                cStyle='approve'
-                icon='done'>
-              </Button>
-              <Button
-                onClick={bulkReject}
-                className={styles.bulkAction}
-                cStyle='reject'
-                icon='close'>
-              </Button>
-              {`${selectedIds.length} comments selected`}
+          <Slot
+            fill="userProfile"
+            data={this.props.data}
+            root={this.props.root}
+            user={user}
+          />
+          <p className={styles.memberSince}><strong>Member since</strong> {new Date(user.created_at).toLocaleString()}</p>
+          <hr/>
+          <p>
+            <strong>Account summary</strong>
+            <br/><small className={styles.small}>Data represents the last six months of activity</small>
+          </p>
+          <div className={styles.stats}>
+            <div className={styles.stat}>
+              <p>Total Comments</p>
+              <p>{totalComments}</p>
             </div>
-          )
-        }
-
-        <div>
+            <div className={styles.stat}>
+              <p>Reject Rate</p>
+              <p>{`${(rejectedPercent).toFixed(1)}%`}</p>
+            </div>
+          </div>
           {
-            nodes.map((comment, i) => {
-              const status = comment.action_summaries ? 'FLAGGED' : comment.status;
-              const selected = selectedIds.indexOf(comment.id) !== -1;
-              return <Comment
-                key={i}
-                index={i}
-                comment={comment}
-                selected={false}
-                suspectWords={suspectWords}
-                bannedWords={bannedWords}
-                viewUserDetail={() => {}}
-                actions={actionsMap[status]}
-                showBanUserDialog={showBanUserDialog}
-                showSuspendUserDialog={showSuspendUserDialog}
-                acceptComment={this.acceptThenReload}
-                rejectComment={this.rejectThenReload}
-                selected={selected}
-                toggleSelect={toggleSelect}
-                currentAsset={null}
-                currentUserId={this.props.id}
-                minimal={true} />;
-            })
+            selectedIds.length === 0
+            ? (
+              <ul className={styles.commentStatuses}>
+                <li className={tab === 'all' ? styles.active : ''} onClick={this.showAll}>All</li>
+                <li className={tab === 'rejected' ? styles.active : ''} onClick={this.showRejected}>Rejected</li>
+              </ul>
+            )
+            : (
+              <div className={styles.bulkActionGroup}>
+                <Button
+                  onClick={bulkAccept}
+                  className={styles.bulkAction}
+                  cStyle='approve'
+                  icon='done'>
+                </Button>
+                <Button
+                  onClick={bulkReject}
+                  className={styles.bulkAction}
+                  cStyle='reject'
+                  icon='close'>
+                </Button>
+                {`${selectedIds.length} comments selected`}
+              </div>
+            )
           }
-        </div>
-      </Drawer>
+
+          <div>
+            {
+              nodes.map((comment, i) => {
+                const status = comment.action_summaries ? 'FLAGGED' : comment.status;
+                const selected = selectedIds.indexOf(comment.id) !== -1;
+                return <Comment
+                  key={i}
+                  index={i}
+                  comment={comment}
+                  selected={false}
+                  suspectWords={suspectWords}
+                  bannedWords={bannedWords}
+                  viewUserDetail={() => {}}
+                  actions={actionsMap[status]}
+                  showBanUserDialog={showBanUserDialog}
+                  showSuspendUserDialog={showSuspendUserDialog}
+                  acceptComment={this.acceptThenReload}
+                  rejectComment={this.rejectThenReload}
+                  selected={selected}
+                  toggleSelect={toggleSelect}
+                  currentAsset={null}
+                  currentUserId={this.props.id}
+                  minimal={true} />;
+              })
+            }
+          </div>
+        </Drawer>
+      </ClickOutside>
     );
   }
 }
diff --git a/client/coral-embed-stream/src/components/TopRightMenu.css b/client/coral-embed-stream/src/components/Toggleable.css
similarity index 100%
rename from client/coral-embed-stream/src/components/TopRightMenu.css
rename to client/coral-embed-stream/src/components/Toggleable.css
diff --git a/client/coral-embed-stream/src/components/Toggleable.js b/client/coral-embed-stream/src/components/Toggleable.js
new file mode 100644
index 000000000..7dc6af5e9
--- /dev/null
+++ b/client/coral-embed-stream/src/components/Toggleable.js
@@ -0,0 +1,39 @@
+import React from 'react';
+import ClickOutside from 'coral-framework/components/ClickOutside';
+import styles from './Toggleable.css';
+import classnames from 'classnames';
+
+const upArrow = <span className={classnames(styles.chevron, styles.up)}></span>;
+const downArrow = <span className={classnames(styles.chevron, styles.down)}></span>;
+export default class Toggleable extends React.Component {
+  constructor(props) {
+    super(props);
+    this.toggle = this.toggle.bind(this);
+    this.close = this.close.bind(this);
+    this.state = {
+      isOpen: false
+    };
+  }
+  toggle() {
+    this.setState({isOpen: !this.state.isOpen});
+  }
+
+  close = () => {
+    this.setState({isOpen: false});
+  }
+
+  render() {
+    const {children} = this.props;
+    const {isOpen} = this.state;
+    return (
+      <ClickOutside onClickOutside={this.close}>
+        <span className={styles.Toggleable} tabIndex="0" >
+          <span className={styles.toggler}
+                onClick={this.toggle}>{isOpen ? upArrow : downArrow}</span>
+          {isOpen ? children : null}
+        </span>
+      </ClickOutside>
+    );
+  }
+}
+
diff --git a/client/coral-embed-stream/src/components/TopRightMenu.js b/client/coral-embed-stream/src/components/TopRightMenu.js
index 84d64f061..d65722b6d 100644
--- a/client/coral-embed-stream/src/components/TopRightMenu.js
+++ b/client/coral-embed-stream/src/components/TopRightMenu.js
@@ -1,8 +1,6 @@
 import React, {PropTypes} from 'react';
-import classnames from 'classnames';
-
 import {IgnoreUserWizard} from './IgnoreUserWizard';
-import styles from './TopRightMenu.css';
+import Toggleable from './Toggleable';
 
 // TopRightMenu appears as a dropdown in the top right of the comment.
 // when you click the down cehvron, it expands and shows IgnoreUserWizard
@@ -56,38 +54,6 @@ export class TopRightMenu extends React.Component {
             />
         </div>
       </Toggleable>
-    );        
-  }
-}
-
-const upArrow = <span className={classnames(styles.chevron, styles.up)}></span>;
-const downArrow = <span className={classnames(styles.chevron, styles.down)}></span>;
-class Toggleable extends React.Component {
-  constructor(props) {
-    super(props);
-    this.toggle = this.toggle.bind(this);
-    this.close = this.close.bind(this);
-    this.state = {
-      isOpen: false
-    };
-  }
-  toggle() {
-    this.setState({isOpen: !this.state.isOpen});
-  }
-  close() {
-    this.setState({isOpen: false});
-  }
-  render() {
-    const {children} = this.props;
-    const {isOpen} = this.state;
-    return (
-
-      // /*onBlur={ this.close } */
-      <span className={styles.Toggleable} tabIndex="0" >
-        <span className={styles.toggler}
-              onClick={this.toggle}>{isOpen ? upArrow : downArrow}</span>
-        {isOpen ? children : null}
-      </span>
     );
   }
 }
diff --git a/client/coral-embed/src/index.js b/client/coral-embed/src/index.js
index 14de2756e..5b42fa541 100644
--- a/client/coral-embed/src/index.js
+++ b/client/coral-embed/src/index.js
@@ -73,6 +73,11 @@ function configurePymParent(pymParent, opts) {
 
   window.document.body.appendChild(snackbar);
 
+  // Notify embed that there was a click outside.
+  document.addEventListener('click', () => {
+    pymParent.sendMessage('click');
+  }, true);
+
   // Workaround: IOS Safari ignores `width` but respects `min-width` value.
   pymParent.el.firstChild.style.width = '1px';
   pymParent.el.firstChild.style.minWidth = '100%';
diff --git a/client/coral-framework/components/ClickOutside.js b/client/coral-framework/components/ClickOutside.js
new file mode 100644
index 000000000..e13ef4472
--- /dev/null
+++ b/client/coral-framework/components/ClickOutside.js
@@ -0,0 +1,35 @@
+import {Component, cloneElement, Children} from 'react';
+import PropTypes from 'prop-types';
+import {findDOMNode} from 'react-dom';
+import {pym} from 'coral-framework';
+
+export default class ClickOutside extends Component {
+  static propTypes = {
+    onClickOutside: PropTypes.func.isRequired
+  };
+
+  domNode = null;
+
+  handleClick = (e) => {
+    const {onClickOutside} = this.props;
+    if (!e || !this.domNode.contains(e.target)) {
+      onClickOutside(e);
+    }
+  };
+
+  componentDidMount() {
+    this.domNode = findDOMNode(this);
+    document.addEventListener('click', this.handleClick, true);
+    pym.onMessage('click', this.handleClick);
+  }
+
+  componentWillUnmount() {
+    document.removeEventListener('click', this.handleClick, true);
+    pym.messageHandlers.click = pym.messageHandlers.click.filter((h) => h !== this.handleClick);
+  }
+
+  render() {
+    const {children, onClickOutside: _, ...rest} = this.props;
+    return cloneElement(Children.only(children), rest);
+  }
+}
diff --git a/client/coral-plugin-flags/FlagButton.js b/client/coral-plugin-flags/FlagButton.js
index 73ed50e9c..e8a17f201 100644
--- a/client/coral-plugin-flags/FlagButton.js
+++ b/client/coral-plugin-flags/FlagButton.js
@@ -4,11 +4,11 @@ import t from 'coral-framework/services/i18n';
 import {can} from 'coral-framework/services/perms';
 
 import {PopupMenu, Button} from 'coral-ui';
-import onClickOutside from 'react-onclickoutside';
+import ClickOutside from 'coral-framework/components/ClickOutside';
 
 const name = 'coral-plugin-flags';
 
-class FlagButton extends Component {
+export default class FlagButton extends Component {
 
   state = {
     showMenu: false,
@@ -128,7 +128,7 @@ class FlagButton extends Component {
     this.setState({message: e.target.value});
   }
 
-  handleClickOutside () {
+  handleClickOutside = () => {
     this.closeMenu();
   }
 
@@ -138,79 +138,81 @@ class FlagButton extends Component {
     const flagged = flaggedByCurrentUser || localPost;
     const popupMenu = getPopupMenu[this.state.step](this.state.itemType);
 
-    return <div className={`${name}-container`}>
-      <button
-        ref={(ref) => this.flagButton = ref}
-        onClick={!this.props.banned && !flaggedByCurrentUser && !localPost ? this.onReportClick : null}
-        className={`${name}-button`}>
-        {
-          flagged
-          ? <span className={`${name}-button-text`}>{t('reported')}</span>
-          : <span className={`${name}-button-text`}>{t('report')}</span>
-        }
-        <i className={`${name}-icon material-icons ${flagged && 'flaggedIcon'}`}
-          style={flagged ? styles.flaggedIcon : {}}
-          aria-hidden={true}>flag</i>
-      </button>
-      {
-        this.state.showMenu &&
-        <div className={`${name}-popup`} ref={(ref) => this.popup = ref}>
-          <PopupMenu>
-            <div className={`${name}-popup-header`}>{popupMenu.header}</div>
+    return (
+      <ClickOutside onClickOutside={this.handleClickOutside}>
+        <div className={`${name}-container`}>
+          <button
+            ref={(ref) => this.flagButton = ref}
+            onClick={!this.props.banned && !flaggedByCurrentUser && !localPost ? this.onReportClick : null}
+            className={`${name}-button`}>
             {
-              popupMenu.text &&
-              <div className={`${name}-popup-text`}>{popupMenu.text}</div>
+              flagged
+              ? <span className={`${name}-button-text`}>{t('reported')}</span>
+              : <span className={`${name}-button-text`}>{t('report')}</span>
             }
-            {
-              popupMenu.options && <form className={`${name}-popup-form`}>
+            <i className={`${name}-icon material-icons ${flagged && 'flaggedIcon'}`}
+              style={flagged ? styles.flaggedIcon : {}}
+              aria-hidden={true}>flag</i>
+          </button>
+          {
+            this.state.showMenu &&
+            <div className={`${name}-popup`} ref={(ref) => this.popup = ref}>
+              <PopupMenu>
+                <div className={`${name}-popup-header`}>{popupMenu.header}</div>
                 {
-                  popupMenu.options.map((option) =>
-                    <div key={option.val}>
-                      <input
-                        className={`${name}-popup-radio`}
-                        type="radio"
-                        id={option.val}
-                        checked={this.state[popupMenu.sets] === option.val}
-                        onClick={this.onPopupOptionClick(popupMenu.sets)}
-                        value={option.val}/>
-                      <label htmlFor={option.val} className={`${name}-popup-radio-label`}>{option.text}</label><br/>
-                    </div>
-                  )
+                  popupMenu.text &&
+                  <div className={`${name}-popup-text`}>{popupMenu.text}</div>
                 }
                 {
-                  this.state.reason && <div>
-                  <label htmlFor={'message'} className={`${name}-popup-radio-label`}>
-                    {t('flag_reason')}
-                  </label><br/>
-                  <textarea
-                      className={`${name}-reason-text`}
-                      id="message"
-                      rows={4}
-                      onChange={this.onNoteTextChange}
-                      value={this.state.message}/>
-                  </div>
+                  popupMenu.options && <form className={`${name}-popup-form`}>
+                    {
+                      popupMenu.options.map((option) =>
+                        <div key={option.val}>
+                          <input
+                            className={`${name}-popup-radio`}
+                            type="radio"
+                            id={option.val}
+                            checked={this.state[popupMenu.sets] === option.val}
+                            onClick={this.onPopupOptionClick(popupMenu.sets)}
+                            value={option.val}/>
+                          <label htmlFor={option.val} className={`${name}-popup-radio-label`}>{option.text}</label><br/>
+                        </div>
+                      )
+                    }
+                    {
+                      this.state.reason && <div>
+                      <label htmlFor={'message'} className={`${name}-popup-radio-label`}>
+                        {t('flag_reason')}
+                      </label><br/>
+                      <textarea
+                          className={`${name}-reason-text`}
+                          id="message"
+                          rows={4}
+                          onChange={this.onNoteTextChange}
+                          value={this.state.message}/>
+                      </div>
+                    }
+                  </form>
                 }
-              </form>
-            }
-            <div className={`${name}-popup-counter`}>
-              {this.state.step + 1} of {getPopupMenu.length}
+                <div className={`${name}-popup-counter`}>
+                  {this.state.step + 1} of {getPopupMenu.length}
+                </div>
+                {
+                  popupMenu.button && <Button
+                  className={`${name}-popup-button`}
+                  onClick={this.onPopupContinue}>
+                    {popupMenu.button}
+                  </Button>
+                }
+              </PopupMenu>
             </div>
-            {
-              popupMenu.button && <Button
-              className={`${name}-popup-button`}
-              onClick={this.onPopupContinue}>
-                {popupMenu.button}
-              </Button>
-            }
-          </PopupMenu>
+          }
         </div>
-      }
-    </div>;
+      </ClickOutside>
+    );
   }
 }
 
-export default onClickOutside(FlagButton);
-
 const styles = {
   flaggedIcon: {
     color: '#F00'
diff --git a/client/coral-plugin-permalinks/PermalinkButton.js b/client/coral-plugin-permalinks/PermalinkButton.js
index 8cab70b0d..3d6df996f 100644
--- a/client/coral-plugin-permalinks/PermalinkButton.js
+++ b/client/coral-plugin-permalinks/PermalinkButton.js
@@ -1,12 +1,12 @@
 import React, {PropTypes} from 'react';
-import onClickOutside from 'react-onclickoutside';
 const name = 'coral-plugin-permalinks';
 import {Button} from 'coral-ui';
 import styles from './styles.css';
+import ClickOutside from 'coral-framework/components/ClickOutside';
 
 import t from 'coral-framework/services/i18n';
 
-class PermalinkButton extends React.Component {
+export default class PermalinkButton extends React.Component {
 
   static propTypes = {
     articleURL: PropTypes.string.isRequired,
@@ -28,7 +28,7 @@ class PermalinkButton extends React.Component {
     this.setState({popoverOpen: !this.state.popoverOpen});
   }
 
-  handleClickOutside () {
+  handleClickOutside = () => {
     this.setState({popoverOpen: false});
   }
 
@@ -49,33 +49,33 @@ class PermalinkButton extends React.Component {
   render () {
     const {copySuccessful, copyFailure} = this.state;
     return (
-      <div className={`${name}-container`}>
-        <button
-          ref={(ref) => this.linkButton = ref}
-          onClick={this.toggle}
-          className={`${name}-button`}>
-          {t('permalink')}
-          <i className={`${name}-icon material-icons`} aria-hidden={true}>link</i>
-        </button>
-        <div
-          ref={(ref) => this.popover = ref}
-          className={`${name}-popover ${styles.container} ${this.state.popoverOpen ? 'active' : ''}`}>
-          <input
-            className={`${name}-copy-field`}
-            type='text'
-            ref={(input) => this.permalinkInput = input}
-            value={`${this.props.articleURL}#${this.props.commentId}`}
-            onChange={() => {}} />
-          <Button className={`${name}-copy-button ${copySuccessful ? styles.success : ''} ${copyFailure ? styles.failure : ''}`}
-                  onClick={this.copyPermalink} >
-            {!copyFailure && !copySuccessful && 'Copy'}
-            {copySuccessful && 'Copied'}
-            {copyFailure && 'Not supported'}
-          </Button>
+      <ClickOutside onClickOutside={this.handleClickOutside}>
+        <div className={`${name}-container`}>
+          <button
+            ref={(ref) => this.linkButton = ref}
+            onClick={this.toggle}
+            className={`${name}-button`}>
+            {t('permalink')}
+            <i className={`${name}-icon material-icons`} aria-hidden={true}>link</i>
+          </button>
+          <div
+            ref={(ref) => this.popover = ref}
+            className={`${name}-popover ${styles.container} ${this.state.popoverOpen ? 'active' : ''}`}>
+            <input
+              className={`${name}-copy-field`}
+              type='text'
+              ref={(input) => this.permalinkInput = input}
+              value={`${this.props.articleURL}#${this.props.commentId}`}
+              onChange={() => {}} />
+            <Button className={`${name}-copy-button ${copySuccessful ? styles.success : ''} ${copyFailure ? styles.failure : ''}`}
+                    onClick={this.copyPermalink} >
+              {!copyFailure && !copySuccessful && 'Copy'}
+              {copySuccessful && 'Copied'}
+              {copyFailure && 'Not supported'}
+            </Button>
+          </div>
         </div>
-      </div>
+      </ClickOutside>
     );
   }
 }
-
-export default onClickOutside(PermalinkButton);
diff --git a/client/coral-ui/components/Drawer.js b/client/coral-ui/components/Drawer.js
index e9ebed92c..3c4f051bd 100644
--- a/client/coral-ui/components/Drawer.js
+++ b/client/coral-ui/components/Drawer.js
@@ -1,11 +1,10 @@
 import React, {PropTypes} from 'react';
 import styles from './Drawer.css';
-import onClickOutside from 'react-onclickoutside';
 
-const Drawer = ({children, handleClickOutside}) => {
+const Drawer = ({children, onClose}) => {
   return (
     <div className={styles.drawer}>
-      <div className={styles.closeButton} onClick={handleClickOutside}>×</div>
+      <div className={styles.closeButton} onClick={onClose}>×</div>
       <div className={styles.content}>
         {children}
       </div>
@@ -15,7 +14,7 @@ const Drawer = ({children, handleClickOutside}) => {
 
 Drawer.propTypes = {
   active: PropTypes.bool,
-  handleClickOutside: PropTypes.func.isRequired
+  onClose: PropTypes.func.isRequired
 };
 
-export default onClickOutside(Drawer);
+export default Drawer;
diff --git a/package.json b/package.json
index fe0bd6117..a33a6348b 100644
--- a/package.json
+++ b/package.json
@@ -192,7 +192,6 @@
     "react-linkify": "^0.1.3",
     "react-mdl": "^1.7.2",
     "react-mdl-selectfield": "^0.2.0",
-    "react-onclickoutside": "^5.11.1",
     "react-redux": "^4.4.5",
     "react-router": "^3.0.0",
     "react-tagsinput": "^3.14.0",
diff --git a/yarn.lock b/yarn.lock
index c298f6063..4f99143d0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2041,7 +2041,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.2:
     create-hash "^1.1.0"
     inherits "^2.0.1"
 
-create-react-class@^15.5.1, create-react-class@^15.5.x:
+create-react-class@^15.5.1:
   version "15.5.2"
   resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.5.2.tgz#6a8758348df660b88326a0e764d569f274aad681"
   dependencies:
@@ -6900,12 +6900,6 @@ react-mdl@^1.7.1, react-mdl@^1.7.2:
     lodash.isequal "^4.4.0"
     prop-types "^15.5.0"
 
-react-onclickoutside@^5.11.1:
-  version "5.11.1"
-  resolved "https://registry.yarnpkg.com/react-onclickoutside/-/react-onclickoutside-5.11.1.tgz#00314e52567cf55faba94cabbacd119619070623"
-  dependencies:
-    create-react-class "^15.5.x"
-
 react-recaptcha@^2.2.6:
   version "2.2.6"
   resolved "https://registry.yarnpkg.com/react-recaptcha/-/react-recaptcha-2.2.6.tgz#bb44c1948a39b37d5a41920c73db833e5d8524f9"

From fc14e9d2fd97b4c0e61328fdbbf98df502e6a7d8 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Wed, 21 Jun 2017 01:27:01 +0700
Subject: [PATCH 171/264] Prevent double execution of fetchMore

---
 .../Moderation/components/ModerationQueue.js  | 11 +++++++-
 .../src/components/Comment.js                 | 26 ++++++++++++++-----
 .../src/components/LoadMore.js                | 12 +++++----
 .../src/components/Stream.js                  | 16 +++++++++++-
 4 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/ModerationQueue.js b/client/coral-admin/src/routes/Moderation/components/ModerationQueue.js
index 490c2a985..d656c7a82 100644
--- a/client/coral-admin/src/routes/Moderation/components/ModerationQueue.js
+++ b/client/coral-admin/src/routes/Moderation/components/ModerationQueue.js
@@ -8,6 +8,7 @@ import LoadMore from './LoadMore';
 import t from 'coral-framework/services/i18n';
 
 class ModerationQueue extends React.Component {
+  isLoadingMore = false;
 
   static propTypes = {
     viewUserDetail: PropTypes.func.isRequired,
@@ -22,7 +23,15 @@ class ModerationQueue extends React.Component {
   }
 
   loadMore = () => {
-    this.props.loadMore(this.props.activeTab);
+    if (!this.isLoadingMore) {
+      this.isLoadingMore = true;
+      this.props.loadMore(this.props.activeTab)
+        .then(() => this.isLoadingMore = false)
+        .catch((e) => {
+          this.isLoadingMore = false;
+          throw e;
+        });
+    }
   }
 
   componentDidUpdate (prev) {
diff --git a/client/coral-embed-stream/src/components/Comment.js b/client/coral-embed-stream/src/components/Comment.js
index f14e4c991..53ac52edf 100644
--- a/client/coral-embed-stream/src/components/Comment.js
+++ b/client/coral-embed-stream/src/components/Comment.js
@@ -75,6 +75,8 @@ const ActionButton = ({children}) => {
 };
 
 export default class Comment extends React.Component {
+  isLoadingReplies = false;
+
   constructor(props) {
     super(props);
 
@@ -210,14 +212,24 @@ export default class Comment extends React.Component {
   }
 
   loadNewReplies = () => {
-    const {replies, replyCount, id} = this.props.comment;
-    if (replyCount > replies.nodes.length) {
-      this.props.loadMore(id).then(() => {
-        this.setState(resetCursors(this.state, this.props));
-      });
-      return;
+    if (!this.isLoadingReplies) {
+      this.isLoadingReplies = true;
+      const {replies, replyCount, id} = this.props.comment;
+      if (replyCount > replies.nodes.length) {
+        this.props.loadMore(id)
+          .then(() => {
+            this.setState(resetCursors(this.state, this.props));
+            this.isLoadingReplies = false;
+          })
+          .catch((e) => {
+            this.isLoadingReplies = false;
+            throw e;
+          });
+        return;
+      }
+      this.setState(resetCursors);
+      this.isLoadingReplies = false;
     }
-    this.setState(resetCursors);
   };
 
   showReplyBox = () => {
diff --git a/client/coral-embed-stream/src/components/LoadMore.js b/client/coral-embed-stream/src/components/LoadMore.js
index ca2816d10..3d1ad4679 100644
--- a/client/coral-embed-stream/src/components/LoadMore.js
+++ b/client/coral-embed-stream/src/components/LoadMore.js
@@ -23,15 +23,17 @@ class LoadMore extends React.Component {
     }
   }
 
+  loadMore = () => {
+    this.initialState = false;
+    this.props.loadMore();
+  }
+
   render () {
-    const {topLevel, moreComments, loadMore, replyCount} = this.props;
+    const {topLevel, moreComments, replyCount} = this.props;
     return moreComments
       ? <div className='coral-load-more'>
         <Button
-          onClick={() => {
-            this.initialState = false;
-            loadMore();
-          }}>
+          onClick={this.loadMore}>
           {topLevel ? t('framework.view_more_comments') : this.replyCountFormat(replyCount)}
         </Button>
       </div>
diff --git a/client/coral-embed-stream/src/components/Stream.js b/client/coral-embed-stream/src/components/Stream.js
index 62a58129b..4519f6417 100644
--- a/client/coral-embed-stream/src/components/Stream.js
+++ b/client/coral-embed-stream/src/components/Stream.js
@@ -53,6 +53,8 @@ function invalidateCursor(invalidated, state, props) {
 
 class Stream extends React.Component {
 
+  isLoadingMoreMore = false;
+
   constructor(props) {
     super(props);
     this.state = resetCursors(this.state, props);
@@ -95,6 +97,18 @@ class Stream extends React.Component {
     }
   };
 
+  loadMoreComments = () => {
+    if (!this.isLoadingMore) {
+      this.isLoadingMore = true;
+      this.props.loadMoreComments()
+        .then(() => this.isLoadingMore = false)
+        .catch((e) => {
+          this.isLoadingMore = false;
+          throw e;
+        });
+    }
+  }
+
   // getVisibileComments returns a list containing comments
   // which were authored by current user or comes after the `idCursor`.
   getVisibleComments() {
@@ -288,7 +302,7 @@ class Stream extends React.Component {
               <LoadMore
                 topLevel={true}
                 moreComments={asset.comments.hasNextPage}
-                loadMore={this.props.loadMoreComments}
+                loadMore={this.loadMoreComments}
               />
             </div>}
       </div>

From 706a12d2e2854e7d60559baafc82ce29eda17dab Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Wed, 21 Jun 2017 02:48:59 +0700
Subject: [PATCH 172/264] No MoreMore

---
 client/coral-embed-stream/src/components/Stream.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-embed-stream/src/components/Stream.js b/client/coral-embed-stream/src/components/Stream.js
index 4519f6417..f6c67fd8d 100644
--- a/client/coral-embed-stream/src/components/Stream.js
+++ b/client/coral-embed-stream/src/components/Stream.js
@@ -53,7 +53,7 @@ function invalidateCursor(invalidated, state, props) {
 
 class Stream extends React.Component {
 
-  isLoadingMoreMore = false;
+  isLoadingMore = false;
 
   constructor(props) {
     super(props);

From 79346738d733d903a0bb0b911cbace9c28465027 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Wed, 21 Jun 2017 13:01:23 +0100
Subject: [PATCH 173/264] Have Moderate this Stream link also default to All

---
 client/coral-plugin-moderation/ModerationLink.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-plugin-moderation/ModerationLink.js b/client/coral-plugin-moderation/ModerationLink.js
index 020b8c345..7239cc793 100644
--- a/client/coral-plugin-moderation/ModerationLink.js
+++ b/client/coral-plugin-moderation/ModerationLink.js
@@ -5,7 +5,7 @@ import t from 'coral-framework/services/i18n';
 
 const ModerationLink = (props) => props.isAdmin ? (
     <div className={styles.moderationLink}>
-      <a href={`/admin/moderate/${props.assetId}`} target="_blank">
+      <a href={`/admin/moderate/all/${props.assetId}`} target="_blank">
         {t('moderate_this_stream')}
       </a>
     </div>

From 9815248b8d867f3b24eead3d64f23c8012e2e475 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Wed, 21 Jun 2017 19:17:48 +0700
Subject: [PATCH 174/264] Prevent errors being swallowed

---
 client/coral-admin/src/actions/assets.js    | 30 ++++++++-----
 client/coral-admin/src/actions/auth.js      | 16 +++++--
 client/coral-admin/src/actions/community.js | 15 ++++---
 client/coral-admin/src/actions/install.js   | 18 +++++---
 client/coral-admin/src/actions/settings.js  |  9 +++-
 client/coral-admin/src/actions/users.js     | 25 ++++++++---
 client/coral-framework/actions/asset.js     | 12 ++++--
 client/coral-framework/actions/auth.js      | 47 ++++++++++++---------
 client/coral-framework/actions/user.js      |  6 ++-
 9 files changed, 119 insertions(+), 59 deletions(-)

diff --git a/client/coral-admin/src/actions/assets.js b/client/coral-admin/src/actions/assets.js
index 8a18a8e3f..369305dc8 100644
--- a/client/coral-admin/src/actions/assets.js
+++ b/client/coral-admin/src/actions/assets.js
@@ -9,6 +9,7 @@ import {
 } from '../constants/assets';
 
 import coralApi from '../../../coral-framework/helpers/request';
+import t from 'coral-framework/services/i18n';
 
 /**
  * Action disptacher related to assets
@@ -18,23 +19,30 @@ import coralApi from '../../../coral-framework/helpers/request';
 // Get comments to fill each of the three lists on the mod queue
 export const fetchAssets = (skip = '', limit = '', search = '', sort = '', filter = '') => (dispatch) => {
   dispatch({type: FETCH_ASSETS_REQUEST});
-  return coralApi(`/assets?skip=${skip}&limit=${limit}&sort=${sort}&search=${search}&filter=${filter}`)
-  .then(({result, count}) =>
-    dispatch({type: FETCH_ASSETS_SUCCESS,
-      assets: result,
-      count
-    }))
-    .catch((error) => dispatch({type: FETCH_ASSETS_FAILURE, error}));
+  coralApi(`/assets?skip=${skip}&limit=${limit}&sort=${sort}&search=${search}&filter=${filter}`)
+    .then(({result, count}) =>
+      dispatch({type: FETCH_ASSETS_SUCCESS,
+        assets: result,
+        count
+      }))
+    .catch((error) => {
+      console.error(error);
+      const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString();
+      dispatch({type: FETCH_ASSETS_FAILURE, error: errorMessage});
+    });
 };
 
 // Update an asset state
 // Get comments to fill each of the three lists on the mod queue
 export const updateAssetState = (id, closedAt) => (dispatch) => {
   dispatch({type: UPDATE_ASSET_STATE_REQUEST});
-  return coralApi(`/assets/${id}/status`, {method: 'PUT', body: {closedAt}})
-  .then(() =>
-    dispatch({type: UPDATE_ASSET_STATE_SUCCESS}))
-    .catch((error) => dispatch({type: UPDATE_ASSET_STATE_FAILURE, error}));
+  coralApi(`/assets/${id}/status`, {method: 'PUT', body: {closedAt}})
+    .then(() => dispatch({type: UPDATE_ASSET_STATE_SUCCESS}))
+    .catch((error) => {
+      console.error(error);
+      const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString();
+      dispatch({type: UPDATE_ASSET_STATE_FAILURE, error: errorMessage});
+    });
 };
 
 export const updateAssets = (assets) => (dispatch) => {
diff --git a/client/coral-admin/src/actions/auth.js b/client/coral-admin/src/actions/auth.js
index 3a9e282ff..975865eef 100644
--- a/client/coral-admin/src/actions/auth.js
+++ b/client/coral-admin/src/actions/auth.js
@@ -4,6 +4,7 @@ import coralApi from 'coral-framework/helpers/request';
 import * as Storage from 'coral-framework/helpers/storage';
 import {handleAuthToken} from 'coral-framework/actions/auth';
 import {resetWebsocket} from 'coral-framework/services/client';
+import t from 'coral-framework/services/i18n';
 
 //==============================================================================
 // SIGN IN
@@ -41,6 +42,7 @@ export const handleLogin = (email, password, recaptchaResponse) => (dispatch) =>
       dispatch(checkLoginSuccess(user));
     })
     .catch((error) => {
+      console.error(error);
       if (error.translation_key === 'LOGIN_MAXIMUM_EXCEEDED') {
         dispatch({
           type: actions.LOGIN_MAXIMUM_EXCEEDED,
@@ -64,8 +66,9 @@ const forgotPassowordSuccess = () => ({
   type: actions.FETCH_FORGOT_PASSWORD_SUCCESS
 });
 
-const forgotPassowordFailure = () => ({
-  type: actions.FETCH_FORGOT_PASSWORD_FAILURE
+const forgotPassowordFailure = (error) => ({
+  type: actions.FETCH_FORGOT_PASSWORD_FAILURE,
+  error,
 });
 
 export const requestPasswordReset = (email) => (dispatch) => {
@@ -74,7 +77,11 @@ export const requestPasswordReset = (email) => (dispatch) => {
 
   return coralApi('/account/password/reset', {method: 'POST', body: {email,  loc: redirectUri}})
     .then(() => dispatch(forgotPassowordSuccess()))
-    .catch((error) => dispatch(forgotPassowordFailure(error)));
+    .catch((error) => {
+      console.error(error);
+      const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString();
+      dispatch(forgotPassowordFailure(errorMessage));
+    });
 };
 
 //==============================================================================
@@ -112,6 +119,7 @@ export const checkLogin = () => (dispatch) => {
     })
     .catch((error) => {
       console.error(error);
-      dispatch(checkLoginFailure(`${error.translation_key}`));
+      const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString();
+      dispatch(checkLoginFailure(errorMessage));
     });
 };
diff --git a/client/coral-admin/src/actions/community.js b/client/coral-admin/src/actions/community.js
index 36b9ffb0a..826594868 100644
--- a/client/coral-admin/src/actions/community.js
+++ b/client/coral-admin/src/actions/community.js
@@ -15,6 +15,7 @@ import {
 } from '../constants/community';
 
 import coralApi from '../../../coral-framework/helpers/request';
+import t from 'coral-framework/services/i18n';
 
 export const fetchAccounts = (query = {}) => (dispatch) => {
 
@@ -30,7 +31,11 @@ export const fetchAccounts = (query = {}) => (dispatch) => {
         totalPages
       });
     })
-    .catch((error) => dispatch({type: FETCH_COMMENTERS_FAILURE, error}));
+    .catch((error) => {
+      console.error(error);
+      const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString();
+      dispatch({type: FETCH_COMMENTERS_FAILURE, error: errorMessage});
+    });
 };
 
 const requestFetchAccounts = () => ({
@@ -48,16 +53,16 @@ export const newPage = () => ({
 
 export const setRole = (id, role) => (dispatch) => {
 
-  return coralApi(`/users/${id}/role`, {method: 'POST', body: {role}})
+  coralApi(`/users/${id}/role`, {method: 'POST', body: {role}})
   .then(() => {
-    return dispatch({type: SET_ROLE, id, role});
+    dispatch({type: SET_ROLE, id, role});
   });
 };
 
 export const setCommenterStatus = (id, status) => (dispatch) => {
-  return coralApi(`/users/${id}/status`, {method: 'POST', body: {status}})
+  coralApi(`/users/${id}/status`, {method: 'POST', body: {status}})
   .then(() => {
-    return dispatch({type: SET_COMMENTER_STATUS, id, status});
+    dispatch({type: SET_COMMENTER_STATUS, id, status});
   });
 };
 
diff --git a/client/coral-admin/src/actions/install.js b/client/coral-admin/src/actions/install.js
index 15413e220..a575557d6 100644
--- a/client/coral-admin/src/actions/install.js
+++ b/client/coral-admin/src/actions/install.js
@@ -2,6 +2,7 @@ import coralApi from 'coral-framework/helpers/request';
 import * as actions from '../constants/install';
 import validate from 'coral-framework/helpers/validate';
 import errorMsj from 'coral-framework/helpers/error';
+import t from 'coral-framework/services/i18n';
 
 export const nextStep = () => ({type: actions.NEXT_STEP});
 export const previousStep = () => ({type: actions.PREVIOUS_STEP});
@@ -17,7 +18,8 @@ const clearErrors = () => ({type: actions.CLEAR_ERRORS});
 
 const validation = (formData, dispatch, next) => {
   if (!(formData != null)) {
-    return dispatch(hasError());
+    dispatch(hasError());
+    return;
   }
 
   const validKeys = Object.keys(formData)
@@ -40,7 +42,8 @@ const validation = (formData, dispatch, next) => {
   });
 
   if (empty.length) {
-    return dispatch(hasError());
+    dispatch(hasError());
+    return;
   }
 
   // RegExp Validation
@@ -59,7 +62,8 @@ const validation = (formData, dispatch, next) => {
     });
 
   if (validation.length) {
-    return dispatch(hasError());
+    dispatch(hasError());
+    return;
   }
 
   dispatch(clearErrors());
@@ -83,14 +87,15 @@ export const submitUser = () => (dispatch, getState) => {
 export const finishInstall = () => (dispatch, getState) => {
   const data = getState().install.toJS().data;
   dispatch(installRequest());
-  return coralApi('/setup', {method: 'POST', body: data})
+  coralApi('/setup', {method: 'POST', body: data})
     .then(() => {
       dispatch(installSuccess());
       dispatch(nextStep());
     })
     .catch((error) => {
       console.error(error);
-      dispatch(installFailure(`${error.translation_key}`));
+      const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString();
+      dispatch(installFailure(errorMessage));
     });
 };
 
@@ -113,6 +118,7 @@ export const checkInstall = (next) => (dispatch) => {
     })
     .catch((error) => {
       console.error(error);
-      dispatch(checkInstallFailure(`${error.translation_key}`));
+      const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString();
+      dispatch(checkInstallFailure(errorMessage));
     });
 };
diff --git a/client/coral-admin/src/actions/settings.js b/client/coral-admin/src/actions/settings.js
index 65c200420..ba8b917ea 100644
--- a/client/coral-admin/src/actions/settings.js
+++ b/client/coral-admin/src/actions/settings.js
@@ -1,4 +1,5 @@
 import coralApi from '../../../coral-framework/helpers/request';
+import t from 'coral-framework/services/i18n';
 
 export const SETTINGS_LOADING = 'SETTINGS_LOADING';
 export const SETTINGS_RECEIVED = 'SETTINGS_RECEIVED';
@@ -20,7 +21,9 @@ export const fetchSettings = () => (dispatch) => {
       dispatch({type: SETTINGS_RECEIVED, settings});
     })
     .catch((error) => {
-      dispatch({type: SETTINGS_FETCH_ERROR, error});
+      console.error(error);
+      const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString();
+      dispatch({type: SETTINGS_FETCH_ERROR, error: errorMessage});
     });
 };
 
@@ -49,6 +52,8 @@ export const saveSettingsToServer = () => (dispatch, getState) => {
       dispatch({type: SAVE_SETTINGS_SUCCESS, settings});
     })
     .catch((error) => {
-      dispatch({type: SAVE_SETTINGS_FAILED, error});
+      console.error(error);
+      const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString();
+      dispatch({type: SAVE_SETTINGS_FAILED, error: errorMessage});
     });
 };
diff --git a/client/coral-admin/src/actions/users.js b/client/coral-admin/src/actions/users.js
index e888d5b74..27f2cf34f 100644
--- a/client/coral-admin/src/actions/users.js
+++ b/client/coral-admin/src/actions/users.js
@@ -1,5 +1,6 @@
 import coralApi from '../../../coral-framework/helpers/request';
 import * as userTypes from '../constants/users';
+import t from 'coral-framework/services/i18n';
 
 /**
  * Action disptacher related to users
@@ -8,24 +9,36 @@ import * as userTypes from '../constants/users';
 export const userStatusUpdate = (status, userId, commentId) => {
   return (dispatch) => {
     dispatch({type: userTypes.UPDATE_STATUS_REQUEST});
-    return coralApi(`/users/${userId}/status`, {method: 'POST', body: {status: status, comment_id: commentId}})
+    coralApi(`/users/${userId}/status`, {method: 'POST', body: {status: status, comment_id: commentId}})
       .then((res) => dispatch({type: userTypes.UPDATE_STATUS_SUCCESS, res}))
-      .catch((error) => dispatch({type: userTypes.UPDATE_STATUS_FAILURE, error}));
+      .catch((error) => {
+        console.error(error);
+        const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString();
+        dispatch({type: userTypes.UPDATE_STATUS_FAILURE, error: errorMessage});
+      });
   };
 };
 
 // change status of a user
 export const sendNotificationEmail = (userId, subject, body) => {
   return (dispatch) => {
-    return coralApi(`/users/${userId}/email`, {method: 'POST', body: {subject, body}})
-      .catch((error) => dispatch({type: userTypes.USER_EMAIL_FAILURE, error}));
+    coralApi(`/users/${userId}/email`, {method: 'POST', body: {subject, body}})
+      .catch((error) => {
+        console.error(error);
+        const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString();
+        dispatch({type: userTypes.USER_EMAIL_FAILURE, error: errorMessage});
+      });
   };
 };
 
 // let a user edit their username
 export const enableUsernameEdit = (userId) => {
   return (dispatch) => {
-    return coralApi(`/users/${userId}/username-enable`, {method: 'POST'})
-      .catch((error) => dispatch({type: userTypes.USERNAME_ENABLE_FAILURE, error}));
+    coralApi(`/users/${userId}/username-enable`, {method: 'POST'})
+      .catch((error) => {
+        console.error(error);
+        const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString();
+        dispatch({type: userTypes.USERNAME_ENABLE_FAILURE, error: errorMessage});
+      });
   };
 };
diff --git a/client/coral-framework/actions/asset.js b/client/coral-framework/actions/asset.js
index d252bb59f..24739ddde 100644
--- a/client/coral-framework/actions/asset.js
+++ b/client/coral-framework/actions/asset.js
@@ -10,7 +10,7 @@ export const fetchAssetFailure = (error) => ({type: actions.FETCH_ASSET_FAILURE,
 
 const updateAssetSettingsRequest = () => ({type: actions.UPDATE_ASSET_SETTINGS_REQUEST});
 const updateAssetSettingsSuccess = (settings) => ({type: actions.UPDATE_ASSET_SETTINGS_SUCCESS, settings});
-const updateAssetSettingsFailure = () => ({type: actions.UPDATE_ASSET_SETTINGS_FAILURE});
+const updateAssetSettingsFailure = (error) => ({type: actions.UPDATE_ASSET_SETTINGS_FAILURE, error});
 
 export const updateConfiguration = (newConfig) => (dispatch, getState) => {
   const assetId = getState().asset.toJS().id;
@@ -20,7 +20,10 @@ export const updateConfiguration = (newConfig) => (dispatch, getState) => {
       dispatch(addNotification('success', t('framework.success_update_settings')));
       dispatch(updateAssetSettingsSuccess(newConfig));
     })
-    .catch((error) => dispatch(updateAssetSettingsFailure(error)));
+    .catch((error) => {
+      console.error(error);
+      dispatch(updateAssetSettingsFailure(error));
+    });
 };
 
 export const updateOpenStream = (closedBody) => (dispatch, getState) => {
@@ -31,7 +34,10 @@ export const updateOpenStream = (closedBody) => (dispatch, getState) => {
       dispatch(addNotification('success', t('framework.success_update_settings')));
       dispatch(fetchAssetSuccess(closedBody));
     })
-    .catch((error) => dispatch(fetchAssetFailure(error)));
+    .catch((error) => {
+      console.error(error);
+      dispatch(fetchAssetFailure(error));
+    });
 };
 
 const openStream = () => ({type: actions.OPEN_COMMENTS});
diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js
index 614b87632..995b5db50 100644
--- a/client/coral-framework/actions/auth.js
+++ b/client/coral-framework/actions/auth.js
@@ -75,7 +75,9 @@ export const createUsername = (userId, formData) => (dispatch) => {
       dispatch(updateUsername(formData));
     })
     .catch((error) => {
-      dispatch(createUsernameFailure(t(`error.${error.translation_key}`)));
+      console.error(error);
+      const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString();
+      dispatch(createUsernameFailure(errorMessage));
     });
 };
 
@@ -131,7 +133,7 @@ export const fetchSignIn = (formData) => {
   return (dispatch) => {
     dispatch(signInRequest());
 
-    return coralApi('/auth/local', {method: 'POST', body: formData})
+    coralApi('/auth/local', {method: 'POST', body: formData})
       .then(({token}) => {
         if (!bowser.safari && !bowser.ios) {
           dispatch(handleAuthToken(token));
@@ -139,16 +141,20 @@ export const fetchSignIn = (formData) => {
         dispatch(hideSignInDialog());
       })
       .catch((error) => {
+        console.error(error);
         if (error.metadata) {
 
           // the user might not have a valid email. prompt the user user re-request the confirmation email
           dispatch(
             signInFailure(t('error.email_not_verified', error.metadata))
           );
-        } else {
+        } else if (error.translation_key === 'NOT_AUTHORIZED') {
 
           // invalid credentials
-          dispatch(signInFailure(t('error.email_password')));
+          dispatch(signInFailure(t('error.email_password'), error.metadata));
+        } else {
+          const str = error.translation_key ? t(`error.${error.translation_key}`) : error.toString();
+          dispatch(signInFailure(str));
         }
       });
   };
@@ -234,12 +240,8 @@ export const fetchSignUp = (formData) => (dispatch, getState) => {
       dispatch(signUpSuccess(user));
     })
     .catch((error) => {
-      let errorMessage = t(`error.${error.message}`);
-
-      // if there is no translation defined, just show the error string
-      if (errorMessage === `error.${error.message}`) {
-        errorMessage = error.message;
-      }
+      console.error(error);
+      const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString();
       dispatch(signUpFailure(errorMessage));
     });
 };
@@ -256,8 +258,9 @@ const forgotPasswordSuccess = () => ({
   type: actions.FETCH_FORGOT_PASSWORD_SUCCESS
 });
 
-const forgotPasswordFailure = () => ({
-  type: actions.FETCH_FORGOT_PASSWORD_FAILURE
+const forgotPasswordFailure = (error) => ({
+  type: actions.FETCH_FORGOT_PASSWORD_FAILURE,
+  error,
 });
 
 export const fetchForgotPassword = (email) => (dispatch, getState) => {
@@ -268,7 +271,11 @@ export const fetchForgotPassword = (email) => (dispatch, getState) => {
     body: {email, loc: redirectUri}
   })
     .then(() => dispatch(forgotPasswordSuccess()))
-    .catch((error) => dispatch(forgotPasswordFailure(error)));
+    .catch((error) => {
+      console.error(error);
+      const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString();
+      dispatch(forgotPasswordFailure(errorMessage));
+    });
 };
 
 //==============================================================================
@@ -326,7 +333,8 @@ export const checkLogin = () => (dispatch) => {
     })
     .catch((error) => {
       console.error(error);
-      dispatch(checkLoginFailure(`${error.translation_key}`));
+      const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString();
+      dispatch(checkLoginFailure(errorMessage));
     });
 };
 
@@ -352,7 +360,7 @@ const verifyEmailFailure = () => ({
 export const requestConfirmEmail = (email) => (dispatch, getState) => {
   const redirectUri = getState().auth.toJS().redirectUri;
   dispatch(verifyEmailRequest());
-  return coralApi('/users/resend-verify', {
+  coralApi('/users/resend-verify', {
     method: 'POST',
     body: {email},
     headers: {'X-Pym-Url': redirectUri}
@@ -360,11 +368,10 @@ export const requestConfirmEmail = (email) => (dispatch, getState) => {
     .then(() => {
       dispatch(verifyEmailSuccess());
     })
-    .catch((err) => {
-
-      // email might have already been verifyed
-      dispatch(verifyEmailFailure(err));
-      throw err;
+    .catch((error) => {
+      console.error(error);
+      const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString();
+      dispatch(verifyEmailFailure(errorMessage));
     });
 };
 
diff --git a/client/coral-framework/actions/user.js b/client/coral-framework/actions/user.js
index b978f686d..f18eb9151 100644
--- a/client/coral-framework/actions/user.js
+++ b/client/coral-framework/actions/user.js
@@ -8,12 +8,14 @@ const editUsernameFailure = (error) => ({type: actions.EDIT_USERNAME_FAILURE, er
 const editUsernameSuccess = () => ({type: actions.EDIT_USERNAME_SUCCESS});
 
 export const editName = (username) => (dispatch) => {
-  return coralApi('/account/username', {method: 'PUT', body: {username}})
+  coralApi('/account/username', {method: 'PUT', body: {username}})
     .then(() => {
       dispatch(editUsernameSuccess());
       dispatch(addNotification('success', t('framework.success_name_update')));
     })
     .catch((error) => {
-      dispatch(editUsernameFailure(t(`error.${error.translation_key}`)));
+      console.error(error);
+      const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString();
+      dispatch(editUsernameFailure(errorMessage));
     });
 };

From b0079c191b40f1b0f8666b52dab7b275bb01fb62 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Wed, 21 Jun 2017 19:31:55 +0700
Subject: [PATCH 175/264] Remove non existant 'truthy' tests

---
 .../coral-plugin-commentbox/__tests__/commentBox.spec.js  | 4 ++--
 test/server/routes/api/account/index.js                   | 8 ++++----
 test/server/services/users.js                             | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/client/coral-plugin-commentbox/__tests__/commentBox.spec.js b/client/coral-plugin-commentbox/__tests__/commentBox.spec.js
index 92e085c79..6ae09e786 100644
--- a/client/coral-plugin-commentbox/__tests__/commentBox.spec.js
+++ b/client/coral-plugin-commentbox/__tests__/commentBox.spec.js
@@ -20,7 +20,7 @@ describe('CommentBox', () => {
   });
 
   it('should render the CommentBox appropriately', () => {
-    expect(render.contains('<div class="CommentBox"')).to.be.truthy;
-    expect(render.contains('<button class="postCommentButton"')).to.be.truthy;
+    expect(render.contains('<div class="CommentBox"')).to.be.true;
+    expect(render.contains('<button class="postCommentButton"')).to.be.true;
   });
 });
diff --git a/test/server/routes/api/account/index.js b/test/server/routes/api/account/index.js
index 67744f9bc..8d4e0057a 100644
--- a/test/server/routes/api/account/index.js
+++ b/test/server/routes/api/account/index.js
@@ -46,10 +46,10 @@ describe('/api/v1/account/username', () => {
           .set(passport.inject({id: 'wrongid', roles: []}))
           .send({username: 'MojoJojo'}))
         .then(() => {
-          done(new Error('Exected Error'));
+          done(new Error('Expected Error'));
         })
         .catch((err) => {
-          expect(err).to.be.truthy;
+          expect(err).to.be.ok;
           done();
         });
     });
@@ -60,10 +60,10 @@ describe('/api/v1/account/username', () => {
         .set(passport.inject({id: mockUser.id, roles: []}))
         .send({username: 'MojoJojo'})
         .then(() => {
-          done(new Error('Exected Error'));
+          done(new Error('Expected Error'));
         })
         .catch((err) => {
-          expect(err).to.be.truthy;
+          expect(err).to.be.ok;
           done();
         });
     });
diff --git a/test/server/services/users.js b/test/server/services/users.js
index 9ee90a693..027ac524c 100644
--- a/test/server/services/users.js
+++ b/test/server/services/users.js
@@ -246,7 +246,7 @@ describe('services.UsersService', () => {
           done(new Error('Error expected'));
         })
         .catch((err) => {
-          expect(err).to.be.truthy;
+          expect(err).to.be.ok;
           done();
         });
     });
@@ -260,7 +260,7 @@ describe('services.UsersService', () => {
         done(new Error('Error expected'));
       })
       .catch((err) => {
-        expect(err).to.be.truthy;
+        expect(err).to.be.ok;
         done();
       });
     });
@@ -272,7 +272,7 @@ describe('services.UsersService', () => {
           expect(false).to.be.true;
         })
         .catch((err) => {
-          expect(err).to.be.truthy;
+          expect(err).to.be.ok;
         });
     });
   });

From 420513804c0932fee011068279b08bb01bafc069 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Wed, 21 Jun 2017 19:37:19 +0700
Subject: [PATCH 176/264] Show correct notification message when edit fails

---
 .../src/components/EditableCommentContent.js  | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/client/coral-embed-stream/src/components/EditableCommentContent.js b/client/coral-embed-stream/src/components/EditableCommentContent.js
index 6654b0e13..1373707a0 100644
--- a/client/coral-embed-stream/src/components/EditableCommentContent.js
+++ b/client/coral-embed-stream/src/components/EditableCommentContent.js
@@ -80,14 +80,17 @@ export class EditableCommentContent extends React.Component {
       }
       successfullyEdited = true;
     } catch (error) {
-      if (error.translation_key) {
-        addNotification('error', t(`error.${error.translation_key}`));
-      } else if (error.networkError) {
-        addNotification('error', t('error.network_error'));
-      } else {
-        addNotification('error', t('edit_comment.unexpected_error'));
-        throw error;
-      }
+      const errors = error.errors || [error];
+      errors.forEach((e) => {
+        if (e.translation_key) {
+          addNotification('error', t(`error.${e.translation_key}`));
+        } else if (error.networkError) {
+          addNotification('error', t('error.network_error'));
+        } else {
+          addNotification('error', t('edit_comment.unexpected_error'));
+          console.error(e);
+        }
+      });
     }
     if (successfullyEdited) {
       const status = response.data.editComment.comment.status;

From 38eaff5397a00c44525ebfb2c139e8905cb26878 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Wed, 21 Jun 2017 19:41:22 +0700
Subject: [PATCH 177/264] Don't render title when it's null

---
 client/coral-plugin-infobox/Markdown.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-plugin-infobox/Markdown.js b/client/coral-plugin-infobox/Markdown.js
index b5cf88d22..482467987 100644
--- a/client/coral-plugin-infobox/Markdown.js
+++ b/client/coral-plugin-infobox/Markdown.js
@@ -5,7 +5,7 @@ const renderer = new marked.Renderer();
 
 // Set link target to `_parent` to work properly in an embed.
 renderer.link = (href, title, text) =>
-  `<a target="_parent" href="${href}" title="${title}">${text}</a>`;
+  `<a target="_parent" href="${href}" ${title ? `title="${title}"` : ''}>${text}</a>`;
 
 marked.setOptions({renderer});
 

From 9b26bc9d96ac150870c883fa7fdaad45729129c9 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Wed, 21 Jun 2017 19:53:00 +0700
Subject: [PATCH 178/264] Fix Typo

---
 client/coral-admin/src/actions/auth.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/coral-admin/src/actions/auth.js b/client/coral-admin/src/actions/auth.js
index 975865eef..0f9ef301b 100644
--- a/client/coral-admin/src/actions/auth.js
+++ b/client/coral-admin/src/actions/auth.js
@@ -58,29 +58,29 @@ export const handleLogin = (email, password, recaptchaResponse) => (dispatch) =>
 // FORGOT PASSWORD
 //==============================================================================
 
-const forgotPassowordRequest = () => ({
+const forgotPasswordRequest = () => ({
   type: actions.FETCH_FORGOT_PASSWORD_REQUEST
 });
 
-const forgotPassowordSuccess = () => ({
+const forgotPasswordSuccess = () => ({
   type: actions.FETCH_FORGOT_PASSWORD_SUCCESS
 });
 
-const forgotPassowordFailure = (error) => ({
+const forgotPasswordFailure = (error) => ({
   type: actions.FETCH_FORGOT_PASSWORD_FAILURE,
   error,
 });
 
 export const requestPasswordReset = (email) => (dispatch) => {
-  dispatch(forgotPassowordRequest(email));
+  dispatch(forgotPasswordRequest(email));
   const redirectUri = location.href;
 
   return coralApi('/account/password/reset', {method: 'POST', body: {email,  loc: redirectUri}})
-    .then(() => dispatch(forgotPassowordSuccess()))
+    .then(() => dispatch(forgotPasswordSuccess()))
     .catch((error) => {
       console.error(error);
       const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString();
-      dispatch(forgotPassowordFailure(errorMessage));
+      dispatch(forgotPasswordFailure(errorMessage));
     });
 };
 

From 4b063607ab2452f77403b30c1f7ef3b28f7e0ca4 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Wed, 21 Jun 2017 20:04:38 +0700
Subject: [PATCH 179/264] Return the returns

---
 client/coral-admin/src/actions/assets.js    | 4 ++--
 client/coral-admin/src/actions/community.js | 9 ++++-----
 client/coral-admin/src/actions/install.js   | 2 +-
 client/coral-admin/src/actions/users.js     | 6 +++---
 client/coral-framework/actions/auth.js      | 4 ++--
 client/coral-framework/actions/user.js      | 2 +-
 6 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/client/coral-admin/src/actions/assets.js b/client/coral-admin/src/actions/assets.js
index 369305dc8..75bd2477d 100644
--- a/client/coral-admin/src/actions/assets.js
+++ b/client/coral-admin/src/actions/assets.js
@@ -19,7 +19,7 @@ import t from 'coral-framework/services/i18n';
 // Get comments to fill each of the three lists on the mod queue
 export const fetchAssets = (skip = '', limit = '', search = '', sort = '', filter = '') => (dispatch) => {
   dispatch({type: FETCH_ASSETS_REQUEST});
-  coralApi(`/assets?skip=${skip}&limit=${limit}&sort=${sort}&search=${search}&filter=${filter}`)
+  return coralApi(`/assets?skip=${skip}&limit=${limit}&sort=${sort}&search=${search}&filter=${filter}`)
     .then(({result, count}) =>
       dispatch({type: FETCH_ASSETS_SUCCESS,
         assets: result,
@@ -36,7 +36,7 @@ export const fetchAssets = (skip = '', limit = '', search = '', sort = '', filte
 // Get comments to fill each of the three lists on the mod queue
 export const updateAssetState = (id, closedAt) => (dispatch) => {
   dispatch({type: UPDATE_ASSET_STATE_REQUEST});
-  coralApi(`/assets/${id}/status`, {method: 'PUT', body: {closedAt}})
+  return coralApi(`/assets/${id}/status`, {method: 'PUT', body: {closedAt}})
     .then(() => dispatch({type: UPDATE_ASSET_STATE_SUCCESS}))
     .catch((error) => {
       console.error(error);
diff --git a/client/coral-admin/src/actions/community.js b/client/coral-admin/src/actions/community.js
index 826594868..ddae062a4 100644
--- a/client/coral-admin/src/actions/community.js
+++ b/client/coral-admin/src/actions/community.js
@@ -52,17 +52,16 @@ export const newPage = () => ({
 });
 
 export const setRole = (id, role) => (dispatch) => {
-
-  coralApi(`/users/${id}/role`, {method: 'POST', body: {role}})
+  return coralApi(`/users/${id}/role`, {method: 'POST', body: {role}})
   .then(() => {
-    dispatch({type: SET_ROLE, id, role});
+    return dispatch({type: SET_ROLE, id, role});
   });
 };
 
 export const setCommenterStatus = (id, status) => (dispatch) => {
-  coralApi(`/users/${id}/status`, {method: 'POST', body: {status}})
+  return coralApi(`/users/${id}/status`, {method: 'POST', body: {status}})
   .then(() => {
-    dispatch({type: SET_COMMENTER_STATUS, id, status});
+    return dispatch({type: SET_COMMENTER_STATUS, id, status});
   });
 };
 
diff --git a/client/coral-admin/src/actions/install.js b/client/coral-admin/src/actions/install.js
index a575557d6..122ffdc4a 100644
--- a/client/coral-admin/src/actions/install.js
+++ b/client/coral-admin/src/actions/install.js
@@ -87,7 +87,7 @@ export const submitUser = () => (dispatch, getState) => {
 export const finishInstall = () => (dispatch, getState) => {
   const data = getState().install.toJS().data;
   dispatch(installRequest());
-  coralApi('/setup', {method: 'POST', body: data})
+  return coralApi('/setup', {method: 'POST', body: data})
     .then(() => {
       dispatch(installSuccess());
       dispatch(nextStep());
diff --git a/client/coral-admin/src/actions/users.js b/client/coral-admin/src/actions/users.js
index 27f2cf34f..7ba051a90 100644
--- a/client/coral-admin/src/actions/users.js
+++ b/client/coral-admin/src/actions/users.js
@@ -9,7 +9,7 @@ import t from 'coral-framework/services/i18n';
 export const userStatusUpdate = (status, userId, commentId) => {
   return (dispatch) => {
     dispatch({type: userTypes.UPDATE_STATUS_REQUEST});
-    coralApi(`/users/${userId}/status`, {method: 'POST', body: {status: status, comment_id: commentId}})
+    return coralApi(`/users/${userId}/status`, {method: 'POST', body: {status: status, comment_id: commentId}})
       .then((res) => dispatch({type: userTypes.UPDATE_STATUS_SUCCESS, res}))
       .catch((error) => {
         console.error(error);
@@ -22,7 +22,7 @@ export const userStatusUpdate = (status, userId, commentId) => {
 // change status of a user
 export const sendNotificationEmail = (userId, subject, body) => {
   return (dispatch) => {
-    coralApi(`/users/${userId}/email`, {method: 'POST', body: {subject, body}})
+    return coralApi(`/users/${userId}/email`, {method: 'POST', body: {subject, body}})
       .catch((error) => {
         console.error(error);
         const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString();
@@ -34,7 +34,7 @@ export const sendNotificationEmail = (userId, subject, body) => {
 // let a user edit their username
 export const enableUsernameEdit = (userId) => {
   return (dispatch) => {
-    coralApi(`/users/${userId}/username-enable`, {method: 'POST'})
+    return coralApi(`/users/${userId}/username-enable`, {method: 'POST'})
       .catch((error) => {
         console.error(error);
         const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString();
diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js
index 995b5db50..05e078010 100644
--- a/client/coral-framework/actions/auth.js
+++ b/client/coral-framework/actions/auth.js
@@ -133,7 +133,7 @@ export const fetchSignIn = (formData) => {
   return (dispatch) => {
     dispatch(signInRequest());
 
-    coralApi('/auth/local', {method: 'POST', body: formData})
+    return coralApi('/auth/local', {method: 'POST', body: formData})
       .then(({token}) => {
         if (!bowser.safari && !bowser.ios) {
           dispatch(handleAuthToken(token));
@@ -360,7 +360,7 @@ const verifyEmailFailure = () => ({
 export const requestConfirmEmail = (email) => (dispatch, getState) => {
   const redirectUri = getState().auth.toJS().redirectUri;
   dispatch(verifyEmailRequest());
-  coralApi('/users/resend-verify', {
+  return coralApi('/users/resend-verify', {
     method: 'POST',
     body: {email},
     headers: {'X-Pym-Url': redirectUri}
diff --git a/client/coral-framework/actions/user.js b/client/coral-framework/actions/user.js
index f18eb9151..a6ad45d4a 100644
--- a/client/coral-framework/actions/user.js
+++ b/client/coral-framework/actions/user.js
@@ -8,7 +8,7 @@ const editUsernameFailure = (error) => ({type: actions.EDIT_USERNAME_FAILURE, er
 const editUsernameSuccess = () => ({type: actions.EDIT_USERNAME_SUCCESS});
 
 export const editName = (username) => (dispatch) => {
-  coralApi('/account/username', {method: 'PUT', body: {username}})
+  return coralApi('/account/username', {method: 'PUT', body: {username}})
     .then(() => {
       dispatch(editUsernameSuccess());
       dispatch(addNotification('success', t('framework.success_name_update')));

From 74fff2f1aced0ffa2c05fd9cbb02de252c0521f2 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Wed, 21 Jun 2017 14:14:33 +0100
Subject: [PATCH 180/264] Add all stories link to story search dropdown

---
 .../src/routes/Moderation/components/StorySearch.css         | 5 +++--
 .../src/routes/Moderation/components/StorySearch.js          | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.css b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
index f0503f6b9..ea8dd6b43 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.css
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
@@ -49,8 +49,9 @@
   font-weight: 300;
 }
 
-.cta {
-  letter-spacing: 1px;
+.cta a {
+  color: #000;
+  text-decoration: none;
   font-weight: bold;
   font-size: 15px;
   margin: 0;
diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.js b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
index f42ceaadd..4ceeb4241 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
@@ -38,7 +38,9 @@ const StorySearch = (props) => {
             </Button>
           </div>
           <div className={styles.results}>
-            <p className={styles.cta}>Moderate comments on All Stories</p>
+            <p className={styles.cta}>
+              <a href={'moderate/all'}>Moderate comments on All Stories</a>
+            </p>
             <div className={styles.storyList}>
 
               {

From 91fa7b2d8d1b10084591f7012aace5220e9cac95 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Wed, 21 Jun 2017 20:17:25 +0700
Subject: [PATCH 181/264] Show correct login error messages in admin

---
 client/coral-admin/src/actions/auth.js        | 19 ++++++++++++++++---
 .../coral-admin/src/components/AdminLogin.js  |  3 +--
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/client/coral-admin/src/actions/auth.js b/client/coral-admin/src/actions/auth.js
index 0f9ef301b..0c1264e1f 100644
--- a/client/coral-admin/src/actions/auth.js
+++ b/client/coral-admin/src/actions/auth.js
@@ -43,13 +43,26 @@ export const handleLogin = (email, password, recaptchaResponse) => (dispatch) =>
     })
     .catch((error) => {
       console.error(error);
-      if (error.translation_key === 'LOGIN_MAXIMUM_EXCEEDED') {
+      const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString();
+
+      if (error.translation_key === 'NOT_AUTHORIZED') {
+
+        // invalid credentials
+        dispatch({
+          type: actions.LOGIN_FAILURE,
+          message: t('error.email_password')
+        });
+      }
+      else if (error.translation_key === 'LOGIN_MAXIMUM_EXCEEDED') {
         dispatch({
           type: actions.LOGIN_MAXIMUM_EXCEEDED,
-          message: error.translation_key
+          message: t(`error.${error.translation_key}`),
         });
       } else {
-        dispatch({type: actions.LOGIN_FAILURE, message: error.translation_key});
+        dispatch({
+          type: actions.LOGIN_FAILURE,
+          message: errorMessage,
+        });
       }
     });
 };
diff --git a/client/coral-admin/src/components/AdminLogin.js b/client/coral-admin/src/components/AdminLogin.js
index 9deee53f7..e75e66d23 100644
--- a/client/coral-admin/src/components/AdminLogin.js
+++ b/client/coral-admin/src/components/AdminLogin.js
@@ -2,7 +2,6 @@ import React, {PropTypes} from 'react';
 import Layout from 'coral-admin/src/components/ui/Layout';
 import styles from './NotFound.css';
 import {Button, TextField, Alert, Success} from 'coral-ui';
-import t from 'coral-framework/services/i18n';
 import Recaptcha from 'react-recaptcha';
 
 class AdminLogin extends React.Component {
@@ -35,7 +34,7 @@ class AdminLogin extends React.Component {
     const {errorMessage, loginMaxExceeded, recaptchaPublic} = this.props;
     const signInForm = (
       <form onSubmit={this.handleSignIn}>
-        {errorMessage && <Alert>{t(`error.${errorMessage}`)}</Alert>}
+        {errorMessage && <Alert>{errorMessage}</Alert>}
         <TextField
           label='Email Address'
           value={this.state.email}

From 6628e6d08dcbd8e0bd788e7559d212857622c7e6 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Wed, 21 Jun 2017 20:34:33 +0700
Subject: [PATCH 182/264] Correctly handle login with mixed case email

---
 services/passport.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/passport.js b/services/passport.js
index 1d031c39c..cc458e2c9 100644
--- a/services/passport.js
+++ b/services/passport.js
@@ -340,6 +340,9 @@ passport.use(new LocalStrategy({
   passReqToCallback: true
 }, async (req, email, password, done) => {
 
+  // Normalize email
+  email = email.toLowerCase();
+
   // We need to check if this request has a recaptcha on it at all, if it does,
   // we must verify it first. If verification fails, we fail the request early.
   // We can only do this obviously when recaptcha is enabled.

From 1b1f2a3608e54e027b71fcc76c5309cc389050a5 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 21 Jun 2017 10:42:01 -0300
Subject: [PATCH 183/264] Changing moderation keys: d approve and f reject

---
 .../src/routes/Moderation/components/Moderation.js            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js
index 63c9e13ab..63fbac6df 100644
--- a/client/coral-admin/src/routes/Moderation/components/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js
@@ -31,8 +31,8 @@ export default class Moderation extends Component {
     key('esc', () => toggleModal(false));
     key('j', this.select(true));
     key('k', this.select(false));
-    key('r', this.moderate(false));
-    key('t', this.moderate(true));
+    key('f', this.moderate(false));
+    key('d', this.moderate(true));
   }
 
   onClose = () => {

From b0156fa11f2d8ecd8a937e6351873a2d75860898 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 21 Jun 2017 10:53:12 -0300
Subject: [PATCH 184/264] missing header css

---
 .../src/routes/Configure/components/StreamSettings.js           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-admin/src/routes/Configure/components/StreamSettings.js b/client/coral-admin/src/routes/Configure/components/StreamSettings.js
index 2de82ec1f..e8c522ae0 100644
--- a/client/coral-admin/src/routes/Configure/components/StreamSettings.js
+++ b/client/coral-admin/src/routes/Configure/components/StreamSettings.js
@@ -165,7 +165,7 @@ const StreamSettings = ({updateSettings, settingsError, settings, errors}) => {
             checked={settings.autoCloseStream} />
         </div>
         <div className={styles.content}>
-          {t('configure.close_after')}
+          <div className={styles.settingsHeader}>{t('configure.comment_count_header')}</div>
           <br />
           <Textfield
             type='number'

From ac89ddc43ff43717cd2a3dc0521028e563ef0f01 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 21 Jun 2017 11:04:45 -0300
Subject: [PATCH 185/264] Show user details from flag history

---
 .../src/routes/Moderation/components/Comment.js    |  1 +
 .../src/routes/Moderation/components/FlagBox.css   | 14 ++++++++++++++
 .../src/routes/Moderation/components/FlagBox.js    | 13 +++++++++----
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.js b/client/coral-admin/src/routes/Moderation/components/Comment.js
index 3d946f9fc..3d3e2803f 100644
--- a/client/coral-admin/src/routes/Moderation/components/Comment.js
+++ b/client/coral-admin/src/routes/Moderation/components/Comment.js
@@ -217,6 +217,7 @@ class Comment extends React.Component {
           ? <FlagBox
               actions={flagActions}
               actionSummaries={flagActionSummaries}
+              viewUserDetail={() => viewUserDetail(comment.user.id)}
             />
           : null}
       </li>
diff --git a/client/coral-admin/src/routes/Moderation/components/FlagBox.css b/client/coral-admin/src/routes/Moderation/components/FlagBox.css
index 5b8ea4f91..402a88045 100644
--- a/client/coral-admin/src/routes/Moderation/components/FlagBox.css
+++ b/client/coral-admin/src/routes/Moderation/components/FlagBox.css
@@ -67,3 +67,17 @@
     color: black;
   }
 }
+
+.username {
+  color: #393B44;
+  text-decoration: none;
+  cursor: pointer;
+  font-weight: 600;
+  padding: 2px 5px;
+  border-radius: 2px;
+  margin-left: -5px;
+  transition: background-color 200ms ease;
+&:hover {
+   background-color: #E0E0E0;
+ }
+}
diff --git a/client/coral-admin/src/routes/Moderation/components/FlagBox.js b/client/coral-admin/src/routes/Moderation/components/FlagBox.js
index 7dff51fdb..caa8b3fbc 100644
--- a/client/coral-admin/src/routes/Moderation/components/FlagBox.js
+++ b/client/coral-admin/src/routes/Moderation/components/FlagBox.js
@@ -33,7 +33,7 @@ class FlagBox extends Component {
   }
 
   render() {
-    const {actionSummaries, actions} = this.props;
+    const {actionSummaries, actions, viewUserDetail} = this.props;
     const {showDetail} = this.state;
 
     return (
@@ -59,9 +59,14 @@ class FlagBox extends Component {
                     <li key={i}>
                       {this.reasonMap(summary.reason)} (<strong>{summary.count}</strong>)
                       <ul>
-                        {
-                          actionList.map((action, j) => <li key={`${i}_${j}`} className={styles.subDetail}><span>{action.user.username}</span> {action.message}</li>)
-                        }
+                        {actionList.map((action, j) =>
+                          <li key={`${i}_${j}`} className={styles.subDetail}>
+                            <a className={styles.username} onClick={viewUserDetail}>
+                              {action.user.username}
+                            </a>
+                            {action.message}
+                          </li>
+                        )}
                       </ul>
                     </li>
                   );

From f709057933b96e1713ca5b18ea775e916e4e2c7e Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Wed, 21 Jun 2017 21:18:28 +0700
Subject: [PATCH 186/264] Require username to be different when editing it

---
 .../src/components/Stream.js                  |  1 +
 .../src/components/SuspendedAccount.js        |  9 ++-
 errors.js                                     |  9 ++-
 locales/en.yml                                |  1 +
 services/users.js                             | 62 ++++++++++++-------
 test/server/routes/api/account/index.js       | 17 +++++
 6 files changed, 73 insertions(+), 26 deletions(-)

diff --git a/client/coral-embed-stream/src/components/Stream.js b/client/coral-embed-stream/src/components/Stream.js
index 62a58129b..c345429c6 100644
--- a/client/coral-embed-stream/src/components/Stream.js
+++ b/client/coral-embed-stream/src/components/Stream.js
@@ -183,6 +183,7 @@ class Stream extends React.Component {
                 <SuspendedAccount
                   canEditName={user && user.canEditName}
                   editName={editName}
+                  currentUsername={user.username}
                 />}
               {loggedIn &&
                 !banned &&
diff --git a/client/coral-embed-stream/src/components/SuspendedAccount.js b/client/coral-embed-stream/src/components/SuspendedAccount.js
index 63fab84fa..1a41bac91 100644
--- a/client/coral-embed-stream/src/components/SuspendedAccount.js
+++ b/client/coral-embed-stream/src/components/SuspendedAccount.js
@@ -9,7 +9,8 @@ class SuspendedAccount extends Component {
 
   static propTypes = {
     canEditName: PropTypes.bool,
-    editName: PropTypes.func.isRequired
+    editName: PropTypes.func.isRequired,
+    currentUsername: PropTypes.string.isRequired,
   }
 
   state = {
@@ -21,7 +22,11 @@ class SuspendedAccount extends Component {
     const {editName} = this.props;
     const {username} = this.state;
     e.preventDefault();
-    if (validate.username(username)) {
+
+    if (username === this.props.currentUsername) {
+      this.setState({alert: t('error.SAME_USERNAME_PROVIDED')});
+    }
+    else if (validate.username(username)) {
       editName(username)
         .then(() => location.reload())
         .catch((error) => {
diff --git a/errors.js b/errors.js
index 8b11412f0..a29fdfe83 100644
--- a/errors.js
+++ b/errors.js
@@ -161,7 +161,13 @@ const ErrInstallLock = new APIError('install lock active', {
 // ErrPermissionUpdateUsername is returned when the user does not have permission to update their username.
 const ErrPermissionUpdateUsername = new APIError('You do not have permission to update your username.', {
   translation_key: 'EDIT_USERNAME_NOT_AUTHORIZED',
-  status: 500
+  status: 403
+});
+
+// ErrSameUsernameProvided returned attempts to update their username with the same username.
+const ErrSameUsernameProvided = new APIError('Same username provided.', {
+  translation_key: 'SAME_USERNAME_PROVIDED',
+  status: 400
 });
 
 // ErrLoginAttemptMaximumExceeded is returned when the login maximum is exceeded.
@@ -209,6 +215,7 @@ module.exports = {
   ErrAuthentication,
   ErrNotAuthorized,
   ErrPermissionUpdateUsername,
+  ErrSameUsernameProvided,
   ErrSettingsInit,
   ErrInstallLock,
   ErrLoginAttemptMaximumExceeded,
diff --git a/locales/en.yml b/locales/en.yml
index 4c2ae7c76..e99f900f0 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -184,6 +184,7 @@ en:
     USERNAME_REQUIRED: "Must input a username"
     EDIT_WINDOW_ENDED: "You can no longer edit this comment. The time window to do so has expired."
     EDIT_USERNAME_NOT_AUTHORIZED: "You do not have permission to update your username."
+    SAME_USERNAME_PROVIDED: "You must submit a different username."
     EMAIL_IN_USE: "Email address already in use"
     EMAIL_REQUIRED: "An email address is required"
     LOGIN_MAXIMUM_EXCEEDED: "You have made too many unsuccessful password attempts. Please wait."
diff --git a/services/users.js b/services/users.js
index 599ef8b33..78ec57b4c 100644
--- a/services/users.js
+++ b/services/users.js
@@ -528,7 +528,7 @@ module.exports = class UsersService {
   }
 
   /**
-   * 
+   *
    * @param {String} id  the id of the current user
    * @param {Object} token  a jwt token used to sign in the user
    */
@@ -858,36 +858,52 @@ module.exports = class UsersService {
 
   /**
    * Updates the user's username.
-   * @param  {String} id the id of the user to be enabled.
-   * @param  {String}  username The new username for the user.
+   * @param  {String} id       The id of the user.
+   * @param  {String} username The new username for the user.
    * @return {Promise}
    */
-  static editName(id, username) {
-    return UserModel.update({
-      id,
-      canEditName: true
-    }, {
-      $set: {
-        username: username,
-        lowercaseUsername: username.toLowerCase(),
-        canEditName: false,
-        status: 'PENDING',
-      }
-    })
-    .then((result) => {
-      if (result.nModified <= 0) {
-        return Promise.reject(errors.ErrPermissionUpdateUsername);
+  static async editName(id, username) {
+    try {
+      const result = await UserModel.findOneAndUpdate({
+        id,
+        username: {$ne: username},
+        canEditName: true
+      }, {
+        $set: {
+          username: username,
+          lowercaseUsername: username.toLowerCase(),
+          canEditName: false,
+          status: 'PENDING',
+        }
+      }, {
+        new: true,
+      });
+
+      if (!result) {
+        const user = await UsersService.findById(id);
+        if (user === null) {
+          throw errors.ErrNotFound;
+        }
+
+        if (!user.canEditName) {
+          throw errors.ErrPermissionUpdateUsername;
+        }
+
+        if (user.username === username) {
+          throw errors.ErrSameUsernameProvided;
+        }
+
+        throw new Error('edit username failed for an unexpected reason');
       }
 
       return result;
-    })
-    .catch((err) => {
+    }
+    catch(err) {
       if (err.code === 11000) {
         throw errors.ErrUsernameTaken;
       }
-
       throw err;
-    });
+    }
   }
 
   /**
@@ -928,7 +944,7 @@ module.exports = class UsersService {
   }
 };
 
-// Extract all the tokenUserNotFound plugins so we can integrate with other 
+// Extract all the tokenUserNotFound plugins so we can integrate with other
 // providers.
 let tokenUserNotFoundHooks = null;
 
diff --git a/test/server/routes/api/account/index.js b/test/server/routes/api/account/index.js
index 8d4e0057a..08b9c8b1d 100644
--- a/test/server/routes/api/account/index.js
+++ b/test/server/routes/api/account/index.js
@@ -54,6 +54,23 @@ describe('/api/v1/account/username', () => {
         });
     });
 
+    it('it should return an error when the user submits the same username', (done) => {
+      chai.request(app)
+        .post(`/api/v1/users/${mockUser.id}/username-enable`)
+        .set(passport.inject({id: '456', roles: ['ADMIN']}))
+        .then(() => chai.request(app)
+          .put('/api/v1/account/username')
+          .set(passport.inject({id: mockUser.id, roles: []}))
+          .send({username: 'Ana'}))
+        .then(() => {
+          done(new Error('Expected Error'));
+        })
+        .catch((err) => {
+          expect(err).to.be.ok;
+          done();
+        });
+    });
+
     it('it should return an error when the user tries to edit their username if canEditName is disabled', (done) => {
       chai.request(app)
         .put('/api/v1/account/username')

From 57ecba6f33bd3f7f04211ab73f326c6129a62e17 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Wed, 21 Jun 2017 21:36:27 +0700
Subject: [PATCH 187/264] Remove unessecary binds

---
 client/coral-embed-stream/src/components/Toggleable.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/coral-embed-stream/src/components/Toggleable.js b/client/coral-embed-stream/src/components/Toggleable.js
index 7dc6af5e9..c7996d866 100644
--- a/client/coral-embed-stream/src/components/Toggleable.js
+++ b/client/coral-embed-stream/src/components/Toggleable.js
@@ -5,16 +5,16 @@ import classnames from 'classnames';
 
 const upArrow = <span className={classnames(styles.chevron, styles.up)}></span>;
 const downArrow = <span className={classnames(styles.chevron, styles.down)}></span>;
+
 export default class Toggleable extends React.Component {
   constructor(props) {
     super(props);
-    this.toggle = this.toggle.bind(this);
-    this.close = this.close.bind(this);
     this.state = {
       isOpen: false
     };
   }
-  toggle() {
+
+  toggle = () => {
     this.setState({isOpen: !this.state.isOpen});
   }
 

From 012ff926eb03a0bc6c621b987afa246cac254ff6 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Wed, 21 Jun 2017 22:21:42 +0700
Subject: [PATCH 188/264] Use router for 'moderate all' link and only show when
 necessary

---
 .../src/routes/Moderation/components/Moderation.js        | 1 +
 .../src/routes/Moderation/components/StorySearch.css      | 5 +++--
 .../src/routes/Moderation/components/StorySearch.js       | 8 +++++---
 .../src/routes/Moderation/containers/StorySearch.js       | 7 +++++++
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js
index 1c1ce1009..47051adfe 100644
--- a/client/coral-admin/src/routes/Moderation/components/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js
@@ -204,6 +204,7 @@ export default class Moderation extends Component {
             rejectComment={props.rejectComment} />
         )}
         <StorySearch
+          assetId={assetId}
           moderation={this.props.moderation}
           closeSearch={this.closeSearch}
           storySearchChange={this.props.storySearchChange}
diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.css b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
index ea8dd6b43..2df130ec4 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.css
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.css
@@ -49,13 +49,14 @@
   font-weight: 300;
 }
 
-.cta a {
+.cta > a {
+  display: inline-block;
+  cursor: pointer;
   color: #000;
   text-decoration: none;
   font-weight: bold;
   font-size: 15px;
   margin: 0;
-  height: 50px;
   box-sizing: border-box;
   font-size: 15px;
   font-weight: 500;
diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.js b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
index 4ceeb4241..65f8a27ac 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
@@ -38,9 +38,11 @@ const StorySearch = (props) => {
             </Button>
           </div>
           <div className={styles.results}>
-            <p className={styles.cta}>
-              <a href={'moderate/all'}>Moderate comments on All Stories</a>
-            </p>
+            {props.assetId &&
+              <div className={styles.cta}>
+                <a onClick={props.goToModerateAll}>Moderate comments on All Stories</a>
+              </div>
+            }
             <div className={styles.storyList}>
 
               {
diff --git a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
index 2196e8994..f4ab6f23e 100644
--- a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
@@ -45,11 +45,18 @@ class StorySearchContainer extends React.Component {
     closeSearch();
   }
 
+  goToModerateAll = () => {
+    const {router, closeSearch} = this.props;
+    router.push('/admin/moderate/all');
+    closeSearch();
+  }
+
   render () {
     return (
       <StorySearch
         search={this.search}
         goToStory={this.goToStory}
+        goToModerateAll={this.goToModerateAll}
         handleEsc={this.handleEsc}
         handleEnter={this.handleEnter}
         searchValue={this.state.searchValue}

From 9d572f6c3bde3599f963962859585129643bbfe2 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Wed, 21 Jun 2017 22:27:13 +0700
Subject: [PATCH 189/264] Add proptype

---
 .../src/routes/Moderation/components/StorySearch.js            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.js b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
index 65f8a27ac..5fe82fa97 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
@@ -91,7 +91,8 @@ StorySearch.propTypes = {
   goToStory: PropTypes.func.isRequired,
   closeSearch: PropTypes.func.isRequired,
   moderation: PropTypes.object.isRequired,
-  handleSearchChange: PropTypes.func.isRequired
+  handleSearchChange: PropTypes.func.isRequired,
+  assetId: PropTypes.string
 };
 
 export default StorySearch;

From 66aec74b387e6b356a37bbf2f0f39b606336b889 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 21 Jun 2017 13:29:44 -0300
Subject: [PATCH 190/264] good looking export

---
 plugin-api/beta/client/components/index.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugin-api/beta/client/components/index.js b/plugin-api/beta/client/components/index.js
index f719b9442..934f75299 100644
--- a/plugin-api/beta/client/components/index.js
+++ b/plugin-api/beta/client/components/index.js
@@ -1,2 +1 @@
-export {Slot} from 'coral-framework/components';
-export {Copy} from 'coral-framework/components';
+export {Slot, Copy} from 'coral-framework/components';
\ No newline at end of file

From cdcd543fe0b98cf312b525c8e099e88239752b99 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 21 Jun 2017 13:30:09 -0300
Subject: [PATCH 191/264] good looking export

---
 plugin-api/beta/client/components/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-api/beta/client/components/index.js b/plugin-api/beta/client/components/index.js
index 934f75299..520c5b7d8 100644
--- a/plugin-api/beta/client/components/index.js
+++ b/plugin-api/beta/client/components/index.js
@@ -1 +1 @@
-export {Slot, Copy} from 'coral-framework/components';
\ No newline at end of file
+export {Slot, Copy} from 'coral-framework/components';

From a9cefd8cbd82d42d7dece588c203e5d49f0c4c95 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 21 Jun 2017 14:23:51 -0300
Subject: [PATCH 192/264] deleting old ref

---
 plugin-api/beta/client/components/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-api/beta/client/components/index.js b/plugin-api/beta/client/components/index.js
index 520c5b7d8..5d76732fc 100644
--- a/plugin-api/beta/client/components/index.js
+++ b/plugin-api/beta/client/components/index.js
@@ -1 +1 @@
-export {Slot, Copy} from 'coral-framework/components';
+export {Slot} from 'coral-framework/components';

From 91b7cd10f87971e4a5fef0eefbca9d63def59506 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 21 Jun 2017 11:35:00 -0600
Subject: [PATCH 193/264] fixing all the :ghost:

---
 bin/cli-token | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/cli-token b/bin/cli-token
index 50335d925..fa5d2e350 100755
--- a/bin/cli-token
+++ b/bin/cli-token
@@ -10,7 +10,7 @@ const TokensService = require('../services/tokens');
 const util = require('./util');
 const Table = require('cli-table');
 
-// Regeister the shutdown criteria.
+// Register the shutdown criteria.
 util.onshutdown([
   () => mongoose.disconnect()
 ]);

From f7a8f9bbd1bfb1b594eda5811bd063ddd3383805 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Thu, 22 Jun 2017 00:59:04 +0700
Subject: [PATCH 194/264] Oops this comment needs a rewrite

---
 errors.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/errors.js b/errors.js
index a29fdfe83..79731dad6 100644
--- a/errors.js
+++ b/errors.js
@@ -164,7 +164,7 @@ const ErrPermissionUpdateUsername = new APIError('You do not have permission to
   status: 403
 });
 
-// ErrSameUsernameProvided returned attempts to update their username with the same username.
+// ErrSameUsernameProvided is returned when attempting to update a username to the same username.
 const ErrSameUsernameProvided = new APIError('Same username provided.', {
   translation_key: 'SAME_USERNAME_PROVIDED',
   status: 400

From bba4474858b136e9296a83cb441f98e2dc67a18a Mon Sep 17 00:00:00 2001
From: A Lawliet <alawliet.code@gmail.com>
Date: Thu, 22 Jun 2017 01:51:06 -0400
Subject: [PATCH 195/264] Search dropdown: clear search when closed

---
 .../Moderation/components/StorySearch.js      |  4 +--
 .../Moderation/containers/StorySearch.js      | 26 +++++++++++++++----
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.js b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
index 5fe82fa97..b58940ea7 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
@@ -81,7 +81,7 @@ const StorySearch = (props) => {
           </div>
         </div>
       </div>
-      <div className={styles.overlay} onClick={props.closeSearch} />
+      <div className={styles.overlay} onClick={props.clearAndCloseSearch} />
     </div>
   );
 };
@@ -89,7 +89,7 @@ const StorySearch = (props) => {
 StorySearch.propTypes = {
   search: PropTypes.func.isRequired,
   goToStory: PropTypes.func.isRequired,
-  closeSearch: PropTypes.func.isRequired,
+  clearAndCloseSearch: PropTypes.func.isRequired,
   moderation: PropTypes.object.isRequired,
   handleSearchChange: PropTypes.func.isRequired,
   assetId: PropTypes.string
diff --git a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
index f4ab6f23e..d9c3b2ef1 100644
--- a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
@@ -13,6 +13,21 @@ class StorySearchContainer extends React.Component {
     };
   }
 
+  componentWillUnmount() {
+    this.props.storySearchChange('');
+  }
+
+  clearSearch = () => {
+    this.setState({searchValue: ''}, () => {
+      this.search();
+    });
+  }
+
+  clearAndCloseSearch = () => {
+    this.clearSearch();
+    this.props.closeSearch();
+  }
+
   handleSearchChange = (e) => {
     const {value} = e.target;
     this.setState({
@@ -23,7 +38,7 @@ class StorySearchContainer extends React.Component {
   handleEsc = (e) => {
     if (e.key === 'Escape') {
       e.preventDefault();
-      this.props.closeSearch();
+      this.clearAndCloseSearch();
     }
   }
 
@@ -40,15 +55,15 @@ class StorySearchContainer extends React.Component {
   }
 
   goToStory = (id) => {
-    const {router, closeSearch} = this.props;
+    const {router} = this.props;
     router.push(`/admin/moderate/all/${id}`);
-    closeSearch();
+    this.clearAndCloseSearch();
   }
 
   goToModerateAll = () => {
-    const {router, closeSearch} = this.props;
+    const {router} = this.props;
     router.push('/admin/moderate/all');
-    closeSearch();
+    this.clearAndCloseSearch();
   }
 
   render () {
@@ -61,6 +76,7 @@ class StorySearchContainer extends React.Component {
         handleEnter={this.handleEnter}
         searchValue={this.state.searchValue}
         handleSearchChange={this.handleSearchChange}
+        clearAndCloseSearch={this.clearAndCloseSearch}
         {...this.props}
       />
     );

From 3de6ba1b2401ec492cb388cd904daf905f6610e6 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Thu, 22 Jun 2017 14:05:50 +0100
Subject: [PATCH 196/264] Limit circle deploys off only our master branch

---
 circle.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/circle.yml b/circle.yml
index e7427094b..b924028f3 100644
--- a/circle.yml
+++ b/circle.yml
@@ -52,5 +52,6 @@ deployment:
 
   latest:
     branch: master
+    owner: coralproject
     commands:
       - bash ./scripts/docker.sh deploy

From c41b3c27bab70e0ac6b906eefb2d6eaab3d45ad1 Mon Sep 17 00:00:00 2001
From: A Lawliet <alawliet.code@gmail.com>
Date: Thu, 22 Jun 2017 10:29:41 -0400
Subject: [PATCH 197/264] Prevent unnecessary render - no need to clear search
 if already empty, just close dropdown

---
 .../src/routes/Moderation/containers/StorySearch.js          | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
index d9c3b2ef1..d5a0ad243 100644
--- a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
@@ -3,6 +3,7 @@ import {compose, gql} from 'react-apollo';
 import StorySearch from '../components/StorySearch';
 import {withRouter} from 'react-router';
 import withQuery from 'coral-framework/hocs/withQuery';
+import {isEmpty} from 'lodash';
 
 class StorySearchContainer extends React.Component {
   constructor(props) {
@@ -24,7 +25,9 @@ class StorySearchContainer extends React.Component {
   }
 
   clearAndCloseSearch = () => {
-    this.clearSearch();
+    if (!isEmpty(this.state.searchValue)) {
+      this.clearSearch();
+    }
     this.props.closeSearch();
   }
 

From 8bb38c5ee5c6f6be3f5bc69a050ba6476736909f Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Thu, 22 Jun 2017 21:50:19 +0700
Subject: [PATCH 198/264] Refactor and reuse "Actions" in "Moderate" and
 "Community"

---
 .../coral-admin/src/actions/banUserDialog.js  |   7 +
 client/coral-admin/src/actions/community.js   |  10 +-
 client/coral-admin/src/actions/moderation.js  |  10 --
 .../src/actions/suspendUserDialog.js          |   7 +
 .../components/BanUserDialog.css              |   0
 .../src/components/BanUserDialog.js           |  44 +++++
 .../components/SuspendUserDialog.css          |   0
 .../components/SuspendUserDialog.js           |   6 +-
 .../src/constants/banUserDialog.js            |   2 +
 client/coral-admin/src/constants/community.js |   4 +-
 .../coral-admin/src/constants/moderation.js   |   4 -
 .../src/constants/suspendUserDialog.js        |   2 +
 .../src/containers/BanUserDialog.js           |  63 +++++++
 client/coral-admin/src/containers/Layout.js   |   8 +-
 .../src/containers/SuspendUserDialog.js       |  83 +++++++++
 .../coral-admin/src/reducers/banUserDialog.js |  30 ++++
 client/coral-admin/src/reducers/community.js  |  14 +-
 client/coral-admin/src/reducers/index.js      |   4 +
 client/coral-admin/src/reducers/moderation.js |  40 +----
 .../src/reducers/suspendUserDialog.js         |  30 ++++
 .../Community/components/ActionButton.js      |   7 +-
 .../Community/components/BanUserButton.css    |  11 --
 .../Community/components/BanUserButton.js     |  24 ---
 .../Community/components/BanUserDialog.css    | 164 ------------------
 .../Community/components/BanUserDialog.js     |  51 ------
 .../routes/Community/components/Community.js  |  18 +-
 .../Community/components/FlaggedAccounts.js   |   4 +-
 ...serDialog.css => RejectUsernameDialog.css} |   0
 ...dUserDialog.js => RejectUsernameDialog.js} |  34 ++--
 .../src/routes/Community/components/User.js   |  38 ++--
 .../routes/Community/containers/Community.js  |  13 +-
 .../Moderation/components/BanUserDialog.js    |  52 ------
 .../routes/Moderation/components/Comment.js   |  18 +-
 .../Moderation/components/Moderation.js       |  20 ---
 .../Moderation/containers/Moderation.js       |  48 +----
 client/coral-framework/hocs/withMutation.js   |   2 +-
 client/coral-framework/hocs/withQuery.js      |   2 +-
 graph/typeDefs.graphql                        |   2 +-
 locales/en.yml                                |  54 +++---
 locales/es.yml                                |  54 +++---
 40 files changed, 430 insertions(+), 554 deletions(-)
 create mode 100644 client/coral-admin/src/actions/banUserDialog.js
 create mode 100644 client/coral-admin/src/actions/suspendUserDialog.js
 rename client/coral-admin/src/{routes/Moderation => }/components/BanUserDialog.css (100%)
 create mode 100644 client/coral-admin/src/components/BanUserDialog.js
 rename client/coral-admin/src/{routes/Moderation => }/components/SuspendUserDialog.css (100%)
 rename client/coral-admin/src/{routes/Moderation => }/components/SuspendUserDialog.js (98%)
 create mode 100644 client/coral-admin/src/constants/banUserDialog.js
 create mode 100644 client/coral-admin/src/constants/suspendUserDialog.js
 create mode 100644 client/coral-admin/src/containers/BanUserDialog.js
 create mode 100644 client/coral-admin/src/containers/SuspendUserDialog.js
 create mode 100644 client/coral-admin/src/reducers/banUserDialog.js
 create mode 100644 client/coral-admin/src/reducers/suspendUserDialog.js
 delete mode 100644 client/coral-admin/src/routes/Community/components/BanUserButton.css
 delete mode 100644 client/coral-admin/src/routes/Community/components/BanUserButton.js
 delete mode 100644 client/coral-admin/src/routes/Community/components/BanUserDialog.css
 delete mode 100644 client/coral-admin/src/routes/Community/components/BanUserDialog.js
 rename client/coral-admin/src/routes/Community/components/{SuspendUserDialog.css => RejectUsernameDialog.css} (100%)
 rename client/coral-admin/src/routes/Community/components/{SuspendUserDialog.js => RejectUsernameDialog.js} (71%)
 delete mode 100644 client/coral-admin/src/routes/Moderation/components/BanUserDialog.js

diff --git a/client/coral-admin/src/actions/banUserDialog.js b/client/coral-admin/src/actions/banUserDialog.js
new file mode 100644
index 000000000..8b068051c
--- /dev/null
+++ b/client/coral-admin/src/actions/banUserDialog.js
@@ -0,0 +1,7 @@
+import {SHOW_BAN_USER_DIALOG, HIDE_BAN_USER_DIALOG} from '../constants/banUserDialog';
+
+export const showBanUserDialog = ({userId, username, commentId, commentStatus}) =>
+  ({type: SHOW_BAN_USER_DIALOG, userId, username, commentId, commentStatus});
+
+export const hideBanUserDialog = () => ({type: HIDE_BAN_USER_DIALOG});
+
diff --git a/client/coral-admin/src/actions/community.js b/client/coral-admin/src/actions/community.js
index ddae062a4..70c9b7592 100644
--- a/client/coral-admin/src/actions/community.js
+++ b/client/coral-admin/src/actions/community.js
@@ -10,8 +10,8 @@ import {
   SET_COMMENTER_STATUS,
   SHOW_BANUSER_DIALOG,
   HIDE_BANUSER_DIALOG,
-  SHOW_SUSPENDUSER_DIALOG,
-  HIDE_SUSPENDUSER_DIALOG
+  SHOW_REJECT_USERNAME_DIALOG,
+  HIDE_REJECT_USERNAME_DIALOG
 } from '../constants/community';
 
 import coralApi from '../../../coral-framework/helpers/request';
@@ -69,6 +69,6 @@ export const setCommenterStatus = (id, status) => (dispatch) => {
 export const showBanUserDialog = (user) => ({type: SHOW_BANUSER_DIALOG, user});
 export const hideBanUserDialog = () => ({type: HIDE_BANUSER_DIALOG});
 
-// Suspend User Dialog
-export const showSuspendUserDialog = (user) => ({type: SHOW_SUSPENDUSER_DIALOG, user});
-export const hideSuspendUserDialog = () => ({type: HIDE_SUSPENDUSER_DIALOG});
+// Reject Username Dialog
+export const showRejectUsernameDialog = (user) => ({type: SHOW_REJECT_USERNAME_DIALOG, user});
+export const hideRejectUsernameDialog = () => ({type: HIDE_REJECT_USERNAME_DIALOG});
diff --git a/client/coral-admin/src/actions/moderation.js b/client/coral-admin/src/actions/moderation.js
index 08dadd8ee..1c803d87d 100644
--- a/client/coral-admin/src/actions/moderation.js
+++ b/client/coral-admin/src/actions/moderation.js
@@ -3,16 +3,6 @@ import * as actions from 'constants/moderation';
 export const toggleModal = (open) => ({type: actions.TOGGLE_MODAL, open});
 export const singleView = () => ({type: actions.SINGLE_VIEW});
 
-// Ban User Dialog
-export const showBanUserDialog = (user, commentId, commentStatus, showRejectedNote) => ({type: actions.SHOW_BANUSER_DIALOG, user, commentId, commentStatus, showRejectedNote});
-export const hideBanUserDialog = () => ({type: actions.HIDE_BANUSER_DIALOG});
-
-// Suspend User Dialog
-export const showSuspendUserDialog = (userId, username, commentId, commentStatus) =>
-  ({type: actions.SHOW_SUSPEND_USER_DIALOG, userId, username, commentId, commentStatus});
-
-export const hideSuspendUserDialog = () => ({type: actions.HIDE_SUSPEND_USER_DIALOG});
-
 // hide shortcuts note
 export const hideShortcutsNote = () => {
   try {
diff --git a/client/coral-admin/src/actions/suspendUserDialog.js b/client/coral-admin/src/actions/suspendUserDialog.js
new file mode 100644
index 000000000..06913147d
--- /dev/null
+++ b/client/coral-admin/src/actions/suspendUserDialog.js
@@ -0,0 +1,7 @@
+import {SHOW_SUSPEND_USER_DIALOG, HIDE_SUSPEND_USER_DIALOG} from '../constants/suspendUserDialog.js';
+
+export const showSuspendUserDialog = ({userId, username, commentId, commentStatus}) =>
+  ({type: SHOW_SUSPEND_USER_DIALOG, userId, username, commentId, commentStatus});
+
+export const hideSuspendUserDialog = () => ({type: HIDE_SUSPEND_USER_DIALOG});
+
diff --git a/client/coral-admin/src/routes/Moderation/components/BanUserDialog.css b/client/coral-admin/src/components/BanUserDialog.css
similarity index 100%
rename from client/coral-admin/src/routes/Moderation/components/BanUserDialog.css
rename to client/coral-admin/src/components/BanUserDialog.css
diff --git a/client/coral-admin/src/components/BanUserDialog.js b/client/coral-admin/src/components/BanUserDialog.js
new file mode 100644
index 000000000..bade3578d
--- /dev/null
+++ b/client/coral-admin/src/components/BanUserDialog.js
@@ -0,0 +1,44 @@
+import React, {PropTypes} from 'react';
+import {Dialog} from 'coral-ui';
+import styles from './BanUserDialog.css';
+
+import Button from 'coral-ui/components/Button';
+import t from 'coral-framework/services/i18n';
+
+const BanUserDialog = ({open, onCancel, onPerform, username, info}) => (
+  <Dialog
+    className={styles.dialog}
+    id="banUserDialog"
+    open={open}
+    onCancel={onCancel}
+    title={t('bandialog.ban_user')}>
+    <span className={styles.close} onClick={onCancel}>×</span>
+    <div>
+      <div className={styles.header}>
+        <h2>{t('bandialog.ban_user')}</h2>
+      </div>
+      <div className={styles.separator}>
+        <h3>{t('bandialog.are_you_sure', username)}</h3>
+        <i>{info}</i>
+      </div>
+      <div className={styles.buttons}>
+        <Button cStyle="cancel" className={styles.cancel} onClick={onCancel} raised>
+          {t('bandialog.cancel')}
+        </Button>
+        <Button cStyle="black" className={styles.ban} onClick={onPerform} raised>
+          {t('bandialog.yes_ban_user')}
+        </Button>
+      </div>
+    </div>
+  </Dialog>
+);
+
+BanUserDialog.propTypes = {
+  open: PropTypes.bool,
+  onPerform: PropTypes.func.isRequired,
+  onCancel: PropTypes.func.isRequired,
+  username: PropTypes.string,
+  info: PropTypes.string,
+};
+
+export default BanUserDialog;
diff --git a/client/coral-admin/src/routes/Moderation/components/SuspendUserDialog.css b/client/coral-admin/src/components/SuspendUserDialog.css
similarity index 100%
rename from client/coral-admin/src/routes/Moderation/components/SuspendUserDialog.css
rename to client/coral-admin/src/components/SuspendUserDialog.css
diff --git a/client/coral-admin/src/routes/Moderation/components/SuspendUserDialog.js b/client/coral-admin/src/components/SuspendUserDialog.js
similarity index 98%
rename from client/coral-admin/src/routes/Moderation/components/SuspendUserDialog.js
rename to client/coral-admin/src/components/SuspendUserDialog.js
index 212757f20..d2ef23891 100644
--- a/client/coral-admin/src/routes/Moderation/components/SuspendUserDialog.js
+++ b/client/coral-admin/src/components/SuspendUserDialog.js
@@ -49,7 +49,6 @@ class SuspendUserDialog extends React.Component {
   handlePerform = () => {
 
     this.props.onPerform({
-      id: this.props.userId,
       message: this.state.message,
 
       // Add 1 minute more to help `timeago.js` to display the correct duration.
@@ -153,11 +152,10 @@ class SuspendUserDialog extends React.Component {
 
 SuspendUserDialog.propTypes = {
   open: PropTypes.bool.isRequired,
-  onCancel: PropTypes.func.isRequired,
   onPerform: PropTypes.func.isRequired,
-  username: PropTypes.string,
-  userId: PropTypes.string,
+  onCancel: PropTypes.func.isRequired,
   organizationName: PropTypes.string,
+  username: PropTypes.string,
 };
 
 export default SuspendUserDialog;
diff --git a/client/coral-admin/src/constants/banUserDialog.js b/client/coral-admin/src/constants/banUserDialog.js
new file mode 100644
index 000000000..90a7031b3
--- /dev/null
+++ b/client/coral-admin/src/constants/banUserDialog.js
@@ -0,0 +1,2 @@
+export const SHOW_BAN_USER_DIALOG = 'SHOW_BAN_USER_DIALOG';
+export const HIDE_BAN_USER_DIALOG = 'HIDE_BAN_USER_DIALOG';
diff --git a/client/coral-admin/src/constants/community.js b/client/coral-admin/src/constants/community.js
index a46e721a6..be11e9b0c 100644
--- a/client/coral-admin/src/constants/community.js
+++ b/client/coral-admin/src/constants/community.js
@@ -13,5 +13,5 @@ export const FETCH_FLAGGED_COMMENTERS_FAILURE = 'FETCH_FLAGGED_COMMENTERS_FAILUR
 export const SHOW_BANUSER_DIALOG = 'SHOW_BANUSER_DIALOG';
 export const HIDE_BANUSER_DIALOG = 'HIDE_BANUSER_DIALOG';
 
-export const SHOW_SUSPENDUSER_DIALOG = 'SHOW_SUSPENDUSER_DIALOG';
-export const HIDE_SUSPENDUSER_DIALOG = 'HIDE_SUSPENDUSER_DIALOG';
+export const SHOW_REJECT_USERNAME_DIALOG = 'SHOW_REJECT_USERNAME_DIALOG';
+export const HIDE_REJECT_USERNAME_DIALOG = 'HIDE_REJECT_USERNAME_DIALOG';
diff --git a/client/coral-admin/src/constants/moderation.js b/client/coral-admin/src/constants/moderation.js
index 6fefcccfb..2c3fc08db 100644
--- a/client/coral-admin/src/constants/moderation.js
+++ b/client/coral-admin/src/constants/moderation.js
@@ -1,10 +1,6 @@
 export const TOGGLE_MODAL = 'TOGGLE_MODAL';
 export const SINGLE_VIEW = 'SINGLE_VIEW';
-export const SHOW_BANUSER_DIALOG = 'SHOW_BANUSER_DIALOG';
-export const HIDE_BANUSER_DIALOG = 'HIDE_BANUSER_DIALOG';
 export const HIDE_SHORTCUTS_NOTE = 'HIDE_SHORTCUTS_NOTE';
-export const SHOW_SUSPEND_USER_DIALOG = 'SHOW_SUSPEND_USER_DIALOG';
-export const HIDE_SUSPEND_USER_DIALOG = 'HIDE_SUSPEND_USER_DIALOG';
 export const VIEW_USER_DETAIL = 'VIEW_USER_DETAIL';
 export const HIDE_USER_DETAIL = 'HIDE_USER_DETAIL';
 export const SET_SORT_ORDER = 'MODERATION_SET_SORT_ORDER';
diff --git a/client/coral-admin/src/constants/suspendUserDialog.js b/client/coral-admin/src/constants/suspendUserDialog.js
new file mode 100644
index 000000000..13673dfe5
--- /dev/null
+++ b/client/coral-admin/src/constants/suspendUserDialog.js
@@ -0,0 +1,2 @@
+export const SHOW_SUSPEND_USER_DIALOG = 'SHOW_SUSPEND_USER_DIALOG';
+export const HIDE_SUSPEND_USER_DIALOG = 'HIDE_SUSPEND_USER_DIALOG';
diff --git a/client/coral-admin/src/containers/BanUserDialog.js b/client/coral-admin/src/containers/BanUserDialog.js
new file mode 100644
index 000000000..2c72b3380
--- /dev/null
+++ b/client/coral-admin/src/containers/BanUserDialog.js
@@ -0,0 +1,63 @@
+import React, {Component} from 'react';
+import {connect} from 'react-redux';
+import {bindActionCreators} from 'redux';
+import BanUserDialog from '../components/BanUserDialog';
+import {hideBanUserDialog} from '../actions/banUserDialog';
+import {withSetUserStatus, withSetCommentStatus} from 'coral-framework/graphql/mutations';
+import {compose} from 'react-apollo';
+import t from 'coral-framework/services/i18n';
+
+class BanUserDialogContainer extends Component {
+
+  banUser = async () => {
+    const {userId, commentId, commentStatus, setUserStatus, setCommentStatus, hideBanUserDialog} = this.props;
+    await setUserStatus({userId, status: 'BANNED'});
+    hideBanUserDialog();
+    if (commentId && commentStatus && commentStatus !== 'REJECTED') {
+      await setCommentStatus({commentId, status: 'REJECTED'});
+    }
+  }
+
+  getInfo() {
+    let note = t('bandialog.note_ban_user');
+    if (this.props.commentStatus && this.props.commentStatus !== 'REJECTED') {
+      note = t('bandialog.note_reject_comment');
+    }
+    return t('bandialog.note', note);
+  }
+
+  render() {
+    return (
+      <BanUserDialog
+        open={this.props.open}
+        onPerform={this.banUser}
+        onCancel={this.props.hideBanUserDialog}
+        username={this.props.username}
+        info={this.getInfo()}
+      />
+    );
+  }
+}
+
+const mapStateToProps = ({banUserDialog: {open, userId, username, commentId, commentStatus}}) => ({
+  open,
+  userId,
+  username,
+  commentId,
+  commentStatus,
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  ...bindActionCreators({
+    hideBanUserDialog,
+  }, dispatch),
+});
+
+export default compose(
+  withSetUserStatus,
+  withSetCommentStatus,
+  connect(
+    mapStateToProps,
+    mapDispatchToProps,
+  ),
+)(BanUserDialogContainer);
diff --git a/client/coral-admin/src/containers/Layout.js b/client/coral-admin/src/containers/Layout.js
index 340a18e3b..dacf768c0 100644
--- a/client/coral-admin/src/containers/Layout.js
+++ b/client/coral-admin/src/containers/Layout.js
@@ -5,6 +5,8 @@ import {fetchConfig} from '../actions/config';
 import AdminLogin from '../components/AdminLogin';
 import {logout} from 'coral-framework/actions/auth';
 import {FullLoading} from '../components/FullLoading';
+import BanUserDialog from './BanUserDialog';
+import SuspendUserDialog from './SuspendUserDialog';
 import {toggleModal as toggleShortcutModal} from '../actions/moderation';
 import {checkLogin, handleLogin, requestPasswordReset} from '../actions/auth';
 import {can} from 'coral-framework/services/perms';
@@ -52,7 +54,11 @@ class LayoutContainer extends Component {
           handleLogout={handleLogout}
           toggleShortcutModal={toggleShortcutModal}
           {...this.props}
-        />
+        >
+        <BanUserDialog />
+        <SuspendUserDialog />
+        {this.props.children}
+        </Layout>
       );
     } else if (loggedIn) {
       return (
diff --git a/client/coral-admin/src/containers/SuspendUserDialog.js b/client/coral-admin/src/containers/SuspendUserDialog.js
new file mode 100644
index 000000000..bd95328a3
--- /dev/null
+++ b/client/coral-admin/src/containers/SuspendUserDialog.js
@@ -0,0 +1,83 @@
+import React, {Component} from 'react';
+import {connect} from 'react-redux';
+import {bindActionCreators} from 'redux';
+import SuspendUserDialog from '../components/SuspendUserDialog';
+import {hideSuspendUserDialog} from '../actions/suspendUserDialog';
+import {withSetCommentStatus, withSuspendUser} from 'coral-framework/graphql/mutations';
+import {compose, gql} from 'react-apollo';
+import * as notification from 'coral-admin/src/services/notification';
+import t, {timeago} from 'coral-framework/services/i18n';
+import withQuery from 'coral-framework/hocs/withQuery';
+import get from 'lodash/get';
+
+class SuspendUserDialogContainer extends Component {
+
+  suspendUser = async ({message, until}) => {
+    const {userId, username, commentStatus, commentId, hideSuspendUserDialog, setCommentStatus, suspendUser} = this.props;
+    hideSuspendUserDialog();
+    try {
+      const result = await suspendUser({id: userId, message, until});
+      if (result.data.suspendUser.errors) {
+        throw result.data.suspendUser.errors;
+      }
+      notification.success(
+        t('suspenduser.notify_suspend_until', username, timeago(until)),
+      );
+      if (commentId && commentStatus && commentStatus !== 'REJECTED') {
+        return setCommentStatus({commentId, status: 'REJECTED'})
+          .then((result) => {
+            if (result.data.setCommentStatus.errors) {
+              throw result.data.setCommentStatus.errors;
+            }
+          });
+      }
+    }
+    catch(err) {
+      notification.showMutationErrors(err);
+    }
+  };
+
+  render() {
+    return (
+      <SuspendUserDialog
+        open={this.props.open}
+        onPerform={this.suspendUser}
+        onCancel={this.props.hideSuspendUserDialog}
+        organizationName={get(this.props, 'root.settings.organizationName')}
+        username={this.props.username}
+      />
+    );
+  }
+}
+
+const withOrganizationName = withQuery(gql`
+  query CoralAdmin_SuspendUserDialog {
+     settings {
+      organizationName
+    }
+  }
+`);
+
+const mapStateToProps = ({suspendUserDialog: {open, userId, username, commentId, commentStatus}}) => ({
+  open,
+  userId,
+  username,
+  commentId,
+  commentStatus,
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  ...bindActionCreators({
+    hideSuspendUserDialog,
+  }, dispatch),
+});
+
+export default compose(
+  connect(
+    mapStateToProps,
+    mapDispatchToProps,
+  ),
+  withSuspendUser,
+  withSetCommentStatus,
+  withOrganizationName,
+)(SuspendUserDialogContainer);
diff --git a/client/coral-admin/src/reducers/banUserDialog.js b/client/coral-admin/src/reducers/banUserDialog.js
new file mode 100644
index 000000000..1d66339ec
--- /dev/null
+++ b/client/coral-admin/src/reducers/banUserDialog.js
@@ -0,0 +1,30 @@
+import {SHOW_BAN_USER_DIALOG, HIDE_BAN_USER_DIALOG} from '../constants/banUserDialog';
+
+const initialState = {
+  open: false,
+  userId: null,
+  username: '',
+  commentId: null,
+  commentStatus: '',
+};
+
+export default function banUserDialog(state = initialState, action) {
+  switch (action.type) {
+  case SHOW_BAN_USER_DIALOG:
+    return {
+      ...state,
+      open: true,
+      userId: action.userId,
+      username: action.username,
+      commentId: action.commentId,
+      commentStatus: action.commentStatus,
+    };
+  case HIDE_BAN_USER_DIALOG:
+    return {
+      ...state,
+      open: false,
+    };
+  default:
+    return state;
+  }
+}
diff --git a/client/coral-admin/src/reducers/community.js b/client/coral-admin/src/reducers/community.js
index 7127c6fbe..3fba504f8 100644
--- a/client/coral-admin/src/reducers/community.js
+++ b/client/coral-admin/src/reducers/community.js
@@ -9,8 +9,8 @@ import {
   SET_COMMENTER_STATUS,
   SHOW_BANUSER_DIALOG,
   HIDE_BANUSER_DIALOG,
-  SHOW_SUSPENDUSER_DIALOG,
-  HIDE_SUSPENDUSER_DIALOG
+  SHOW_REJECT_USERNAME_DIALOG,
+  HIDE_REJECT_USERNAME_DIALOG
 } from '../constants/community';
 
 const initialState = Map({
@@ -24,7 +24,7 @@ const initialState = Map({
   pagePeople: 0,
   user: Map({}),
   banDialog: false,
-  suspendDialog: false
+  rejectUsernameDialog: false
 });
 
 export default function community (state = initialState, action) {
@@ -79,14 +79,14 @@ export default function community (state = initialState, action) {
         user: Map(action.user),
         banDialog: true
       });
-  case HIDE_SUSPENDUSER_DIALOG:
+  case HIDE_REJECT_USERNAME_DIALOG:
     return state
-      .set('suspendDialog', false);
-  case SHOW_SUSPENDUSER_DIALOG:
+      .set('rejectUsernameDialog', false);
+  case SHOW_REJECT_USERNAME_DIALOG:
     return state
       .merge({
         user: Map(action.user),
-        suspendDialog: true
+        rejectUsernameDialog: true
       });
   default :
     return state;
diff --git a/client/coral-admin/src/reducers/index.js b/client/coral-admin/src/reducers/index.js
index 04c8b6590..f94b50817 100644
--- a/client/coral-admin/src/reducers/index.js
+++ b/client/coral-admin/src/reducers/index.js
@@ -5,9 +5,13 @@ import community from './community';
 import moderation from './moderation';
 import install from './install';
 import config from './config';
+import banUserDialog from './banUserDialog';
+import suspendUserDialog from './suspendUserDialog';
 
 export default {
   auth,
+  banUserDialog,
+  suspendUserDialog,
   assets,
   settings,
   community,
diff --git a/client/coral-admin/src/reducers/moderation.js b/client/coral-admin/src/reducers/moderation.js
index fd6f7c0ea..a2c8975ff 100644
--- a/client/coral-admin/src/reducers/moderation.js
+++ b/client/coral-admin/src/reducers/moderation.js
@@ -1,61 +1,23 @@
-import {fromJS, Map, Set} from 'immutable';
+import {fromJS, Set} from 'immutable';
 import * as actions from '../constants/moderation';
 
 const initialState = fromJS({
   singleView: false,
   modalOpen: false,
-  user: {},
-  commentId: null,
-  commentStatus: null,
   userDetailId: null,
   userDetailActiveTab: 'all',
   userDetailStatuses: ['NONE', 'ACCEPTED', 'REJECTED', 'PREMOD'],
   userDetailSelectedIds: new Set(),
-  banDialog: false,
   storySearchVisible: false,
   storySearchString: '',
   shortcutsNoteVisible: window.localStorage.getItem('coral:shortcutsNote') || 'show',
   sortOrder: 'REVERSE_CHRONOLOGICAL',
-  suspendUserDialog: {
-    show: false,
-    userId: null,
-    username: '',
-    commentId: null,
-    commentStatus: '',
-  },
 });
 
 export default function moderation (state = initialState, action) {
   switch (action.type) {
   case actions.MODERATION_CLEAR_STATE:
     return initialState;
-  case actions.HIDE_BANUSER_DIALOG:
-    return state
-      .set('banDialog', false)
-      .set('commentStatus', null);
-  case actions.SHOW_BANUSER_DIALOG:
-    return state
-      .merge({
-        user: Map(action.user),
-        commentId: action.commentId,
-        commentStatus: action.commentStatus,
-        showRejectedNote: action.showRejectedNote,
-        banDialog: true
-      });
-  case actions.SHOW_SUSPEND_USER_DIALOG:
-    return state
-      .mergeDeep({
-        suspendUserDialog: {
-          show: true,
-          userId: action.userId,
-          username: action.username,
-          commentId: action.commentId,
-          commentStatus: action.commentStatus,
-        }
-      });
-  case actions.HIDE_SUSPEND_USER_DIALOG:
-    return state
-      .setIn(['suspendUserDialog', 'show'], false);
   case actions.SET_ACTIVE_TAB:
     return state
       .set('activeTab', action.activeTab);
diff --git a/client/coral-admin/src/reducers/suspendUserDialog.js b/client/coral-admin/src/reducers/suspendUserDialog.js
new file mode 100644
index 000000000..733dd337b
--- /dev/null
+++ b/client/coral-admin/src/reducers/suspendUserDialog.js
@@ -0,0 +1,30 @@
+import {SHOW_SUSPEND_USER_DIALOG, HIDE_SUSPEND_USER_DIALOG} from '../constants/suspendUserDialog';
+
+const initialState = {
+  open: false,
+  userId: null,
+  username: '',
+  commentId: null,
+  commentStatus: '',
+};
+
+export default function suspendUserDialog(state = initialState, action) {
+  switch (action.type) {
+  case SHOW_SUSPEND_USER_DIALOG:
+    return {
+      ...state,
+      open: true,
+      userId: action.userId,
+      username: action.username,
+      commentId: action.commentId,
+      commentStatus: action.commentStatus,
+    };
+  case HIDE_SUSPEND_USER_DIALOG:
+    return {
+      ...state,
+      open: false,
+    };
+  default:
+    return state;
+  }
+}
diff --git a/client/coral-admin/src/routes/Community/components/ActionButton.js b/client/coral-admin/src/routes/Community/components/ActionButton.js
index 67f16acad..b0b68b063 100644
--- a/client/coral-admin/src/routes/Community/components/ActionButton.js
+++ b/client/coral-admin/src/routes/Community/components/ActionButton.js
@@ -1,23 +1,18 @@
 import React from 'react';
 import styles from './Community.css';
-import BanUserButton from './BanUserButton';
 import {Button} from 'coral-ui';
 import {menuActionsMap} from '../../Moderation/helpers/moderationQueueActionsMap';
 
 import t from 'coral-framework/services/i18n';
 
 const ActionButton = ({type = '', user, ...props}) => {
-  if (type === 'BAN') {
-    return <BanUserButton icon='not interested' user={user} onClick={() => props.showBanUserDialog(user)} />;
-  }
-
   return (
     <Button
       className={`${type.toLowerCase()} ${styles.actionButton}`}
       cStyle={type.toLowerCase()}
       icon={menuActionsMap[type].icon}
       onClick={() => {
-        type === 'APPROVE' ? props.approveUser({userId: user.id}) : props.showSuspendUserDialog({user: user});
+        type === 'APPROVE' ? props.approveUser({userId: user.id}) : props.showRejectUsernameDialog({user: user});
       }}
     >{t(`modqueue.${menuActionsMap[type].text}`)}</Button>
   );
diff --git a/client/coral-admin/src/routes/Community/components/BanUserButton.css b/client/coral-admin/src/routes/Community/components/BanUserButton.css
deleted file mode 100644
index 6e8e50f71..000000000
--- a/client/coral-admin/src/routes/Community/components/BanUserButton.css
+++ /dev/null
@@ -1,11 +0,0 @@
-.banButton {
-  -webkit-transform: scale(.8);
-  transform: scale(.8);
-  margin: 0;
-
-  i {
-    vertical-align: middle;
-    margin-right: 5px;
-    font-size: 14px;
-  }
-}
diff --git a/client/coral-admin/src/routes/Community/components/BanUserButton.js b/client/coral-admin/src/routes/Community/components/BanUserButton.js
deleted file mode 100644
index cc4935204..000000000
--- a/client/coral-admin/src/routes/Community/components/BanUserButton.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import React, {PropTypes} from 'react';
-import {Button, Icon} from 'coral-ui';
-import styles from './BanUserButton.css';
-
-import t from 'coral-framework/services/i18n';
-
-const BanUserButton = ({user, ...props}) => (
-  <div className={styles.ban}>
-    <Button cStyle='ban'
-      className={`ban ${styles.banButton}`}
-      disabled={user.status === 'BANNED' ? 'disabled' : ''}
-      onClick={props.onClick}
-      raised>
-      <Icon name='not_interested' />
-      {t('comment.ban_user')}
-    </Button>
-  </div>
-);
-
-BanUserButton.propTypes = {
-  onClick: PropTypes.func.isRequired
-};
-
-export default BanUserButton;
diff --git a/client/coral-admin/src/routes/Community/components/BanUserDialog.css b/client/coral-admin/src/routes/Community/components/BanUserDialog.css
deleted file mode 100644
index a46b9da32..000000000
--- a/client/coral-admin/src/routes/Community/components/BanUserDialog.css
+++ /dev/null
@@ -1,164 +0,0 @@
-.dialog {
-  border: none;
-  box-shadow: 0 9px 46px 8px rgba(0, 0, 0, 0.14), 0 11px 15px -7px rgba(0, 0, 0, 0.12), 0 24px 38px 3px rgba(0, 0, 0, 0.2);
-  width: 500px;
-  top: 50%;
-  transform: translateY(-50%);
-  height: 184px;
-  padding: 20px;
-
-  h2 {
-    color: black;
-    font-size: 1.76em;
-    font-weight: 500;
-    margin: 0;
-  }
-
-  h3 {
-    color: black;
-    font-size: 1.4em;
-    font-weight: 500;
-    margin: 0;
-  }
-}
-
-.textField {
-    margin-top: 15px;
-}
-
-.textField label {
-    font-size: 1.08em;
-    font-weight: bold;
-    margin-bottom: 5px;
-}
-
-.textField input {
-    width: 100%;
-    display: block;
-    border: none;
-    outline: none;
-    border: 1px solid rgba(0,0,0,.12);
-    padding: 10px 6px;
-    box-sizing: border-box;
-    border-radius: 2px;
-    margin: 5px auto;
-}
-
-.footer {
-    margin: 20px auto 10px;
-    text-align: center;
-}
-
-.footer span {
-    display: block;
-    margin-bottom: 5px;
-}
-
-.footer a {
-    color: #2c69b6;
-    cursor: pointer;
-    margin: 0 5px;
-}
-
-.socialConnections {
-    margin-bottom: 20px;
-}
-
-.signInButton {
-    margin-top: 10px;
-}
-
-.close {
-    font-size: 20px;
-    line-height: 14px;
-    top: 10px;
-    right: 10px;
-    position: absolute;
-    display: block;
-    font-weight: bold;
-    color: #363636;
-    cursor: pointer;
-}
-
-.close:hover {
-    color: #6b6b6b;
-}
-
-input.error{
-    border: solid 2px #f44336;
-}
-
-.errorMsg, .hint {
-    color: grey;
-    font-weight: 600;
-    padding: 3px 0 16px;
-}
-
-.alert {
-    padding: 10px;
-    margin-bottom: 20px;
-    border-radius: 2px;
-}
-
-.alert--success {
-    border: solid 1px #1ec00e;
-    background: #cbf1b8;
-    color: #006900;
-}
-
-.alert--error {
-    background: #FFEBEE;
-    color: #B71C1C;
-}
-
-.userBox a {
-    color: #2c69b6;
-    cursor: pointer;
-    margin: 0px;
-}
-
-.attention {
-    display: inline-block;
-    width: 15px;
-    height: 15px;
-    background: #B71C1C;
-    color: #FFEBEE;
-    font-weight: bolder;
-    padding: 4px;
-    vertical-align: middle;
-    border-radius: 20px;
-    box-sizing: border-box;
-    font-size: 9px;
-    line-height: 7px;
-    text-align: center;
-    margin-right: 5px;
-}
-
-.action {
-    margin-top: 15px;
-}
-
-.passwordRequestSuccess {
-    border: 1px solid green;
-    background-color: lightgreen;
-    padding: 10px;
-}
-
-.passwordRequestFailure {
-    border: 1px solid orange;
-    background-color: 1px solid coral;
-    padding: 10px;
-}
-
-.cancel {
-  margin-right: 10px;
-  width: 47%;
-}
-
-.ban {
-  width: 47%;
-}
-
-.buttons {
-  margin: 20px 0;
-}
diff --git a/client/coral-admin/src/routes/Community/components/BanUserDialog.js b/client/coral-admin/src/routes/Community/components/BanUserDialog.js
deleted file mode 100644
index 26a885e8b..000000000
--- a/client/coral-admin/src/routes/Community/components/BanUserDialog.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import React, {PropTypes} from 'react';
-import {Dialog} from 'coral-ui';
-import styles from './BanUserDialog.css';
-
-import Button from 'coral-ui/components/Button';
-
-import t from 'coral-framework/services/i18n';
-
-const BanUserDialog = ({open, handleClose, handleBanUser, user}) => (
-  <Dialog
-    className={styles.dialog}
-    id="banuserDialog"
-    open={open}
-    onClose={handleClose}
-    onCancel={handleClose}
-    title={t('community.ban_user')}>
-    <span className={styles.close} onClick={handleClose}>×</span>
-    <div>
-      <div className={styles.header}>
-        <h2>{t('community.ban_user')}</h2>
-      </div>
-      <div className={styles.separator}>
-        <h3>{t('community.are_you_sure', user.username)}</h3>
-        <i>{t('community.note')}</i>
-      </div>
-      <div className={styles.buttons}>
-        <Button cStyle="cancel" className={styles.cancel} onClick={handleClose} raised>
-          {t('community.cancel')}
-        </Button>
-        <Button
-          cStyle="black" className={styles.ban}
-          onClick={() => {
-            handleBanUser({userId: user.id}).then(() => {
-              handleClose();
-            });
-          }}
-          raised>
-          {t('community.yes_ban_user')}
-        </Button>
-      </div>
-    </div>
-  </Dialog>
-);
-
-BanUserDialog.propTypes = {
-  handleBanUser: PropTypes.func.isRequired,
-  handleClose: PropTypes.func.isRequired,
-  user: PropTypes.object.isRequired,
-};
-
-export default BanUserDialog;
diff --git a/client/coral-admin/src/routes/Community/components/Community.js b/client/coral-admin/src/routes/Community/components/Community.js
index f6544b0ac..fe7478efb 100644
--- a/client/coral-admin/src/routes/Community/components/Community.js
+++ b/client/coral-admin/src/routes/Community/components/Community.js
@@ -1,10 +1,9 @@
 import React, {Component} from 'react';
 
 import CommunityMenu from './CommunityMenu';
-import BanUserDialog from './BanUserDialog';
-import SuspendUserDialog from './SuspendUserDialog';
 import People from './People';
 import FlaggedAccounts from './FlaggedAccounts';
+import RejectUsernameDialog from './RejectUsernameDialog';
 
 export default class Community extends Component {
 
@@ -80,19 +79,14 @@ export default class Community extends Component {
         <FlaggedAccounts
           commenters={users}
           showBanUserDialog={props.showBanUserDialog}
+          showSuspendUserDialog={props.showSuspendUserDialog}
+          showRejectUsernameDialog={props.showRejectUsernameDialog}
           approveUser={props.approveUser}
           rejectUsername={props.rejectUsername}
-          showSuspendUserDialog={props.showSuspendUserDialog}
         />
-        <BanUserDialog
-          open={community.banDialog}
-          user={community.user}
-          handleClose={props.hideBanUserDialog}
-          handleBanUser={props.banUser}
-        />
-        <SuspendUserDialog
-          open={community.suspendDialog}
-          handleClose={props.hideSuspendUserDialog}
+        <RejectUsernameDialog
+          open={community.rejectUsernameDialog}
+          handleClose={props.hideRejectUsernameDialog}
           user={community.user}
           rejectUsername={props.rejectUsername}
         />
diff --git a/client/coral-admin/src/routes/Community/components/FlaggedAccounts.js b/client/coral-admin/src/routes/Community/components/FlaggedAccounts.js
index df6368844..dc2003850 100644
--- a/client/coral-admin/src/routes/Community/components/FlaggedAccounts.js
+++ b/client/coral-admin/src/routes/Community/components/FlaggedAccounts.js
@@ -9,8 +9,6 @@ const FlaggedAccounts = ({...props}) => {
   const {commenters} = props;
   const hasResults = commenters && !!commenters.length;
 
-// if (commenter.status === 'PENDING' && commenter.actions.length > 0) {
-
   return (
     <div className={styles.container}>
       <div className={styles.mainFlaggedContent}>
@@ -24,8 +22,8 @@ const FlaggedAccounts = ({...props}) => {
               modActionButtons={['APPROVE', 'REJECT']}
               showBanUserDialog={props.showBanUserDialog}
               showSuspendUserDialog={props.showSuspendUserDialog}
+              showRejectUsernameDialog={props.showRejectUsernameDialog}
               approveUser={props.approveUser}
-              suspendUser={props.suspendUser}
               />;
           })
           : <EmptyCard>{t('community.no_flagged_accounts')}</EmptyCard>
diff --git a/client/coral-admin/src/routes/Community/components/SuspendUserDialog.css b/client/coral-admin/src/routes/Community/components/RejectUsernameDialog.css
similarity index 100%
rename from client/coral-admin/src/routes/Community/components/SuspendUserDialog.css
rename to client/coral-admin/src/routes/Community/components/RejectUsernameDialog.css
diff --git a/client/coral-admin/src/routes/Community/components/SuspendUserDialog.js b/client/coral-admin/src/routes/Community/components/RejectUsernameDialog.js
similarity index 71%
rename from client/coral-admin/src/routes/Community/components/SuspendUserDialog.js
rename to client/coral-admin/src/routes/Community/components/RejectUsernameDialog.js
index 0db31ccc1..9ae039ac5 100644
--- a/client/coral-admin/src/routes/Community/components/SuspendUserDialog.js
+++ b/client/coral-admin/src/routes/Community/components/RejectUsernameDialog.js
@@ -1,30 +1,30 @@
 import React, {Component, PropTypes} from 'react';
 
 import {Dialog, Button} from 'coral-ui';
-import styles from './SuspendUserDialog.css';
+import styles from './RejectUsernameDialog.css';
 
 import t from 'coral-framework/services/i18n';
 
 const stages = [
   {
-    title: 'suspenduser.title_reject',
-    description: 'suspenduser.description_reject',
+    title: 'rejectUsername.title_reject',
+    description: 'rejectUsername.description_reject',
     options: {
-      'j': 'suspenduser.no_cancel',
-      'k': 'suspenduser.yes_suspend'
+      'j': 'rejectUsername.no_cancel',
+      'k': 'rejectUsername.yes_suspend'
     }
   },
   {
-    title: 'suspenduser.title_notify',
-    description: 'suspenduser.description_notify',
+    title: 'rejectUsername.title_notify',
+    description: 'rejectUsername.description_notify',
     options: {
       'j': 'bandialog.cancel',
-      'k': 'suspenduser.send'
+      'k': 'rejectUsername.send'
     }
   }
 ];
 
-class SuspendUserDialog extends Component  {
+class RejectUsernameDialog extends Component  {
 
   state = {email: '', stage: 0}
 
@@ -35,7 +35,7 @@ class SuspendUserDialog extends Component  {
   }
 
   componentDidMount() {
-    this.setState({email: t('suspenduser.email_message_reject'), about: t('suspenduser.username')});
+    this.setState({email: t('rejectUsername.email_message_reject'), about: t('rejectUsername.username')});
   }
 
   /*
@@ -72,22 +72,22 @@ class SuspendUserDialog extends Component  {
 
     return <Dialog
             className={styles.suspendDialog}
-            id="suspendUserDialog"
+            id="rejectUsernameDialog"
             open={open}
             onClose={handleClose}
             onCancel={handleClose}
-            title={t('suspenduser.suspend_user')}>
+            title={t('rejectUsername.suspend_user')}>
             <div className={styles.title}>
-              {t(stages[stage].title, t('suspenduser.username'))}
+              {t(stages[stage].title, t('rejectUsername.username'))}
             </div>
             <div className={styles.container}>
               <div className={styles.description}>
-                {t(stages[stage].description, t('suspenduser.username'))}
+                {t(stages[stage].description, t('rejectUsername.username'))}
               </div>
               {
                 stage === 1 &&
                 <div className={styles.writeContainer}>
-                  <div className={styles.emailMessage}>{t('suspenduser.write_message')}</div>
+                  <div className={styles.emailMessage}>{t('rejectUsername.write_message')}</div>
                   <div className={styles.emailContainer}>
                     <textarea
                       rows={5}
@@ -100,7 +100,7 @@ class SuspendUserDialog extends Component  {
               <div className={styles.modalButtons}>
                 {Object.keys(stages[stage].options).map((key, i) => (
                   <Button key={i} onClick={this.onActionClick(stage, i)}>
-                    {t(stages[stage].options[key], t('suspenduser.username'))}
+                    {t(stages[stage].options[key], t('rejectUsername.username'))}
                   </Button>
                 ))}
               </div>
@@ -109,4 +109,4 @@ class SuspendUserDialog extends Component  {
   }
 }
 
-export default SuspendUserDialog;
+export default RejectUsernameDialog;
diff --git a/client/coral-admin/src/routes/Community/components/User.js b/client/coral-admin/src/routes/Community/components/User.js
index 84d30e5f3..639888e7d 100644
--- a/client/coral-admin/src/routes/Community/components/User.js
+++ b/client/coral-admin/src/routes/Community/components/User.js
@@ -2,6 +2,8 @@ import React from 'react';
 import styles from './Community.css';
 
 import ActionButton from './ActionButton';
+import ActionsMenu from 'coral-admin/src/components/ActionsMenu';
+import ActionsMenuItem from 'coral-admin/src/components/ActionsMenuItem';
 
 import t from 'coral-framework/services/i18n';
 
@@ -18,6 +20,16 @@ const User = (props) => {
   const {user, modActionButtons} = props;
   let userStatus = user.status;
 
+  const showSuspenUserDialog = () => props.showSuspendUserDialog({
+    userId: user.id,
+    username: user.username,
+  });
+
+  const showBanUserDialog = () => props.showBanUserDialog({
+    userId: user.id,
+    username: user.username,
+  });
+
   // Do not display unless the user status is 'pending' or 'banned'.
   // This means that they have already been reviewed and approved.
   return (userStatus === 'PENDING' ||  userStatus === 'BANNED') &&
@@ -28,12 +40,17 @@ const User = (props) => {
             <span>
               {user.username}
             </span>
-            <ActionButton
-              className={styles.banButton}
-              type='BAN'
-              user={user}
-              showBanUserDialog={props.showBanUserDialog}
-            />
+            <ActionsMenu icon="not_interested">
+              <ActionsMenuItem
+                disabled={user.status === 'BANNED'}
+                onClick={showSuspenUserDialog}>
+                Suspend User</ActionsMenuItem>
+              <ActionsMenuItem
+                disabled={user.status === 'BANNED'}
+                onClick={showBanUserDialog}>
+                Ban User
+              </ActionsMenuItem>
+            </ActionsMenu>
           </div>
         </div>
 
@@ -78,11 +95,10 @@ const User = (props) => {
             <div className={`actions ${styles.actions}`}>
               {modActionButtons.map((action, i) =>
                 <ActionButton key={i}
-                              type={action.toUpperCase()}
-                              user={user}
-                              approveUser={props.approveUser}
-                              suspendUser={props.suspendUser}
-                              showSuspendUserDialog={props.showSuspendUserDialog}
+                  type={action.toUpperCase()}
+                  user={user}
+                  approveUser={props.approveUser}
+                  showRejectUsernameDialog={props.showRejectUsernameDialog}
                 />
               )}
             </div>
diff --git a/client/coral-admin/src/routes/Community/containers/Community.js b/client/coral-admin/src/routes/Community/containers/Community.js
index 8c5de95d4..2ef0d9eb3 100644
--- a/client/coral-admin/src/routes/Community/containers/Community.js
+++ b/client/coral-admin/src/routes/Community/containers/Community.js
@@ -7,14 +7,15 @@ import {Spinner} from 'coral-ui';
 
 import {withSetUserStatus, withRejectUsername} from 'coral-framework/graphql/mutations';
 
+import {showBanUserDialog} from 'actions/banUserDialog';
+import {showSuspendUserDialog} from 'actions/suspendUserDialog';
+
 import {
   fetchAccounts,
   updateSorting,
   newPage,
-  showBanUserDialog,
-  hideBanUserDialog,
-  showSuspendUserDialog,
-  hideSuspendUserDialog
+  showRejectUsernameDialog,
+  hideRejectUsernameDialog
 } from '../../../actions/community';
 
 import Community from '../components/Community';
@@ -92,9 +93,9 @@ const mapDispatchToProps = (dispatch) =>
   bindActionCreators({
     fetchAccounts,
     showBanUserDialog,
-    hideBanUserDialog,
     showSuspendUserDialog,
-    hideSuspendUserDialog,
+    showRejectUsernameDialog,
+    hideRejectUsernameDialog,
     updateSorting,
     newPage,
   }, dispatch);
diff --git a/client/coral-admin/src/routes/Moderation/components/BanUserDialog.js b/client/coral-admin/src/routes/Moderation/components/BanUserDialog.js
deleted file mode 100644
index 56507e13c..000000000
--- a/client/coral-admin/src/routes/Moderation/components/BanUserDialog.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import React, {PropTypes} from 'react';
-import {Dialog} from 'coral-ui';
-import styles from './BanUserDialog.css';
-
-import Button from 'coral-ui/components/Button';
-import t from 'coral-framework/services/i18n';
-
-const onBanClick = (userId, commentId, commentStatus, handleBanUser, rejectComment, handleClose) => (e) => {
-  e.preventDefault();
-  handleBanUser({userId})
-  .then(handleClose)
-  .then(() => commentStatus === 'REJECTED' ? null : rejectComment({commentId}));
-};
-
-const BanUserDialog = ({open, handleClose, handleBanUser, rejectComment, user, commentId, commentStatus, showRejectedNote}) => (
-  <Dialog
-    className={styles.dialog}
-    id="banuserDialog"
-    open={open}
-    onClose={handleClose}
-    onCancel={handleClose}
-    title={t('bandialog.ban_user')}>
-    <span className={styles.close} onClick={handleClose}>×</span>
-    <div>
-      <div className={styles.header}>
-        <h2>{t('bandialog.ban_user')}</h2>
-      </div>
-      <div className={styles.separator}>
-        <h3>{t('bandialog.are_you_sure', user.username)}</h3>
-        <i>{showRejectedNote && t('bandialog.note')}</i>
-      </div>
-      <div className={styles.buttons}>
-        <Button cStyle="cancel" className={styles.cancel} onClick={handleClose} raised>
-          {t('bandialog.cancel')}
-        </Button>
-        <Button cStyle="black" className={styles.ban} onClick={onBanClick(user.id, commentId, commentStatus, handleBanUser, rejectComment, handleClose)} raised>
-          {t('bandialog.yes_ban_user')}
-        </Button>
-      </div>
-    </div>
-  </Dialog>
-);
-
-BanUserDialog.propTypes = {
-  handleBanUser: PropTypes.func.isRequired,
-  handleClose: PropTypes.func.isRequired,
-  rejectComment: PropTypes.func.isRequired,
-  commentId: PropTypes.string,
-  user: PropTypes.object.isRequired,
-};
-
-export default BanUserDialog;
diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.js b/client/coral-admin/src/routes/Moderation/components/Comment.js
index 3d946f9fc..7ce2917dc 100644
--- a/client/coral-admin/src/routes/Moderation/components/Comment.js
+++ b/client/coral-admin/src/routes/Moderation/components/Comment.js
@@ -65,6 +65,20 @@ class Comment extends React.Component {
       selectionStateCSS = selected ? 'mdl-shadow--16dp' : 'mdl-shadow--2dp';
     }
 
+    const showSuspenUserDialog = () => props.showSuspendUserDialog({
+      userId: comment.user.id,
+      username: comment.user.username,
+      commentId: comment.id,
+      commentStatus: comment.status,
+    });
+
+    const showBanUserDialog = () => props.showBanUserDialog({
+      userId: comment.user.id,
+      username: comment.user.username,
+      commentId: comment.id,
+      commentStatus: comment.status,
+    });
+
     return (
       <li
         tabIndex={props.index}
@@ -102,11 +116,11 @@ class Comment extends React.Component {
                 <ActionsMenu icon="not_interested">
                   <ActionsMenuItem
                     disabled={comment.user.status === 'BANNED'}
-                    onClick={() => props.showSuspendUserDialog(comment.user.id, comment.user.username, comment.id, comment.status)}>
+                    onClick={showSuspenUserDialog}>
                     Suspend User</ActionsMenuItem>
                   <ActionsMenuItem
                     disabled={comment.user.status === 'BANNED'}
-                    onClick={() => props.showBanUserDialog(comment.user, comment.id, comment.status, comment.status !== 'REJECTED')}>
+                    onClick={showBanUserDialog}>
                     Ban User
                   </ActionsMenuItem>
                 </ActionsMenu>
diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js
index eb0b21c46..dd75b62f8 100644
--- a/client/coral-admin/src/routes/Moderation/components/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js
@@ -2,8 +2,6 @@ import React, {Component} from 'react';
 import key from 'keymaster';
 import styles from './styles.css';
 
-import BanUserDialog from './BanUserDialog';
-import SuspendUserDialog from './SuspendUserDialog';
 import ModerationQueue from './ModerationQueue';
 import ModerationMenu from './ModerationMenu';
 import ModerationHeader from './ModerationHeader';
@@ -169,24 +167,6 @@ export default class Moderation extends Component {
           viewUserDetail={viewUserDetail}
           hideUserDetail={hideUserDetail}
         />
-        <BanUserDialog
-          open={moderation.banDialog}
-          user={moderation.user}
-          commentId={moderation.commentId}
-          commentStatus={moderation.commentStatus}
-          handleClose={props.hideBanUserDialog}
-          handleBanUser={props.banUser}
-          showRejectedNote={moderation.showRejectedNote}
-          rejectComment={props.rejectComment}
-        />
-        <SuspendUserDialog
-          open={moderation.suspendUserDialog.show}
-          username={moderation.suspendUserDialog.username}
-          userId={moderation.suspendUserDialog.userId}
-          organizationName={root.settings.organizationName}
-          onCancel={props.hideSuspendUserDialog}
-          onPerform={this.props.suspendUser}
-        />
         <ModerationKeysModal
           hideShortcutsNote={props.hideShortcutsNote}
           shortcutsNoteVisible={moderation.shortcutsNoteVisible}
diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index ba026abb3..ccd689e19 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -4,23 +4,20 @@ import {bindActionCreators} from 'redux';
 import {compose, gql} from 'react-apollo';
 import withQuery from 'coral-framework/hocs/withQuery';
 import {getDefinitionName} from 'coral-framework/utils';
-import * as notification from 'coral-admin/src/services/notification';
-import t, {timeago} from 'coral-framework/services/i18n';
+import t from 'coral-framework/services/i18n';
 import update from 'immutability-helper';
 import truncate from 'lodash/truncate';
 import NotFoundAsset from '../components/NotFoundAsset';
 
-import {withSetUserStatus, withSuspendUser, withSetCommentStatus} from 'coral-framework/graphql/mutations';
+import {withSetCommentStatus} from 'coral-framework/graphql/mutations';
 import {handleCommentChange} from '../../../graphql/utils';
 
 import {fetchSettings} from 'actions/settings';
+import {showBanUserDialog} from 'actions/banUserDialog';
+import {showSuspendUserDialog} from 'actions/suspendUserDialog';
 import {
   toggleModal,
   singleView,
-  showBanUserDialog,
-  hideBanUserDialog,
-  showSuspendUserDialog,
-  hideSuspendUserDialog,
   hideShortcutsNote,
   toggleStorySearch,
   viewUserDetail,
@@ -138,37 +135,6 @@ class ModerationContainer extends Component {
     }
   }
 
-  suspendUser = async (args) => {
-    this.props.hideSuspendUserDialog();
-    try {
-      const result = await this.props.suspendUser(args);
-      if (result.data.suspendUser.errors) {
-        throw result.data.suspendUser.errors;
-      }
-      notification.success(
-        t('suspenduser.notify_suspend_until',
-          this.props.moderation.suspendUserDialog.username,
-          timeago(args.until)),
-      );
-      const {commentStatus, commentId} = this.props.moderation.suspendUserDialog;
-      if (commentStatus !== 'REJECTED') {
-        return this.props.rejectComment({commentId})
-          .then((result) => {
-            if (result.data.setCommentStatus.errors) {
-              throw result.data.setCommentStatus.errors;
-            }
-          });
-      }
-    }
-    catch(err) {
-      notification.showMutationErrors(err);
-    }
-  };
-
-  banUser = ({userId}) => {
-    return this.props.setUserStatus({userId, status: 'BANNED'});
-  }
-
   acceptComment = ({commentId}) => {
     return this.props.setCommentStatus({commentId, status: 'ACCEPTED'});
   }
@@ -245,10 +211,8 @@ class ModerationContainer extends Component {
     return <Moderation
       {...this.props}
       loadMore={this.loadMore}
-      banUser={this.banUser}
       acceptComment={this.acceptComment}
       rejectComment={this.rejectComment}
-      suspendUser={this.suspendUser}
       activeTab={this.activeTab}
     />;
   }
@@ -458,11 +422,9 @@ const mapDispatchToProps = (dispatch) => ({
     singleView,
     fetchSettings,
     showBanUserDialog,
-    hideBanUserDialog,
     hideShortcutsNote,
     toggleStorySearch,
     showSuspendUserDialog,
-    hideSuspendUserDialog,
     viewUserDetail,
     hideUserDetail,
     setSortOrder,
@@ -474,8 +436,6 @@ const mapDispatchToProps = (dispatch) => ({
 export default compose(
   connect(mapStateToProps, mapDispatchToProps),
   withSetCommentStatus,
-  withSetUserStatus,
-  withSuspendUser,
   withQueueCountPolling,
   withModQueueQuery,
 )(ModerationContainer);
diff --git a/client/coral-framework/hocs/withMutation.js b/client/coral-framework/hocs/withMutation.js
index 5cccaa062..d3ba73ecd 100644
--- a/client/coral-framework/hocs/withMutation.js
+++ b/client/coral-framework/hocs/withMutation.js
@@ -30,7 +30,7 @@ class ResponseError {
  * Exports a HOC with the same signature as `graphql`, that will
  * apply mutation options registered in the graphRegistry.
  */
-export default (document, config) => (WrappedComponent) => {
+export default (document, config = {}) => (WrappedComponent) => {
   config = {
     ...config,
     options: config.options || {},
diff --git a/client/coral-framework/hocs/withQuery.js b/client/coral-framework/hocs/withQuery.js
index 84182f7dd..c4e9bc375 100644
--- a/client/coral-framework/hocs/withQuery.js
+++ b/client/coral-framework/hocs/withQuery.js
@@ -14,7 +14,7 @@ const withSkipOnErrors = (reducer) => (prev, action, ...rest) => {
  * Exports a HOC with the same signature as `graphql`, that will
  * apply query options registered in the graphRegistry.
  */
-export default (document, config) => (WrappedComponent) => {
+export default (document, config = {}) => (WrappedComponent) => {
   config = {
     ...config,
     options: config.options || {},
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 22f4a668f..8764a5f66 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -981,7 +981,7 @@ type RootMutation {
   # Suspends a user. Requires the `ADMIN` role.
   suspendUser(input: SuspendUserInput!): SuspendUserResponse
 
-  # Suspends a user. Requires the `ADMIN` role.
+  # Reject a username. Requires the `ADMIN` role.
   rejectUsername(input: RejectUsernameInput!): RejectUsernameResponse
 
   # Sets Comment status. Requires the `ADMIN` role.
diff --git a/locales/en.yml b/locales/en.yml
index 944902e15..9e95cdf6c 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -4,7 +4,9 @@ en:
     ban_user: "Ban User?"
     banned_user: "Banned User"
     cancel: "Cancel"
-    note: "Note: Banning this user will also place this comment in the Rejected queue."
+    note: "Note: {0}"
+    note_reject_comment: "Banning this user will also place this comment in the Rejected queue."
+    note_ban_user: "Banning this user will not let them edit comment or remove anything."
     yes_ban_user: "Yes, Ban User"
   bio_offensive: "This bio is offensive"
   cancel: "Cancel"
@@ -54,7 +56,6 @@ en:
     newsroom_role: "Newsroom Role"
     no_flagged_accounts: "The Flagged Usernames queue is currently empty."
     no_results: "No users found with that user name or email address. They're hiding!"
-    note: "Note: Banning this user will not let them edit comment or remove anything."
     offensive: "Offensive"
     other: Other
     people: People
@@ -330,35 +331,32 @@ en:
     status: "Stream Status"
     stream_status: "Stream Status"
   suspenduser:
-    bio: bio
-    cancel: "Cancel"
-    days: "{0} days"
-    description_0: "Would you like to temporarily suspend this user because of their {0}? Doing so will temporarily hide their comments until they rewrite their {0}."
-    description_1: "Suspending this user will temporarily disable their account and hide all of their comments on the site."
-    description_notify: "Suspending this user will temporarily disable their account and hide all of their comments on the site."
-    description_reject: "Would you like to temporarily ban this user because of their {0}? Doing so will temporarily hide their comments until they rewrite their {0}."
-    description_suspend: "You are suspending {0}. This comment will go to the Rejected queue, and {0} will not be allowed to like, report, reply or post until the suspension time is complete."
-    email: "Another member of the community recently flagged your username for review. Because of its content your user was rejected. This means you can no longer comment like or flag content until you rewrite your username. Please e-mail us if you have any questions or concerns."
-    email_subject: "Your account has been suspended"
-    email_message_reject: "Another member of the community recently flagged your username for review. Because of its content your user was rejected. This means you can no longer comment, like, or flag content until you rewrite your username. Please e-mail us if you have any questions or concerns."
-    email_message_suspend: "Dear {0},\n\nIn accordance with {1}’s community guidelines, your account has been temporarily suspended. During the suspension, you will be unable to comment, flag or engage with fellow commenters. Please rejoin the conversation {2}."
-    error_email_message_empty: "You must specify an E-Mail message."
-    hours: "{0} hours"
-    no_cancel: "No cancel"
-    notify_suspend_until: "User {0} has been temporarily suspended. This suspension will automatically end {1}."
-    one_hour: "1 hour"
-    send: Send
-    select_duration: "Select suspension duration"
-    suspend_user: "Suspend User"
-    title: "Suspend a user"
-    title_0: "We noticed you rejected a username"
-    title_1: "Notify the user of their temporary suspension"
-    title_notify: "Notify the user of their temporary suspension"
-    title_reject: "We noticed you rejected a username"
     title_suspend: "Suspend User"
-    username: username
+    description_suspend: "You are suspending {0}. This comment will go to the Rejected queue, and {0} will not be allowed to like, report, reply or post until the suspension time is complete."
+    select_duration: "Select suspension duration"
+    one_hour: "1 hour"
+    hours: "{0} hours"
+    days: "{0} days"
+    cancel: "Cancel"
+    suspend_user: "Suspend User"
+    email_message_suspend: "Dear {0},\n\nIn accordance with {1}’s community guidelines, your account has been temporarily suspended. During the suspension, you will be unable to comment, flag or engage with fellow commenters. Please rejoin the conversation {2}."
+    title_notify: "Notify the user of their temporary suspension"
+    notify_suspend_until: "User {0} has been temporarily suspended. This suspension will automatically end {1}."
+    description_notify: "Suspending this user will temporarily disable their account and hide all of their comments on the site."
     write_message: "Write a message"
+    send: Send
+  rejectUsername:
+    username: username
+    no_cancel: "No cancel"
+    description_reject: "Would you like to temporarily ban this user because of their {0}? Doing so will temporarily hide their comments until they rewrite their {0}."
+    title_notify: "Notify the user of their temporary suspension"
+    description_notify: "Suspending this user will temporarily disable their account and hide all of their comments on the site."
+    title_reject: "We noticed you rejected a username"
+    suspend_user: "Suspend User"
     yes_suspend: "Yes suspend"
+    email_message_reject: "Another member of the community recently flagged your username for review. Because of its content your user was rejected. This means you can no longer comment, like, or flag content until you rewrite your username. Please e-mail us if you have any questions or concerns."
+    write_message: "Write a message"
+    send: Send
   thank_you: "We value your safety and feedback. A moderator will review your report."
   unset_best: "Untag as Best"
   user:
diff --git a/locales/es.yml b/locales/es.yml
index 58bc7a132..53db5ec86 100644
--- a/locales/es.yml
+++ b/locales/es.yml
@@ -4,7 +4,9 @@ es:
     ban_user: "¿Quieres suspender el Usuario?"
     banned_user: "Usuario Suspendido"
     cancel: Cancelar
-    note: "Nota: Suspender a este usuario también va a colocar este comentario en la cola de Rechazados."
+    note: "Nota: {0}"
+    note_reject_comment: "Suspender a este usuario también va a colocar este comentario en la cola de Rechazados."
+    note_ban_user: "Suspender a este usuario no le va a permitir (al usuario) borrar ni editar ni comentar."
     yes_ban_user: "Si, Suspender al usuario"
   bio_offensive: "Esta biografia es ofensiva"
   cancel: Cancelar
@@ -53,7 +55,6 @@ es:
     newsroom_role: "Rol en la redacción"
     no_flagged_accounts: "No hay ningún nombre de usario reportado en este momento."
     no_results: "No se encontraron usuarios con ese nombre o correo."
-    note: "Nota: Suspender a este usuario no le va a permitir (al usuario) borrar ni editar ni comentar."
     offensive: Ofensivo
     other: Otro
     people: Gente
@@ -353,35 +354,32 @@ es:
     status: "Estado del Hilo"
     stream_status: "Estado del Hilo"
   suspenduser:
-    bio: "bio"
-    cancel: "Cancelar"
-    days: "{0} días"
-    description_0: "¿Quiere suspender temporalmente a este usuario por su {0}? Hacerlo va a ocultar temporalmente todos sus comentarios hasta que edite su {0}."
-    description_1: "Suspender a este usuario va a deshabilitar temporalmente su cuenta y ocultar todos sus comentarios en el sitio."
-    description_notify: "Suspender a este usuario va a deshabilitar temporalmente su cuenta y ocultar todos sus comentarios en el sitio."
-    description_reject: "¿Quiere suspender temporalmente a este usuario por su {0}? Hacerlo va a ocultar temporalmente sus comentarios hasta que edite su {0}."
-    description_suspend: "Esta suspendiendo a {0}. Este comentario va a ir a la fila de Rechazados, y a {0} no se le va a permitir gustar, marcar, responder o publicar hasta que el tiempo de suspendido halla concluido."
-    email: "Otro miembro de la comunidad recientemente marco su nombre de usuario para revisarlo. Por su contenido su nombre de usuario ha sido rechazado. Esto significa que no puede comentar o marcar contenido hasta que edite su nombre de usuario. Envíenos un correo si tiene preguntas o comentarios."
-    email_subject: "Su cuenta ha sido suspendida"
-    email_message_reject: "Otro miembro de la comunidad hace poco ha marcado su nombre de usuario para revisar. Y este ha sido rechazado por su contenido. Esto significa que no puede comentar, gustar o marcar contenido hasta que edite su nombre de usuario. Envíenos un correo si tiene alguna preocupación o pregunta."
-    email_message_suspend: "Querida {0}, De acuerdo a la guía comunitaria de {1}, su cuenta ha sido temporalmente suspendida. Durante este tiempo, no podrá comentar, marcar o involucrarse con otros comentaristas. Por favor unirse a la conversación {2}."
-    error_email_message_empty: "Debe especificar un mensaje de correo."
-    hours: "{0} horas"
-    no_cancel: "No cancelar"
-    notify_suspend_until: "Usuario {0} ha sido temporalmente suspendido. Esta suspension va a terminar automáticamente en {1}."
-    one_hour: "1 hora"
-    send: "Enviar"
-    select_duration: "Seleccionar la duración de la suspensión"
-    suspend_user: "Suspender Usuario"
-    title: "Suspender un usuario"
-    title_0: "Nos dimos cuenta que ha rechazado un nombre de usuario"
-    title_1: "Notificar al usuario de su suspensión temporal"
-    title_notify: "Notificar al usuario de su suspensión temporal"
-    title_reject: "Vimos que ha rechazado un nombre de usuario"
     title_suspend: "Suspender Usuario"
-    username: nombre de usuario
+    description_suspend: "Esta suspendiendo a {0}. Este comentario va a ir a la fila de Rechazados, y a {0} no se le va a permitir gustar, marcar, responder o publicar hasta que el tiempo de suspendido halla concluido."
+    select_duration: "Seleccionar la duración de la suspensión"
+    one_hour: "1 hora"
+    hours: "{0} horas"
+    days: "{0} días"
+    cancel: "Cancelar"
+    suspend_user: "Suspender Usuario"
+    email_message_suspend: "Querida {0}, De acuerdo a la guía comunitaria de {1}, su cuenta ha sido temporalmente suspendida. Durante este tiempo, no podrá comentar, marcar o involucrarse con otros comentaristas. Por favor unirse a la conversación {2}."
+    title_notify: "Notificar al usuario de su suspensión temporal"
+    notify_suspend_until: "Usuario {0} ha sido temporalmente suspendido. Esta suspension va a terminar automáticamente en {1}."
+    description_notify: "Suspender a este usuario va a deshabilitar temporalmente su cuenta y ocultar todos sus comentarios en el sitio."
     write_message: "Escribir un mensaje"
+    send: "Enviar"
+  rejectUsername:
+    username: nombre de usuario
+    no_cancel: "No cancelar"
+    description_reject: "¿Quiere suspender temporalmente a este usuario por su {0}? Hacerlo va a ocultar temporalmente sus comentarios hasta que edite su {0}."
+    title_notify: "Notificar al usuario de su suspensión temporal"
+    description_notify: "Suspender a este usuario va a deshabilitar temporalmente su cuenta y ocultar todos sus comentarios en el sitio."
+    title_reject: "Vimos que ha rechazado un nombre de usuario"
+    suspend_user: "Suspender Usuario"
     yes_suspend: "Si, suspender"
+    email_message_reject: "Otro miembro de la comunidad hace poco ha marcado su nombre de usuario para revisar. Y este ha sido rechazado por su contenido. Esto significa que no puede comentar, gustar o marcar contenido hasta que edite su nombre de usuario. Envíenos un correo si tiene alguna preocupación o pregunta."
+    write_message: "Escribir un mensaje"
+    send: "Enviar"
   thank_you: "Valoramos tanto su seguridad en este espacio como sus comentarios. Un o una moderadora va a leer su reporte."
   unset_best: "Des-etiquetar como el mejor"
   user:

From 46e707ba51e041c0b0f2cc86518af5cd4970b2eb Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Thu, 22 Jun 2017 22:04:11 +0700
Subject: [PATCH 199/264] Use snake case for new translations

---
 .../components/RejectUsernameDialog.js        | 26 +++++++++----------
 locales/en.yml                                |  2 +-
 locales/es.yml                                |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/client/coral-admin/src/routes/Community/components/RejectUsernameDialog.js b/client/coral-admin/src/routes/Community/components/RejectUsernameDialog.js
index 9ae039ac5..3ff764b2b 100644
--- a/client/coral-admin/src/routes/Community/components/RejectUsernameDialog.js
+++ b/client/coral-admin/src/routes/Community/components/RejectUsernameDialog.js
@@ -7,19 +7,19 @@ import t from 'coral-framework/services/i18n';
 
 const stages = [
   {
-    title: 'rejectUsername.title_reject',
-    description: 'rejectUsername.description_reject',
+    title: 'reject_username.title_reject',
+    description: 'reject_username.description_reject',
     options: {
-      'j': 'rejectUsername.no_cancel',
-      'k': 'rejectUsername.yes_suspend'
+      'j': 'reject_username.no_cancel',
+      'k': 'reject_username.yes_suspend'
     }
   },
   {
-    title: 'rejectUsername.title_notify',
-    description: 'rejectUsername.description_notify',
+    title: 'reject_username.title_notify',
+    description: 'reject_username.description_notify',
     options: {
       'j': 'bandialog.cancel',
-      'k': 'rejectUsername.send'
+      'k': 'reject_username.send'
     }
   }
 ];
@@ -35,7 +35,7 @@ class RejectUsernameDialog extends Component  {
   }
 
   componentDidMount() {
-    this.setState({email: t('rejectUsername.email_message_reject'), about: t('rejectUsername.username')});
+    this.setState({email: t('reject_username.email_message_reject'), about: t('reject_username.username')});
   }
 
   /*
@@ -76,18 +76,18 @@ class RejectUsernameDialog extends Component  {
             open={open}
             onClose={handleClose}
             onCancel={handleClose}
-            title={t('rejectUsername.suspend_user')}>
+            title={t('reject_username.suspend_user')}>
             <div className={styles.title}>
-              {t(stages[stage].title, t('rejectUsername.username'))}
+              {t(stages[stage].title, t('reject_username.username'))}
             </div>
             <div className={styles.container}>
               <div className={styles.description}>
-                {t(stages[stage].description, t('rejectUsername.username'))}
+                {t(stages[stage].description, t('reject_username.username'))}
               </div>
               {
                 stage === 1 &&
                 <div className={styles.writeContainer}>
-                  <div className={styles.emailMessage}>{t('rejectUsername.write_message')}</div>
+                  <div className={styles.emailMessage}>{t('reject_username.write_message')}</div>
                   <div className={styles.emailContainer}>
                     <textarea
                       rows={5}
@@ -100,7 +100,7 @@ class RejectUsernameDialog extends Component  {
               <div className={styles.modalButtons}>
                 {Object.keys(stages[stage].options).map((key, i) => (
                   <Button key={i} onClick={this.onActionClick(stage, i)}>
-                    {t(stages[stage].options[key], t('rejectUsername.username'))}
+                    {t(stages[stage].options[key], t('reject_username.username'))}
                   </Button>
                 ))}
               </div>
diff --git a/locales/en.yml b/locales/en.yml
index 9e95cdf6c..1fac86785 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -345,7 +345,7 @@ en:
     description_notify: "Suspending this user will temporarily disable their account and hide all of their comments on the site."
     write_message: "Write a message"
     send: Send
-  rejectUsername:
+  reject_username:
     username: username
     no_cancel: "No cancel"
     description_reject: "Would you like to temporarily ban this user because of their {0}? Doing so will temporarily hide their comments until they rewrite their {0}."
diff --git a/locales/es.yml b/locales/es.yml
index 53db5ec86..ef4826cf2 100644
--- a/locales/es.yml
+++ b/locales/es.yml
@@ -368,7 +368,7 @@ es:
     description_notify: "Suspender a este usuario va a deshabilitar temporalmente su cuenta y ocultar todos sus comentarios en el sitio."
     write_message: "Escribir un mensaje"
     send: "Enviar"
-  rejectUsername:
+  reject_username:
     username: nombre de usuario
     no_cancel: "No cancelar"
     description_reject: "¿Quiere suspender temporalmente a este usuario por su {0}? Hacerlo va a ocultar temporalmente sus comentarios hasta que edite su {0}."

From 455a0348020f392bdabc82f339acde48a0010009 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Thu, 22 Jun 2017 22:13:09 +0700
Subject: [PATCH 200/264] Don't show dropdown on current logged in user

---
 .../routes/Community/components/Community.js  |  1 +
 .../Community/components/FlaggedAccounts.js   |  1 +
 .../src/routes/Community/components/User.js   | 24 ++++++++++---------
 .../routes/Community/containers/Community.js  |  3 ++-
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/client/coral-admin/src/routes/Community/components/Community.js b/client/coral-admin/src/routes/Community/components/Community.js
index fe7478efb..e87e7ac54 100644
--- a/client/coral-admin/src/routes/Community/components/Community.js
+++ b/client/coral-admin/src/routes/Community/components/Community.js
@@ -83,6 +83,7 @@ export default class Community extends Component {
           showRejectUsernameDialog={props.showRejectUsernameDialog}
           approveUser={props.approveUser}
           rejectUsername={props.rejectUsername}
+          currentUser={this.props.currentUser}
         />
         <RejectUsernameDialog
           open={community.rejectUsernameDialog}
diff --git a/client/coral-admin/src/routes/Community/components/FlaggedAccounts.js b/client/coral-admin/src/routes/Community/components/FlaggedAccounts.js
index dc2003850..3e730e0ac 100644
--- a/client/coral-admin/src/routes/Community/components/FlaggedAccounts.js
+++ b/client/coral-admin/src/routes/Community/components/FlaggedAccounts.js
@@ -24,6 +24,7 @@ const FlaggedAccounts = ({...props}) => {
               showSuspendUserDialog={props.showSuspendUserDialog}
               showRejectUsernameDialog={props.showRejectUsernameDialog}
               approveUser={props.approveUser}
+              currentUser={props.currentUser}
               />;
           })
           : <EmptyCard>{t('community.no_flagged_accounts')}</EmptyCard>
diff --git a/client/coral-admin/src/routes/Community/components/User.js b/client/coral-admin/src/routes/Community/components/User.js
index 639888e7d..ee917e295 100644
--- a/client/coral-admin/src/routes/Community/components/User.js
+++ b/client/coral-admin/src/routes/Community/components/User.js
@@ -40,17 +40,19 @@ const User = (props) => {
             <span>
               {user.username}
             </span>
-            <ActionsMenu icon="not_interested">
-              <ActionsMenuItem
-                disabled={user.status === 'BANNED'}
-                onClick={showSuspenUserDialog}>
-                Suspend User</ActionsMenuItem>
-              <ActionsMenuItem
-                disabled={user.status === 'BANNED'}
-                onClick={showBanUserDialog}>
-                Ban User
-              </ActionsMenuItem>
-            </ActionsMenu>
+            {props.currentUser.id !== user.id &&
+              <ActionsMenu icon="not_interested">
+                <ActionsMenuItem
+                  disabled={user.status === 'BANNED'}
+                  onClick={showSuspenUserDialog}>
+                  Suspend User</ActionsMenuItem>
+                <ActionsMenuItem
+                  disabled={user.status === 'BANNED'}
+                  onClick={showBanUserDialog}>
+                  Ban User
+                </ActionsMenuItem>
+              </ActionsMenu>
+            }
           </div>
         </div>
 
diff --git a/client/coral-admin/src/routes/Community/containers/Community.js b/client/coral-admin/src/routes/Community/containers/Community.js
index 2ef0d9eb3..ee2f874a8 100644
--- a/client/coral-admin/src/routes/Community/containers/Community.js
+++ b/client/coral-admin/src/routes/Community/containers/Community.js
@@ -86,7 +86,8 @@ export const withCommunityQuery = withQuery(gql`
 });
 
 const mapStateToProps = (state) => ({
-  community: state.community.toJS()
+  community: state.community.toJS(),
+  currentUser: state.auth.toJS().user,
 });
 
 const mapDispatchToProps = (dispatch) =>

From 60dd6a37d728e613623859a287dc9d16304740cd Mon Sep 17 00:00:00 2001
From: A Lawliet <alawliet.code@gmail.com>
Date: Thu, 22 Jun 2017 13:44:48 -0400
Subject: [PATCH 201/264] =?UTF-8?q?Fix=20Moderate=20=E2=86=92=20link=20by?=
 =?UTF-8?q?=20setting=20to=20"All"=20for=20that=20story?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/coral-admin/src/routes/Moderation/components/Comment.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.js b/client/coral-admin/src/routes/Moderation/components/Comment.js
index 3d946f9fc..29ecfb0e7 100644
--- a/client/coral-admin/src/routes/Moderation/components/Comment.js
+++ b/client/coral-admin/src/routes/Moderation/components/Comment.js
@@ -129,7 +129,7 @@ class Comment extends React.Component {
           <div className={styles.moderateArticle}>
             Story: {comment.asset.title}
             {!props.currentAsset &&
-              <Link to={`/admin/moderate/${comment.asset.id}`}>{t('modqueue.moderate')}</Link>}
+              <Link to={`/admin/moderate/all/${comment.asset.id}`}>{t('modqueue.moderate')}</Link>}
           </div>
           <CSSTransitionGroup
             component={'div'}

From 010f0cb0d79a6e74689a357d77c34099a69020e2 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 22 Jun 2017 14:32:49 -0600
Subject: [PATCH 202/264] Added support for keep alive websocket frames

---
 README.md              | 1 +
 config.js              | 6 +++++-
 graph/subscriptions.js | 8 +++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 4ea9ff0e4..68547e7a8 100644
--- a/README.md
+++ b/README.md
@@ -50,6 +50,7 @@ sign and verify tokens via a `HS256` algorithm.
 - `TALK_RECAPTCHA_SECRET` (*required for reCAPTCHA support*) - server secret used for enabling reCAPTCHA powered logins. If not provided it will instead default to providing only a time based lockout.
 - `TALK_RECAPTCHA_PUBLIC` (*required for reCAPTCHA support*) - client secret used for enabling reCAPTCHA powered logins. If not provided it will instead default to providing only a time based lockout.
 - `TALK_PLUGINS_JSON` (_optional_) - used to specify the plugin config via the environment
+- `TALK_KEEP_ALIVE` (_optional_) - The keepalive timeout that should be used to send keep alive messages through the websocket to keep the socket alive. (Default `30s`)
 
 Refer to the wiki page on [Configuration Loading](https://github.com/coralproject/talk/wiki/Configuration-Loading) for
 alternative methods of loading configuration during development.
diff --git a/config.js b/config.js
index 3d75f44a8..02f95d070 100644
--- a/config.js
+++ b/config.js
@@ -56,7 +56,11 @@ const CONFIG = {
 
   // The URL for this Talk Instance as viewable from the outside.
   ROOT_URL: process.env.TALK_ROOT_URL,
-  
+
+  // The keepalive timeout (in ms) that should be used to send keep alive
+  // messages through the websocket to keep the socket alive.
+  KEEP_ALIVE: process.env.TALK_KEEP_ALIVE || '30s',
+
   //------------------------------------------------------------------------------
   // Recaptcha configuration
   //------------------------------------------------------------------------------
diff --git a/graph/subscriptions.js b/graph/subscriptions.js
index 2ba0c2c1f..ec2d5b786 100644
--- a/graph/subscriptions.js
+++ b/graph/subscriptions.js
@@ -10,6 +10,11 @@ const plugins = require('../services/plugins');
 
 const {deserializeUser} = require('../services/subscriptions');
 
+const ms = require('ms');
+const {
+  KEEP_ALIVE
+} = require('../config');
+
 const {
   SUBSCRIBE_COMMENT_ACCEPTED,
   SUBSCRIBE_COMMENT_REJECTED,
@@ -119,7 +124,8 @@ const createSubscriptionManager = (server) => new SubscriptionServer({
     };
 
     return baseParams;
-  }
+  },
+  keepAlive: ms(KEEP_ALIVE)
 }, {
   server,
   path: '/api/v1/live'

From 57e0a160a2021298547118cc02135f15623e164c Mon Sep 17 00:00:00 2001
From: David Erwin <davidjerwin@gmail.com>
Date: Thu, 22 Jun 2017 17:25:01 -0400
Subject: [PATCH 203/264] Add plugins overview and quickstart

---
 PLUGINS.md                           |   2 -
 docs/_data/sidebars/talk_sidebar.yml |   9 +++
 docs/install.md                      |  22 ++++++
 docs/plugins-overview.md             | 105 ++++++++++++++++++++++++
 docs/plugins-quickstart.md           | 114 +++++++++++++++++++++++++++
 5 files changed, 250 insertions(+), 2 deletions(-)
 create mode 100644 docs/install.md
 create mode 100644 docs/plugins-overview.md
 create mode 100644 docs/plugins-quickstart.md

diff --git a/PLUGINS.md b/PLUGINS.md
index 8bac10aba..8753dc820 100644
--- a/PLUGINS.md
+++ b/PLUGINS.md
@@ -1,7 +1,5 @@
 # Talk Plugins
 
-Plugins for Talk can take various forms, currently we are only supporting server
-side plugins.
 
 ## Plugin Registration
 
diff --git a/docs/_data/sidebars/talk_sidebar.yml b/docs/_data/sidebars/talk_sidebar.yml
index c7ba32025..0245b56f4 100644
--- a/docs/_data/sidebars/talk_sidebar.yml
+++ b/docs/_data/sidebars/talk_sidebar.yml
@@ -18,6 +18,9 @@ entries:
   - title: Installation
     output: web
     folderitems:
+    - title: Getting Started
+      output: web
+      url: /install.html
     - title: Configuration
       output: web
       url: /configuration.html
@@ -34,6 +37,12 @@ entries:
   - title: Plugins
     output: web
     folderitems:
+    - title: Quickstart
+      url: /plugins-quickstart.html
+      output: web
+    - title: Overview
+      url: /plugins-overview.html
+      output: web
     - title: Client API
       url: /plugins-client.html
       output: web
diff --git a/docs/install.md b/docs/install.md
new file mode 100644
index 000000000..71b99191a
--- /dev/null
+++ b/docs/install.md
@@ -0,0 +1,22 @@
+---
+title: Installation
+sidebar: talk_sidebar
+permalink: install.html
+summary:
+---
+
+## Requirements
+
+Talk requires MongoDB and Redis.
+
+- MongoDB ^3.2 - [Docs](https://docs.mongodb.com/manual/installation/)
+- Redis ^3.2.5 - [Docs](https://redis.io/topics/quickstart)
+
+## Installation method
+
+While Talk can be installed in many ways, we support two install paths:
+
+* [Install from Source](install-source.html) (development)
+* [Install via Docker](install-docker.html) (deployment)
+
+If you have success installing Talk in another way, please consider [contributing to this documentation](faq.html#how-do-i-contribue-to-these-docs)!
diff --git a/docs/plugins-overview.md b/docs/plugins-overview.md
new file mode 100644
index 000000000..668f19b77
--- /dev/null
+++ b/docs/plugins-overview.md
@@ -0,0 +1,105 @@
+---
+title: Plugins Overview
+keywords: plugins
+sidebar: talk_sidebar
+permalink: plugins-overview.html
+summary:
+---
+
+## Plugin Registration
+
+In order for a plugin to be active in a Talk install, it must be _registered_. The parsing order for the plugin registration is as follows:
+
+- `TALK_PLUGINS_JSON` environment variable
+- `plugins.json` file
+- `plugins.default.json` file
+
+If you need to "disable all plugins", you can simply provide `{}` as the
+contents of `process.env.TALK_PLUGINS_JSON` or the `plugins.json`.
+
+The format for this is thus:
+
+```json
+{
+  "server": [
+    "people"
+  ]
+}
+```
+
+Where we have a `server` key with an array of plugins that match the folder
+name in the `plugins/` folder. For example, the above config would
+require a plugin from `plugins/people`, which must provide a `index.js` file
+that returns an object that matches the Plugin Specification.
+
+If the package is external (available on NPM) you can specify the string for
+the version by using an object instead, for example:
+
+```json
+{
+  "server": [
+    {"people": "^1.2.0"}
+  ]
+}
+```
+
+External plugins can be resolved by running:
+
+```bash
+./bin/cli plugins reconcile
+```
+
+This achieves two things:
+
+1. It will traverse into local plugin folders and install their dependencies.
+  _Note that if the plugin is already installed and available in the node_modules folder, it will not be
+  fetched again unless there is a version mismatch._ This will result in the
+  project `package.json` and `yarn.lock` files to be modified, this is normal as
+  this ensures that repeated deployments (with the same config) will have the
+  same config, these changes should not be committed to source control.
+2. It will seek out dependencies that are listed in the object notation and try
+  to install them from npm.
+
+## Plugin Dependencies
+
+You may also include additional external dependencies in your local packages by
+specifying a `package.json` at your plugin root which will result in a
+`node_modules` folder being generated at the plugin root with your specific
+dependencies.
+
+## Deployment Solutions
+
+Plugins can be deployed with a production instance of Talk.
+
+### Source
+
+Source deployments can just modify the `plugins.json` file and include any
+local plugins into the `plugins/` directory. After including the config, you
+need to reconcile the plugins and build the static assets:
+
+```bash
+# get plugin dependancies and remote plugins
+./bin/cli plugins reconcile
+
+# build staic assets (including enabled client side plugins)
+yarn build
+```
+
+Then the application can be started as is.
+
+### Docker
+
+If you deploy using Docker, you can extend from the `*-onbuild` image, an
+example `Dockerfile` for your project could be:
+
+```Dockerfile
+FROM coralproject/talk:latest-onbuild
+```
+
+Where the directory for your instance would contain a `plugins.json` file
+describing the plugin requirements and a `plugins` directory containing any
+other local plugins that should be included.
+
+Onbuild triggers will execute when the image is building with your custom
+configuration and will ensure that the image is ready to use by building all
+assets inside the image as well.
diff --git a/docs/plugins-quickstart.md b/docs/plugins-quickstart.md
new file mode 100644
index 000000000..38303bd5c
--- /dev/null
+++ b/docs/plugins-quickstart.md
@@ -0,0 +1,114 @@
+---
+title: Plugins Quickstart
+keywords: plugins
+sidebar: talk_sidebar
+permalink: plugins-quickstart.html
+summary:
+---
+
+I would like to create a plugin that allows my CMS to update asset information.
+
+## Setup the environment
+
+Before I begin working on the plugin, I've installed [Talk from source](/install-source.html).
+
+### Watch the Server
+
+In a terminal, I run `yarn dev-start`. This command:
+
+* starts my server, showing plugin and configuration information
+* restarts it when I save files
+* shows my temporary `console.log()` statements here
+* shows real time access logs
+* shows verbose debug output if enabled (more on this later)
+
+
+
+### Watch the Client build process
+
+In another window I run `yarn build-watch`. This command:
+
+* builds the client side javascript bundles
+* watches relevant files and rebuilds the bundle on change
+* displays _compile time_ errors, including (the many) syntax errors I cause
+
+If you need to run `yarn install`, you will see missing module error messages here.
+
+### Watch from the Browser
+
+I open up `http://localhost:3000` in a web browser and see the default comment stream. I then open the dev tools console which:
+
+* shows any _run time_ errors/warnings generated on the front end.
+* shows any temporary `console.log()` statements I add during development.
+
+I also often toggle to the Network Tab to see:
+
+* which files are being loaded
+* requests sent from my front end code, including headers, the payload/queries sent and the data returned
+
+## Create a home for my new plugin
+
+I want to build this plugin locally, using source control and eventually publish it to npm.
+
+### Create a repo
+
+I create a new repo called `talk-plugin-asset-manager`. (I use github, but this you could store this anywhere, bitbucket, svn, etc...)
+
+_make sure to respect the naming convention `talk-plugin-*`. This will allow for easy identification of the repo and, eventually, easy searching on npm._
+
+### Set up a local file structure
+
+I like to put my plugins in a directory next to talk, but you could put this anywhere.
+
+```
+cd ..
+git clone https://github.com/jde/talk-plugin-asset-manager.git
+```
+
+### Register your plugin
+
+Add the plugin to the plugins.json file:
+
+```
+{
+  "server": [
+    ...
+    "talk-plugin-asset-manager"
+  ],
+  "client": [
+    ...
+    // no client side components so I won't add it here
+  ]
+}
+```
+
+But wait! Talk looks in `talk/plugins/[plugin-name]` for plugin code. Why couldn't we just add that plugin there?
+
+We could have.
+
+This would make it _a little_ easier to register, but _a lot_ harder to cleanly manage in version control. In order to avoid it being sucked into your Talk repo, you would have to manually `.gitignore` it or use [sub modules]() or something similar.
+
+As a user of a Linux_y_ os, I prefer to create a symbolic link.
+
+```
+cd /path/to/talk/plugins
+ln -s /path/to/your/plugin
+```
+
+or in this case:
+
+```
+cd ../talk/plugins
+ln -s ../../talk-plugin-asset-manager
+```
+
+Now, as far as Talk knows, our plugin is right there in the folder. Git is wise, however, and will not include it in the Talk repo. Best of all, our `yarn dev-start` based watch statement follows symbolic links and will restart our sever each time a file is saved.
+
+### Create the initial index file
+
+All plugins contain server and/or client index files, which export all plugin functionality.
+
+```
+// talk-plugin-asset-manager/index.js
+module.exports = {};
+```

From d57d05fda986f324df833e7965fbbe8cb0dcdcc0 Mon Sep 17 00:00:00 2001
From: David Erwin <davidjerwin@gmail.com>
Date: Thu, 22 Jun 2017 17:33:16 -0400
Subject: [PATCH 204/264] Move plugin docs into new docs

---
 PLUGINS.md                               | 524 +----------------------
 docs/plugins-server.md                   |  59 +++
 docs/{plugins-overview.md => plugins.md} |   2 +-
 3 files changed, 61 insertions(+), 524 deletions(-)
 rename docs/{plugins-overview.md => plugins.md} (98%)

diff --git a/PLUGINS.md b/PLUGINS.md
index 8753dc820..ac34240b1 100644
--- a/PLUGINS.md
+++ b/PLUGINS.md
@@ -1,525 +1,3 @@
 # Talk Plugins
 
-
-## Plugin Registration
-
-The parsing order for the plugin registration is as follows:
-
-- `TALK_PLUGINS_JSON` environment variable
-- `plugins.json` file
-- `plugins.default.json` file
-
-If you need to "disable all plugins", you can simply provide `{}` as the
-contents of `process.env.TALK_PLUGINS_JSON` or the `plugins.json`.
-
-The format for this is thus:
-
-```json
-{
-  "server": [
-    "people"
-  ]
-}
-```
-
-Where we have a `server` key with an array of plugins that match the folder
-name in the `plugins/` folder. For example, the above config would
-require a plugin from `plugins/people`, which must provide a `index.js` file
-that returns an object that matches the Plugin Specification.
-
-If the package is external (available on NPM) you can specify the string for
-the version by using an object instead, for example:
-
-```json
-{
-  "server": [
-    {"people": "^1.2.0"}
-  ]
-}
-```
-
-External plugins can be resolved by running:
-
-```bash
-./bin/cli plugins reconcile
-```
-
-This achieves two things:
-
-1. It will traverse into local plugin folders and install their dependencies.
-  _Note that if the plugin is already installed and available in the node_modules folder, it will not be
-  fetched again unless there is a version mismatch._ This will result in the
-  project `package.json` and `yarn.lock` files to be modified, this is normal as
-  this ensures that repeated deployments (with the same config) will have the
-  same config, these changes should not be committed to source control.
-2. It will seek out dependencies that are listed in the object notation and try
-  to install them from npm.
-
-## Plugin Dependencies
-
-You may also include additional external dependencies in your local packages by
-specifying a `package.json` at your plugin root which will result in a
-`node_modules` folder being generated at the plugin root with your specific
-dependencies.
-
-## Deployment Solutions
-
-Plugins can be deployed with a production instance of Talk.
-
-### Source
-
-Source deployments can just modify the `plugins.json` file and include any
-local plugins into the `plugins/` directory. After including the config, you
-need to reconcile the plugins and build the static assets:
-
-```bash
-# get plugin dependancies and remote plugins
-./bin/cli plugins reconcile
-
-# build staic assets (including enabled client side plugins)
-yarn build
-```
-
-Then the application can be started as is.
-
-### Docker
-
-If you deploy using Docker, you can extend from the `*-onbuild` image, an
-example `Dockerfile` for your project could be:
-
-```Dockerfile
-FROM coralproject/talk:latest-onbuild
-```
-
-Where the directory for your instance would contain a `plugins.json` file
-describing the plugin requirements and a `plugins` directory containing any
-other local plugins that should be included.
-
-Onbuild triggers will execute when the image is building with your custom
-configuration and will ensure that the image is ready to use by building all
-assets inside the image as well.
-
-## Server Plugins
-
-### API
-
-You can access any API available inside the talk directory in a plugin by simply
-importing the file relative to the talk project root. An example would be if you
-wanted to import the `MetadataService`, you would simply write:
-
-```javascript
-const MetadataService = require('services/metadata');
-```
-
-### Specification
-
-Each plugin should export a single object with all hooks available on it.
-
-_**Note: You will have access to the whole core and other plugin's typeDefs,
-context, loaders, mutators, resolvers, hooks. This is intentional, as it
-encourages composing plugins to merge functionality, like a Slack plugin which
-provides a Slack notify context function as well as having the loader for
-comments.**_
-
-The following are the hooks available:
-
-#### Field: `typeDefs`
-
-```graphql
-enum COLOUR {
-  RED
-  BLUE
-}
-
-type Person {
-  name: String!
-  colour: COLOUR!
-}
-
-type RootMutation {
-  createPerson(name: String!): Person
-}
-
-type RootQuery {
-  people: [Person!]
-}
-
-type Subscription {
-  leader: Person
-}
-```
-
-Thanks to [gql-merge](https://www.npmjs.com/package/gql-merge) the contents of
-`typeDefs` should be a string that will be _merged_ with the existing type
-definitions. `enum`'s will be appended to, types will be appended, and new types
-will be added.
-
-#### Field: `context`
-
-```js
-{
-  Slack: (context) => ({
-    notify: (message) => {
-      // return a promise after we're done sending notifications.
-    }
-  })
-}
-```
-
-Any property provided here will be added to the context parameter available
-inside all resolvers, loaders, mutators, and of course, other context based
-plugins.
-
-The top level item must accept a context for the request which it should use to
-configure the context plugin before it would be mounted at `context.plugins`.
-This plugin above would mount at: `context.plugins.Slack`, or, if you're using
-[object destructuring](https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Operators/Destructuring_assignment), `{plugins: {Slack}}`.
-
-#### Field: `loaders`
-
-```js
-(context) => ({
-  People: {
-    load: () => db.people.find({user: context.user})
-  }
-})
-```
-
-Loaders should be provided as a function which returns a map which is used in
-the resolvers function. These must return a promise or a value.
-
-#### Field: `mutators`
-
-```js
-(context) => ({
-  People: {
-    create: (name) => {
-      return db.people.insert({user: context.user, name});
-    }
-  }
-})
-```
-
-Mutators should be provided as a function which returns a map which is used in
-the resolvers function. These must return a promise or a value.
-
-#### Field: `resolvers`
-
-```js
-{
-  Person: {
-    name(obj, args, context) {
-      return obj.name;
-    },
-    colour(obj, args, context) {
-      // Bill likes the colour red, everyone else likes blue.
-      return obj.name === 'bill' ? 'RED' : 'BLUE';
-    }
-  },
-  RootQuery: {
-    people(obj, args, {loaders: {People}}) {
-      return People.load();
-    }
-  },
-  RootMutation: {
-    createPerson(obj, {name}, {mutators: {People}}) {
-      return People.create(name);
-    }
-  }
-}
-```
-
-Should return a resolver map as described in the
-[Apollo Docs](http://dev.apollodata.com/tools/graphql-tools/resolvers.html#Resolver-map).
-
-This will merge with the existing resolvers in core and from previous plugins.
-
-#### Field: `hooks`
-
-```js
-{
-  RootMutation: {
-    createPerson: {
-      post: async (obj, args, {plugins: {Slack}}, info, person) {
-        if (!person) {
-          return person;
-        }
-
-        await Slack.notify(`A new person just was created with name ${person.name}`);
-
-        return person;
-      }
-    }
-  }
-}
-```
-
-Hooks here are pretty special, for each resolver field, you can specify a
-pre/post hook that will execute pre and post field resolution.
-
-If your post function accepts four parameters, then it can modify the field
-result. It is *required* that the function resolves a promise (or returns) with
-the modified value or simply the original if you didn't modify it.
-
-#### Field: `setupFunctions`
-
-```js
-setupFunctions: {
-  leader: (options, args) => ({
-    leader: {
-      filter: (person) => person.place === 1
-    },
-  }),
-}
-```
-
-Setup functions allow you to create filters that control which pubsub.publish() events
-send data to the client. If the type in question contains args, clients may subscribe using those arguments to further filter their subscription.
-
-For more information, see the [Apollo Docs](https://github.com/apollographql/graphql-subscriptions).
-
-#### Field: `tokenUserNotFound`
-
-```js
-tokenUserNotFound: async ({jwt, token}) => {
-  let profile = await someExternalService(token);
-  if (!profile) {
-    return null;
-  }
-
-  let user = await UserModel.findOneAndUpdate({
-    id: profile.id
-  }, {
-    id: profile.id,
-    username: profile.username,
-    lowercaseUsername: profile.username.toLowerCase(),
-    roles: [],
-    profiles: []
-  }, {
-    setDefaultsOnInsert: true,
-    new: true,
-    upsert: true
-  });
-
-  return user;
-}
-```
-
-The `tokenUserNotFound` hook allows auth integrations to hook into the event
-when a valid token is provided but a user can't be found in the database that
-matches the provided id.
-
-The function is async, and should return the user object that was created in the
-database, or null if the user wasn't found. The `jwt` paramenter of the object
-is the unpacked token, while `token` is the original jwt token string.
-
-#### Field: `router`
-
-```js
-(router) => {
-  router.get('/api/v1/people', (req, res) => {
-    res.json({people: [{name: 'Bob'}]});
-  });
-}
-```
-
-The Router hook allows you to create a function that accepts the base express
-router where you can mount any amount of middleware/routes to do any form of
-action needed by external applications. We also provide the authorization
-middleware via:
-
-```js
-const authorization = require('middleware/authorization');
-
-module.exports = {
-  router(router) {
-    router.get('/api/v1/people', authorization.needed('ADMIN'), (req, res) => {
-      res.json({people: [{name: 'SECRET PEOPLE'}]});
-    });
-  }
-}
-```
-
-#### Field: `tags`
-
-The tags hook allows a plugin to define tags that are code controlled (added
-or enabled by code). Below is an example pulled from the core off topic plugin
-on how to create a hook for the `OFF_TOPIC` name:
-
-```js
-[
-  {
-    name: 'OFF_TOPIC',
-    permissions: {
-      public: true,
-      self: true,
-      roles: []
-    },
-    models: ['COMMENTS'],
-    created_at: new Date()
-  }
-]
-```
-
-You can refer to `models/schema/tag.js` for the available schema to match when
-creating models to enable/disable specific features.
-
-#### Field: `passport`
-
-```js
-const FacebookStrategy = require('passport-facebook').Strategy;
-const UsersService = require('services/users');
-const {ValidateUserLogin, HandleAuthPopupCallback} = require('services/passport');
-
-module.exports = {
-  passport(passport) {
-    passport.use(new FacebookStrategy({
-      clientID: process.env.TALK_FACEBOOK_APP_ID,
-      clientSecret: process.env.TALK_FACEBOOK_APP_SECRET,
-      callbackURL: `${process.env.TALK_ROOT_URL}/api/v1/auth/facebook/callback`,
-      passReqToCallback: true,
-      profileFields: ['id', 'displayName', 'picture.type(large)']
-    }, async (req, accessToken, refreshToken, profile, done) => {
-
-      let user;
-      try {
-        user = await UsersService.findOrCreateExternalUser(profile);
-      } catch (err) {
-        return done(err);
-      }
-
-      return ValidateUserLogin(profile, user, done);
-    }));
-  },
-  router(router) {
-
-    // Note that we have to import the passport instance here, it is
-    // instantiated after all the strategies have been mounted.
-    const {passport} = require('services/passport');
-
-    /**
-     * Facebook auth endpoint, this will redirect the user immediatly to facebook
-     * for authorization.
-     */
-    router.get('/facebook', passport.authenticate('facebook', {display: 'popup', authType: 'rerequest', scope: ['public_profile']}));
-
-    /**
-     * Facebook callback endpoint, this will send the user a html page designed to
-     * send back the user credentials upon sucesfull login.
-     */
-    router.get('/facebook/callback', (req, res, next) => {
-
-      // Perform the facebook login flow and pass the data back through the opener.
-      passport.authenticate('facebook', HandleAuthPopupCallback(req, res, next))(req, res, next);
-    });
-  }
-};
-```
-
-This is a full example including the routes hook to add the required components
-to the application router to support a different auth strategy.
-
-### Full Example
-
-Contents of `plugins.json`:
-
-```json
-{
-  "server": [
-    "people"
-  ]
-}
-```
-
-Located in `plugins/people/index.js`:
-
-```js
-module.exports = {
-  typeDefs: `
-  enum COLOUR {
-    RED
-    BLUE
-  }
-
-  type Person {
-    name: String!
-    colour: COLOUR!
-  }
-
-  type RootMutation {
-    createPerson(name: String!): Person
-  }
-
-  type RootQuery {
-    people: [Person!]
-  }
-
-  type Subscription {
-    leader: Person
-  }
-  `,
-  context: {
-    Slack: () => ({
-      notify: (message) => {
-        // return a promise after we're done sending notifications.
-      }
-    })
-  },
-  loaders: ({user}) => ({
-    People: {
-      load: () => db.people.find({user})
-    }
-  }),
-  mutators: ({user}) => ({
-    People: {
-      create: (name) => {
-        return db.people.insert({user, name});
-      }
-    }
-  }),
-  resolvers: {
-    Person: {
-      name(obj, args, context) {
-        return obj.name;
-      },
-      colour(obj, args, context) {
-        // Bill likes the colour red, everyone else likes blue.
-        return obj.name === 'bill' ? 'RED' : 'BLUE';
-      }
-    },
-    RootQuery: {
-      people(obj, args, {loaders: {People}}) {
-        return People.load();
-      }
-    },
-    RootMutation: {
-      createPerson(obj, {name}, {mutators: {People}}) {
-        return People.create(name);
-      }
-    }
-  },
-  hooks: {
-    RootMutation: {
-      createPerson: {
-        post: async (obj, args, {plugins: {Slack}}, info, person) => {
-          if (!person) {
-            return person;
-          }
-
-          await Slack.notify(`A new person just was created with name ${person.name}`);
-
-          return person;
-        }
-      }
-    }
-  },
-  setupFunctions: {
-    leader: (options, args) => ({
-      leader: {
-        filter: (person) => person.place === 1
-      }
-    }
-  }
-};
-
-```
+Our documentation for Talk has moved! Utilize [this hyperlink](https://coralproject.github.io/talk/plugins.html) via click or tap to navigate your browser to the new location!
diff --git a/docs/plugins-server.md b/docs/plugins-server.md
index 7b670429f..2c562f843 100644
--- a/docs/plugins-server.md
+++ b/docs/plugins-server.md
@@ -189,6 +189,41 @@ send data to the client. If the type in question contains args, clients may subs
 
 For more information, see the [Apollo Docs](https://github.com/apollographql/graphql-subscriptions).
 
+#### Field: `tokenUserNotFound`
+
+```js
+tokenUserNotFound: async ({jwt, token}) => {
+  let profile = await someExternalService(token);
+  if (!profile) {
+    return null;
+  }
+
+  let user = await UserModel.findOneAndUpdate({
+    id: profile.id
+  }, {
+    id: profile.id,
+    username: profile.username,
+    lowercaseUsername: profile.username.toLowerCase(),
+    roles: [],
+    profiles: []
+  }, {
+    setDefaultsOnInsert: true,
+    new: true,
+    upsert: true
+  });
+
+  return user;
+}
+```
+
+The `tokenUserNotFound` hook allows auth integrations to hook into the event
+when a valid token is provided but a user can't be found in the database that
+matches the provided id.
+
+The function is async, and should return the user object that was created in the
+database, or null if the user wasn't found. The `jwt` paramenter of the object
+is the unpacked token, while `token` is the original jwt token string.
+
 ### Routes
 
 #### Field: `router`
@@ -205,6 +240,30 @@ The Router hook allows you to create a function that accepts the base express
 router where you can mount any amount of middleware/routes to do any form of
 action needed by external applications.
 
+#### Field: `tags`
+
+The tags hook allows a plugin to define tags that are code controlled (added
+or enabled by code). Below is an example pulled from the core off topic plugin
+on how to create a hook for the `OFF_TOPIC` name:
+
+```js
+[
+  {
+    name: 'OFF_TOPIC',
+    permissions: {
+      public: true,
+      self: true,
+      roles: []
+    },
+    models: ['COMMENTS'],
+    created_at: new Date()
+  }
+]
+```
+
+You can refer to `models/schema/tag.js` for the available schema to match when
+creating models to enable/disable specific features.
+
 ### Authorization middleware
 
 The following example creates the requisite callback route and passport
diff --git a/docs/plugins-overview.md b/docs/plugins.md
similarity index 98%
rename from docs/plugins-overview.md
rename to docs/plugins.md
index 668f19b77..0e2a758a2 100644
--- a/docs/plugins-overview.md
+++ b/docs/plugins.md
@@ -2,7 +2,7 @@
 title: Plugins Overview
 keywords: plugins
 sidebar: talk_sidebar
-permalink: plugins-overview.html
+permalink: plugins.html
 summary:
 ---
 

From a3059a9fa3ae57101c926cde193ec48e9fbdb419 Mon Sep 17 00:00:00 2001
From: David Erwin <davidjerwin@gmail.com>
Date: Thu, 22 Jun 2017 17:42:42 -0400
Subject: [PATCH 205/264] Update docs menu

---
 docs/_data/sidebars/talk_sidebar.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/_data/sidebars/talk_sidebar.yml b/docs/_data/sidebars/talk_sidebar.yml
index 0245b56f4..f0227274b 100644
--- a/docs/_data/sidebars/talk_sidebar.yml
+++ b/docs/_data/sidebars/talk_sidebar.yml
@@ -37,12 +37,12 @@ entries:
   - title: Plugins
     output: web
     folderitems:
+    - title: Overview
+      url: /plugins.html
+      output: web
     - title: Quickstart
       url: /plugins-quickstart.html
       output: web
-    - title: Overview
-      url: /plugins-overview.html
-      output: web
     - title: Client API
       url: /plugins-client.html
       output: web

From 40b4c0cab48f4d9f6cea0c3a224676447ae424b3 Mon Sep 17 00:00:00 2001
From: Michael Macherey <macherey@gmx.net>
Date: Thu, 22 Jun 2017 22:59:33 +0200
Subject: [PATCH 206/264] Issue-676 add addOnBlur preventing loss of
 domain-whitelist settings

Whithout addOnBlur set true, typed domain-whitelist settings like localhost:3000 get lost and will not be set in configure->Tech Settings->Permitted Domains.
This address issue-676.
---
 .../src/routes/Install/components/Steps/PermittedDomainsStep.js  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/coral-admin/src/routes/Install/components/Steps/PermittedDomainsStep.js b/client/coral-admin/src/routes/Install/components/Steps/PermittedDomainsStep.js
index fde78779d..6741954ec 100644
--- a/client/coral-admin/src/routes/Install/components/Steps/PermittedDomainsStep.js
+++ b/client/coral-admin/src/routes/Install/components/Steps/PermittedDomainsStep.js
@@ -16,6 +16,7 @@ const PermittedDomainsStep = (props) => {
         <TagsInput
           value={domains}
           inputProps={{placeholder: 'URL'}}
+          addOnBlur={true}
           addOnPaste={true}
           pasteSplit={(data) => data.split(',').map((d) => d.trim())}
           onChange={(tags) => handleDomainsChange(tags)}

From e89a15f2d2435b7af1700dfd396f685d24732c98 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 23 Jun 2017 18:11:54 +0700
Subject: [PATCH 207/264] If not specified redirect to 'all' tab

---
 client/coral-admin/src/AppRouter.js                           | 4 ++--
 .../src/routes/Moderation/containers/Moderation.js            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/coral-admin/src/AppRouter.js b/client/coral-admin/src/AppRouter.js
index 385076b21..aee40a3a8 100644
--- a/client/coral-admin/src/AppRouter.js
+++ b/client/coral-admin/src/AppRouter.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import {Router, Route, IndexRedirect, browserHistory} from 'react-router';
+import {Router, Route, IndexRedirect, browserHistory, Redirect} from 'react-router';
 
 import Configure from 'routes/Configure';
 import Dashboard from 'routes/Dashboard';
@@ -49,7 +49,7 @@ const routes = (
         <Route path='flagged' components={Moderation}>
           <Route path=':id' components={Moderation} />
         </Route>
-        <Route path=':id' components={Moderation} />
+        <Redirect from=':id' to='all/:id' />
         <IndexRedirect to='all' />
       </Route>
     </Route>
diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index ba026abb3..ea04ec1b6 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -41,7 +41,7 @@ function prepareNotificationText(text) {
 class ModerationContainer extends Component {
   subscriptions = [];
 
-  get activeTab() { return this.props.route.path === ':id' ? 'premod' : this.props.route.path; }
+  get activeTab() { return this.props.route.path; }
 
   subscribeToUpdates(variables = this.props.data.variables) {
     const sub1 = this.props.data.subscribeToMore({

From 2ab2b41b55c766dd6f994bcf3fc1b2771773b0ec Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 23 Jun 2017 09:54:21 -0300
Subject: [PATCH 208/264] unbind

---
 .../src/routes/Moderation/components/Moderation.js            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js
index a1fa97a2e..703131aa1 100644
--- a/client/coral-admin/src/routes/Moderation/components/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js
@@ -88,8 +88,8 @@ export default class Moderation extends Component {
     key.unbind('esc');
     key.unbind('j');
     key.unbind('k');
-    key.unbind('r');
-    key.unbind('t');
+    key.unbind('f');
+    key.unbind('d');
   }
 
   componentDidUpdate(_, prevState) {

From ea030af440e5432877839270abf21f8a3798c594 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 23 Jun 2017 09:59:05 -0300
Subject: [PATCH 209/264] missing keys

---
 client/coral-admin/src/components/ModerationList.js           | 4 ++--
 .../routes/Moderation/helpers/moderationQueueActionsMap.js    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/coral-admin/src/components/ModerationList.js b/client/coral-admin/src/components/ModerationList.js
index fae85e492..e2b536f2c 100644
--- a/client/coral-admin/src/components/ModerationList.js
+++ b/client/coral-admin/src/components/ModerationList.js
@@ -8,8 +8,8 @@ import SuspendUserModal from './SuspendUserModal';
 
 // Each action has different meaning and configuration
 const menuOptionsMap = {
-  'reject': {status: 'REJECTED', icon: 'close', key: 'r'},
-  'approve': {status: 'ACCEPTED', icon: 'done', key: 't'},
+  'reject': {status: 'REJECTED', icon: 'close', key: 'f'},
+  'approve': {status: 'ACCEPTED', icon: 'done', key: 'd'},
   'flag': {status: 'FLAGGED', icon: 'flag', filter: 'Untouched'},
   'ban': {status: 'BANNED', icon: 'not interested'}
 };
diff --git a/client/coral-admin/src/routes/Moderation/helpers/moderationQueueActionsMap.js b/client/coral-admin/src/routes/Moderation/helpers/moderationQueueActionsMap.js
index 32b79a35c..95b0ecb55 100644
--- a/client/coral-admin/src/routes/Moderation/helpers/moderationQueueActionsMap.js
+++ b/client/coral-admin/src/routes/Moderation/helpers/moderationQueueActionsMap.js
@@ -5,9 +5,9 @@ export const actionsMap = {
 };
 
 export const menuActionsMap = {
-  'REJECT': {status: 'REJECTED', text: 'reject', icon: 'close', key: 'r'},
+  'REJECT': {status: 'REJECTED', text: 'reject', icon: 'close', key: 'f'},
   'REJECTED': {status: 'REJECTED', text: 'rejected', icon: 'close'},
-  'APPROVE': {status: 'ACCEPTED', text: 'approve', icon: 'done', key: 't'},
+  'APPROVE': {status: 'ACCEPTED', text: 'approve', icon: 'done', key: 'd'},
   'FLAGGED': {status: 'FLAGGED', text: 'flag', icon: 'flag', filter: 'Untouched'},
   'BAN': {status: 'BANNED', text: 'ban_user', icon: 'not interested'},
   '': {icon: 'done'}

From 4a5424b81d5032bd15324ae6f67bec7dda8fcb8c Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 23 Jun 2017 22:38:30 +0700
Subject: [PATCH 210/264] Translation Querido/a

---
 locales/es.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/es.yml b/locales/es.yml
index ef4826cf2..62ea0e97e 100644
--- a/locales/es.yml
+++ b/locales/es.yml
@@ -362,7 +362,7 @@ es:
     days: "{0} días"
     cancel: "Cancelar"
     suspend_user: "Suspender Usuario"
-    email_message_suspend: "Querida {0}, De acuerdo a la guía comunitaria de {1}, su cuenta ha sido temporalmente suspendida. Durante este tiempo, no podrá comentar, marcar o involucrarse con otros comentaristas. Por favor unirse a la conversación {2}."
+    email_message_suspend: "Querido/a {0}, De acuerdo a la guía comunitaria de {1}, su cuenta ha sido temporalmente suspendida. Durante este tiempo, no podrá comentar, marcar o involucrarse con otros comentaristas. Por favor unirse a la conversación {2}."
     title_notify: "Notificar al usuario de su suspensión temporal"
     notify_suspend_until: "Usuario {0} ha sido temporalmente suspendido. Esta suspension va a terminar automáticamente en {1}."
     description_notify: "Suspender a este usuario va a deshabilitar temporalmente su cuenta y ocultar todos sus comentarios en el sitio."

From 5984f57682e392d9cd6dc735dc12cad39835919e Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 23 Jun 2017 14:29:22 -0300
Subject: [PATCH 211/264] Close after, wrong label

---
 .../src/routes/Configure/components/StreamSettings.js           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-admin/src/routes/Configure/components/StreamSettings.js b/client/coral-admin/src/routes/Configure/components/StreamSettings.js
index e8c522ae0..1bd7534af 100644
--- a/client/coral-admin/src/routes/Configure/components/StreamSettings.js
+++ b/client/coral-admin/src/routes/Configure/components/StreamSettings.js
@@ -165,7 +165,7 @@ const StreamSettings = ({updateSettings, settingsError, settings, errors}) => {
             checked={settings.autoCloseStream} />
         </div>
         <div className={styles.content}>
-          <div className={styles.settingsHeader}>{t('configure.comment_count_header')}</div>
+          <div className={styles.settingsHeader}>{t('configure.close_after')}</div>
           <br />
           <Textfield
             type='number'

From a49a53903dff06678faed80c390ceae4ae60dee7 Mon Sep 17 00:00:00 2001
From: David Erwin <davidjerwin@gmail.com>
Date: Fri, 23 Jun 2017 13:29:35 -0400
Subject: [PATCH 212/264] Finish quickstart first draft

---
 docs/plugins-quickstart.md | 122 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 121 insertions(+), 1 deletion(-)

diff --git a/docs/plugins-quickstart.md b/docs/plugins-quickstart.md
index 38303bd5c..12d30c515 100644
--- a/docs/plugins-quickstart.md
+++ b/docs/plugins-quickstart.md
@@ -95,7 +95,7 @@ cd /path/to/talk/plugins
 ln -s /path/to/your/plugin
 ```
 
-or in this case:
+or in this case, from the directory create above:
 
 ```
 cd ../talk/plugins
@@ -112,3 +112,123 @@ All plugins contain server and/or client index files, which export all plugin fu
 // talk-plugin-asset-manager/index.js
 module.exports = {};
 ```
+
+## Build the feature!
+
+Now that the plugin is set up I can get down to writing the feature. My goal is to allow my CMS to push new assets as they are created into Talk. To accomplish this, I will create a POST endpoint using Talk's [route api](plugins-server.html#field-router).
+
+### Create a route
+
+When designing my api, I want to be careful to avoid conflicts with not only the existing Talk api, but other plugins in the open source ecosystem that may be creating routes. To do this, I'll follow the golden rule of creating universals with plugins:
+
+_Always namespace all universals with your plugin's unique name._
+
+To ensure everything is hooked up, I'll log the request body (POST payload in this case) to the console and echo it as the response:
+
+```
+// talk-plugin-asset-manager/index.js
+module.exports = {
+  router(router) {
+    router.post('/api/v1/asset-manager', (req, res) => {
+      console.log(req.body);
+      res.json(req.body);
+    });
+  }
+}
+```
+
+When I save this file, I reflexively check my console to be sure that the server restarts.
+
+To test that this works, I can:
+
+```
+$ curl -H "Content-Type: application/json" -X POST -d '{"url":"http://localhost:3000/my-article.html","title":"My Article"}' http://localhost:3000/api/v1/asset-manager
+{"url":"http://localhost:3000/my-article.html","title":"My Article"}
+```
+
+After hitting the endpoint, I can also look at the terminal running `yarn dev-start` and see the access log and my `console.log()` statement:
+
+```
+{ url: 'http://localhost:3000/my-article.html',
+  title: 'My Article' }
+POST /api/v1/asset-manager 200 1.379 ms - 682309
+```
+
+### Save the asset
+
+When I save this asset, I will use Talk's [asset model](https://github.com/coralproject/talk/blob/master/models/asset.js).
+
+Mongo has a handy method [findOneAndUpdate](https://docs.mongodb.com/v3.2/reference/method/db.collection.findOneAndUpdate/) that will take care determining whether or not this asset exists, then either updating or inserting it. Whenever possible, we recommend using these atomic patterns that prevent multiple queries to the db and the efficiency problems and race conditions that they cause.
+
+```
+// talk-plugin-asset-manager/index.js
+
+const AssetModel = require('models/asset');
+
+module.exports = {
+  router(router) {
+    router.post('/api/v1/asset-manager', (req, res) => {
+
+      const asset = req.body;
+      const update = {$setOnInsert: {url: asset.url}};
+
+      AssetModel.findOneAndUpdate(asset, update, {
+        new: true,
+        upsert: true,
+        setDefaultsOnInsert: true
+      })
+      .then((asset) => res.json(asset));
+    });
+  }
+}
+```
+
+I can now run the `curl` command as before, then see my new asset in my db!
+
+We have an alpha version of our plugin!
+
+### More work to be done
+
+The purpose of this tutorial is to follow the full lifecycle of a plugin, from conception through publication into deployment. With that in mind we'll move forward with this alpha version.
+
+Some things to make this production ready:
+
+* refactoring to separate concerns,
+* commenting,
+* adding tests,
+* validating data,
+* [adding security](https://github.com/coralproject/talk/blob/b805451d376d2892c81c58d8822a85563e469b88/routes/api/users/index.js#L14)  
+* incorporating [domain whitelisting](https://github.com/coralproject/talk/blob/b805451d376d2892c81c58d8822a85563e469b88/services/assets.js#L60).
+
+It is important to realize that when you're writing a Talk plugin you are writing a program that may be touched by other devs and could grow in size and complexity. Bring your best engineering sensibilities to bear.
+
+## Publishing the plugin
+
+
+### Publish to npm
+
+In order to [register](http://localhost:4000/plugins.html#plugin-registration) your _published_ plugin, you will need to [publish it to npm](https://docs.npmjs.com/getting-started/publishing-npm-packages).
+
+Once the package is published, update `plugins.json` to use the published plugin:
+
+```
+{
+  "server": [
+    ...
+    {"talk-plugin-asset-manager": "^0.1"}
+  ],
+  ...
+}
+```
+
+Finally, run the `reconcile` script to install the plugin from npm.
+
+```
+$ bin/cli plugins reconcile
+```
+
+### Publish to version control
+
+This plugin is open source, so I'm also going to [publish it to github](https://github.com/jde/talk-plugin-asset-manager/commit/66b626caa85cb8030b3ddaa7c1a4821bf01e350a) and [cut a release](https://github.com/jde/talk-plugin-asset-manager/releases/tag/v0.1) that mirrors the npm relese.
+
+## Done!

From 01f6bfa9796e25bb994a9620beb0ee934812bfa3 Mon Sep 17 00:00:00 2001
From: David Erwin <davidjerwin@gmail.com>
Date: Fri, 23 Jun 2017 16:18:29 -0400
Subject: [PATCH 213/264] Clean up the quickstart

---
 docs/plugins-quickstart.md | 62 ++++++++++++++++++++++----------------
 1 file changed, 36 insertions(+), 26 deletions(-)

diff --git a/docs/plugins-quickstart.md b/docs/plugins-quickstart.md
index 12d30c515..06ea5650d 100644
--- a/docs/plugins-quickstart.md
+++ b/docs/plugins-quickstart.md
@@ -6,7 +6,9 @@ permalink: plugins-quickstart.html
 summary:
 ---
 
-I would like to create a plugin that allows my CMS to update asset information.
+This tutorial walks through the mechanics of creating and publishing a Talk plugin. Along the way I call out some particular habits and techniques that I employ. If you have other practices that you find valuable, please don't hesitate to [contribute!](faq.html#how-do-i-contribue-to-these-docs)
+
+We will create a plugin that exposes a route that allows assets to be created or updated.
 
 ## Setup the environment
 
@@ -14,19 +16,17 @@ Before I begin working on the plugin, I've installed [Talk from source](/install
 
 ### Watch the Server
 
-In a terminal, I run `yarn dev-start`. This command:
+In a terminal, I run `yarn dev-start`. This:
 
 * starts my server, showing plugin and configuration information
 * restarts it when I save files
-* shows my temporary `console.log()` statements here
+* shows my temporary `console.log()` statements
 * shows real time access logs
 * shows verbose debug output if enabled (more on this later)
 
-
-
 ### Watch the Client build process
 
-In another window I run `yarn build-watch`. This command:
+In a separate terminal I run `yarn build-watch`. This:
 
 * builds the client side javascript bundles
 * watches relevant files and rebuilds the bundle on change
@@ -36,7 +36,7 @@ If you need to run `yarn install`, you will see missing module error messages he
 
 ### Watch from the Browser
 
-I open up `http://localhost:3000` in a web browser and see the default comment stream. I then open the dev tools console which:
+I open up `http://localhost:3000` in a web browser and see the default comment stream. I then open the dev tools console, which:
 
 * shows any _run time_ errors/warnings generated on the front end.
 * shows any temporary `console.log()` statements I add during development.
@@ -46,9 +46,15 @@ I also often toggle to the Network Tab to see:
 * which files are being loaded
 * requests sent from my front end code, including headers, the payload/queries sent and the data returned
 
+I strongly recommend taking the time to fully explore all the features of your browser's dev tools!
+
 ## Create a home for my new plugin
 
-I want to build this plugin locally, using source control and eventually publish it to npm.
+My goals for this tutorial are to:
+
+* build this plugin locally
+* use source control and publish for collaboration
+* publish the plugin as an npm library
 
 ### Create a repo
 
@@ -58,10 +64,16 @@ _make sure to respect the naming convention `talk-plugin-*`. This will allow for
 
 ### Set up a local file structure
 
+In a blatant rip off from the Golang community, I create an environment var to hold the path to the root of my Coral directory. This allows absolute pathing.
+
+```
+export CORALPATH=/path/to/my/coral/root/dir
+```
+
 I like to put my plugins in a directory next to talk, but you could put this anywhere.
 
 ```
-cd ..
+cd $CORALPATH
 git clone https://github.com/jde/talk-plugin-asset-manager.git
 ```
 
@@ -91,15 +103,8 @@ This would make it _a little_ easier to register, but _a lot_ harder to cleanly
 As a user of a Linux_y_ os, I prefer to create a symbolic link.
 
 ```
-cd /path/to/talk/plugins
-ln -s /path/to/your/plugin
-```
-
-or in this case, from the directory create above:
-
-```
-cd ../talk/plugins
-ln -s ../../talk-plugin-asset-manager
+cd $CORALPATH/talk/plugins
+ln -s $CORALPATH/talk-plugin-asset-manager
 ```
 
 Now, as far as Talk knows, our plugin is right there in the folder. Git is wise, however, and will not include it in the Talk repo. Best of all, our `yarn dev-start` based watch statement follows symbolic links and will restart our sever each time a file is saved.
@@ -146,12 +151,12 @@ $ curl -H "Content-Type: application/json" -X POST -d '{"url":"http://localhost:
 {"url":"http://localhost:3000/my-article.html","title":"My Article"}
 ```
 
-After hitting the endpoint, I can also look at the terminal running `yarn dev-start` and see the access log and my `console.log()` statement:
+After hitting the endpoint, I can also look at the terminal running `yarn dev-start` and see my `console.log()` and the access log:
 
 ```
 { url: 'http://localhost:3000/my-article.html',
   title: 'My Article' }
-POST /api/v1/asset-manager 200 1.379 ms - 682309
+POST /api/v1/asset-manager 200 1.379 ms - 68
 ```
 
 ### Save the asset
@@ -183,7 +188,11 @@ module.exports = {
 }
 ```
 
-I can now run the `curl` command as before, then see my new asset in my db!
+I can now run the `curl` command as before and see that the response contains a complete asset document!
+
+In addition, I can change the title in the json payload and verify that the id is the same, indicating that the record was updated!
+
+Lastly, I can see the asset in the admin panel at `http://localhost:3000/admin` as well as in my database.
 
 We have an alpha version of our plugin!
 
@@ -193,10 +202,10 @@ The purpose of this tutorial is to follow the full lifecycle of a plugin, from c
 
 Some things to make this production ready:
 
-* refactoring to separate concerns,
-* commenting,
-* adding tests,
-* validating data,
+* refactoring to separate concerns
+* commenting
+* adding tests
+* validating data
 * [adding security](https://github.com/coralproject/talk/blob/b805451d376d2892c81c58d8822a85563e469b88/routes/api/users/index.js#L14)  
 * incorporating [domain whitelisting](https://github.com/coralproject/talk/blob/b805451d376d2892c81c58d8822a85563e469b88/services/assets.js#L60).
 
@@ -204,7 +213,6 @@ It is important to realize that when you're writing a Talk plugin you are writin
 
 ## Publishing the plugin
 
-
 ### Publish to npm
 
 In order to [register](http://localhost:4000/plugins.html#plugin-registration) your _published_ plugin, you will need to [publish it to npm](https://docs.npmjs.com/getting-started/publishing-npm-packages).
@@ -227,6 +235,8 @@ Finally, run the `reconcile` script to install the plugin from npm.
 $ bin/cli plugins reconcile
 ```
 
+Once you've taken this step, anyone can register your plugin into their Talk server! Thank you for contributing to the open source community!
+
 ### Publish to version control
 
 This plugin is open source, so I'm also going to [publish it to github](https://github.com/jde/talk-plugin-asset-manager/commit/66b626caa85cb8030b3ddaa7c1a4821bf01e350a) and [cut a release](https://github.com/jde/talk-plugin-asset-manager/releases/tag/v0.1) that mirrors the npm relese.

From 5e6a295f119172d5bd12d9169070fbeb36e57b54 Mon Sep 17 00:00:00 2001
From: A Lawliet <alawliet.code@gmail.com>
Date: Sat, 24 Jun 2017 15:50:44 -0400
Subject: [PATCH 214/264] Make highlight suspect/banned words regex case
 insensitive

---
 client/coral-admin/src/routes/Moderation/components/Comment.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.js b/client/coral-admin/src/routes/Moderation/components/Comment.js
index 9b0477472..3c5e535b2 100644
--- a/client/coral-admin/src/routes/Moderation/components/Comment.js
+++ b/client/coral-admin/src/routes/Moderation/components/Comment.js
@@ -54,7 +54,7 @@ class Comment extends React.Component {
     // currently the highlighter plugin does not support out of the box.
     const searchWords = [...suspectWords, ...bannedWords]
       .filter((w) => {
-        return new RegExp(`(^|\\s)${w}(\\s|$)`).test(comment.body);
+        return new RegExp(`(^|\\s)${w}(\\s|$)`, 'i').test(comment.body);
       })
       .concat(linkText);
 

From eb4d85fb86823c9554781725b0975eed071a5b99 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Mon, 26 Jun 2017 17:34:15 +0700
Subject: [PATCH 215/264] Refactor TagsInput and Improve UX

---
 .../coral-admin/src/components/TagsInput.css  | 51 ++++++++++++++++++
 .../coral-admin/src/components/TagsInput.js   | 31 +++++++++++
 .../routes/Configure/components/Configure.css |  7 ---
 .../routes/Configure/components/Domainlist.js |  4 +-
 .../routes/Configure/components/Wordlist.js   |  6 +--
 .../components/Steps/PermittedDomainsStep.js  |  5 +-
 package.json                                  |  3 +-
 views/admin.ejs                               | 52 -------------------
 yarn.lock                                     | 15 ++++--
 9 files changed, 98 insertions(+), 76 deletions(-)
 create mode 100644 client/coral-admin/src/components/TagsInput.css
 create mode 100644 client/coral-admin/src/components/TagsInput.js

diff --git a/client/coral-admin/src/components/TagsInput.css b/client/coral-admin/src/components/TagsInput.css
new file mode 100644
index 000000000..6bb630521
--- /dev/null
+++ b/client/coral-admin/src/components/TagsInput.css
@@ -0,0 +1,51 @@
+.root {
+  background-color: #fff;
+  border: 1px solid #ccc;
+  overflow: hidden;
+  padding-left: 5px;
+  padding-top: 5px;
+
+}
+
+.rootFocuesd {
+  border-color: rgb(142, 76, 65);
+}
+
+.tag {
+  background-color: rgb(255, 220, 214);
+  border-radius: 2px;
+  border: 1px solid rgb(244, 126, 107);
+  color: rgb(244, 126, 107);
+  display: inline-block;
+  font-family: sans-serif;
+  font-size: 13px;
+  font-weight: 400;
+  margin-bottom: 5px;
+  margin-right: 5px;
+  padding: 5px;
+}
+
+.tagRemove {
+  cursor: pointer;
+  font-weight: bold;
+  color: rgb(101, 24, 23);
+
+  &::before {
+    content: " ×";
+  }
+}
+
+.input > input {
+  background: transparent;
+  border: 0;
+  color: #777;
+  font-family: sans-serif;
+  font-size: 13px;
+  font-weight: 400;
+  margin-bottom: 6px;
+  margin-top: 1px;
+  outline: none;
+  padding: 5px;
+}
+
+
diff --git a/client/coral-admin/src/components/TagsInput.js b/client/coral-admin/src/components/TagsInput.js
new file mode 100644
index 000000000..d9854ed86
--- /dev/null
+++ b/client/coral-admin/src/components/TagsInput.js
@@ -0,0 +1,31 @@
+import React from 'react';
+import TagsInput from 'react-tagsinput';
+import styles from './TagsInput.css';
+import AutosizeInput from 'react-input-autosize';
+
+const autosizingRenderInput = ({onChange, value, addTag: _, ...other}) =>
+  <AutosizeInput type='text' onChange={onChange} value={value} {...other} />;
+
+export default (props) => {
+  return (
+    <TagsInput
+      addOnBlur={true}
+      addOnPaste={true}
+      pasteSplit={(data) => data.split(',').map((d) => d.trim())}
+      className={styles.root}
+      focusedClassName={styles.rootFocus}
+      renderInput={autosizingRenderInput}
+      {...props}
+
+      tagProps={{
+        className: styles.tag,
+        classNameRemove: styles.tagRemove,
+        ...props.tagProps,
+      }}
+      inputProps={{
+        className: styles.input,
+        ...props.inputProps,
+      }}
+    />
+  );
+};
diff --git a/client/coral-admin/src/routes/Configure/components/Configure.css b/client/coral-admin/src/routes/Configure/components/Configure.css
index 22e46518c..5b02b963a 100644
--- a/client/coral-admin/src/routes/Configure/components/Configure.css
+++ b/client/coral-admin/src/routes/Configure/components/Configure.css
@@ -136,13 +136,6 @@
   resize: none;
 }
 
-#bannedWordlist, #suspectWordlist {
-  display: block;
-  input {
-    width: 100%;
-  }
-}
-
 .customCSSInput {
   width: 100%;
   font-size: 14px;
diff --git a/client/coral-admin/src/routes/Configure/components/Domainlist.js b/client/coral-admin/src/routes/Configure/components/Domainlist.js
index 45790ec89..7b7565c5e 100644
--- a/client/coral-admin/src/routes/Configure/components/Domainlist.js
+++ b/client/coral-admin/src/routes/Configure/components/Domainlist.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import {Card} from 'coral-ui';
 import styles from './Configure.css';
-import TagsInput from 'react-tagsinput';
+import TagsInput from 'coral-admin/src/components/TagsInput';
 import t from 'coral-framework/services/i18n';
 
 const Domainlist = ({domains, onChangeDomainlist}) => {
@@ -14,8 +14,6 @@ const Domainlist = ({domains, onChangeDomainlist}) => {
           <TagsInput
             value={domains}
             inputProps={{placeholder: 'URL'}}
-            addOnPaste={true}
-            pasteSplit={(data) => data.split(',').map((d) => d.trim())}
             onChange={(tags) => onChangeDomainlist('whitelist', tags)}
           />
         </div>
diff --git a/client/coral-admin/src/routes/Configure/components/Wordlist.js b/client/coral-admin/src/routes/Configure/components/Wordlist.js
index af8c1b383..e96f37f9f 100644
--- a/client/coral-admin/src/routes/Configure/components/Wordlist.js
+++ b/client/coral-admin/src/routes/Configure/components/Wordlist.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import t from 'coral-framework/services/i18n';
-import TagsInput from 'react-tagsinput';
+import TagsInput from 'coral-admin/src/components/TagsInput';
 import styles from './Configure.css';
 import {Card} from 'coral-ui';
 
@@ -13,8 +13,6 @@ const Wordlist = ({suspectWords, bannedWords, onChangeWordlist}) => (
         <TagsInput
           value={bannedWords}
           inputProps={{placeholder: 'word or phrase'}}
-          addOnPaste={true}
-          pasteSplit={(data) => data.split(',').map((d) => d.trim())}
           onChange={(tags) => onChangeWordlist('banned', tags)}
         />
       </div>
@@ -26,8 +24,6 @@ const Wordlist = ({suspectWords, bannedWords, onChangeWordlist}) => (
         <TagsInput
           value={suspectWords}
           inputProps={{placeholder: 'word or phrase'}}
-          addOnPaste={true}
-          pasteSplit={(data) => data.split(',').map((d) => d.trim())}
           onChange={(tags) => onChangeWordlist('suspect', tags)} />
       </div>
     </Card>
diff --git a/client/coral-admin/src/routes/Install/components/Steps/PermittedDomainsStep.js b/client/coral-admin/src/routes/Install/components/Steps/PermittedDomainsStep.js
index 6741954ec..20b037890 100644
--- a/client/coral-admin/src/routes/Install/components/Steps/PermittedDomainsStep.js
+++ b/client/coral-admin/src/routes/Install/components/Steps/PermittedDomainsStep.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import styles from './style.css';
 import {Button, Card} from 'coral-ui';
-import TagsInput from 'react-tagsinput';
+import TagsInput from 'coral-admin/src/components/TagsInput';
 
 import t from 'coral-framework/services/i18n';
 
@@ -16,9 +16,6 @@ const PermittedDomainsStep = (props) => {
         <TagsInput
           value={domains}
           inputProps={{placeholder: 'URL'}}
-          addOnBlur={true}
-          addOnPaste={true}
-          pasteSplit={(data) => data.split(',').map((d) => d.trim())}
           onChange={(tags) => handleDomainsChange(tags)}
         />
       </Card>
diff --git a/package.json b/package.json
index 729358ffc..9d48f39cd 100644
--- a/package.json
+++ b/package.json
@@ -109,6 +109,7 @@
     "passport-local": "^1.0.0",
     "prop-types": "^15.5.10",
     "react-apollo": "^1.1.0",
+    "react-input-autosize": "^1.1.4",
     "react-recaptcha": "^2.2.6",
     "react-toastify": "^1.5.0",
     "react-transition-group": "^1.1.3",
@@ -195,7 +196,7 @@
     "react-mdl-selectfield": "^0.2.0",
     "react-redux": "^4.4.5",
     "react-router": "^3.0.0",
-    "react-tagsinput": "^3.14.0",
+    "react-tagsinput": "^3.17.0",
     "redux": "^3.6.0",
     "redux-mock-store": "^1.2.1",
     "redux-thunk": "^2.1.0",
diff --git a/views/admin.ejs b/views/admin.ejs
index 4ef4112da..54c666395 100644
--- a/views/admin.ejs
+++ b/views/admin.ejs
@@ -33,58 +33,6 @@
       #root > div {
         height: 100%;
       }
-
-      /* putting this here until I can get webpack to behave */
-      .react-tagsinput {
-        background-color: #fff;
-        border: 1px solid #ccc;
-        overflow: hidden;
-        padding-left: 5px;
-        padding-top: 5px;
-      }
-
-      .react-tagsinput--focused {
-        border-color: rgb(142, 76, 65);
-      }
-
-      .react-tagsinput-tag {
-        background-color: rgb(255, 220, 214);
-        border-radius: 2px;
-        border: 1px solid rgb(244, 126, 107);
-        color: rgb(244, 126, 107);
-        display: inline-block;
-        font-family: sans-serif;
-        font-size: 13px;
-        font-weight: 400;
-        margin-bottom: 5px;
-        margin-right: 5px;
-        padding: 5px;
-      }
-
-      .react-tagsinput-remove {
-        cursor: pointer;
-        font-weight: bold;
-        color: rgb(101, 24, 23);
-      }
-
-      .react-tagsinput-tag a::before {
-        content: " ×";
-      }
-
-      .react-tagsinput-input {
-        background: transparent;
-        border: 0;
-        color: #777;
-        font-family: sans-serif;
-        font-size: 13px;
-        font-weight: 400;
-        margin-bottom: 6px;
-        margin-top: 1px;
-        outline: none;
-        padding: 5px;
-        width: 90px;
-      }
-
     </style>
     <% if (data != null) { %>
       <script id="data" type="application/json"><%- JSON.stringify(data) %></script>
diff --git a/yarn.lock b/yarn.lock
index df7efdaf8..6e8776e08 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2041,7 +2041,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.2:
     create-hash "^1.1.0"
     inherits "^2.0.1"
 
-create-react-class@^15.5.1:
+create-react-class@^15.5.1, create-react-class@^15.5.2:
   version "15.5.2"
   resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.5.2.tgz#6a8758348df660b88326a0e764d569f274aad681"
   dependencies:
@@ -6878,6 +6878,13 @@ react-highlight-words@^0.6.0:
   dependencies:
     highlight-words-core "^1.0.2"
 
+react-input-autosize@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-1.1.4.tgz#cbc45072d4084ddc57806db8e3b34e644b8366ac"
+  dependencies:
+    create-react-class "^15.5.2"
+    prop-types "^15.5.8"
+
 react-linkify@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/react-linkify/-/react-linkify-0.1.3.tgz#6e886180bda6c8fdc5f9f8a7ebe82fc0f48db7ad"
@@ -6931,9 +6938,9 @@ react-router@^3.0.0:
     prop-types "^15.5.6"
     warning "^3.0.0"
 
-react-tagsinput@^3.14.0:
-  version "3.16.1"
-  resolved "https://registry.yarnpkg.com/react-tagsinput/-/react-tagsinput-3.16.1.tgz#dfb3bcbe5fc4430f60c145716c17cdc2613ce117"
+react-tagsinput@^3.17.0:
+  version "3.17.0"
+  resolved "https://registry.yarnpkg.com/react-tagsinput/-/react-tagsinput-3.17.0.tgz#d699bc7ff3be3492d5a3d2a57f6976908774fba3"
 
 react-toastify@^1.5.0:
   version "1.5.0"

From a025f4ca24b17a5018fff02a2fdd8c0773a97df4 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Mon, 26 Jun 2017 17:35:45 +0700
Subject: [PATCH 216/264] Validate `confirmPassword` in the web installer

---
 client/coral-admin/src/actions/install.js     | 22 +++++++++++++++++++
 .../components/Steps/CreateYourAccount.js     |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/client/coral-admin/src/actions/install.js b/client/coral-admin/src/actions/install.js
index 122ffdc4a..33cefab63 100644
--- a/client/coral-admin/src/actions/install.js
+++ b/client/coral-admin/src/actions/install.js
@@ -66,6 +66,28 @@ const validation = (formData, dispatch, next) => {
     return;
   }
 
+  // Confirm Validation
+  const prefixLength = 'confirm'.length;
+  const confirm = validKeys
+    .filter((name) => {
+      if (!name.startsWith('confirm')) {
+        return false;
+      }
+
+      // Check that 'confirmX' equals 'X'.
+      const other = name.substr(prefixLength, 1).toLowerCase() + name.substr(prefixLength + 1);
+      const cond = formData[other] !== formData[name];
+      if (cond) {
+        dispatch(addError(name, errorMsj[name]));
+      }
+      return cond;
+    });
+
+  if (confirm.length) {
+    dispatch(hasError());
+    return;
+  }
+
   dispatch(clearErrors());
   next();
 };
diff --git a/client/coral-admin/src/routes/Install/components/Steps/CreateYourAccount.js b/client/coral-admin/src/routes/Install/components/Steps/CreateYourAccount.js
index c5d334610..2a5b87e5f 100644
--- a/client/coral-admin/src/routes/Install/components/Steps/CreateYourAccount.js
+++ b/client/coral-admin/src/routes/Install/components/Steps/CreateYourAccount.js
@@ -48,7 +48,7 @@ const InitialStep = (props) => {
             label={t('install.create.confirm_password')}
             onChange={handleUserChange}
             showErrors={install.showErrors}
-            errorMsg={install.errors.confirm_password}
+            errorMsg={install.errors.confirmPassword}
             />
 
           {

From 59407e99d7e16cc3793601b9a253f7bbae4a8c01 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 26 Jun 2017 09:59:28 -0300
Subject: [PATCH 217/264] commentCount by asset_url

---
 graph/loaders/assets.js       | 17 ++++++++++++++++-
 graph/resolvers/asset.js      |  2 +-
 graph/resolvers/root_query.js | 15 ++++++++++++---
 graph/typeDefs.graphql        |  3 +++
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/graph/loaders/assets.js b/graph/loaders/assets.js
index 020eafbcb..b1be7dafb 100644
--- a/graph/loaders/assets.js
+++ b/graph/loaders/assets.js
@@ -63,18 +63,33 @@ const getAssetsForMetrics = async ({loaders: {Actions, Comments}}) => {
     .then((connection) => connection.nodes);
 };
 
+const findByUrl = async (context, asset_url) => {
+
+  // Verify that the asset_url is parsable.
+  let parsed_asset_url = url.parse(asset_url);
+  if (!parsed_asset_url.protocol) {
+    throw errors.ErrInvalidAssetURL;
+  }
+
+  let asset = await AssetsService.findByUrl(asset_url);
+
+  return asset;
+};
+
 /**
  * Creates a set of loaders based on a GraphQL context.
  * @param  {Object} context the context of the GraphQL request
  * @return {Object}         object of loaders
  */
+
 module.exports = (context) => ({
   Assets: {
 
     // TODO: decide whether we want to move these to mutators or not, as in fact
     // this operation create a new asset if one isn't found.
     getByURL: (url) => findOrCreateAssetByURL(context, url),
-
+    
+    findByUrl: (url) => findByUrl(context, url),
     search: (query) => getAssetsByQuery(context, query),
     getByID: new DataLoader((ids) => genAssetsByID(context, ids)),
     getForMetrics: () => getAssetsForMetrics(context),
diff --git a/graph/resolvers/asset.js b/graph/resolvers/asset.js
index 47e0a9541..f6793fbf1 100644
--- a/graph/resolvers/asset.js
+++ b/graph/resolvers/asset.js
@@ -14,7 +14,7 @@ const Asset = {
     });
   },
   commentCount({id, commentCount}, {excludeIgnored}, {user, loaders: {Comments}}) {
-
+    
     // TODO: remove
     if (user && excludeIgnored) {
       return Comments.parentCountByAssetIDPersonalized({assetId: id, excludeIgnored});
diff --git a/graph/resolvers/root_query.js b/graph/resolvers/root_query.js
index 9889b62f2..d608316b0 100644
--- a/graph/resolvers/root_query.js
+++ b/graph/resolvers/root_query.js
@@ -40,17 +40,26 @@ const RootQuery = {
     return Comments.get.load(id);
   },
 
-  async commentCount(_, {query}, {user, loaders: {Actions, Comments}}) {
+  async commentCount(_, {query}, {user, loaders: {Actions, Comments, Assets}}) {
+
     if (user == null || !user.can(SEARCH_OTHERS_COMMENTS)) {
       return null;
     }
-
-    const {action_type} = query;
+    
+    const {action_type, asset_url} = query;
 
     if (action_type) {
       query.ids = await Actions.getByTypes({action_type, item_type: 'COMMENTS'});
     }
 
+    if (asset_url) {
+      return Assets.findByUrl(asset_url)
+        .then((asset) => {
+          const newQuery = Object.assign({}, query, {asset_id: asset.id});
+          return Comments.getCountByQuery(newQuery);
+        });
+    }
+
     return Comments.getCountByQuery(query);
   },
 
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 8764a5f66..7801872a6 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -255,6 +255,9 @@ input CommentCountQuery {
   # Asset that a comment is on.
   asset_id: ID
 
+  # The URL that the asset is located on.
+  asset_url: String
+
   # the parent of the comment that we want to retrieve.
   parent_id: ID
 

From fedca113d2d218c6a2bcba7bdfdd66f78ce268ec Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 26 Jun 2017 11:50:51 -0300
Subject: [PATCH 218/264] Adding plugin

---
 .eslintignore                                 |  1 +
 .gitignore                                    |  1 +
 .../src/components/Comment.js                 | 10 ++-
 .../coral-plugin-permalink/client/.babelrc    | 14 ++++
 .../client/.eslintrc.json                     | 23 ++++++
 .../client/components}/PermalinkButton.js     | 72 +++++++++++--------
 .../client/components}/styles.css             |  2 +-
 .../coral-plugin-permalink/client/index.js    |  7 ++
 plugins/coral-plugin-permalink/index.js       |  1 +
 plugins/coral-plugin-permalink/package.json   | 11 +++
 10 files changed, 106 insertions(+), 36 deletions(-)
 create mode 100644 plugins/coral-plugin-permalink/client/.babelrc
 create mode 100644 plugins/coral-plugin-permalink/client/.eslintrc.json
 rename {client/coral-plugin-permalinks => plugins/coral-plugin-permalink/client/components}/PermalinkButton.js (53%)
 rename {client/coral-plugin-permalinks => plugins/coral-plugin-permalink/client/components}/styles.css (95%)
 create mode 100644 plugins/coral-plugin-permalink/client/index.js
 create mode 100644 plugins/coral-plugin-permalink/index.js
 create mode 100644 plugins/coral-plugin-permalink/package.json

diff --git a/.eslintignore b/.eslintignore
index 8a8c3a213..48c4f4844 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -12,4 +12,5 @@ plugins/*
 !plugins/coral-plugin-love
 !plugins/coral-plugin-viewing-options
 !plugins/coral-plugin-comment-content
+!plugins/coral-plugin-permalink
 node_modules
diff --git a/.gitignore b/.gitignore
index b3e0eaa73..0709912e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,5 +25,6 @@ plugins/*
 !plugins/coral-plugin-love
 !plugins/coral-plugin-viewing-options
 !plugins/coral-plugin-comment-content
+!plugins/coral-plugin-permalink
 
 **/node_modules/*
diff --git a/client/coral-embed-stream/src/components/Comment.js b/client/coral-embed-stream/src/components/Comment.js
index 754f44558..4fa7d234b 100644
--- a/client/coral-embed-stream/src/components/Comment.js
+++ b/client/coral-embed-stream/src/components/Comment.js
@@ -1,6 +1,5 @@
 import React, {PropTypes} from 'react';
 
-import PermalinkButton from 'coral-plugin-permalinks/PermalinkButton';
 import AuthorName from 'coral-plugin-author-name/AuthorName';
 import TagLabel from 'coral-plugin-tag-label/TagLabel';
 import PubDate from 'coral-plugin-pubdate/PubDate';
@@ -509,19 +508,18 @@ export default class Comment extends React.Component {
                   currentUserId={currentUser && currentUser.id}
                 />
               </ActionButton>}
+          </div>
+          <div className="commentActionsRight comment__action-container">
             <Slot
               fill="commentActions"
+              wrapperComponent={ActionButton}
               data={this.props.data}
               root={this.props.root}
+              asset={asset}
               comment={comment}
               commentId={comment.id}
               inline
             />
-          </div>
-          <div className="commentActionsRight comment__action-container">
-            <ActionButton>
-              <PermalinkButton articleURL={asset.url} commentId={comment.id} />
-            </ActionButton>
             <ActionButton>
               <FlagComment
                 flaggedByCurrentUser={!!myFlag}
diff --git a/plugins/coral-plugin-permalink/client/.babelrc b/plugins/coral-plugin-permalink/client/.babelrc
new file mode 100644
index 000000000..60be246eb
--- /dev/null
+++ b/plugins/coral-plugin-permalink/client/.babelrc
@@ -0,0 +1,14 @@
+{
+  "presets": [
+    "es2015"
+  ],
+  "plugins": [
+    "add-module-exports",
+    "transform-class-properties",
+    "transform-decorators-legacy",
+    "transform-object-assign",
+    "transform-object-rest-spread",
+    "transform-async-to-generator",
+    "transform-react-jsx"
+  ]
+}
\ No newline at end of file
diff --git a/plugins/coral-plugin-permalink/client/.eslintrc.json b/plugins/coral-plugin-permalink/client/.eslintrc.json
new file mode 100644
index 000000000..9fe56bd14
--- /dev/null
+++ b/plugins/coral-plugin-permalink/client/.eslintrc.json
@@ -0,0 +1,23 @@
+{
+  "env": {
+    "browser": true,
+    "es6": true,
+    "mocha": true
+  },
+  "parserOptions": {
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "experimentalObjectRestSpread": true,
+      "jsx": true
+    }
+  },
+  "parser": "babel-eslint",
+  "plugins": [
+    "react"
+  ],
+  "rules": {
+    "react/jsx-uses-react": "error",
+    "react/jsx-uses-vars": "error",
+    "no-console": ["warn", { "allow": ["warn", "error"] }]
+  }
+}
diff --git a/client/coral-plugin-permalinks/PermalinkButton.js b/plugins/coral-plugin-permalink/client/components/PermalinkButton.js
similarity index 53%
rename from client/coral-plugin-permalinks/PermalinkButton.js
rename to plugins/coral-plugin-permalink/client/components/PermalinkButton.js
index 3d6df996f..41c0cae6d 100644
--- a/client/coral-plugin-permalinks/PermalinkButton.js
+++ b/plugins/coral-plugin-permalink/client/components/PermalinkButton.js
@@ -1,53 +1,64 @@
-import React, {PropTypes} from 'react';
-const name = 'coral-plugin-permalinks';
+import React from 'react';
 import {Button} from 'coral-ui';
 import styles from './styles.css';
-import ClickOutside from 'coral-framework/components/ClickOutside';
-
 import t from 'coral-framework/services/i18n';
+import ClickOutside from 'coral-framework/components/ClickOutside';
+import cn from 'classnames';
+
+const name = 'coral-plugin-permalinks';
 
 export default class PermalinkButton extends React.Component {
-
-  static propTypes = {
-    articleURL: PropTypes.string.isRequired,
-    commentId: PropTypes.string.isRequired
-  }
-
   constructor (props) {
     super(props);
-    this.state = {popoverOpen: false, copySuccessful: null, copyFailure: null};
-    this.toggle = this.toggle.bind(this);
-    this.copyPermalink = this.copyPermalink.bind(this);
+
+    this.state = {
+      popoverOpen: false,
+      copySuccessful: null,
+      copyFailure: null
+    };
+
   }
 
-  toggle () {
-
-    // I wish I could position this with a stylesheet, but top-level comments with
-    // nested replies throws everything off, as well as very long comments
+  toggle = () => {
     this.popover.style.top = `${this.linkButton.offsetTop - 80}px`;
-    this.setState({popoverOpen: !this.state.popoverOpen});
+
+    this.setState({
+      popoverOpen: !this.state.popoverOpen
+    });
   }
 
   handleClickOutside = () => {
-    this.setState({popoverOpen: false});
+    this.setState({
+      popoverOpen: false
+    });
   }
 
-  copyPermalink () {
+  copyPermalink = () => {
     this.permalinkInput.select();
     try {
       document.execCommand('copy');
-      this.setState({copySuccessful: true, copyFailure: null});
+      this.setState({
+        copySuccessful: true,
+        copyFailure: null
+      });
     } catch (err) {
-      this.setState({copyFailure: true, copySuccessful: null});
+      this.setState({
+        copyFailure: true,
+        copySuccessful: null
+      });
     }
 
     setTimeout(() => {
-      this.setState({copyFailure: null, copySuccessful: null});
+      this.setState({
+        copyFailure: null,
+        copySuccessful: null
+      });
     }, 3000);
   }
 
   render () {
-    const {copySuccessful, copyFailure} = this.state;
+    const {copySuccessful, copyFailure, popoverOpen} = this.state;
+    const {asset} = this.props;
     return (
       <ClickOutside onClickOutside={this.handleClickOutside}>
         <div className={`${name}-container`}>
@@ -60,15 +71,18 @@ export default class PermalinkButton extends React.Component {
           </button>
           <div
             ref={(ref) => this.popover = ref}
-            className={`${name}-popover ${styles.container} ${this.state.popoverOpen ? 'active' : ''}`}>
+            className={cn([`${name}-popover`, styles.container, {active: popoverOpen}])}>
             <input
               className={`${name}-copy-field`}
               type='text'
               ref={(input) => this.permalinkInput = input}
-              value={`${this.props.articleURL}#${this.props.commentId}`}
-              onChange={() => {}} />
-            <Button className={`${name}-copy-button ${copySuccessful ? styles.success : ''} ${copyFailure ? styles.failure : ''}`}
-                    onClick={this.copyPermalink} >
+              value={`${asset.url}#${this.props.commentId}`}
+            />
+
+            <Button
+              onClick={this.copyPermalink}
+              className={cn([`${name}-copy-button`, {[style.success]:copySuccessful, [styles.failure]: copyFailure}])}
+            >
               {!copyFailure && !copySuccessful && 'Copy'}
               {copySuccessful && 'Copied'}
               {copyFailure && 'Not supported'}
diff --git a/client/coral-plugin-permalinks/styles.css b/plugins/coral-plugin-permalink/client/components/styles.css
similarity index 95%
rename from client/coral-plugin-permalinks/styles.css
rename to plugins/coral-plugin-permalink/client/components/styles.css
index a4671c685..ba263fe0c 100644
--- a/client/coral-plugin-permalinks/styles.css
+++ b/plugins/coral-plugin-permalink/client/components/styles.css
@@ -2,10 +2,10 @@
   border-radius: 3px;
   padding: 15px 10px;
   box-sizing: border-box;
-  /* box-shadow: 3px 3px 5px 0 rgba(0, 0, 0, 0.3); */
   border: solid 1px rgba(153, 153, 153, 0.33);
   left: 0;
   width: 100%;
+  z-index: 10;
 
   &::before {
     content: '';
diff --git a/plugins/coral-plugin-permalink/client/index.js b/plugins/coral-plugin-permalink/client/index.js
new file mode 100644
index 000000000..d413da870
--- /dev/null
+++ b/plugins/coral-plugin-permalink/client/index.js
@@ -0,0 +1,7 @@
+import PermalinkButton from './components/PermalinkButton';
+
+export default {
+  slots: {
+    commentActions: [PermalinkButton]
+  }
+};
diff --git a/plugins/coral-plugin-permalink/index.js b/plugins/coral-plugin-permalink/index.js
new file mode 100644
index 000000000..f053ebf79
--- /dev/null
+++ b/plugins/coral-plugin-permalink/index.js
@@ -0,0 +1 @@
+module.exports = {};
diff --git a/plugins/coral-plugin-permalink/package.json b/plugins/coral-plugin-permalink/package.json
new file mode 100644
index 000000000..0d1f1e6ba
--- /dev/null
+++ b/plugins/coral-plugin-permalink/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "coral-plugin-permalink",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC"
+}

From 2745245564ebdd0057f296cb2242b58eeec1893b Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 26 Jun 2017 14:39:10 -0300
Subject: [PATCH 219/264] updated

---
 graph/loaders/assets.js       | 4 +---
 graph/resolvers/root_query.js | 9 ++++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/graph/loaders/assets.js b/graph/loaders/assets.js
index b1be7dafb..d3d1e40a8 100644
--- a/graph/loaders/assets.js
+++ b/graph/loaders/assets.js
@@ -71,9 +71,7 @@ const findByUrl = async (context, asset_url) => {
     throw errors.ErrInvalidAssetURL;
   }
 
-  let asset = await AssetsService.findByUrl(asset_url);
-
-  return asset;
+  return AssetsService.findByUrl(asset_url);
 };
 
 /**
diff --git a/graph/resolvers/root_query.js b/graph/resolvers/root_query.js
index d608316b0..8bb9d31d3 100644
--- a/graph/resolvers/root_query.js
+++ b/graph/resolvers/root_query.js
@@ -53,11 +53,10 @@ const RootQuery = {
     }
 
     if (asset_url) {
-      return Assets.findByUrl(asset_url)
-        .then((asset) => {
-          const newQuery = Object.assign({}, query, {asset_id: asset.id});
-          return Comments.getCountByQuery(newQuery);
-        });
+      let asset = await Assets.findByUrl(asset_url);
+      if (asset) {
+        query.asset_id = asset.id;
+      }
     }
 
     return Comments.getCountByQuery(query);

From a14e4859a91dbe79094f185902e589fed60e31f6 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 26 Jun 2017 14:49:24 -0300
Subject: [PATCH 220/264] refactor

---
 .../coral-plugin-permalink/client/.babelrc    | 14 ---
 .../client/.eslintrc.json                     | 23 -----
 .../client/components/PermalinkButton.js      | 95 -------------------
 .../client/components/styles.css              | 67 -------------
 .../coral-plugin-permalink/client/index.js    |  7 --
 plugins/coral-plugin-permalink/index.js       |  1 -
 plugins/coral-plugin-permalink/package.json   | 11 ---
 7 files changed, 218 deletions(-)
 delete mode 100644 plugins/coral-plugin-permalink/client/.babelrc
 delete mode 100644 plugins/coral-plugin-permalink/client/.eslintrc.json
 delete mode 100644 plugins/coral-plugin-permalink/client/components/PermalinkButton.js
 delete mode 100644 plugins/coral-plugin-permalink/client/components/styles.css
 delete mode 100644 plugins/coral-plugin-permalink/client/index.js
 delete mode 100644 plugins/coral-plugin-permalink/index.js
 delete mode 100644 plugins/coral-plugin-permalink/package.json

diff --git a/plugins/coral-plugin-permalink/client/.babelrc b/plugins/coral-plugin-permalink/client/.babelrc
deleted file mode 100644
index 60be246eb..000000000
--- a/plugins/coral-plugin-permalink/client/.babelrc
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "presets": [
-    "es2015"
-  ],
-  "plugins": [
-    "add-module-exports",
-    "transform-class-properties",
-    "transform-decorators-legacy",
-    "transform-object-assign",
-    "transform-object-rest-spread",
-    "transform-async-to-generator",
-    "transform-react-jsx"
-  ]
-}
\ No newline at end of file
diff --git a/plugins/coral-plugin-permalink/client/.eslintrc.json b/plugins/coral-plugin-permalink/client/.eslintrc.json
deleted file mode 100644
index 9fe56bd14..000000000
--- a/plugins/coral-plugin-permalink/client/.eslintrc.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "env": {
-    "browser": true,
-    "es6": true,
-    "mocha": true
-  },
-  "parserOptions": {
-    "sourceType": "module",
-    "ecmaFeatures": {
-      "experimentalObjectRestSpread": true,
-      "jsx": true
-    }
-  },
-  "parser": "babel-eslint",
-  "plugins": [
-    "react"
-  ],
-  "rules": {
-    "react/jsx-uses-react": "error",
-    "react/jsx-uses-vars": "error",
-    "no-console": ["warn", { "allow": ["warn", "error"] }]
-  }
-}
diff --git a/plugins/coral-plugin-permalink/client/components/PermalinkButton.js b/plugins/coral-plugin-permalink/client/components/PermalinkButton.js
deleted file mode 100644
index 41c0cae6d..000000000
--- a/plugins/coral-plugin-permalink/client/components/PermalinkButton.js
+++ /dev/null
@@ -1,95 +0,0 @@
-import React from 'react';
-import {Button} from 'coral-ui';
-import styles from './styles.css';
-import t from 'coral-framework/services/i18n';
-import ClickOutside from 'coral-framework/components/ClickOutside';
-import cn from 'classnames';
-
-const name = 'coral-plugin-permalinks';
-
-export default class PermalinkButton extends React.Component {
-  constructor (props) {
-    super(props);
-
-    this.state = {
-      popoverOpen: false,
-      copySuccessful: null,
-      copyFailure: null
-    };
-
-  }
-
-  toggle = () => {
-    this.popover.style.top = `${this.linkButton.offsetTop - 80}px`;
-
-    this.setState({
-      popoverOpen: !this.state.popoverOpen
-    });
-  }
-
-  handleClickOutside = () => {
-    this.setState({
-      popoverOpen: false
-    });
-  }
-
-  copyPermalink = () => {
-    this.permalinkInput.select();
-    try {
-      document.execCommand('copy');
-      this.setState({
-        copySuccessful: true,
-        copyFailure: null
-      });
-    } catch (err) {
-      this.setState({
-        copyFailure: true,
-        copySuccessful: null
-      });
-    }
-
-    setTimeout(() => {
-      this.setState({
-        copyFailure: null,
-        copySuccessful: null
-      });
-    }, 3000);
-  }
-
-  render () {
-    const {copySuccessful, copyFailure, popoverOpen} = this.state;
-    const {asset} = this.props;
-    return (
-      <ClickOutside onClickOutside={this.handleClickOutside}>
-        <div className={`${name}-container`}>
-          <button
-            ref={(ref) => this.linkButton = ref}
-            onClick={this.toggle}
-            className={`${name}-button`}>
-            {t('permalink')}
-            <i className={`${name}-icon material-icons`} aria-hidden={true}>link</i>
-          </button>
-          <div
-            ref={(ref) => this.popover = ref}
-            className={cn([`${name}-popover`, styles.container, {active: popoverOpen}])}>
-            <input
-              className={`${name}-copy-field`}
-              type='text'
-              ref={(input) => this.permalinkInput = input}
-              value={`${asset.url}#${this.props.commentId}`}
-            />
-
-            <Button
-              onClick={this.copyPermalink}
-              className={cn([`${name}-copy-button`, {[style.success]:copySuccessful, [styles.failure]: copyFailure}])}
-            >
-              {!copyFailure && !copySuccessful && 'Copy'}
-              {copySuccessful && 'Copied'}
-              {copyFailure && 'Not supported'}
-            </Button>
-          </div>
-        </div>
-      </ClickOutside>
-    );
-  }
-}
diff --git a/plugins/coral-plugin-permalink/client/components/styles.css b/plugins/coral-plugin-permalink/client/components/styles.css
deleted file mode 100644
index ba263fe0c..000000000
--- a/plugins/coral-plugin-permalink/client/components/styles.css
+++ /dev/null
@@ -1,67 +0,0 @@
-.container {
-  border-radius: 3px;
-  padding: 15px 10px;
-  box-sizing: border-box;
-  border: solid 1px rgba(153, 153, 153, 0.33);
-  left: 0;
-  width: 100%;
-  z-index: 10;
-
-  &::before {
-    content: '';
-    border: 10px solid transparent;
-    border-top-color: white;
-    position: absolute;
-    right: 7em;
-    bottom: -20px;
-    z-index: 2;
-  }
-
-  &::after{
-    content: '';
-    border: 10px solid transparent;
-    border-top-color: rgba(153, 153, 153, 0.33);
-    position: absolute;
-    right: 7em;
-    bottom: -21px;
-    z-index: 1;
-  }
-
-  input {
-    display: inline-block;
-    width: calc(100% - 78px);
-    padding: 8px;
-    border-radius: 3px;
-    border: solid 1px #e0e0e0;
-    height: 32px;
-    box-sizing: border-box;
-    font-size: 1em;
-  }
-
-  button {
-    display: inline-block;
-    float: right;
-    box-sizing: border-box;
-    margin: 0;
-    background-color: #e0e0e0;
-    font-size: 1em;
-    width: auto;
-    height: auto;
-    padding: 2px;
-    transition: background-color 0.4s ease;
-
-    &:hover{
-      color: black;
-    }
-
-    &.success {
-      background-color: #00897B;
-      color: white;
-    }
-
-    &.failure {
-      background-color: #FF5252;
-      color: white;
-    }
-  }
-}
diff --git a/plugins/coral-plugin-permalink/client/index.js b/plugins/coral-plugin-permalink/client/index.js
deleted file mode 100644
index d413da870..000000000
--- a/plugins/coral-plugin-permalink/client/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import PermalinkButton from './components/PermalinkButton';
-
-export default {
-  slots: {
-    commentActions: [PermalinkButton]
-  }
-};
diff --git a/plugins/coral-plugin-permalink/index.js b/plugins/coral-plugin-permalink/index.js
deleted file mode 100644
index f053ebf79..000000000
--- a/plugins/coral-plugin-permalink/index.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = {};
diff --git a/plugins/coral-plugin-permalink/package.json b/plugins/coral-plugin-permalink/package.json
deleted file mode 100644
index 0d1f1e6ba..000000000
--- a/plugins/coral-plugin-permalink/package.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "name": "coral-plugin-permalink",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "ISC"
-}

From 5e1450ffb0c131e82da72e952605eda380221d21 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 26 Jun 2017 15:46:53 -0300
Subject: [PATCH 221/264] Renaming to talk

---
 .eslintignore                                 |   2 +-
 .gitignore                                    |   2 +-
 plugins/talk-plugin-permalink/client/.babelrc |  14 +++
 .../client/.eslintrc.json                     |  23 ++++
 .../client/components/PermalinkButton.js      | 101 ++++++++++++++++++
 .../client/components/styles.css              |  66 ++++++++++++
 plugins/talk-plugin-permalink/client/index.js |   7 ++
 plugins/talk-plugin-permalink/index.js        |   1 +
 plugins/talk-plugin-permalink/package.json    |  11 ++
 9 files changed, 225 insertions(+), 2 deletions(-)
 create mode 100644 plugins/talk-plugin-permalink/client/.babelrc
 create mode 100644 plugins/talk-plugin-permalink/client/.eslintrc.json
 create mode 100644 plugins/talk-plugin-permalink/client/components/PermalinkButton.js
 create mode 100644 plugins/talk-plugin-permalink/client/components/styles.css
 create mode 100644 plugins/talk-plugin-permalink/client/index.js
 create mode 100644 plugins/talk-plugin-permalink/index.js
 create mode 100644 plugins/talk-plugin-permalink/package.json

diff --git a/.eslintignore b/.eslintignore
index 48c4f4844..3a259c106 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -12,5 +12,5 @@ plugins/*
 !plugins/coral-plugin-love
 !plugins/coral-plugin-viewing-options
 !plugins/coral-plugin-comment-content
-!plugins/coral-plugin-permalink
+!plugins/talk-plugin-permalink
 node_modules
diff --git a/.gitignore b/.gitignore
index 0709912e5..0be1266c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,6 @@ plugins/*
 !plugins/coral-plugin-love
 !plugins/coral-plugin-viewing-options
 !plugins/coral-plugin-comment-content
-!plugins/coral-plugin-permalink
+!plugins/talk-plugin-permalink
 
 **/node_modules/*
diff --git a/plugins/talk-plugin-permalink/client/.babelrc b/plugins/talk-plugin-permalink/client/.babelrc
new file mode 100644
index 000000000..60be246eb
--- /dev/null
+++ b/plugins/talk-plugin-permalink/client/.babelrc
@@ -0,0 +1,14 @@
+{
+  "presets": [
+    "es2015"
+  ],
+  "plugins": [
+    "add-module-exports",
+    "transform-class-properties",
+    "transform-decorators-legacy",
+    "transform-object-assign",
+    "transform-object-rest-spread",
+    "transform-async-to-generator",
+    "transform-react-jsx"
+  ]
+}
\ No newline at end of file
diff --git a/plugins/talk-plugin-permalink/client/.eslintrc.json b/plugins/talk-plugin-permalink/client/.eslintrc.json
new file mode 100644
index 000000000..9fe56bd14
--- /dev/null
+++ b/plugins/talk-plugin-permalink/client/.eslintrc.json
@@ -0,0 +1,23 @@
+{
+  "env": {
+    "browser": true,
+    "es6": true,
+    "mocha": true
+  },
+  "parserOptions": {
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "experimentalObjectRestSpread": true,
+      "jsx": true
+    }
+  },
+  "parser": "babel-eslint",
+  "plugins": [
+    "react"
+  ],
+  "rules": {
+    "react/jsx-uses-react": "error",
+    "react/jsx-uses-vars": "error",
+    "no-console": ["warn", { "allow": ["warn", "error"] }]
+  }
+}
diff --git a/plugins/talk-plugin-permalink/client/components/PermalinkButton.js b/plugins/talk-plugin-permalink/client/components/PermalinkButton.js
new file mode 100644
index 000000000..b4dd190d8
--- /dev/null
+++ b/plugins/talk-plugin-permalink/client/components/PermalinkButton.js
@@ -0,0 +1,101 @@
+import React from 'react';
+import {Button} from 'coral-ui';
+import styles from './styles.css';
+import t from 'coral-framework/services/i18n';
+import ClickOutside from 'coral-framework/components/ClickOutside';
+import cn from 'classnames';
+
+const name = 'talk-plugin-permalink';
+
+export default class PermalinkButton extends React.Component {
+  constructor (props) {
+    super(props);
+
+    this.state = {
+      popoverOpen: false,
+      copySuccessful: null,
+      copyFailure: null
+    };
+
+  }
+
+  toggle = () => {
+    this.popover.style.top = `${this.linkButton.offsetTop - 80}px`;
+
+    this.setState({
+      popoverOpen: !this.state.popoverOpen
+    });
+  }
+
+  handleClickOutside = () => {
+    this.setState({
+      popoverOpen: false
+    });
+  }
+
+  copyPermalink = () => {
+    this.permalinkInput.select();
+    try {
+      document.execCommand('copy');
+      this.setState({
+        copySuccessful: true,
+        copyFailure: null
+      });
+    } catch (err) {
+      this.setState({
+        copyFailure: true,
+        copySuccessful: null
+      });
+    }
+
+    setTimeout(() => {
+      this.setState({
+        copyFailure: null,
+        copySuccessful: null
+      });
+    }, 3000);
+  }
+
+  render () {
+    const {copySuccessful, copyFailure, popoverOpen} = this.state;
+    const {asset} = this.props;
+    return (
+      <ClickOutside onClickOutside={this.handleClickOutside}>
+        <div className={`${name}-container`}>
+          <button
+            ref={(ref) => this.linkButton = ref}
+            onClick={this.toggle}
+            className={`${name}-button`}>
+            {t('permalink')}
+            <i className={`${name}-icon material-icons`} aria-hidden={true}>link</i>
+          </button>
+          <div
+            ref={(ref) => this.popover = ref}
+            className={cn([`${name}-popover`, styles.container, {active: popoverOpen}])}>
+
+            <input
+              className={cn(styles.input, `${name}-copy-field`)}
+              type='text'
+              ref={(input) => this.permalinkInput = input}
+              value={`${asset.url}#${this.props.commentId}`}
+            />
+
+            <Button
+              onClick={this.copyPermalink}
+              className={cn([
+                styles.button,
+                `${name}-copy-button`, {
+                  [styles.success]:copySuccessful,
+                  [styles.failure]: copyFailure
+                }])}>
+              {!copyFailure && !copySuccessful && 'Copy'}
+              {copySuccessful && 'Copied'}
+              {copyFailure && 'Not supported'}
+            </Button>
+            
+          </div>
+        </div>
+      </ClickOutside>
+    );
+  }
+}
diff --git a/plugins/talk-plugin-permalink/client/components/styles.css b/plugins/talk-plugin-permalink/client/components/styles.css
new file mode 100644
index 000000000..df417dd23
--- /dev/null
+++ b/plugins/talk-plugin-permalink/client/components/styles.css
@@ -0,0 +1,66 @@
+.container {
+  border-radius: 3px;
+  padding: 15px 10px;
+  box-sizing: border-box;
+  border: solid 1px rgba(153, 153, 153, 0.33);
+  left: 0;
+  width: 100%;
+  z-index: 10;
+}
+.container::before {
+  content: '';
+  border: 10px solid transparent;
+  border-top-color: white;
+  position: absolute;
+  right: 7em;
+  bottom: -20px;
+  z-index: 2;
+}
+
+.container::after{
+  content: '';
+  border: 10px solid transparent;
+  border-top-color: rgba(153, 153, 153, 0.33);
+  position: absolute;
+  right: 7em;
+  bottom: -21px;
+  z-index: 1;
+}
+
+.input {
+  display: inline-block;
+  width: calc(100% - 78px);
+  padding: 8px;
+  border-radius: 3px;
+  border: solid 1px #e0e0e0;
+  height: 32px;
+  box-sizing: border-box;
+  font-size: 1em;
+}
+
+.button {
+  display: inline-block;
+  float: right;
+  box-sizing: border-box;
+  margin: 0;
+  background-color: #e0e0e0;
+  font-size: 1em;
+  width: auto;
+  height: auto;
+  padding: 2px;
+  transition: background-color 0.4s ease;
+}
+
+.button:hover{
+  color: black;
+}
+
+.button.success {
+  background-color: #00897B;
+  color: white;
+}
+
+.button.failure {
+  background-color: #FF5252;
+  color: white;
+}
diff --git a/plugins/talk-plugin-permalink/client/index.js b/plugins/talk-plugin-permalink/client/index.js
new file mode 100644
index 000000000..d413da870
--- /dev/null
+++ b/plugins/talk-plugin-permalink/client/index.js
@@ -0,0 +1,7 @@
+import PermalinkButton from './components/PermalinkButton';
+
+export default {
+  slots: {
+    commentActions: [PermalinkButton]
+  }
+};
diff --git a/plugins/talk-plugin-permalink/index.js b/plugins/talk-plugin-permalink/index.js
new file mode 100644
index 000000000..f053ebf79
--- /dev/null
+++ b/plugins/talk-plugin-permalink/index.js
@@ -0,0 +1 @@
+module.exports = {};
diff --git a/plugins/talk-plugin-permalink/package.json b/plugins/talk-plugin-permalink/package.json
new file mode 100644
index 000000000..0d1f1e6ba
--- /dev/null
+++ b/plugins/talk-plugin-permalink/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "coral-plugin-permalink",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC"
+}

From b00d2f569eef91bce6dae967a175ef9d7d372b04 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 26 Jun 2017 16:01:07 -0300
Subject: [PATCH 222/264] Removing styles from default.css

---
 client/coral-embed-stream/style/default.css   | 27 -------------------
 .../client/components/PermalinkButton.js      |  7 ++---
 .../client/components/styles.css              | 18 ++++++++++---
 3 files changed, 19 insertions(+), 33 deletions(-)

diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css
index 701a06fd5..a752493a3 100644
--- a/client/coral-embed-stream/style/default.css
+++ b/client/coral-embed-stream/style/default.css
@@ -335,33 +335,6 @@ button.comment__action-button[disabled],
   display: inline-block;
 }
 
-.coral-plugin-permalinks-container {
-  /*position: relative;*/
-  z-index: 2;
-}
-
-.coral-plugin-permalinks-popover {
-  display: none;
-  background-color: white;
-  border: 1px solid black;
-  position: absolute;
-  padding: 5px;
-}
-
-.coral-plugin-permalinks-popover.active {
-  display: block;
-}
-
-.coral-plugin-permalinks-copy-field {
-  display: block;
-  width: calc(100% - 5px);
-}
-
-.coral-plugin-permalinks-copied-text {
-  float: right;
-  margin: 8px;
-}
-
 /* Flag Styles */
 
 .coral-plugin-flags-popup-form {
diff --git a/plugins/talk-plugin-permalink/client/components/PermalinkButton.js b/plugins/talk-plugin-permalink/client/components/PermalinkButton.js
index b4dd190d8..6a92d69ce 100644
--- a/plugins/talk-plugin-permalink/client/components/PermalinkButton.js
+++ b/plugins/talk-plugin-permalink/client/components/PermalinkButton.js
@@ -61,7 +61,7 @@ export default class PermalinkButton extends React.Component {
     const {asset} = this.props;
     return (
       <ClickOutside onClickOutside={this.handleClickOutside}>
-        <div className={`${name}-container`}>
+        <div className={cn(`${name}-container`, styles.container)}>
           <button
             ref={(ref) => this.linkButton = ref}
             onClick={this.toggle}
@@ -69,15 +69,16 @@ export default class PermalinkButton extends React.Component {
             {t('permalink')}
             <i className={`${name}-icon material-icons`} aria-hidden={true}>link</i>
           </button>
+
           <div
             ref={(ref) => this.popover = ref}
-            className={cn([`${name}-popover`, styles.container, {active: popoverOpen}])}>
+            className={cn([`${name}-popover`, styles.popover, {[styles.active]: popoverOpen}])}>
 
             <input
               className={cn(styles.input, `${name}-copy-field`)}
               type='text'
               ref={(input) => this.permalinkInput = input}
-              value={`${asset.url}#${this.props.commentId}`}
+              defaultValue={`${asset.url}#${this.props.commentId}`}
             />
 
             <Button
diff --git a/plugins/talk-plugin-permalink/client/components/styles.css b/plugins/talk-plugin-permalink/client/components/styles.css
index df417dd23..6401dbece 100644
--- a/plugins/talk-plugin-permalink/client/components/styles.css
+++ b/plugins/talk-plugin-permalink/client/components/styles.css
@@ -1,4 +1,8 @@
-.container {
+.popover {
+  display: none;
+  background-color: white;
+  position: absolute;
+
   border-radius: 3px;
   padding: 15px 10px;
   box-sizing: border-box;
@@ -7,7 +11,7 @@
   width: 100%;
   z-index: 10;
 }
-.container::before {
+.popover::before {
   content: '';
   border: 10px solid transparent;
   border-top-color: white;
@@ -17,7 +21,7 @@
   z-index: 2;
 }
 
-.container::after{
+.popover::after{
   content: '';
   border: 10px solid transparent;
   border-top-color: rgba(153, 153, 153, 0.33);
@@ -64,3 +68,11 @@
   background-color: #FF5252;
   color: white;
 }
+
+.container {
+  z-index: 2;
+}
+
+.active {
+  display: block;
+}
\ No newline at end of file

From fa9a4ecc501178a265cc50cc4d5bd10dc14c3972 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 26 Jun 2017 16:08:32 -0300
Subject: [PATCH 223/264] Clearing the timeout

---
 .../client/components/PermalinkButton.js                    | 6 +++++-
 plugins/talk-plugin-permalink/client/components/styles.css  | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/talk-plugin-permalink/client/components/PermalinkButton.js b/plugins/talk-plugin-permalink/client/components/PermalinkButton.js
index 6a92d69ce..7eba9ddd0 100644
--- a/plugins/talk-plugin-permalink/client/components/PermalinkButton.js
+++ b/plugins/talk-plugin-permalink/client/components/PermalinkButton.js
@@ -48,7 +48,7 @@ export default class PermalinkButton extends React.Component {
       });
     }
 
-    setTimeout(() => {
+    this.timeout = window.setTimeout(() => {
       this.setState({
         copyFailure: null,
         copySuccessful: null
@@ -56,6 +56,10 @@ export default class PermalinkButton extends React.Component {
     }, 3000);
   }
 
+  componentWillUnmount() {
+    window.clearTimeout(this.timeout);
+  }
+
   render () {
     const {copySuccessful, copyFailure, popoverOpen} = this.state;
     const {asset} = this.props;
diff --git a/plugins/talk-plugin-permalink/client/components/styles.css b/plugins/talk-plugin-permalink/client/components/styles.css
index 6401dbece..56d069755 100644
--- a/plugins/talk-plugin-permalink/client/components/styles.css
+++ b/plugins/talk-plugin-permalink/client/components/styles.css
@@ -2,7 +2,6 @@
   display: none;
   background-color: white;
   position: absolute;
-
   border-radius: 3px;
   padding: 15px 10px;
   box-sizing: border-box;

From 2ac6ad8eb8447cd6c4183882af80408f64d414af Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 26 Jun 2017 16:16:40 -0300
Subject: [PATCH 224/264] Using the plugin api

---
 plugin-api/beta/client/components/index.js          |  1 +
 .../client/components/PermalinkButton.js            | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/plugin-api/beta/client/components/index.js b/plugin-api/beta/client/components/index.js
index 5d76732fc..6466b9ffc 100644
--- a/plugin-api/beta/client/components/index.js
+++ b/plugin-api/beta/client/components/index.js
@@ -1 +1,2 @@
 export {Slot} from 'coral-framework/components';
+export {default as ClickOutside} from 'coral-framework/components/ClickOutside';
diff --git a/plugins/talk-plugin-permalink/client/components/PermalinkButton.js b/plugins/talk-plugin-permalink/client/components/PermalinkButton.js
index 7eba9ddd0..68406472e 100644
--- a/plugins/talk-plugin-permalink/client/components/PermalinkButton.js
+++ b/plugins/talk-plugin-permalink/client/components/PermalinkButton.js
@@ -1,9 +1,9 @@
 import React from 'react';
-import {Button} from 'coral-ui';
-import styles from './styles.css';
-import t from 'coral-framework/services/i18n';
-import ClickOutside from 'coral-framework/components/ClickOutside';
 import cn from 'classnames';
+import styles from './styles.css';
+import {t} from 'plugin-api/beta/client/services';
+import {ClickOutside} from 'plugin-api/beta/client/components';
+import {Icon, Button} from 'plugin-api/beta/client/components/ui';
 
 const name = 'talk-plugin-permalink';
 
@@ -66,12 +66,13 @@ export default class PermalinkButton extends React.Component {
     return (
       <ClickOutside onClickOutside={this.handleClickOutside}>
         <div className={cn(`${name}-container`, styles.container)}>
+          
           <button
             ref={(ref) => this.linkButton = ref}
             onClick={this.toggle}
             className={`${name}-button`}>
-            {t('permalink')}
-            <i className={`${name}-icon material-icons`} aria-hidden={true}>link</i>
+              {t('permalink')}
+            <Icon name="link" />
           </button>
 
           <div

From bee1cc124cb18f472e9375b06bed539d3ded824e Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 26 Jun 2017 16:26:05 -0300
Subject: [PATCH 225/264] renamed to talk

---
 plugins/talk-plugin-permalink/package.json | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/plugins/talk-plugin-permalink/package.json b/plugins/talk-plugin-permalink/package.json
index 0d1f1e6ba..fefeb9f16 100644
--- a/plugins/talk-plugin-permalink/package.json
+++ b/plugins/talk-plugin-permalink/package.json
@@ -1,11 +1,8 @@
 {
-  "name": "coral-plugin-permalink",
+  "name": "talk-plugin-permalink",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
   "author": "",
   "license": "ISC"
 }

From c90c177b7c9ebec6f20aad70923bd7d34dcc46a4 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 27 Jun 2017 20:06:27 +0700
Subject: [PATCH 226/264] Live update on stream when banned user, suspended
 user or rejected username

---
 .../src/components/Comment.js                 |  14 ++-
 .../src/components/EditableCommentContent.js  |   9 +-
 .../src/containers/Embed.js                   | 102 ++++++++++++++++++
 .../src/containers/Stream.js                  |   4 +-
 client/coral-embed/src/index.js               |  12 ++-
 client/coral-framework/reducers/auth.js       |  14 +++
 client/coral-plugin-commentbox/CommentBox.js  |   7 ++
 client/coral-plugin-flags/FlagButton.js       |   2 +
 graph/context.js                              |   3 +-
 graph/index.js                                |   3 +-
 graph/mutators/action.js                      |   4 +-
 graph/mutators/comment.js                     |  28 ++---
 graph/mutators/user.js                        |  24 +++--
 graph/resolvers/subscription.js               |   9 ++
 graph/resolvers/user.js                       |   8 ++
 graph/subscriptions.js                        |  48 ++++++++-
 graph/typeDefs.graphql                        |  23 ++++
 locales/en.yml                                |   3 +
 locales/es.yml                                |   3 +
 perms/constants.js                            |   4 +
 perms/queryReducer.js                         |   2 +
 perms/subscriptionReducer.js                  |   6 ++
 plugin-api/beta/client/hocs/withReaction.js   |   4 +-
 .../coral-plugin-like/client/LikeButton.js    |   2 +
 .../coral-plugin-love/client/LoveButton.js    |   2 +
 .../client/RespectButton.js                   |   2 +
 routes/api/users/index.js                     |  15 ++-
 {graph => services}/pubsub.js                 |   2 +-
 services/users.js                             |  97 +++++++++--------
 test/server/graph/context.js                  |  27 +++--
 30 files changed, 375 insertions(+), 108 deletions(-)
 rename {graph => services}/pubsub.js (69%)

diff --git a/client/coral-embed-stream/src/components/Comment.js b/client/coral-embed-stream/src/components/Comment.js
index 754f44558..86149b178 100644
--- a/client/coral-embed-stream/src/components/Comment.js
+++ b/client/coral-embed-stream/src/components/Comment.js
@@ -196,8 +196,16 @@ export default class Comment extends React.Component {
     editComment: React.PropTypes.func,
   }
 
+  editComment = () => {
+    return this.props.editComment(this.props.comment.id, this.props.asset.id);
+  }
+
   onClickEdit (e) {
     e.preventDefault();
+    if (!can(this.props.currentUser, 'INTERACT_WITH_COMMUNITY')) {
+      this.props.addNotification('error', t('error.NOT_AUTHORIZED'));
+      return;
+    }
     this.setState({isEditing: true});
   }
 
@@ -240,7 +248,8 @@ export default class Comment extends React.Component {
     }
     if (can(this.props.currentUser, 'INTERACT_WITH_COMMUNITY')) {
       this.props.setActiveReplyBox(this.props.comment.id);
-      return;
+    } else {
+      this.props.addNotification('error', t('error.NOT_AUTHORIZED'));
     }
     return;
   }
@@ -469,7 +478,7 @@ export default class Comment extends React.Component {
           {
             this.state.isEditing
             ? <EditableCommentContent
-                editComment={this.props.editComment.bind(null, comment.id, asset.id)}
+                editComment={this.editComment}
                 addNotification={addNotification}
                 asset={asset}
                 comment={comment}
@@ -529,6 +538,7 @@ export default class Comment extends React.Component {
                 id={comment.id}
                 author_id={comment.user.id}
                 postFlag={postFlag}
+                addNotification={addNotification}
                 postDontAgree={postDontAgree}
                 deleteAction={deleteAction}
                 showSignInDialog={showSignInDialog}
diff --git a/client/coral-embed-stream/src/components/EditableCommentContent.js b/client/coral-embed-stream/src/components/EditableCommentContent.js
index 1373707a0..5e4e354db 100644
--- a/client/coral-embed-stream/src/components/EditableCommentContent.js
+++ b/client/coral-embed-stream/src/components/EditableCommentContent.js
@@ -4,6 +4,7 @@ import {CommentForm} from 'coral-plugin-commentbox/CommentForm';
 import styles from './Comment.css';
 import {CountdownSeconds} from './CountdownSeconds';
 import {getEditableUntilDate} from './util';
+import {can} from 'coral-framework/services/perms';
 
 import {Icon} from 'coral-ui';
 import t from 'coral-framework/services/i18n';
@@ -47,7 +48,6 @@ export class EditableCommentContent extends React.Component {
   }
   constructor(props) {
     super(props);
-    this.editComment = this.editComment.bind(this);
     this.editWindowExpiryTimeout = null;
   }
   componentDidMount() {
@@ -65,7 +65,12 @@ export class EditableCommentContent extends React.Component {
       this.editWindowExpiryTimeout = clearTimeout(this.editWindowExpiryTimeout);
     }
   }
-  async editComment(edit) {
+  editComment = async (edit) => {
+    if (!can(this.props.currentUser, 'INTERACT_WITH_COMMUNITY')) {
+      this.props.addNotification('error', t('error.NOT_AUTHORIZED'));
+      return;
+    }
+
     const {editComment, addNotification, stopEditing} = this.props;
     if (typeof editComment !== 'function') {return;}
     let response;
diff --git a/client/coral-embed-stream/src/containers/Embed.js b/client/coral-embed-stream/src/containers/Embed.js
index 68f76ccc5..2c41b0886 100644
--- a/client/coral-embed-stream/src/containers/Embed.js
+++ b/client/coral-embed-stream/src/containers/Embed.js
@@ -12,6 +12,8 @@ import {getDefinitionName} from 'coral-framework/utils';
 import {withQuery} from 'coral-framework/hocs';
 import Embed from '../components/Embed';
 import Stream from './Stream';
+import {addNotification} from 'coral-framework/actions/notification';
+import t from 'coral-framework/services/i18n';
 
 import {setActiveTab} from '../actions/embed';
 import {viewAllComments} from '../actions/stream';
@@ -20,12 +22,72 @@ const {logout, checkLogin} = authActions;
 const {fetchAssetSuccess} = assetActions;
 
 class EmbedContainer extends React.Component {
+  subscriptions = [];
+
+  subscribeToUpdates(props = this.props) {
+    if (props.auth.loggedIn) {
+      let sub = props.data.subscribeToMore({
+        document: USER_BANNED_SUBSCRIPTION,
+        variables: {
+          user_id: props.auth.user.id,
+        },
+        updateQuery: () => {
+          addNotification('info', t('your_account_has_been_banned'));
+        },
+      });
+
+      this.subscriptions.push(sub);
+
+      sub = props.data.subscribeToMore({
+        document: USER_SUSPENDED_SUBSCRIPTION,
+        variables: {
+          user_id: props.auth.user.id,
+        },
+        updateQuery: () => {
+          addNotification('info', t('your_account_has_been_suspended'));
+        },
+      });
+
+      this.subscriptions.push(sub);
+
+      sub = props.data.subscribeToMore({
+        document: USERNAME_REJECTED_SUBSCRIPTION,
+        variables: {
+          user_id: props.auth.user.id,
+        },
+        updateQuery: () => {
+          addNotification('info', t('your_username_has_been_rejected'));
+        },
+      });
+
+      this.subscriptions.push(sub);
+    }
+  }
+
+  unsubscribe() {
+    this.subscriptions.forEach((unsubscribe) => unsubscribe());
+    this.subscriptions = [];
+  }
+
+  resubscribe(props) {
+    this.unsubscribe();
+    this.subscribeToUpdates(props);
+  }
+
+  componentDidMount() {
+    this.subscribeToUpdates();
+  }
+
+  componentWillUnmount() {
+    this.unsubscribe();
+  }
 
   componentWillReceiveProps(nextProps) {
     if (this.props.auth.loggedIn !== nextProps.auth.loggedIn) {
 
       // Refetch after login/logout.
       this.props.data.refetch();
+      this.resubscribe(nextProps);
     }
 
     const {fetchAssetSuccess} = this.props;
@@ -52,6 +114,45 @@ class EmbedContainer extends React.Component {
   }
 }
 
+const USER_BANNED_SUBSCRIPTION = gql`
+  subscription UserBanned($user_id: ID!) {
+    userBanned(user_id: $user_id){
+      id
+      status
+      canEditName
+      suspension {
+        until
+      }
+    }
+  }
+`;
+
+const USER_SUSPENDED_SUBSCRIPTION = gql`
+  subscription UserSuspended($user_id: ID!) {
+    userSuspended(user_id: $user_id){
+      id
+      status
+      canEditName
+      suspension {
+        until
+      }
+    }
+  }
+`;
+
+const USERNAME_REJECTED_SUBSCRIPTION = gql`
+  subscription UsernameRejected($user_id: ID!) {
+    usernameRejected(user_id: $user_id){
+      id
+      status
+      canEditName
+      suspension {
+        until
+      }
+    }
+  }
+`;
+
 const EMBED_QUERY = gql`
   query CoralEmbedStream_Embed($assetId: ID, $assetUrl: String, $commentId: ID!, $hasComment: Boolean!, $excludeIgnored: Boolean) {
     asset(id: $assetId, url: $assetUrl) {
@@ -95,6 +196,7 @@ const mapDispatchToProps = (dispatch) =>
       setActiveTab,
       viewAllComments,
       fetchAssetSuccess,
+      addNotification,
     },
     dispatch
   );
diff --git a/client/coral-embed-stream/src/containers/Stream.js b/client/coral-embed-stream/src/containers/Stream.js
index f6e1fd9ec..d66ad38d4 100644
--- a/client/coral-embed-stream/src/containers/Stream.js
+++ b/client/coral-embed-stream/src/containers/Stream.js
@@ -173,7 +173,7 @@ const commentFragment = gql`
 `;
 
 const COMMENTS_ADDED_SUBSCRIPTION = gql`
-  subscription onCommentAdded($assetId: ID!, $excludeIgnored: Boolean){
+  subscription CommentAdded($assetId: ID!, $excludeIgnored: Boolean){
     commentAdded(asset_id: $assetId){
       parent {
         id
@@ -185,7 +185,7 @@ const COMMENTS_ADDED_SUBSCRIPTION = gql`
 `;
 
 const COMMENTS_EDITED_SUBSCRIPTION = gql`
-  subscription onCommentEdited($assetId: ID!){
+  subscription CommentEdited($assetId: ID!){
     commentEdited(asset_id: $assetId){
       id
       body
diff --git a/client/coral-embed/src/index.js b/client/coral-embed/src/index.js
index 5b42fa541..82eea8ef7 100644
--- a/client/coral-embed/src/index.js
+++ b/client/coral-embed/src/index.js
@@ -28,6 +28,7 @@ const snackbarStyles = {
 // This function should return value of window.Coral
 const Coral = {};
 const Talk = (Coral.Talk = {});
+let notificationTimeout = null;
 
 // build the URL to load in the pym iframe
 function buildStreamIframeUrl(talkBaseUrl, query) {
@@ -110,14 +111,15 @@ function configurePymParent(pymParent, opts) {
     snackbar.className = `coral-notif-${type}`;
     snackbar.textContent = text;
 
-    setTimeout(() => {
+    clearTimeout(notificationTimeout);
+    notificationTimeout = setTimeout(() => {
       snackbar.style.transform = 'translate(-50%, 0)';
       snackbar.style.opacity = 1;
-    }, 0);
 
-    setTimeout(() => {
-      snackbar.style.opacity = 0;
-    }, 5000);
+      notificationTimeout = setTimeout(() => {
+        snackbar.style.opacity = 0;
+      }, 7000);
+    }, 0);
   });
 
   // Helps child show notifications at the right scrollTop
diff --git a/client/coral-framework/reducers/auth.js b/client/coral-framework/reducers/auth.js
index 5a05de28e..7ab12cf53 100644
--- a/client/coral-framework/reducers/auth.js
+++ b/client/coral-framework/reducers/auth.js
@@ -151,6 +151,20 @@ export default function auth (state = initialState, action) {
   case actions.SET_REDIRECT_URI:
     return state
       .set('redirectUri', action.uri);
+  case 'APOLLO_SUBSCRIPTION_RESULT':
+    if (action.operationName === 'UserBanned' && state.getIn(['user', 'id']) === action.variables.user_id) {
+      return state
+        .mergeIn(['user'], action.result.data.userBanned);
+    }
+    if (action.operationName === 'UserSuspended' && state.getIn(['user', 'id']) === action.variables.user_id) {
+      return state
+        .mergeIn(['user'], action.result.data.userSuspended);
+    }
+    if (action.operationName === 'UsernameRejected' && state.getIn(['user', 'id']) === action.variables.user_id) {
+      return state
+        .mergeIn(['user'], action.result.data.usernameRejected);
+    }
+    return state;
   default :
     return state;
   }
diff --git a/client/coral-plugin-commentbox/CommentBox.js b/client/coral-plugin-commentbox/CommentBox.js
index 5105667ed..c05f7bda0 100644
--- a/client/coral-plugin-commentbox/CommentBox.js
+++ b/client/coral-plugin-commentbox/CommentBox.js
@@ -1,6 +1,7 @@
 import React, {PropTypes} from 'react';
 
 import t from 'coral-framework/services/i18n';
+import {can} from 'coral-framework/services/perms';
 
 import Slot from 'coral-framework/components/Slot';
 import {connect} from 'react-redux';
@@ -43,8 +44,14 @@ class CommentBox extends React.Component {
       assetId,
       parentId,
       addNotification,
+      currentUser,
     } = this.props;
 
+    if (!can(currentUser, 'INTERACT_WITH_COMMUNITY')) {
+      addNotification('error', t('error.NOT_AUTHORIZED'));
+      return;
+    }
+
     let comment = {
       asset_id: assetId,
       parent_id: parentId,
diff --git a/client/coral-plugin-flags/FlagButton.js b/client/coral-plugin-flags/FlagButton.js
index e8a17f201..38b1fd594 100644
--- a/client/coral-plugin-flags/FlagButton.js
+++ b/client/coral-plugin-flags/FlagButton.js
@@ -39,6 +39,8 @@ export default class FlagButton extends Component {
       } else {
         this.setState({showMenu: true});
       }
+    } else {
+      this.props.addNotification('error', t('error.NOT_AUTHORIZED'));
     }
   }
 
diff --git a/graph/context.js b/graph/context.js
index 66086dc89..d2306cbc8 100644
--- a/graph/context.js
+++ b/graph/context.js
@@ -3,6 +3,7 @@ const mutators = require('./mutators');
 const uuid = require('uuid');
 
 const plugins = require('../services/plugins');
+const pubsub = require('../services/pubsub');
 const debug = require('debug')('talk:graph:context');
 
 /**
@@ -32,7 +33,7 @@ const decorateContextPlugins = (context, contextPlugins) => contextPlugins.reduc
  * Stores the request context.
  */
 class Context {
-  constructor({user = null}, pubsub) {
+  constructor({user = null}) {
 
     // Generate a new context id for the request.
     this.id = uuid.v4();
diff --git a/graph/index.js b/graph/index.js
index 4e99714d9..7495c0605 100644
--- a/graph/index.js
+++ b/graph/index.js
@@ -1,6 +1,5 @@
 const schema = require('./schema');
 const Context = require('./context');
-const pubsub = require('./pubsub');
 const {createSubscriptionManager} = require('./subscriptions');
 
 module.exports = {
@@ -11,7 +10,7 @@ module.exports = {
 
     // Load in the new context here, this'll create the loaders + mutators for
     // the lifespan of this request.
-    context: new Context(req, pubsub)
+    context: new Context(req)
   }),
   createSubscriptionManager
 };
diff --git a/graph/mutators/action.js b/graph/mutators/action.js
index 19db33183..d62d3b4c5 100644
--- a/graph/mutators/action.js
+++ b/graph/mutators/action.js
@@ -16,7 +16,7 @@ const {CREATE_ACTION, DELETE_ACTION} = require('../../perms/constants');
 const createAction = async ({user = {}, pubsub, loaders: {Comments}}, {item_id, item_type, action_type, group_id, metadata = {}}) => {
 
   let comment;
-  if (pubsub && item_type === 'COMMENTS') {
+  if (item_type === 'COMMENTS') {
     comment = await Comments.get.load(item_id);
     if (!comment) {
       throw new Error('Comment not found');
@@ -38,7 +38,7 @@ const createAction = async ({user = {}, pubsub, loaders: {Comments}}, {item_id,
     await UsersService.setStatus(item_id, 'PENDING');
   }
 
-  if (pubsub && comment) {
+  if (comment) {
     pubsub.publish('commentFlagged', comment);
   }
 
diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index df6ed71ce..f32172a4d 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -177,11 +177,8 @@ const createComment = async (context, {tags = [], body, asset_id, parent_id = nu
     }
     Comments.countByAssetID.incr(asset_id);
 
-    if (pubsub) {
-
-      // Publish the newly added comment via the subscription.
-      pubsub.publish('commentAdded', comment);
-    }
+    // Publish the newly added comment via the subscription.
+    pubsub.publish('commentAdded', comment);
   }
 
   return comment;
@@ -346,17 +343,14 @@ const setStatus = async ({user, loaders: {Comments}, pubsub}, {id, status}) => {
   // adjust the affected user's karma in the next tick.
   process.nextTick(adjustKarma(Comments, id, status));
 
-  if (pubsub) {
+  if (status === 'ACCEPTED') {
 
-    if (status === 'ACCEPTED') {
+    // Publish the comment status change via the subscription.
+    pubsub.publish('commentAccepted', comment);
+  } else if (status === 'REJECTED') {
 
-      // Publish the comment status change via the subscription.
-      pubsub.publish('commentAccepted', comment);
-    } else if (status === 'REJECTED') {
-
-      // Publish the comment status change via the subscription.
-      pubsub.publish('commentRejected', comment);
-    }
+    // Publish the comment status change via the subscription.
+    pubsub.publish('commentRejected', comment);
   }
 
   return comment;
@@ -379,11 +373,9 @@ const edit = async (context, {id, asset_id, edit: {body}}) => {
   // Execute the edit.
   const comment = await CommentsService.edit(id, context.user.id, {body, status});
 
-  if (context.pubsub) {
+  // Publish the edited comment via the subscription.
+  context.pubsub.publish('commentEdited', comment);
 
-    // Publish the edited comment via the subscription.
-    context.pubsub.publish('commentEdited', comment);
-  }
   return comment;
 };
 
diff --git a/graph/mutators/user.js b/graph/mutators/user.js
index cf0106a2c..448ac750a 100644
--- a/graph/mutators/user.js
+++ b/graph/mutators/user.js
@@ -2,16 +2,28 @@ const errors = require('../../errors');
 const UsersService = require('../../services/users');
 const {SET_USER_STATUS, SUSPEND_USER, REJECT_USERNAME} = require('../../perms/constants');
 
-const setUserStatus = ({user}, {id, status}) => {
-  return UsersService.setStatus(id, status);
+const setUserStatus = async ({user, pubsub}, {id, status}) => {
+  const result = await UsersService.setStatus(id, status);
+  if (result && result.status === 'BANNED') {
+    pubsub.publish('userBanned', result);
+  }
+  return result;
 };
 
-const suspendUser = ({user}, {id, message, until}) => {
-  return UsersService.suspendUser(id, message, until);
+const suspendUser = async ({user, pubsub}, {id, message, until}) => {
+  const result = await UsersService.suspendUser(id, message, until);
+  if (result) {
+    pubsub.publish('userSuspended', result);
+  }
+  return result;
 };
 
-const rejectUsername = ({user}, {id, message}) => {
-  return UsersService.rejectUsername(id, message);
+const rejectUsername = async ({user, pubsub}, {id, message}) => {
+  const result = await UsersService.rejectUsername(id, message);
+  if (result) {
+    pubsub.publish('usernameRejected', result);
+  }
+  return result;
 };
 
 const ignoreUser = ({user}, userToIgnore) => {
diff --git a/graph/resolvers/subscription.js b/graph/resolvers/subscription.js
index 1f26d5ff3..f6da9fb54 100644
--- a/graph/resolvers/subscription.js
+++ b/graph/resolvers/subscription.js
@@ -14,6 +14,15 @@ const Subscription = {
   commentFlagged(comment) {
     return comment;
   },
+  userBanned(user) {
+    return user;
+  },
+  userSuspended(user) {
+    return user;
+  },
+  usernameRejected(user) {
+    return user;
+  },
 };
 
 module.exports = Subscription;
diff --git a/graph/resolvers/user.js b/graph/resolvers/user.js
index 035af22cb..2878d6561 100644
--- a/graph/resolvers/user.js
+++ b/graph/resolvers/user.js
@@ -6,6 +6,7 @@ const {
   SEARCH_OTHERS_COMMENTS,
   UPDATE_USER_ROLES,
   SEARCH_COMMENT_METRICS,
+  VIEW_SUSPENSION_INFO,
   LIST_OWN_TOKENS
 } = require('../../perms/constants');
 
@@ -84,6 +85,13 @@ const User = {
     if (requestingUser && requestingUser.can(SEARCH_COMMENT_METRICS)) {
       return KarmaService.model(user);
     }
+  },
+
+  suspension({id, suspension}, _, {user}) {
+    if (user.id !== id && !user.can(VIEW_SUSPENSION_INFO)) {
+      return null;
+    }
+    return suspension;
   }
 };
 
diff --git a/graph/subscriptions.js b/graph/subscriptions.js
index ec2d5b786..ce1eb1a09 100644
--- a/graph/subscriptions.js
+++ b/graph/subscriptions.js
@@ -3,7 +3,7 @@ const {SubscriptionServer} = require('subscriptions-transport-ws');
 const _ = require('lodash');
 const debug = require('debug')('talk:graph:subscriptions');
 
-const pubsub = require('./pubsub');
+const pubsub = require('../services/pubsub');
 const schema = require('./schema');
 const Context = require('./context');
 const plugins = require('../services/plugins');
@@ -21,6 +21,9 @@ const {
   SUBSCRIBE_COMMENT_FLAGGED,
   SUBSCRIBE_ALL_COMMENT_EDITED,
   SUBSCRIBE_ALL_COMMENT_ADDED,
+  SUBSCRIBE_ALL_USER_SUSPENDED,
+  SUBSCRIBE_ALL_USER_BANNED,
+  SUBSCRIBE_ALL_USERNAME_REJECTED,
 } = require('../perms/constants');
 
 /**
@@ -83,6 +86,45 @@ const setupFunctions = plugins.get('server', 'setupFunctions').reduce((acc, {plu
       }
     },
   }),
+  userSuspended: (options, args) => ({
+    userSuspended: {
+      filter: (user, context) => {
+        if (
+          !context.user
+          || args.user_id !== user.id && !context.user.can(SUBSCRIBE_ALL_USER_SUSPENDED)
+        ) {
+          return false;
+        }
+        return !args.user_id || user.id === args.user_id;
+      }
+    },
+  }),
+  userBanned: (options, args) => ({
+    userBanned: {
+      filter: (user, context) => {
+        if (
+          !context.user
+          || args.user_id !== user.id && !context.user.can(SUBSCRIBE_ALL_USER_BANNED)
+        ) {
+          return false;
+        }
+        return !args.user_id || user.id === args.user_id;
+      }
+    },
+  }),
+  usernameRejected: (options, args) => ({
+    usernameRejected: {
+      filter: (user, context) => {
+        if (
+          !context.user
+          || args.user_id !== user.id && !context.user.can(SUBSCRIBE_ALL_USERNAME_REJECTED)
+        ) {
+          return false;
+        }
+        return !args.user_id || user.id === args.user_id;
+      }
+    },
+  }),
 });
 
 /**
@@ -117,10 +159,10 @@ const createSubscriptionManager = (server) => new SubscriptionServer({
       } catch (e) {
         console.error(e);
 
-        return new Context({}, pubsub);
+        return new Context({});
       }
 
-      return new Context(req, pubsub);
+      return new Context(req);
     };
 
     return baseParams;
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 22f4a668f..249be8d13 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -61,6 +61,10 @@ type UserProfile {
   provider: String!
 }
 
+type SuspensionInfo {
+  until: Date
+}
+
 # Any person who can author comments, create actions, and view comments on a
 # stream.
 type User {
@@ -108,6 +112,10 @@ type User {
 
   # returns user status
   status: USER_STATUS
+
+  # returns suspension info. Only available to Admins and Moderators
+  # or on own logged in User.
+  suspension: SuspensionInfo
 }
 
 # UsersQuery allows the ability to query users by a specific fields.
@@ -1031,6 +1039,21 @@ type Subscription {
   # Get an update whenever a comment has been rejected.
   # Requires the `ADMIN` or `MODERATOR` role.
   commentRejected(asset_id: ID): Comment
+
+  # Get an update whenever a user has been suspended.
+  # `user_id` must match id of current user except for
+  # users with the `ADMIN` or `MODERATOR` role.
+  userSuspended(user_id: ID): User
+
+  # Get an update whenever a user has been banned.
+  # `user_id` must match id of current user except for
+  # users with the `ADMIN` or `MODERATOR` role.
+  userBanned(user_id: ID): User
+
+  # Get an update whenever a username has been rejected.
+  # `user_id` must match id of current user except for
+  # users with the `ADMIN` or `MODERATOR` role.
+  usernameRejected(user_id: ID): User
 }
 
 ################################################################################
diff --git a/locales/en.yml b/locales/en.yml
index 944902e15..0051a92f2 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -1,4 +1,7 @@
 en:
+  your_account_has_been_suspended: Your account has been temporarily suspended.
+  your_account_has_been_banned: Your account has been banned.
+  your_username_has_been_rejected: Your account has been suspended because your username has been deemed inappropriate. To restore your account please enter a new username.
   bandialog:
     are_you_sure: "Are you sure you would like to ban {0}?"
     ban_user: "Ban User?"
diff --git a/locales/es.yml b/locales/es.yml
index 58bc7a132..98e2dbc0c 100644
--- a/locales/es.yml
+++ b/locales/es.yml
@@ -1,4 +1,7 @@
 es:
+  your_account_has_been_suspended: Su cuenta ha sido temporalmente suspendida.
+  your_account_has_been_banned: Su cuenta ha sido suspendida.
+  your_username_has_been_rejected: Su cuenta ha sido suspendida porque tu nombre de usuario ha sido considerado no apropiado para el espacio. Para recuperar la cuenta, por favor ingresar un nuevo nombre de usuario.
   bandialog:
     are_you_sure: "¿Estás segura que quieres suspender a {0}?"
     ban_user: "¿Quieres suspender el Usuario?"
diff --git a/perms/constants.js b/perms/constants.js
index abfd16c6f..383f36daf 100644
--- a/perms/constants.js
+++ b/perms/constants.js
@@ -26,6 +26,7 @@ module.exports = {
   SEARCH_COMMENT_METRICS: 'SEARCH_COMMENT_METRICS',
   LIST_OWN_TOKENS: 'LIST_OWN_TOKENS',
   SEARCH_COMMENT_STATUS_HISTORY: 'SEARCH_COMMENT_STATUS_HISTORY',
+  VIEW_SUSPENSION_INFO: 'VIEW_SUSPENSION_INFO',
 
   // subscriptions
   SUBSCRIBE_COMMENT_ACCEPTED: 'SUBSCRIBE_COMMENT_ACCEPTED',
@@ -33,4 +34,7 @@ module.exports = {
   SUBSCRIBE_COMMENT_FLAGGED: 'SUBSCRIBE_COMMENT_FLAGGED',
   SUBSCRIBE_ALL_COMMENT_ADDED: 'SUBSCRIBE_ALL_COMMENT_ADDED',
   SUBSCRIBE_ALL_COMMENT_EDITED: 'SUBSCRIBE_ALL_COMMENT_EDITED',
+  SUBSCRIBE_ALL_USER_SUSPENDED: 'SUBSCRIBE_ALL_USER_SUSPENDED',
+  SUBSCRIBE_ALL_USER_BANNED: 'SUBSCRIBE_ALL_USER_BANNED',
+  SUBSCRIBE_ALL_USERNAME_REJECTED: 'SUBSCRIBE_ALL_USERNAME_REJECTED',
 };
diff --git a/perms/queryReducer.js b/perms/queryReducer.js
index ed84f2265..0b76c225a 100644
--- a/perms/queryReducer.js
+++ b/perms/queryReducer.js
@@ -19,6 +19,8 @@ module.exports = (user, perm) => {
     return check(user, ['ADMIN']);
   case types.SEARCH_COMMENT_STATUS_HISTORY:
     return check(user, ['ADMIN', 'MODERATOR']);
+  case types.VIEW_SUSPENSION_INFO:
+    return check(user, ['ADMIN', 'MODERATOR']);
   default:
     break;
   }
diff --git a/perms/subscriptionReducer.js b/perms/subscriptionReducer.js
index 0b06902cf..e0f73526a 100644
--- a/perms/subscriptionReducer.js
+++ b/perms/subscriptionReducer.js
@@ -13,6 +13,12 @@ module.exports = (user, perm) => {
     return check(user, ['ADMIN', 'MODERATOR']);
   case types.SUBSCRIBE_ALL_COMMENT_ADDED:
     return check(user, ['ADMIN', 'MODERATOR']);
+  case types.SUBSCRIBE_ALL_USER_SUSPENDED:
+    return check(user, ['ADMIN', 'MODERATOR']);
+  case types.SUBSCRIBE_ALL_USER_BANNED:
+    return check(user, ['ADMIN', 'MODERATOR']);
+  case types.SUBSCRIBE_ALL_USERNAME_REJECTED:
+    return check(user, ['ADMIN', 'MODERATOR']);
   default:
     break;
   }
diff --git a/plugin-api/beta/client/hocs/withReaction.js b/plugin-api/beta/client/hocs/withReaction.js
index 1ed777996..72de7f5c4 100644
--- a/plugin-api/beta/client/hocs/withReaction.js
+++ b/plugin-api/beta/client/hocs/withReaction.js
@@ -8,6 +8,7 @@ import {compose, gql} from 'react-apollo';
 import withFragments from 'coral-framework/hocs/withFragments';
 import withMutation from 'coral-framework/hocs/withMutation';
 import {showSignInDialog} from 'coral-framework/actions/auth';
+import {addNotification} from 'coral-framework/actions/notification';
 import {capitalize} from 'coral-framework/helpers/strings';
 import {getMyActionSummary, getTotalActionCount} from 'coral-framework/utils';
 import * as PropTypes from 'prop-types';
@@ -248,6 +249,7 @@ export default (reaction) => (WrappedComponent) => {
 
       return <WrappedComponent
         showSignInDialog={this.props.showSignInDialog}
+        addNotification={this.props.addNotification}
         user={this.props.user}
         comment={comment}
         reactionSummary={reactionSummary}
@@ -350,7 +352,7 @@ export default (reaction) => (WrappedComponent) => {
   });
 
   const mapDispatchToProps = (dispatch) =>
-    bindActionCreators({showSignInDialog}, dispatch);
+    bindActionCreators({showSignInDialog, addNotification}, dispatch);
 
   const enhance = compose(
     withFragments({
diff --git a/plugins/coral-plugin-like/client/LikeButton.js b/plugins/coral-plugin-like/client/LikeButton.js
index 68a516c3f..7d17ef056 100644
--- a/plugins/coral-plugin-like/client/LikeButton.js
+++ b/plugins/coral-plugin-like/client/LikeButton.js
@@ -13,6 +13,7 @@ class LikeButton extends React.Component {
       postReaction,
       deleteReaction,
       showSignInDialog,
+      addNotification,
       alreadyReacted,
       user,
     } = this.props;
@@ -25,6 +26,7 @@ class LikeButton extends React.Component {
 
     // If the current user is suspended, do nothing.
     if (!can(user, 'INTERACT_WITH_COMMUNITY')) {
+      addNotification('error', t('error.NOT_AUTHORIZED'));
       return;
     }
 
diff --git a/plugins/coral-plugin-love/client/LoveButton.js b/plugins/coral-plugin-love/client/LoveButton.js
index 0fc7bd7ca..7450ad668 100644
--- a/plugins/coral-plugin-love/client/LoveButton.js
+++ b/plugins/coral-plugin-love/client/LoveButton.js
@@ -13,6 +13,7 @@ class LoveButton extends React.Component {
       postReaction,
       deleteReaction,
       showSignInDialog,
+      addNotification,
       alreadyReacted,
       user,
     } = this.props;
@@ -25,6 +26,7 @@ class LoveButton extends React.Component {
 
     // If the current user is suspended, do nothing.
     if (!can(user, 'INTERACT_WITH_COMMUNITY')) {
+      addNotification('error', t('error.NOT_AUTHORIZED'));
       return;
     }
 
diff --git a/plugins/coral-plugin-respect/client/RespectButton.js b/plugins/coral-plugin-respect/client/RespectButton.js
index bde8c9669..9bc556b67 100644
--- a/plugins/coral-plugin-respect/client/RespectButton.js
+++ b/plugins/coral-plugin-respect/client/RespectButton.js
@@ -14,6 +14,7 @@ class RespectButton extends React.Component {
       deleteReaction,
       showSignInDialog,
       alreadyReacted,
+      addNotification,
       user,
     } = this.props;
 
@@ -25,6 +26,7 @@ class RespectButton extends React.Component {
 
     // If the current user is suspended, do nothing.
     if (!can(user, 'INTERACT_WITH_COMMUNITY')) {
+      addNotification('error', t('error.NOT_AUTHORIZED'));
       return;
     }
 
diff --git a/routes/api/users/index.js b/routes/api/users/index.js
index 10d72fe3a..47ff46853 100644
--- a/routes/api/users/index.js
+++ b/routes/api/users/index.js
@@ -1,8 +1,8 @@
 const express = require('express');
 const router = express.Router();
 const UsersService = require('../../../services/users');
-const CommentsService = require('../../../services/comments');
 const mailer = require('../../../services/mailer');
+const pubsub = require('../../../services/pubsub');
 const errors = require('../../../errors');
 const authorization = require('../../../middleware/authorization');
 const i18n = require('../../../services/i18n');
@@ -53,11 +53,16 @@ router.post('/:user_id/role', authorization.needed('ADMIN'), (req, res, next) =>
 router.post('/:user_id/status', authorization.needed('ADMIN'), (req, res, next) => {
   UsersService
     .setStatus(req.params.user_id, req.body.status)
-    .then((status) => {
-      res.status(201).json(status);
+    .then((user) => {
 
-      if (status === 'BANNED' && req.body.comment_id) {
-        return CommentsService.pushStatus(req.body.comment_id, 'rejected', req.params.user_id);
+      // TODO: current updating status behavior is weird.
+      if (user) {
+        if (user.status === 'BANNED') {
+          pubsub.publish('userBanned', user);
+        }
+        res.status(201).json(user.status);
+      } else {
+        res.status(500).json();
       }
     })
     .catch(next);
diff --git a/graph/pubsub.js b/services/pubsub.js
similarity index 69%
rename from graph/pubsub.js
rename to services/pubsub.js
index 704f83725..a42ffb314 100644
--- a/graph/pubsub.js
+++ b/services/pubsub.js
@@ -1,5 +1,5 @@
 const {RedisPubSub} = require('graphql-redis-subscriptions');
 
-const {connectionOptions} = require('../services/redis');
+const {connectionOptions} = require('./redis');
 
 module.exports = new RedisPubSub({connection: connectionOptions});
diff --git a/services/users.js b/services/users.js
index 78ec57b4c..dea208c8e 100644
--- a/services/users.js
+++ b/services/users.js
@@ -435,7 +435,10 @@ module.exports = class UsersService {
       return Promise.reject(new Error(`status ${status} is not supported`));
     }
 
-    return UserModel.update({
+    // TODO: current updating status behavior is weird.
+    // once a user has been `APPROVED` its status cannot be
+    // changed anymore.
+    return UserModel.findOneAndUpdate({
       id,
       status: {
         $ne: 'APPROVED'
@@ -444,6 +447,8 @@ module.exports = class UsersService {
       $set: {
         status
       }
+    }, {
+      new: true,
     });
   }
 
@@ -453,34 +458,37 @@ module.exports = class UsersService {
    * @param  {String}   message             message to be send to the user
    * @param  {Date}     until               date until the suspension is valid.
    */
-  static suspendUser(id, message, until) {
-    return UserModel.findOneAndUpdate(
+  static async suspendUser(id, message, until) {
+    const user = await UserModel.findOneAndUpdate(
       {id}, {
         $set: {
           suspension: {
             until,
           },
         }
-      })
-      .then((user) => {
-        if (message) {
-          let localProfile = user.profiles.find((profile) => profile.provider === 'local');
-          if (localProfile) {
-            const options =
-              {
-                template: 'suspension',              // needed to know which template to render!
-                locals: {                            // specifies the template locals.
-                  body: message
-                },
-                subject: 'Your account has been suspended',
-                to: localProfile.id  // This only works if the user has registered via e-mail.
-                                     // We may want a standard way to access a user's e-mail address in the future
-              };
-
-            return MailerService.sendSimple(options);
-          }
-        }
+      }, {
+        new: true,
       });
+
+    if (message) {
+      let localProfile = user.profiles.find((profile) => profile.provider === 'local');
+      if (localProfile) {
+        const options =
+          {
+            template: 'suspension',              // needed to know which template to render!
+            locals: {                            // specifies the template locals.
+              body: message
+            },
+            subject: 'Your account has been suspended',
+            to: localProfile.id  // This only works if the user has registered via e-mail.
+                                 // We may want a standard way to access a user's e-mail address in the future
+          };
+
+        await MailerService.sendSimple(options);
+      }
+    }
+
+    return user;
   }
 
   /**
@@ -489,34 +497,37 @@ module.exports = class UsersService {
    * @param  {String}   message             message to be send to the user
    * @param  {Date}     until               date until the suspension is valid.
    */
-  static rejectUsername(id, message) {
-    return UserModel.findOneAndUpdate({
+  static async rejectUsername(id, message) {
+    const user = await UserModel.findOneAndUpdate({
       id
     }, {
       $set: {
         status: 'BANNED',
         canEditName: true,
       }
-    })
-    .then((user) => {
-      if (message) {
-        let localProfile = user.profiles.find((profile) => profile.provider === 'local');
-        if (localProfile) {
-          const options =
-            {
-              template: 'suspension',              // needed to know which template to render!
-              locals: {                            // specifies the template locals.
-                body: message
-              },
-              subject: 'Email Suspension',
-              to: localProfile.id  // This only works if the user has registered via e-mail.
-                                   // We may want a standard way to access a user's e-mail address in the future
-            };
-
-          return MailerService.sendSimple(options);
-        }
-      }
+    }, {
+      new: true,
     });
+
+    if (message) {
+      let localProfile = user.profiles.find((profile) => profile.provider === 'local');
+      if (localProfile) {
+        const options =
+          {
+            template: 'suspension',              // needed to know which template to render!
+            locals: {                            // specifies the template locals.
+              body: message
+            },
+            subject: 'Email Suspension',
+            to: localProfile.id  // This only works if the user has registered via e-mail.
+                                 // We may want a standard way to access a user's e-mail address in the future
+          };
+
+        await MailerService.sendSimple(options);
+      }
+    }
+
+    return user;
   }
 
   /**
diff --git a/test/server/graph/context.js b/test/server/graph/context.js
index b01917289..7d30042e4 100644
--- a/test/server/graph/context.js
+++ b/test/server/graph/context.js
@@ -3,14 +3,16 @@ const expect = require('chai').expect;
 const User = require('../../../models/user');
 const Context = require('../../../graph/context');
 const errors = require('../../../errors');
+const SettingsService = require('../../../services/settings');
 
 describe('graph.Context', () => {
+  beforeEach(() => SettingsService.init());
 
   describe('#constructor: with a user', () => {
     let c;
 
     beforeEach(() => {
-      c = new Context({user: new User({id: '1'})});
+      c = new Context({user: new User({id: '1', roles: ['ADMIN']})});
     });
 
     it('creates a context with a user', (done) => {
@@ -21,15 +23,10 @@ describe('graph.Context', () => {
     });
 
     it('does have access to mutators', () => {
-      return c.mutators.Action.create({
-        item_id: '1',
-        item_type: 'COMMENTS',
-        action_type: 'LIKE'
-      })
-      .then((action) => {
-        expect(action).to.have.property('item_id', '1');
-        expect(action).to.have.property('item_type', 'COMMENTS');
-        expect(action).to.have.property('action_type', 'LIKE');
+      return c.mutators.Tag.add({
+        item_type: 'USERS',
+        id: '1',
+        name: 'Tag',
       });
     });
   });
@@ -48,13 +45,13 @@ describe('graph.Context', () => {
     });
 
     it('does not have access to mutators', () => {
-      return c.mutators.Action.create({
-        item_id: '1',
+      return c.mutators.Tag.add({
         item_type: 'COMMENTS',
-        action_type: 'LIKE'
+        id: '1',
+        name: 'Tag',
       })
-      .then((action) => {
-        expect(action).to.be.null;
+      .then(() => {
+        throw new Error('should not reach this point');
       })
       .catch((err) => {
         expect(err).to.be.equal(errors.ErrNotAuthorized);

From 3f4747c2ec4145753fcd476b2a12a956d731940a Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Tue, 27 Jun 2017 14:11:04 +0100
Subject: [PATCH 227/264] Fix typo

---
 docs/faq.md                | 2 +-
 docs/install.md            | 2 +-
 docs/plugins-quickstart.md | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/faq.md b/docs/faq.md
index 3182c3c1c..8168885f3 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -52,7 +52,7 @@ We strive for clear inline documentation across our codebase, but have gaps. Con
 
 If you are considering changing a core component (aka, one that is not in a plugin), you are entering the realm of a core developer. We strongly ask that you reach out the coral team before forking and changing core code. We are glad to help talk through your product need and come up with a strategy for implementing as a plugin, or working with you to extend the plugin API for your use case.
 
-### How do I contribue to these docs?
+### How do I contribute to these docs?
 
 Contributions to the docs are much appreciated and a great way to get involved in the project.
 
diff --git a/docs/install.md b/docs/install.md
index 71b99191a..8276818b9 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -19,4 +19,4 @@ While Talk can be installed in many ways, we support two install paths:
 * [Install from Source](install-source.html) (development)
 * [Install via Docker](install-docker.html) (deployment)
 
-If you have success installing Talk in another way, please consider [contributing to this documentation](faq.html#how-do-i-contribue-to-these-docs)!
+If you have success installing Talk in another way, please consider [contributing to this documentation](faq.html#how-do-i-contribute-to-these-docs)!
diff --git a/docs/plugins-quickstart.md b/docs/plugins-quickstart.md
index 06ea5650d..77de5e8a0 100644
--- a/docs/plugins-quickstart.md
+++ b/docs/plugins-quickstart.md
@@ -6,7 +6,7 @@ permalink: plugins-quickstart.html
 summary:
 ---
 
-This tutorial walks through the mechanics of creating and publishing a Talk plugin. Along the way I call out some particular habits and techniques that I employ. If you have other practices that you find valuable, please don't hesitate to [contribute!](faq.html#how-do-i-contribue-to-these-docs)
+This tutorial walks through the mechanics of creating and publishing a Talk plugin. Along the way I call out some particular habits and techniques that I employ. If you have other practices that you find valuable, please don't hesitate to [contribute!](faq.html#how-do-i-contribute-to-these-docs)
 
 We will create a plugin that exposes a route that allows assets to be created or updated.
 

From 175dd30d274cbb35ccec451494f5396fd7d3d215 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 27 Jun 2017 21:40:48 +0700
Subject: [PATCH 228/264] Keep comment box when user is degraded (live)

---
 .../src/components/Stream.js                  | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/client/coral-embed-stream/src/components/Stream.js b/client/coral-embed-stream/src/components/Stream.js
index c912d1a72..457880a94 100644
--- a/client/coral-embed-stream/src/components/Stream.js
+++ b/client/coral-embed-stream/src/components/Stream.js
@@ -57,7 +57,10 @@ class Stream extends React.Component {
 
   constructor(props) {
     super(props);
-    this.state = resetCursors(this.state, props);
+    this.state = {
+      ...resetCursors(this.state, props),
+      keepCommentBox: false,
+    };
   }
 
   componentWillReceiveProps(next) {
@@ -68,6 +71,12 @@ class Stream extends React.Component {
       this.setState(resetCursors);
       return;
     }
+
+    // Keep comment box when user was live suspended, banned, ...
+    if (!this.userIsDegraged(this.props) && this.userIsDegraged(next)) {
+      this.setState({keepCommentBox: true});
+    }
+
     if (
         prevComments && nextComments &&
         nextComments.nodes.length < prevComments.nodes.length
@@ -133,6 +142,10 @@ class Stream extends React.Component {
     return view;
   }
 
+  userIsDegraged({auth: {user}} = this.props) {
+    return !can(user, 'INTERACT_WITH_COMMUNITY');
+  }
+
   render() {
     const {
       commentClassNames,
@@ -150,6 +163,7 @@ class Stream extends React.Component {
       pluginProps,
       editName
     } = this.props;
+    const {keepCommentBox} = this.state;
     const view = this.getVisibleComments();
     const open = asset.closedAt === null;
 
@@ -171,6 +185,8 @@ class Stream extends React.Component {
         me.ignoredUsers.find((u) => u.id === comment.user.id)
       );
     };
+
+    const showCommentBox = loggedIn && ((!banned && !temporarilySuspended && !highlightedComment) || keepCommentBox);
     return (
       <div id="stream">
 
@@ -199,10 +215,7 @@ class Stream extends React.Component {
                   editName={editName}
                   currentUsername={user.username}
                 />}
-              {loggedIn &&
-                !banned &&
-                !temporarilySuspended &&
-                !highlightedComment &&
+              {showCommentBox &&
                 <CommentBox
                   addNotification={this.props.addNotification}
                   postComment={this.props.postComment}

From 500d5d582e87d386cd09ad885423b7e8e0a02c76 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 27 Jun 2017 21:51:19 +0700
Subject: [PATCH 229/264] Fix edit

---
 client/coral-embed-stream/src/components/Comment.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-embed-stream/src/components/Comment.js b/client/coral-embed-stream/src/components/Comment.js
index 86149b178..2178e6c44 100644
--- a/client/coral-embed-stream/src/components/Comment.js
+++ b/client/coral-embed-stream/src/components/Comment.js
@@ -196,8 +196,8 @@ export default class Comment extends React.Component {
     editComment: React.PropTypes.func,
   }
 
-  editComment = () => {
-    return this.props.editComment(this.props.comment.id, this.props.asset.id);
+  editComment = (...args) => {
+    return this.props.editComment(this.props.comment.id, this.props.asset.id, ...args);
   }
 
   onClickEdit (e) {

From b67ac375ba68283da4f160931a472a2177823043 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 27 Jun 2017 22:14:06 +0700
Subject: [PATCH 230/264] Pass current user to CommentBox

---
 client/coral-embed-stream/src/components/Comment.js | 2 +-
 client/coral-embed-stream/src/components/Stream.js  | 2 +-
 client/coral-plugin-commentbox/CommentBox.js        | 6 +++---
 client/coral-plugin-replies/ReplyBox.js             | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/coral-embed-stream/src/components/Comment.js b/client/coral-embed-stream/src/components/Comment.js
index 2178e6c44..bfa629047 100644
--- a/client/coral-embed-stream/src/components/Comment.js
+++ b/client/coral-embed-stream/src/components/Comment.js
@@ -557,8 +557,8 @@ export default class Comment extends React.Component {
               setActiveReplyBox={setActiveReplyBox}
               parentId={parentId || comment.id}
               addNotification={addNotification}
-              authorId={currentUser.id}
               postComment={postComment}
+              currentUser={currentUser}
               assetId={asset.id}
             />
           : null}
diff --git a/client/coral-embed-stream/src/components/Stream.js b/client/coral-embed-stream/src/components/Stream.js
index 457880a94..165b3ce4c 100644
--- a/client/coral-embed-stream/src/components/Stream.js
+++ b/client/coral-embed-stream/src/components/Stream.js
@@ -224,7 +224,7 @@ class Stream extends React.Component {
                   assetId={asset.id}
                   premod={asset.settings.moderation}
                   isReply={false}
-                  authorId={user.id}
+                  currentUser={user}
                   charCountEnable={asset.settings.charCountEnable}
                   maxCharCount={asset.settings.charCount}
                 />}
diff --git a/client/coral-plugin-commentbox/CommentBox.js b/client/coral-plugin-commentbox/CommentBox.js
index c05f7bda0..efa1d27ed 100644
--- a/client/coral-plugin-commentbox/CommentBox.js
+++ b/client/coral-plugin-commentbox/CommentBox.js
@@ -133,7 +133,7 @@ class CommentBox extends React.Component {
   handleChange = (e) => this.setState({body: e.target.value});
 
   render () {
-    const {styles, isReply, authorId, maxCharCount} = this.props;
+    const {styles, isReply, currentUser, maxCharCount} = this.props;
     let {cancelButtonClicked} = this.props;
 
     if (isReply && typeof cancelButtonClicked !== 'function') {
@@ -152,7 +152,7 @@ class CommentBox extends React.Component {
         charCountEnable={this.props.charCountEnable}
         bodyPlaceholder={t('comment.comment')}
         bodyInputId={isReply ? 'replyText' : 'commentText'}
-        saveComment={authorId && this.postComment}
+        saveComment={currentUser && this.postComment}
         buttonContainerStart={<Slot
           fill="commentInputDetailArea"
           registerHook={this.registerHook}
@@ -177,7 +177,7 @@ CommentBox.propTypes = {
   cancelButtonClicked: PropTypes.func,
   assetId: PropTypes.string.isRequired,
   parentId: PropTypes.string,
-  authorId: PropTypes.string.isRequired,
+  currentUser: PropTypes.object.isRequired,
   isReply: PropTypes.bool.isRequired,
   canPost: PropTypes.bool,
 };
diff --git a/client/coral-plugin-replies/ReplyBox.js b/client/coral-plugin-replies/ReplyBox.js
index 8241bf511..b8b983fe4 100644
--- a/client/coral-plugin-replies/ReplyBox.js
+++ b/client/coral-plugin-replies/ReplyBox.js
@@ -18,7 +18,7 @@ class ReplyBox extends Component {
       styles,
       postComment,
       assetId,
-      authorId,
+      currentUser,
       addNotification,
       parentId,
       commentPostedHandler,
@@ -33,7 +33,7 @@ class ReplyBox extends Component {
         parentId={parentId}
         cancelButtonClicked={this.cancelReply}
         addNotification={addNotification}
-        authorId={authorId}
+        currentUser={currentUser}
         assetId={assetId}
         postComment={postComment}
         isReply={true} />

From 97ab338486a219e9f40c7e2d2f47ae3749894ae0 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 27 Jun 2017 23:51:49 +0700
Subject: [PATCH 231/264] Don't alias username

---
 client/coral-embed-stream/src/containers/Comment.js | 2 +-
 client/coral-plugin-author-name/AuthorName.js       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-embed-stream/src/containers/Comment.js b/client/coral-embed-stream/src/containers/Comment.js
index f5682bdd1..040d1a83e 100644
--- a/client/coral-embed-stream/src/containers/Comment.js
+++ b/client/coral-embed-stream/src/containers/Comment.js
@@ -34,7 +34,7 @@ export default withFragments({
       }
       user {
         id
-        name: username
+        username
       }
       action_summaries {
         __typename
diff --git a/client/coral-plugin-author-name/AuthorName.js b/client/coral-plugin-author-name/AuthorName.js
index 66b907ad8..7d453d96f 100644
--- a/client/coral-plugin-author-name/AuthorName.js
+++ b/client/coral-plugin-author-name/AuthorName.js
@@ -24,7 +24,7 @@ export default class AuthorName extends Component {
     return (
       <div
         className={`${packagename}-text`}>
-        {author && author.name}
+        {author && author.username}
       </div>
     );
   }

From b134d4099cf5ea892c000fb22e913dc98a4ea534 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Wed, 28 Jun 2017 00:13:47 +0700
Subject: [PATCH 232/264] More concise and functional subscribing

---
 .../src/containers/Embed.js                   | 35 +++++++------------
 .../src/containers/Stream.js                  | 23 ++++++------
 2 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/client/coral-embed-stream/src/containers/Embed.js b/client/coral-embed-stream/src/containers/Embed.js
index 2c41b0886..bf05caf29 100644
--- a/client/coral-embed-stream/src/containers/Embed.js
+++ b/client/coral-embed-stream/src/containers/Embed.js
@@ -26,41 +26,32 @@ class EmbedContainer extends React.Component {
 
   subscribeToUpdates(props = this.props) {
     if (props.auth.loggedIn) {
-      let sub = props.data.subscribeToMore({
+      const newSubscriptions = [{
         document: USER_BANNED_SUBSCRIPTION,
-        variables: {
-          user_id: props.auth.user.id,
-        },
         updateQuery: () => {
           addNotification('info', t('your_account_has_been_banned'));
         },
-      });
-
-      this.subscriptions.push(sub);
-
-      sub = props.data.subscribeToMore({
+      },
+      {
         document: USER_SUSPENDED_SUBSCRIPTION,
-        variables: {
-          user_id: props.auth.user.id,
-        },
         updateQuery: () => {
           addNotification('info', t('your_account_has_been_suspended'));
         },
-      });
-
-      this.subscriptions.push(sub);
-
-      sub = props.data.subscribeToMore({
+      },
+      {
         document: USERNAME_REJECTED_SUBSCRIPTION,
-        variables: {
-          user_id: props.auth.user.id,
-        },
         updateQuery: () => {
           addNotification('info', t('your_username_has_been_rejected'));
         },
-      });
+      }];
 
-      this.subscriptions.push(sub);
+      this.subscriptions = newSubscriptions.map((s) => props.data.subscribeToMore({
+        document: s.document,
+        variables: {
+          user_id: props.auth.user.id,
+        },
+        updateQuery: s.updateQuery,
+      }));
     }
   }
 
diff --git a/client/coral-embed-stream/src/containers/Stream.js b/client/coral-embed-stream/src/containers/Stream.js
index d66ad38d4..3491fc846 100644
--- a/client/coral-embed-stream/src/containers/Stream.js
+++ b/client/coral-embed-stream/src/containers/Stream.js
@@ -30,11 +30,8 @@ class StreamContainer extends React.Component {
   subscriptions = [];
 
   subscribeToUpdates() {
-    const sub1 = this.props.data.subscribeToMore({
+    const newSubscriptions = [{
       document: COMMENTS_EDITED_SUBSCRIPTION,
-      variables: {
-        assetId: this.props.root.asset.id,
-      },
       updateQuery: (prev, {subscriptionData: {data: {commentEdited}}}) => {
 
         // Ignore mutations from me.
@@ -52,13 +49,9 @@ class StreamContainer extends React.Component {
           return removeCommentFromEmbedQuery(prev, commentEdited.id);
         }
       },
-    });
-
-    const sub2 = this.props.data.subscribeToMore({
+    },
+    {
       document: COMMENTS_ADDED_SUBSCRIPTION,
-      variables: {
-        assetId: this.props.root.asset.id,
-      },
       updateQuery: (prev, {subscriptionData: {data: {commentAdded}}}) => {
 
         // Ignore mutations from me.
@@ -81,9 +74,15 @@ class StreamContainer extends React.Component {
 
         return insertCommentIntoEmbedQuery(prev, commentAdded);
       }
-    });
+    }];
 
-    this.subscriptions.push(sub1, sub2);
+    this.subscriptions = newSubscriptions.map((s) => this.props.data.subscribeToMore({
+      document: s.document,
+      variables: {
+        assetId: this.props.root.asset.id,
+      },
+      updateQuery: s.updateQuery,
+    }));
   }
 
   unsubscribe() {

From 35ccc5070d6b2235a539c75ba2e6e4ebc6ae8599 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Tue, 27 Jun 2017 14:52:12 -0300
Subject: [PATCH 233/264] Flag refactor

---
 .../src/components/Comment.js                 |  2 +-
 .../{ => components}/FlagButton.js            |  0
 .../{ => components}/FlagComment.js           | 19 ++++++++++---------
 client/coral-plugin-flags/helpers/flagMap.js  | 15 +++++++++++++++
 client/coral-plugin-flags/index.js            |  1 +
 5 files changed, 27 insertions(+), 10 deletions(-)
 rename client/coral-plugin-flags/{ => components}/FlagButton.js (100%)
 rename client/coral-plugin-flags/{ => components}/FlagComment.js (56%)
 create mode 100644 client/coral-plugin-flags/helpers/flagMap.js
 create mode 100644 client/coral-plugin-flags/index.js

diff --git a/client/coral-embed-stream/src/components/Comment.js b/client/coral-embed-stream/src/components/Comment.js
index 754f44558..efa88d0dd 100644
--- a/client/coral-embed-stream/src/components/Comment.js
+++ b/client/coral-embed-stream/src/components/Comment.js
@@ -5,7 +5,7 @@ import AuthorName from 'coral-plugin-author-name/AuthorName';
 import TagLabel from 'coral-plugin-tag-label/TagLabel';
 import PubDate from 'coral-plugin-pubdate/PubDate';
 import {ReplyBox, ReplyButton} from 'coral-plugin-replies';
-import FlagComment from 'coral-plugin-flags/FlagComment';
+import {FlagComment} from 'coral-plugin-flags';
 import {can} from 'coral-framework/services/perms';
 import {TransitionGroup} from 'react-transition-group';
 import cn from 'classnames';
diff --git a/client/coral-plugin-flags/FlagButton.js b/client/coral-plugin-flags/components/FlagButton.js
similarity index 100%
rename from client/coral-plugin-flags/FlagButton.js
rename to client/coral-plugin-flags/components/FlagButton.js
diff --git a/client/coral-plugin-flags/FlagComment.js b/client/coral-plugin-flags/components/FlagComment.js
similarity index 56%
rename from client/coral-plugin-flags/FlagComment.js
rename to client/coral-plugin-flags/components/FlagComment.js
index efc4c282f..ddad63b7e 100644
--- a/client/coral-plugin-flags/FlagComment.js
+++ b/client/coral-plugin-flags/components/FlagComment.js
@@ -2,6 +2,7 @@ import React from 'react';
 import FlagButton from './FlagButton';
 
 import t from 'coral-framework/services/i18n';
+import * as flagReason from '../helpers/flagMap';
 
 const FlagComment = (props) => <FlagButton {...props} getPopupMenu={getPopupMenu} />;
 
@@ -20,17 +21,17 @@ const getPopupMenu = [
   (itemType) => {
     const options = itemType === 'COMMENTS' ?
     [
-      {val: 'This comment is offensive', text: t('comment_offensive')},
-      {val: 'This looks like an ad/marketing', text: t('marketing')},
-      {val: 'I don\'t agree with this comment', text: t('no_agree_comment')},
-      {val: 'Other', text: t('other')}
+      {val: flagReason.commment.offensive, text: t('comment_offensive')},
+      {val: flagReason.commment.spam, text: t('marketing')},
+      {val: flagReason.commment.noagree, text: t('no_agree_comment')},
+      {val: flagReason.commment.other, text: t('other')}
     ]
     : [
-      {val: 'This username is offensive', text: t('username_offensive')},
-      {val: 'I don\'t like this username', text: t('no_like_username')},
-      {val: 'This user is impersonating', text: t('user_impersonating')},
-      {val: 'This looks like an ad/marketing', text: t('marketing')},
-      {val: 'Other', text: t('other')}
+      {val: flagReason.username.offensive, text: t('username_offensive')},
+      {val: flagReason.username.nolike, text: t('no_like_username')},
+      {val: flagReason.username.impersonating, text: t('user_impersonating')},
+      {val: flagReason.username.spam, text: t('marketing')},
+      {val: flagReason.username.other, text: t('other')}
     ];
     return {
       header: t('step_2_header'),
diff --git a/client/coral-plugin-flags/helpers/flagMap.js b/client/coral-plugin-flags/helpers/flagMap.js
new file mode 100644
index 000000000..514c57398
--- /dev/null
+++ b/client/coral-plugin-flags/helpers/flagMap.js
@@ -0,0 +1,15 @@
+export default {
+  username: {
+    offensive: 'USERNAME_OFFENSIVE',
+    nolike: 'USERNAME_NOLIKE',
+    impersonating: 'USERNAME_IMPERSONATING',
+    spam: 'USERNAME_SPAM',
+    other: 'USERNAME_OTHER'
+  },
+  comment: {
+    offensive: 'COMMENT_OFFENSIVE',
+    spam: 'COMMENT_SPAM',
+    noagree: 'COMMENT_NOAGREE',
+    other: 'COMMENT_OTHER'
+  }
+};
diff --git a/client/coral-plugin-flags/index.js b/client/coral-plugin-flags/index.js
new file mode 100644
index 000000000..d896d34f5
--- /dev/null
+++ b/client/coral-plugin-flags/index.js
@@ -0,0 +1 @@
+export {default as FlagComment} from './components/FlagComment';
\ No newline at end of file

From d68169757d5b9cd862dd7f79a62673272a5eda57 Mon Sep 17 00:00:00 2001
From: David Erwin <davidjerwin@gmail.com>
Date: Tue, 27 Jun 2017 15:04:00 -0400
Subject: [PATCH 234/264] Rewrite contributor's guide

---
 CONTRIBUTING.md                      |  77 --------------------
 docs/_data/sidebars/talk_sidebar.yml |   3 +
 docs/contributors-guide.md           | 103 +++++++++++++++++++++++++++
 3 files changed, 106 insertions(+), 77 deletions(-)
 delete mode 100644 CONTRIBUTING.md
 create mode 100644 docs/contributors-guide.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index 94e2be437..000000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# Contributor's Guide
-
-Welcome! We are very excited that you are interested in contributing to Talk.
-
-This document is a companion to help you approach contributing. If it does not do so, please [let us know how we can improve it](https://github.com/coralproject/talk/issues)!
-
-By contributing to this project you agree to the [Code of Conduct](https://coralproject.net/code-of-conduct.html).
-
-## Product Roadmap
-
-You can view what the Coral Team is working on next here https://www.pivotaltracker.com/n/projects/1863625.
-
-If you'd like to see our longer term roadmap, [get in touch.](https://coralproject.net/contact.html)
-
-
-## Contribute to the documentation
-
-Clear docs are a prerequisite for a successful open source project. We value non-code and code contributions equally.
-
-We are looking for _documentarians_ to:
-
-* make clarity, grammar and completeness updates,
-* create new / missing sections, and
-* take the lead in making sections, or the over all structure better.
-
-### But how?
-
-* Our public docs site can be updated [here](https://github.com/coralproject/docs).
-* [Let us know](https://github.com/coralproject/talk/wiki/Contact-Us) if you'd like permission to update our wiki.
-* Update any of our .md docs files by following [this guide](https://github.com/coralproject/talk/wiki/Forking,-Branching-and-Merging).
-* Our API docs need to be kept honest. [Update them here](https://github.com/coralproject/talk/blob/master/docs/swagger.yaml).
-
-## Integrate into your environment
-
-First, [set up a dev environment](https://github.com/coralproject/talk/blob/master/INSTALL.md). Please let us know how this goes!
-
-Talk is designed to integrate into existing environments in a variety of ways:
-
-* [Auth integrations](https://github.com/coralproject/talk/wiki/Security#authentication-strategies)
-* [Push assets into Talk](https://github.com/coralproject/talk/blob/master/routes/api/assets/index.js)
-* Monitoring Hooks (coming in 2017)
-
-If you're considering deploying Talk, [please let us know](https://github.com/coralproject/talk/wiki/Contact-Us)! We are quite literally doing this for you and want to help you succeed any way we can.
-
-If you are writing custom integration code in your fork of Talk, please consider keeping it generic and filing a Pull Request to contribute it back to the project! See our [forking and merging guidelines](https://github.com/coralproject/talk/wiki/Forking,-Branching-and-Merging) for more info.
-
-## Write some code
-
-First, [set up a dev environment](https://github.com/coralproject/talk/blob/master/INSTALL.md). Please let us know how this goes!
-
-### Build a New Feature / Plugin
-
-Talk is beginning life as a Commenting Platform, but is architected to support many varieties of community engagement.
-
-Please [contact us](https://github.com/coralproject/talk/wiki/Contact-Us) early and often if you'd like to help. We would love to hear your ideas for features and plugins and help you find a way to productively engage the project.
-
-To get an idea of where the Coral Team is going, see:
-
-* our [Slack channel](https://coralprojectslackin.herokuapp.com/), where you can talk directly with the Team and other community members,
-* our [current stories](https://www.pivotaltracker.com/n/projects/1863625), and
-* our [issues](https://github.com/coralproject/talk/issues).
-
-
-Examples:
-
-* [Add An Emoji Button to Comments](https://github.com/coralproject/talk/wiki/Add-An-Emoji-Button-to-Comments)
-
-
-### Work on the Core
-
-There is always more work to be done to make an application more stable, scaleable and secure.
-
-If you see issues in the code or have ideas on how we may improve Talk, please consider:
-
-* [contributing a fix](https://github.com/coralproject/talk/wiki/Forking,-Branching-and-Merging),
-* [filing an issue](https://github.com/coralproject/talk/issues), or
-* or otherwise [letting us know](https://github.com/coralproject/talk/wiki/Contact-Us).
diff --git a/docs/_data/sidebars/talk_sidebar.yml b/docs/_data/sidebars/talk_sidebar.yml
index f0227274b..b44c9648f 100644
--- a/docs/_data/sidebars/talk_sidebar.yml
+++ b/docs/_data/sidebars/talk_sidebar.yml
@@ -11,6 +11,9 @@ entries:
     - title: About
       url: /index.html
       output: web
+    - title: Contribute
+      url: /contribute.html
+      output: web
     - title: FAQ
       url: /faq.html
       output: web
diff --git a/docs/contributors-guide.md b/docs/contributors-guide.md
new file mode 100644
index 000000000..bffc6f2dc
--- /dev/null
+++ b/docs/contributors-guide.md
@@ -0,0 +1,103 @@
+---
+title: Contributor's Guide
+keywords: homepage
+sidebar: talk_sidebar
+permalink: contributions.html
+summary:
+---
+
+
+Welcome! This guide is meant 
+
+## What should I Contribute?
+
+There are three main ways to contribute to Talk:
+
+* Writing Code
+* Writing Docs
+* Participating in conversation
+* Translating
+
+## Contributing Code
+
+The first question to ask is where your contribution fits into Talk's plugin / core architecture. 
+
+Talk core consists of architecture and functionality that deliver stability, security, scalability, extendability and other *abilities. In addition, the Core contains features and functionality that is essential to the operation of Talk as a product.
+
+Talk plugins deliver the featuers and functionality that can be changed or removed. Much of the default functionality is delivered by plugins allowing developers to change behavior along product lines that we've found to be important.
+
+Our goal is to continually extend our plugin infrastructure making the Core as pluggable as possible. Ultimately, a day may come where the Core of Talk is simply a framework for delivering a certain flavor of web applications.
+
+### Should I contribute via a Plugin or to the Core?
+
+Ask these questions:
+
+1) Does Talk's exiting Plugin APIs support the thing you want to build? 
+
+If so, then you should build it as a plugin. Feel free to explore here on your own or reach out to us. We love to advise on plugins, so please feel free to _specify your contribution_ as described below to start a conversation. We will help you conceptualize, architect and promote your plugin if it is in line with our values.
+
+2) If the current Plugin API doesn't support your idea, should the API be extended to do so?
+
+As mentioned above, we seek to interatively extend the Talk Plugin API. How do we know what the next iteration will be? Your ideas. If you want to build a plugin that isn't supported, please _specify your contribution_ as described below and we will discuss how the Core may be extended to support not only your specific idea, but other's ideas as well.
+
+Quite often the only things missing from Core are things like _events_, _slots_, _CSS classes_, etc... Adding these is a great way to become a Core Contibutor and break new ground as a Plugin Developer.
+
+3) Is my idea really just Core?
+
+Amazing! We are always looking to extend the capabilities of Talk. We look forward to discussing what you've got to bring!
+
+
+### Specify your Contribution
+
+Coral has adopted an iterative, agile development philosophy. All contributions that make it into the Talk repo should start with a story or this form:
+
+`As a [type of person] I'd like to be able to [do something] so that I can [get some result].`
+
+We have found that the exercise of expressing our next steps in this format allows us to ground our technical choices in a clear, simple product need. It also expresses that product need in a way that doesn't imply a specific technical solution allowing for debate as to the best way to solve the problem.
+
+
+## Contributing Documentation
+
+Clear docs are a prerequisite for a successful open source project. Contributing to the documentation is often more important than contributing to the code!
+
+We are looking for _documentarians_ to:
+
+* make clarity, grammar and completeness updates,
+* create new / missing sections, and
+* take the lead in making sections, or the over all structure better.
+
+Information about how to update docs can be found in our [FAQ](faq.html#how-do-i-contribute-to-these-docs).
+
+If you'd like to make a significant contribution, please [file an issue](https://github.com/coralproject/talk/issues) describing the changes you would like to make and we'll begin the conversation. 
+
+## Contributing Translations
+
+Talk's tranlations are stored in `.yml` files [here](https://github.com/coralproject/talk/tree/master/locales). 
+
+Translations can be submitted via pull request. If you do not use github, you can use 'en.yml' as a template and email the translations to us and we can import it into the repo.  
+
+## I want to contribute but I'm not sure what to do!
+
+If you want to contribute but don't have a clear idea of exactly what that may be, here are some resources that may help:
+
+### Product Roadmap
+
+Please visit our product roadmap here: https://www.pivotaltracker.com/n/projects/1863625. If you'd like to take on any of our scheduled tasks we'd be forever grateful!
+
+### Discussion Forum
+
+If you'd like to discuss what we're up to, please visit or [community](https://community.coralproject.net/) or [contact us](https://coralproject.net/contact.html).
+
+### Integrations
+
+Have a favorite analytics engine? Data science service? CMS? Auth platform? Deployment platform or pipeline? Pet project? Consider building a plugin to integrate them!
+
+### Favorite Features?
+
+Do you have a favorite feature of an exisitng platform that's not yet been done in Talk? Sounds like Talk needs that feature.
+
+## Thanks!
+
+By contributing to this project you agree to the [Code of Conduct](https://coralproject.net/code-of-conduct.html).
+
+

From 3695ce5cb71d35cf771647e583039e31b439a404 Mon Sep 17 00:00:00 2001
From: David Erwin <davidjerwin@gmail.com>
Date: Tue, 27 Jun 2017 15:08:21 -0400
Subject: [PATCH 235/264] Update links

---
 docs/contributors-guide.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/contributors-guide.md b/docs/contributors-guide.md
index bffc6f2dc..7b4fe4562 100644
--- a/docs/contributors-guide.md
+++ b/docs/contributors-guide.md
@@ -2,7 +2,7 @@
 title: Contributor's Guide
 keywords: homepage
 sidebar: talk_sidebar
-permalink: contributions.html
+permalink: contribute.html
 summary:
 ---
 
@@ -74,7 +74,7 @@ If you'd like to make a significant contribution, please [file an issue](https:/
 
 Talk's tranlations are stored in `.yml` files [here](https://github.com/coralproject/talk/tree/master/locales). 
 
-Translations can be submitted via pull request. If you do not use github, you can use 'en.yml' as a template and email the translations to us and we can import it into the repo.  
+Translations can be submitted via pull request. localIf you do not use github, you can use 'en.yml' as a template and email the translations to us and we can import it into the repo.  
 
 ## I want to contribute but I'm not sure what to do!
 

From f13682c12585ea98f9798d629ab4de2e0fc7695d Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Tue, 27 Jun 2017 16:12:13 -0300
Subject: [PATCH 236/264] flagMap added to the admin side

---
 .../src/routes/Community/components/User.js           | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/client/coral-admin/src/routes/Community/components/User.js b/client/coral-admin/src/routes/Community/components/User.js
index ee917e295..85f8cbd27 100644
--- a/client/coral-admin/src/routes/Community/components/User.js
+++ b/client/coral-admin/src/routes/Community/components/User.js
@@ -2,17 +2,18 @@ import React from 'react';
 import styles from './Community.css';
 
 import ActionButton from './ActionButton';
+import {username} from 'coral-plugin-flags/helpers/flagMap';
 import ActionsMenu from 'coral-admin/src/components/ActionsMenu';
 import ActionsMenuItem from 'coral-admin/src/components/ActionsMenuItem';
 
 import t from 'coral-framework/services/i18n';
 
 const shortReasons = {
-  'This comment is offensive': t('community.offensive'),
-  'This looks like an ad/marketing': t('community.spam_ads'),
-  'This user is impersonating': t('community.impersonating'),
-  'I don\'t like this username': t('community.dont_like_username'),
-  'Other': t('community.other')
+  [username.other]: t('community.other'),
+  [username.spam]: t('community.spam_ads'),
+  [username.offensive]: t('community.offensive'),
+  [username.nolike]: t('community.dont_like_username'),
+  [username.impersonating]: t('community.impersonating'),
 };
 
 // Render a single user for the list

From e03e15fb3bf7d58690bdeec71d23ef92a362fe99 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Tue, 27 Jun 2017 16:20:08 -0300
Subject: [PATCH 237/264] renaming

---
 .../src/routes/Community/components/User.js   |  2 +-
 .../components/FlagComment.js                 | 20 +++++++++----------
 .../helpers/{flagMap.js => flagReasons.js}    |  0
 3 files changed, 11 insertions(+), 11 deletions(-)
 rename client/coral-plugin-flags/helpers/{flagMap.js => flagReasons.js} (100%)

diff --git a/client/coral-admin/src/routes/Community/components/User.js b/client/coral-admin/src/routes/Community/components/User.js
index 85f8cbd27..b6a01f016 100644
--- a/client/coral-admin/src/routes/Community/components/User.js
+++ b/client/coral-admin/src/routes/Community/components/User.js
@@ -2,7 +2,7 @@ import React from 'react';
 import styles from './Community.css';
 
 import ActionButton from './ActionButton';
-import {username} from 'coral-plugin-flags/helpers/flagMap';
+import {username} from 'coral-plugin-flags/helpers/flagReasons';
 import ActionsMenu from 'coral-admin/src/components/ActionsMenu';
 import ActionsMenuItem from 'coral-admin/src/components/ActionsMenuItem';
 
diff --git a/client/coral-plugin-flags/components/FlagComment.js b/client/coral-plugin-flags/components/FlagComment.js
index ddad63b7e..fc67d4b71 100644
--- a/client/coral-plugin-flags/components/FlagComment.js
+++ b/client/coral-plugin-flags/components/FlagComment.js
@@ -2,7 +2,7 @@ import React from 'react';
 import FlagButton from './FlagButton';
 
 import t from 'coral-framework/services/i18n';
-import * as flagReason from '../helpers/flagMap';
+import {username, comment} from '../helpers/flagReasons';
 
 const FlagComment = (props) => <FlagButton {...props} getPopupMenu={getPopupMenu} />;
 
@@ -21,17 +21,17 @@ const getPopupMenu = [
   (itemType) => {
     const options = itemType === 'COMMENTS' ?
     [
-      {val: flagReason.commment.offensive, text: t('comment_offensive')},
-      {val: flagReason.commment.spam, text: t('marketing')},
-      {val: flagReason.commment.noagree, text: t('no_agree_comment')},
-      {val: flagReason.commment.other, text: t('other')}
+      {val: comment.offensive, text: t('comment_offensive')},
+      {val: comment.spam, text: t('marketing')},
+      {val: comment.noagree, text: t('no_agree_comment')},
+      {val: comment.other, text: t('other')}
     ]
     : [
-      {val: flagReason.username.offensive, text: t('username_offensive')},
-      {val: flagReason.username.nolike, text: t('no_like_username')},
-      {val: flagReason.username.impersonating, text: t('user_impersonating')},
-      {val: flagReason.username.spam, text: t('marketing')},
-      {val: flagReason.username.other, text: t('other')}
+      {val: username.offensive, text: t('username_offensive')},
+      {val: username.nolike, text: t('no_like_username')},
+      {val: username.impersonating, text: t('user_impersonating')},
+      {val: username.spam, text: t('marketing')},
+      {val: username.other, text: t('other')}
     ];
     return {
       header: t('step_2_header'),
diff --git a/client/coral-plugin-flags/helpers/flagMap.js b/client/coral-plugin-flags/helpers/flagReasons.js
similarity index 100%
rename from client/coral-plugin-flags/helpers/flagMap.js
rename to client/coral-plugin-flags/helpers/flagReasons.js

From dd76ac1ed4fb5fbdd27c473eccf27d7637f06dbc Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Tue, 27 Jun 2017 16:51:00 -0300
Subject: [PATCH 238/264] Now the smooth flag works

---
 client/coral-admin/src/index.js               |   2 +
 package.json                                  |   1 +
 .../client/components/CopyButton.js           |  16 +++
 .../client/components/Permalink.js            | 107 ++++++++++++++++++
 yarn.lock                                     |   4 +
 5 files changed, 130 insertions(+)
 create mode 100644 plugins/talk-plugin-permalink/client/components/CopyButton.js
 create mode 100644 plugins/talk-plugin-permalink/client/components/Permalink.js

diff --git a/client/coral-admin/src/index.js b/client/coral-admin/src/index.js
index 2f2e75275..29df3753c 100644
--- a/client/coral-admin/src/index.js
+++ b/client/coral-admin/src/index.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import {render} from 'react-dom';
 import {ApolloProvider} from 'react-apollo';
+import smoothscroll from 'smoothscroll-polyfill';
 
 import {getClient} from './services/client';
 import store from './services/store';
@@ -13,6 +14,7 @@ import {loadPluginsTranslations, injectPluginsReducers} from 'coral-framework/he
 
 loadPluginsTranslations();
 injectPluginsReducers();
+smoothscroll.polyfill();
 
 render(
   <ApolloProvider client={getClient()} store={store}>
diff --git a/package.json b/package.json
index 9d48f39cd..2834a3e3a 100644
--- a/package.json
+++ b/package.json
@@ -118,6 +118,7 @@
     "resolve": "^1.3.2",
     "semver": "^5.3.0",
     "simplemde": "^1.11.2",
+    "smoothscroll-polyfill": "^0.3.5",
     "snake-case": "^2.1.0",
     "subscriptions-transport-ws": "^0.7.2",
     "timekeeper": "^1.0.0",
diff --git a/plugins/talk-plugin-permalink/client/components/CopyButton.js b/plugins/talk-plugin-permalink/client/components/CopyButton.js
new file mode 100644
index 000000000..405468a6e
--- /dev/null
+++ b/plugins/talk-plugin-permalink/client/components/CopyButton.js
@@ -0,0 +1,16 @@
+import React from 'react';
+import {t} from 'plugin-api/beta/client/services';
+import {withCopyToClipboard} from 'plugin-api/beta/client/hocs';
+import {Button} from 'plugin-api/beta/client/components/ui';
+
+class ButtonCopyToClipboard extends React.Component {
+  render () {
+    return (
+      <Button {...this.props} >
+        {t('common.copy')}
+      </Button>
+    );
+  }
+}
+
+export default withCopyToClipboard(ButtonCopyToClipboard);
diff --git a/plugins/talk-plugin-permalink/client/components/Permalink.js b/plugins/talk-plugin-permalink/client/components/Permalink.js
new file mode 100644
index 000000000..68406472e
--- /dev/null
+++ b/plugins/talk-plugin-permalink/client/components/Permalink.js
@@ -0,0 +1,107 @@
+import React from 'react';
+import cn from 'classnames';
+import styles from './styles.css';
+import {t} from 'plugin-api/beta/client/services';
+import {ClickOutside} from 'plugin-api/beta/client/components';
+import {Icon, Button} from 'plugin-api/beta/client/components/ui';
+
+const name = 'talk-plugin-permalink';
+
+export default class PermalinkButton extends React.Component {
+  constructor (props) {
+    super(props);
+
+    this.state = {
+      popoverOpen: false,
+      copySuccessful: null,
+      copyFailure: null
+    };
+
+  }
+
+  toggle = () => {
+    this.popover.style.top = `${this.linkButton.offsetTop - 80}px`;
+
+    this.setState({
+      popoverOpen: !this.state.popoverOpen
+    });
+  }
+
+  handleClickOutside = () => {
+    this.setState({
+      popoverOpen: false
+    });
+  }
+
+  copyPermalink = () => {
+    this.permalinkInput.select();
+    try {
+      document.execCommand('copy');
+      this.setState({
+        copySuccessful: true,
+        copyFailure: null
+      });
+    } catch (err) {
+      this.setState({
+        copyFailure: true,
+        copySuccessful: null
+      });
+    }
+
+    this.timeout = window.setTimeout(() => {
+      this.setState({
+        copyFailure: null,
+        copySuccessful: null
+      });
+    }, 3000);
+  }
+
+  componentWillUnmount() {
+    window.clearTimeout(this.timeout);
+  }
+
+  render () {
+    const {copySuccessful, copyFailure, popoverOpen} = this.state;
+    const {asset} = this.props;
+    return (
+      <ClickOutside onClickOutside={this.handleClickOutside}>
+        <div className={cn(`${name}-container`, styles.container)}>
+          
+          <button
+            ref={(ref) => this.linkButton = ref}
+            onClick={this.toggle}
+            className={`${name}-button`}>
+              {t('permalink')}
+            <Icon name="link" />
+          </button>
+
+          <div
+            ref={(ref) => this.popover = ref}
+            className={cn([`${name}-popover`, styles.popover, {[styles.active]: popoverOpen}])}>
+
+            <input
+              className={cn(styles.input, `${name}-copy-field`)}
+              type='text'
+              ref={(input) => this.permalinkInput = input}
+              defaultValue={`${asset.url}#${this.props.commentId}`}
+            />
+
+            <Button
+              onClick={this.copyPermalink}
+              className={cn([
+                styles.button,
+                `${name}-copy-button`, {
+                  [styles.success]:copySuccessful,
+                  [styles.failure]: copyFailure
+                }])}>
+              {!copyFailure && !copySuccessful && 'Copy'}
+              {copySuccessful && 'Copied'}
+              {copyFailure && 'Not supported'}
+            </Button>
+            
+          </div>
+        </div>
+      </ClickOutside>
+    );
+  }
+}
diff --git a/yarn.lock b/yarn.lock
index 6e8776e08..92edf11b5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7602,6 +7602,10 @@ smart-buffer@^1.0.4:
   version "1.1.15"
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-1.1.15.tgz#7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"
 
+smoothscroll-polyfill@^0.3.5:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/smoothscroll-polyfill/-/smoothscroll-polyfill-0.3.5.tgz#466e6039b51cb525d70e1a5077ef81e064678eae"
+
 smtp-connection@2.12.0:
   version "2.12.0"
   resolved "https://registry.yarnpkg.com/smtp-connection/-/smtp-connection-2.12.0.tgz#d76ef9127cb23c2259edb1e8349c2e8d5e2d74c1"

From 270491dc0f346cb48a47bc8ba012e868f1c11a93 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Wed, 28 Jun 2017 16:08:46 +0700
Subject: [PATCH 239/264] Allow editing to the same username in the "create
 username" flow

---
 services/users.js                       | 19 +++++++++++++++---
 test/server/routes/api/account/index.js | 17 ----------------
 test/server/services/users.js           | 26 +++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/services/users.js b/services/users.js
index 78ec57b4c..011e8e3ca 100644
--- a/services/users.js
+++ b/services/users.js
@@ -863,11 +863,24 @@ module.exports = class UsersService {
    * @return {Promise}
    */
   static async editName(id, username) {
+
+    // TODO: Revisit this when we revamped User status workflows.
+    const queryUsernameRejected = {
+      id,
+      username: {$ne: username},
+      status: 'BANNED',
+      canEditName: true
+    };
+
+    const queryCreateUsername = {
+      id,
+      status: 'ACTIVE',
+      canEditName: true
+    };
+
     try {
       const result = await UserModel.findOneAndUpdate({
-        id,
-        username: {$ne: username},
-        canEditName: true
+        $or: [queryUsernameRejected, queryCreateUsername],
       }, {
         $set: {
           username: username,
diff --git a/test/server/routes/api/account/index.js b/test/server/routes/api/account/index.js
index 08b9c8b1d..8d4e0057a 100644
--- a/test/server/routes/api/account/index.js
+++ b/test/server/routes/api/account/index.js
@@ -54,23 +54,6 @@ describe('/api/v1/account/username', () => {
         });
     });
 
-    it('it should return an error when the user submits the same username', (done) => {
-      chai.request(app)
-        .post(`/api/v1/users/${mockUser.id}/username-enable`)
-        .set(passport.inject({id: '456', roles: ['ADMIN']}))
-        .then(() => chai.request(app)
-          .put('/api/v1/account/username')
-          .set(passport.inject({id: mockUser.id, roles: []}))
-          .send({username: 'Ana'}))
-        .then(() => {
-          done(new Error('Expected Error'));
-        })
-        .catch((err) => {
-          expect(err).to.be.ok;
-          done();
-        });
-    });
-
     it('it should return an error when the user tries to edit their username if canEditName is disabled', (done) => {
       chai.request(app)
         .put('/api/v1/account/username')
diff --git a/test/server/services/users.js b/test/server/services/users.js
index 027ac524c..53f4bc018 100644
--- a/test/server/services/users.js
+++ b/test/server/services/users.js
@@ -238,6 +238,32 @@ describe('services.UsersService', () => {
         });
     });
 
+    it('should let the user submit the same username if user is not banned (create username)', () => {
+      return UsersService
+        .toggleNameEdit(mockUsers[0].id, true)
+        .then(() => UsersService.editName(mockUsers[0].id, mockUsers[0].username))
+        .then(() => UsersService.findById(mockUsers[0].id))
+        .then((user) => {
+          expect(user).to.have.property('username', mockUsers[0].username);
+          expect(user).to.have.property('canEditName', false);
+        });
+    });
+
+    it('should return error when a banned user submits the same username (rejected username)', () => {
+      return UsersService
+        .toggleNameEdit(mockUsers[0].id, true)
+        .then(() => UsersService.setStatus(mockUsers[0].id, 'BANNED'))
+        .then(() => UsersService.editName(mockUsers[0].id, mockUsers[0].username))
+        .then(() => UsersService.findById(mockUsers[0].id))
+        .then(() => {
+          throw new Error('Error expected');
+        })
+        .catch((err) => {
+          expect(err.status).to.equal(400);
+          expect(err.translation_key).to.equal('SAME_USERNAME_PROVIDED');
+        });
+    });
+
     it('should return an error if canEditName is false', (done) => {
       UsersService
         .editName(mockUsers[0].id, 'Jojo')

From f767b6a99806b5e19fd326ffbef57c7ffa134533 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 28 Jun 2017 09:06:46 -0300
Subject: [PATCH 240/264] Removing old

---
 .../client/components/CopyButton.js           |  16 ---
 .../client/components/Permalink.js            | 107 ------------------
 2 files changed, 123 deletions(-)
 delete mode 100644 plugins/talk-plugin-permalink/client/components/CopyButton.js
 delete mode 100644 plugins/talk-plugin-permalink/client/components/Permalink.js

diff --git a/plugins/talk-plugin-permalink/client/components/CopyButton.js b/plugins/talk-plugin-permalink/client/components/CopyButton.js
deleted file mode 100644
index 405468a6e..000000000
--- a/plugins/talk-plugin-permalink/client/components/CopyButton.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import React from 'react';
-import {t} from 'plugin-api/beta/client/services';
-import {withCopyToClipboard} from 'plugin-api/beta/client/hocs';
-import {Button} from 'plugin-api/beta/client/components/ui';
-
-class ButtonCopyToClipboard extends React.Component {
-  render () {
-    return (
-      <Button {...this.props} >
-        {t('common.copy')}
-      </Button>
-    );
-  }
-}
-
-export default withCopyToClipboard(ButtonCopyToClipboard);
diff --git a/plugins/talk-plugin-permalink/client/components/Permalink.js b/plugins/talk-plugin-permalink/client/components/Permalink.js
deleted file mode 100644
index 68406472e..000000000
--- a/plugins/talk-plugin-permalink/client/components/Permalink.js
+++ /dev/null
@@ -1,107 +0,0 @@
-import React from 'react';
-import cn from 'classnames';
-import styles from './styles.css';
-import {t} from 'plugin-api/beta/client/services';
-import {ClickOutside} from 'plugin-api/beta/client/components';
-import {Icon, Button} from 'plugin-api/beta/client/components/ui';
-
-const name = 'talk-plugin-permalink';
-
-export default class PermalinkButton extends React.Component {
-  constructor (props) {
-    super(props);
-
-    this.state = {
-      popoverOpen: false,
-      copySuccessful: null,
-      copyFailure: null
-    };
-
-  }
-
-  toggle = () => {
-    this.popover.style.top = `${this.linkButton.offsetTop - 80}px`;
-
-    this.setState({
-      popoverOpen: !this.state.popoverOpen
-    });
-  }
-
-  handleClickOutside = () => {
-    this.setState({
-      popoverOpen: false
-    });
-  }
-
-  copyPermalink = () => {
-    this.permalinkInput.select();
-    try {
-      document.execCommand('copy');
-      this.setState({
-        copySuccessful: true,
-        copyFailure: null
-      });
-    } catch (err) {
-      this.setState({
-        copyFailure: true,
-        copySuccessful: null
-      });
-    }
-
-    this.timeout = window.setTimeout(() => {
-      this.setState({
-        copyFailure: null,
-        copySuccessful: null
-      });
-    }, 3000);
-  }
-
-  componentWillUnmount() {
-    window.clearTimeout(this.timeout);
-  }
-
-  render () {
-    const {copySuccessful, copyFailure, popoverOpen} = this.state;
-    const {asset} = this.props;
-    return (
-      <ClickOutside onClickOutside={this.handleClickOutside}>
-        <div className={cn(`${name}-container`, styles.container)}>
-          
-          <button
-            ref={(ref) => this.linkButton = ref}
-            onClick={this.toggle}
-            className={`${name}-button`}>
-              {t('permalink')}
-            <Icon name="link" />
-          </button>
-
-          <div
-            ref={(ref) => this.popover = ref}
-            className={cn([`${name}-popover`, styles.popover, {[styles.active]: popoverOpen}])}>
-
-            <input
-              className={cn(styles.input, `${name}-copy-field`)}
-              type='text'
-              ref={(input) => this.permalinkInput = input}
-              defaultValue={`${asset.url}#${this.props.commentId}`}
-            />
-
-            <Button
-              onClick={this.copyPermalink}
-              className={cn([
-                styles.button,
-                `${name}-copy-button`, {
-                  [styles.success]:copySuccessful,
-                  [styles.failure]: copyFailure
-                }])}>
-              {!copyFailure && !copySuccessful && 'Copy'}
-              {copySuccessful && 'Copied'}
-              {copyFailure && 'Not supported'}
-            </Button>
-            
-          </div>
-        </div>
-      </ClickOutside>
-    );
-  }
-}

From b92afff4e7fb6eb632e0000b436392e4d992ee1e Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Wed, 28 Jun 2017 21:14:34 +0700
Subject: [PATCH 241/264] Don't alias username 2

---
 client/coral-embed-stream/src/components/Comment.js          | 2 +-
 client/coral-embed-stream/src/components/IgnoreUserWizard.js | 4 ++--
 client/coral-embed-stream/src/components/TopRightMenu.js     | 2 +-
 client/coral-plugin-replies/ReplyBox.js                      | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/client/coral-embed-stream/src/components/Comment.js b/client/coral-embed-stream/src/components/Comment.js
index 6e3c645be..7a8b13312 100644
--- a/client/coral-embed-stream/src/components/Comment.js
+++ b/client/coral-embed-stream/src/components/Comment.js
@@ -169,7 +169,7 @@ export default class Comment extends React.Component {
       replies: PropTypes.object,
       user: PropTypes.shape({
         id: PropTypes.string.isRequired,
-        name: PropTypes.string.isRequired
+        username: PropTypes.string.isRequired
       }).isRequired,
       editing: PropTypes.shape({
         edited: PropTypes.bool,
diff --git a/client/coral-embed-stream/src/components/IgnoreUserWizard.js b/client/coral-embed-stream/src/components/IgnoreUserWizard.js
index 7e72bb924..b7612b9f8 100644
--- a/client/coral-embed-stream/src/components/IgnoreUserWizard.js
+++ b/client/coral-embed-stream/src/components/IgnoreUserWizard.js
@@ -9,7 +9,7 @@ export class IgnoreUserWizard extends React.Component {
     // comment on which this menu appears
     user: PropTypes.shape({
       id: PropTypes.string.isRequired,
-      name: PropTypes.string.isRequired
+      username: PropTypes.string.isRequired
     }).isRequired,
     cancel: PropTypes.func.isRequired,
 
@@ -47,7 +47,7 @@ export class IgnoreUserWizard extends React.Component {
     const step2Confirmation = (
       <div>
         <header>Ignore User</header>
-        <p>Are you sure you want to ignore { user.name }?</p>
+        <p>Are you sure you want to ignore { user.username }?</p>
         <div className={styles.textAlignRight}>
           <Button cStyle='cancel' onClick={this.onClickCancel}>Cancel</Button>
           <Button onClick={onClickIgnoreUser}>Ignore user</Button>
diff --git a/client/coral-embed-stream/src/components/TopRightMenu.js b/client/coral-embed-stream/src/components/TopRightMenu.js
index d65722b6d..4cd544379 100644
--- a/client/coral-embed-stream/src/components/TopRightMenu.js
+++ b/client/coral-embed-stream/src/components/TopRightMenu.js
@@ -12,7 +12,7 @@ export class TopRightMenu extends React.Component {
     comment: PropTypes.shape({
       user: PropTypes.shape({
         id: PropTypes.string.isRequired,
-        name: PropTypes.string.isRequired
+        username: PropTypes.string.isRequired
       }).isRequired
     }).isRequired,
     ignoreUser: PropTypes.func,
diff --git a/client/coral-plugin-replies/ReplyBox.js b/client/coral-plugin-replies/ReplyBox.js
index b8b983fe4..cc8e8045f 100644
--- a/client/coral-plugin-replies/ReplyBox.js
+++ b/client/coral-plugin-replies/ReplyBox.js
@@ -48,7 +48,6 @@ ReplyBox.propTypes = {
   commentPostedHandler: PropTypes.func,
   parentId: PropTypes.string,
   addNotification: PropTypes.func.isRequired,
-  authorId: PropTypes.string.isRequired,
   postComment: PropTypes.func.isRequired,
   assetId: PropTypes.string.isRequired
 };

From ccaa744a7832c986e039d6f5e773971bd3b11012 Mon Sep 17 00:00:00 2001
From: StephanieDClark <stephanie@devisolutions.com>
Date: Wed, 28 Jun 2017 14:26:41 -0700
Subject: [PATCH 242/264] Updates to tab classes

---
 client/coral-ui/components/Tab.js    | 2 +-
 client/coral-ui/components/TabBar.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-ui/components/Tab.js b/client/coral-ui/components/Tab.js
index cc2ee82d7..492c35cbe 100644
--- a/client/coral-ui/components/Tab.js
+++ b/client/coral-ui/components/Tab.js
@@ -4,7 +4,7 @@ import styles from './Tab.css';
 export default ({children, tabId, active, onTabClick, cStyle = 'base', ...props}) => (
   <li
     key={tabId}
-    className={`${active ? `${styles[`${cStyle}--active`]} coral-tab-active` : ''} coral-tab ${props.className}`}
+    className={`${active ? `${styles[`${cStyle}--active`]} talk-tab-active` : ''} talk-tab ${props.className}`}
     onClick={() => onTabClick(tabId)}
   >
     {children}
diff --git a/client/coral-ui/components/TabBar.js b/client/coral-ui/components/TabBar.js
index 7809dee11..08f466ffc 100644
--- a/client/coral-ui/components/TabBar.js
+++ b/client/coral-ui/components/TabBar.js
@@ -17,7 +17,7 @@ class TabBar extends React.Component {
     const {children, activeTab, cStyle = 'base'} = this.props;
     return (
       <div>
-        <ul className={`${styles.base} ${cStyle ? styles[cStyle] : ''} ${this.props.className}`}>
+        <ul className={`${styles.base} ${cStyle ? styles[cStyle] : ''} talk-tab-bar ${this.props.className}`}>
           {React.Children.toArray(children)
             .filter((child) => !child.props.restricted)
             .map((child, tabId) =>

From ab84436a782a5ccb219313e0765607dacc9c82ea Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 28 Jun 2017 15:32:53 -0600
Subject: [PATCH 243/264] Update plugins.default.json

---
 plugins.default.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins.default.json b/plugins.default.json
index 7b2115421..3bc2e41bf 100644
--- a/plugins.default.json
+++ b/plugins.default.json
@@ -12,6 +12,7 @@
     "coral-plugin-auth",
     "coral-plugin-offtopic",
     "coral-plugin-viewing-options",
-    "coral-plugin-comment-content"
+    "coral-plugin-comment-content",
+    "talk-plugin-permalink"
   ]
 }

From 06ebd9ccc52ee78703a7975dd9a07232d04dd717 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Thu, 29 Jun 2017 12:15:00 +0100
Subject: [PATCH 244/264] Bump version to 2.2.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2834a3e3a..95e4515fc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "talk",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "A better commenting experience from Mozilla, The New York Times, and the Washington Post. https://coralproject.net",
   "main": "app.js",
   "scripts": {

From 87f8ed401f169167e86d0db73ce80a53ed138193 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 29 Jun 2017 10:18:40 -0300
Subject: [PATCH 245/264] Using CommentId by queryParam

---
 client/coral-embed/src/index.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/coral-embed/src/index.js b/client/coral-embed/src/index.js
index 82eea8ef7..3f3c63ba3 100644
--- a/client/coral-embed/src/index.js
+++ b/client/coral-embed/src/index.js
@@ -190,7 +190,10 @@ Talk.render = function(el, opts) {
   // Compose the query to send down to the Talk API so it knows what to load.
   let query = {};
 
-  query.comment_id = window.location.hash.slice(1);
+  let urlParams = new URLSearchParams(window.location.search);
+
+  query.comment_id = urlParams.get('commentId');
+
   query.asset_id = opts.asset_id;
 
   query.asset_url = opts.asset_url;

From 0312530b86e25699c1388454e3c77a8a761824ba Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 29 Jun 2017 10:20:33 -0300
Subject: [PATCH 246/264] Modifying permalink plugin

---
 .../talk-plugin-permalink/client/components/PermalinkButton.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/talk-plugin-permalink/client/components/PermalinkButton.js b/plugins/talk-plugin-permalink/client/components/PermalinkButton.js
index 68406472e..fc8561bdc 100644
--- a/plugins/talk-plugin-permalink/client/components/PermalinkButton.js
+++ b/plugins/talk-plugin-permalink/client/components/PermalinkButton.js
@@ -83,7 +83,7 @@ export default class PermalinkButton extends React.Component {
               className={cn(styles.input, `${name}-copy-field`)}
               type='text'
               ref={(input) => this.permalinkInput = input}
-              defaultValue={`${asset.url}#${this.props.commentId}`}
+              defaultValue={`${asset.url}?commentId=${this.props.commentId}`}
             />
 
             <Button

From ddac5c2c850e582e964e8c2a486837272962b426 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 29 Jun 2017 10:48:29 -0300
Subject: [PATCH 247/264] Avoid Error due to invalid queries

---
 client/coral-embed-stream/src/components/Stream.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/client/coral-embed-stream/src/components/Stream.js b/client/coral-embed-stream/src/components/Stream.js
index 165b3ce4c..54a077c83 100644
--- a/client/coral-embed-stream/src/components/Stream.js
+++ b/client/coral-embed-stream/src/components/Stream.js
@@ -163,6 +163,7 @@ class Stream extends React.Component {
       pluginProps,
       editName
     } = this.props;
+
     const {keepCommentBox} = this.state;
     const view = this.getVisibleComments();
     const open = asset.closedAt === null;
@@ -187,6 +188,12 @@ class Stream extends React.Component {
     };
 
     const showCommentBox = loggedIn && ((!banned && !temporarilySuspended && !highlightedComment) || keepCommentBox);
+
+    if (!comment && !comments) {
+      console.error('No comments came back from the graph given that query. Please, check the query params.');
+      return <div> An error has occured! </div>;
+    }
+
     return (
       <div id="stream">
 

From db9c3b45c18978d47cfe3f09ad386daae3562848 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 29 Jun 2017 11:06:52 -0300
Subject: [PATCH 248/264] Stream Error

---
 client/coral-embed-stream/src/components/Stream.js       | 7 ++++---
 client/coral-embed-stream/src/components/StreamError.css | 3 +++
 client/coral-embed-stream/src/components/StreamError.js  | 8 ++++++++
 3 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 client/coral-embed-stream/src/components/StreamError.css
 create mode 100644 client/coral-embed-stream/src/components/StreamError.js

diff --git a/client/coral-embed-stream/src/components/Stream.js b/client/coral-embed-stream/src/components/Stream.js
index 54a077c83..ff8bddc11 100644
--- a/client/coral-embed-stream/src/components/Stream.js
+++ b/client/coral-embed-stream/src/components/Stream.js
@@ -1,5 +1,6 @@
 import React, {PropTypes} from 'react';
 import LoadMore from './LoadMore';
+import {StreamError} from './StreamError';
 import Comment from '../components/Comment';
 import SuspendedAccount from './SuspendedAccount';
 import Slot from 'coral-framework/components/Slot';
@@ -189,9 +190,9 @@ class Stream extends React.Component {
 
     const showCommentBox = loggedIn && ((!banned && !temporarilySuspended && !highlightedComment) || keepCommentBox);
 
-    if (!comment && !comments) {
-      console.error('No comments came back from the graph given that query. Please, check the query params.');
-      return <div> An error has occured! </div>;
+    if (!comment && !comments) { 
+      console.error('Talk: No comments came back from the graph given that query. Please, check the query params.'); 
+      return <StreamError />;
     }
 
     return (
diff --git a/client/coral-embed-stream/src/components/StreamError.css b/client/coral-embed-stream/src/components/StreamError.css
new file mode 100644
index 000000000..908d963c0
--- /dev/null
+++ b/client/coral-embed-stream/src/components/StreamError.css
@@ -0,0 +1,3 @@
+.streamError {
+  padding: 10px 0;
+}
\ No newline at end of file
diff --git a/client/coral-embed-stream/src/components/StreamError.js b/client/coral-embed-stream/src/components/StreamError.js
new file mode 100644
index 000000000..149056409
--- /dev/null
+++ b/client/coral-embed-stream/src/components/StreamError.js
@@ -0,0 +1,8 @@
+import React from 'react';
+import styles from './StreamError.css';
+
+export const StreamError = () => (
+  <div className={styles.streamError}>
+    An error has occured!
+  </div>
+);

From d31044f39e3c9560d588c9494234a53e87a880eb Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 29 Jun 2017 11:25:52 -0300
Subject: [PATCH 249/264] linting

---
 client/coral-plugin-flags/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-plugin-flags/index.js b/client/coral-plugin-flags/index.js
index d896d34f5..dd851b094 100644
--- a/client/coral-plugin-flags/index.js
+++ b/client/coral-plugin-flags/index.js
@@ -1 +1 @@
-export {default as FlagComment} from './components/FlagComment';
\ No newline at end of file
+export {default as FlagComment} from './components/FlagComment';

From 867f6966baf4d0606f8927c6f1e5c4fe6f58522e Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Thu, 29 Jun 2017 16:52:01 +0100
Subject: [PATCH 250/264] Update dependencies to fix build

---
 package.json                            | 1 +
 plugins/talk-plugin-permalink/yarn.lock | 4 ++++
 yarn.lock                               | 6 ++++++
 3 files changed, 11 insertions(+)
 create mode 100644 plugins/talk-plugin-permalink/yarn.lock

diff --git a/package.json b/package.json
index 95e4515fc..5e00ea6a5 100644
--- a/package.json
+++ b/package.json
@@ -57,6 +57,7 @@
   "dependencies": {
     "accepts": "^1.3.3",
     "app-module-path": "^2.2.0",
+    "async": "^2.5.0",
     "bcrypt": "^1.0.2",
     "body-parser": "^1.17.1",
     "bowser": "^1.7.0",
diff --git a/plugins/talk-plugin-permalink/yarn.lock b/plugins/talk-plugin-permalink/yarn.lock
new file mode 100644
index 000000000..fb57ccd13
--- /dev/null
+++ b/plugins/talk-plugin-permalink/yarn.lock
@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
diff --git a/yarn.lock b/yarn.lock
index 92edf11b5..317d83e85 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -358,6 +358,12 @@ async@^2.0.1, async@^2.1.2, async@^2.1.4:
   dependencies:
     lodash "^4.14.0"
 
+async@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
+  dependencies:
+    lodash "^4.14.0"
+
 async@~0.9.0:
   version "0.9.2"
   resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"

From 737cea6e761d5af109d15ac19f8898fd73d49b55 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Thu, 29 Jun 2017 16:59:00 +0100
Subject: [PATCH 251/264] Reinstall modules

---
 yarn.lock | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 317d83e85..f98887478 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -352,13 +352,7 @@ async@2.1.4:
   dependencies:
     lodash "^4.14.0"
 
-async@^2.0.1, async@^2.1.2, async@^2.1.4:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.3.0.tgz#1013d1051047dd320fe24e494d5c66ecaf6147d9"
-  dependencies:
-    lodash "^4.14.0"
-
-async@^2.5.0:
+async@^2.0.1, async@^2.1.2, async@^2.1.4, async@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
   dependencies:

From 354295c0ae609590abcc318f72d36b8a5d029cc9 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 29 Jun 2017 13:20:27 -0300
Subject: [PATCH 252/264] Adding polyfill

---
 client/coral-embed/src/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/coral-embed/src/index.js b/client/coral-embed/src/index.js
index 3f3c63ba3..702308c3a 100644
--- a/client/coral-embed/src/index.js
+++ b/client/coral-embed/src/index.js
@@ -1,4 +1,5 @@
 import pym from 'pym.js';
+import URLSearchParams from 'url-search-params';
 
 import {stringify} from 'querystring';
 

From 2289c405d1df0cb40b70c23cf62b81e306134cac Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 29 Jun 2017 13:25:50 -0300
Subject: [PATCH 253/264] Translatios

---
 client/coral-embed-stream/src/components/StreamError.js | 3 ++-
 locales/en.yml                                          | 1 +
 locales/es.yml                                          | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/coral-embed-stream/src/components/StreamError.js b/client/coral-embed-stream/src/components/StreamError.js
index 149056409..2e8b8ff96 100644
--- a/client/coral-embed-stream/src/components/StreamError.js
+++ b/client/coral-embed-stream/src/components/StreamError.js
@@ -1,8 +1,9 @@
 import React from 'react';
 import styles from './StreamError.css';
+import t from 'coral-framework/services/i18n';
 
 export const StreamError = () => (
   <div className={styles.streamError}>
-    An error has occured!
+    {t('common.error')}
   </div>
 );
diff --git a/locales/en.yml b/locales/en.yml
index 03256e75e..2bf6fc75b 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -40,6 +40,7 @@ en:
   comment_post_notif_premod: "Thank you for posting. Our moderation team will review your comment shortly."
   common:
     copy: 'Copy'
+    error: 'An error has occurred.'
   community:
     account_creation_date: "Account Creation Date"
     active: Active
diff --git a/locales/es.yml b/locales/es.yml
index 7297fedd5..61fb7fc0b 100644
--- a/locales/es.yml
+++ b/locales/es.yml
@@ -40,6 +40,7 @@ es:
   comment_post_notif_premod: "Gracias por el comentario. Nuestro equipo de moderación va a revisarlo muy pronto."
   common:
     copy: 'Copiar'
+    error: 'Ha ocurrido un error.'
   community:
     account_creation_date: "Fecha de creación de la cuenta"
     active: Activa

From c3ee4427755f819266e00c1baf70e74aba637c57 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 29 Jun 2017 13:30:12 -0300
Subject: [PATCH 254/264] Replacing moderation comment and history hashes

---
 client/coral-admin/src/routes/Moderation/components/Comment.js | 2 +-
 client/coral-plugin-history/Comment.js                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.js b/client/coral-admin/src/routes/Moderation/components/Comment.js
index 3c5e535b2..26543be6e 100644
--- a/client/coral-admin/src/routes/Moderation/components/Comment.js
+++ b/client/coral-admin/src/routes/Moderation/components/Comment.js
@@ -168,7 +168,7 @@ class Comment extends React.Component {
                 {' '}
                 <a
                   className={styles.external}
-                  href={`${comment.asset.url}#${comment.id}`}
+                  href={`${comment.asset.url}?commentId=${comment.id}`}
                   target="_blank"
                 >
                   <Icon name="open_in_new" /> {t('comment.view_context')}
diff --git a/client/coral-plugin-history/Comment.js b/client/coral-plugin-history/Comment.js
index 888989737..048f0592b 100644
--- a/client/coral-plugin-history/Comment.js
+++ b/client/coral-plugin-history/Comment.js
@@ -29,7 +29,7 @@ const Comment = (props) => {
       <div className={styles.sidebar}>
         <ul>
           <li>
-            <a onClick={props.link(`${props.asset.url}#${props.comment.id}`)}>
+            <a onClick={props.link(`${props.asset.url}?commentId=${props.comment.id}`)}>
               <Icon name="open_in_new" />{t('view_conversation')}
             </a>
           </li>

From c8d9447033bc99c4c9a81695eae2293c39118f1b Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 29 Jun 2017 13:44:40 -0300
Subject: [PATCH 255/264] Adding the polifill to the package.json

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 5e00ea6a5..a0040783a 100644
--- a/package.json
+++ b/package.json
@@ -123,6 +123,7 @@
     "snake-case": "^2.1.0",
     "subscriptions-transport-ws": "^0.7.2",
     "timekeeper": "^1.0.0",
+    "url-search-params": "^0.9.0",
     "uuid": "^3.0.1",
     "yaml-loader": "^0.4.0",
     "yamljs": "^0.2.10"

From 9de99a9ef45fe89e345af6951beb2f456fb7f39b Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 30 Jun 2017 16:55:37 +0700
Subject: [PATCH 256/264] Support post, reply, edit, load and view more loading
 states via global css classnames

---
 .../src/components/Comment.js                 |  39 +++----
 .../src/components/EditableCommentContent.js  |  91 ++++++++-------
 .../src/components/LoadMore.js                |  27 +++--
 .../src/components/Stream.js                  |  25 +++--
 client/coral-embed-stream/style/default.css   |  24 ++--
 client/coral-framework/utils/index.js         |  18 +++
 client/coral-plugin-commentbox/CommentBox.js  |  47 ++++----
 client/coral-plugin-commentbox/CommentForm.js | 105 ++++++++++--------
 client/coral-plugin-commentbox/styles.css     |  94 +++++++++++++++-
 client/coral-plugin-replies/ReplyBox.js       |   2 +-
 client/coral-ui/components/Button.css         |  14 ++-
 locales/en.yml                                |   2 +-
 locales/es.yml                                |   2 +-
 13 files changed, 312 insertions(+), 178 deletions(-)

diff --git a/client/coral-embed-stream/src/components/Comment.js b/client/coral-embed-stream/src/components/Comment.js
index 7a8b13312..2e854633b 100644
--- a/client/coral-embed-stream/src/components/Comment.js
+++ b/client/coral-embed-stream/src/components/Comment.js
@@ -24,7 +24,7 @@ import CommentContent from './CommentContent';
 import Slot from 'coral-framework/components/Slot';
 import IgnoredCommentTombstone from './IgnoredCommentTombstone';
 import {EditableCommentContent} from './EditableCommentContent';
-import {getActionSummary, iPerformedThisAction} from 'coral-framework/utils';
+import {getActionSummary, iPerformedThisAction, forEachError} from 'coral-framework/utils';
 import t from 'coral-framework/services/i18n';
 
 const isStaff = (tags) => !tags.every((t) => t.tag.name !== 'STAFF');
@@ -75,7 +75,6 @@ const ActionButton = ({children}) => {
 };
 
 export default class Comment extends React.Component {
-  isLoadingReplies = false;
 
   constructor(props) {
     super(props);
@@ -90,6 +89,7 @@ export default class Comment extends React.Component {
       isEditing: false,
       replyBoxVisible: false,
       animateEnter: false,
+      loadingState: '',
       ...resetCursors({}, props),
     };
   }
@@ -220,24 +220,23 @@ export default class Comment extends React.Component {
   }
 
   loadNewReplies = () => {
-    if (!this.isLoadingReplies) {
-      this.isLoadingReplies = true;
-      const {replies, replyCount, id} = this.props.comment;
-      if (replyCount > replies.nodes.length) {
-        this.props.loadMore(id)
-          .then(() => {
-            this.setState(resetCursors(this.state, this.props));
-            this.isLoadingReplies = false;
-          })
-          .catch((e) => {
-            this.isLoadingReplies = false;
-            throw e;
+    const {replies, replyCount, id} = this.props.comment;
+    if (replyCount > replies.nodes.length) {
+      this.setState({loadingState: 'loading'});
+      this.props.loadMore(id)
+        .then(() => {
+          this.setState({
+            ...resetCursors(this.state, this.props),
+            loadingState: 'success',
           });
-        return;
-      }
-      this.setState(resetCursors);
-      this.isLoadingReplies = false;
+        })
+        .catch((error) => {
+          this.setState({loadingState: 'error'});
+          forEachError(error, ({msg}) => {this.props.addNotification('error', msg);});
+        });
+      return;
     }
+    this.setState(resetCursors);
   };
 
   showReplyBox = () => {
@@ -331,6 +330,7 @@ export default class Comment extends React.Component {
     } = this.props;
 
     const view = this.getVisibileReplies();
+    const {loadingState} = this.state;
 
     const hasMoreComments = comment.replies && (comment.replies.hasNextPage || comment.replies.nodes.length > view.length);
     const replyCount = this.hasIgnoredReplies() ? '' : comment.replyCount;
@@ -595,12 +595,13 @@ export default class Comment extends React.Component {
               />;
         })}
         </TransitionGroup>
-        <div className="coral-load-more-replies">
+        <div className="talk-load-more-replies">
           <LoadMore
             topLevel={false}
             replyCount={replyCount}
             moreComments={hasMoreComments}
             loadMore={this.loadNewReplies}
+            loadingState={loadingState}
           />
         </div>
       </div>
diff --git a/client/coral-embed-stream/src/components/EditableCommentContent.js b/client/coral-embed-stream/src/components/EditableCommentContent.js
index 5e4e354db..7e6035d58 100644
--- a/client/coral-embed-stream/src/components/EditableCommentContent.js
+++ b/client/coral-embed-stream/src/components/EditableCommentContent.js
@@ -5,6 +5,7 @@ import styles from './Comment.css';
 import {CountdownSeconds} from './CountdownSeconds';
 import {getEditableUntilDate} from './util';
 import {can} from 'coral-framework/services/perms';
+import {forEachError} from 'coral-framework/utils';
 
 import {Icon} from 'coral-ui';
 import t from 'coral-framework/services/i18n';
@@ -46,9 +47,14 @@ export class EditableCommentContent extends React.Component {
     // called when editing should be stopped
     stopEditing: React.PropTypes.func,
   }
+
   constructor(props) {
     super(props);
     this.editWindowExpiryTimeout = null;
+    this.state = {
+      body: props.comment.body,
+      loadingState: '',
+    };
   }
   componentDidMount() {
     const editableUntil = getEditableUntilDate(this.props.comment);
@@ -65,74 +71,75 @@ export class EditableCommentContent extends React.Component {
       this.editWindowExpiryTimeout = clearTimeout(this.editWindowExpiryTimeout);
     }
   }
-  editComment = async (edit) => {
+
+  handleBodyChange = (body) => {
+    this.setState({body});
+  }
+
+  handleSubmit = async () => {
     if (!can(this.props.currentUser, 'INTERACT_WITH_COMMUNITY')) {
       this.props.addNotification('error', t('error.NOT_AUTHORIZED'));
       return;
     }
 
+    this.setState({loadingState: 'loading'});
+
     const {editComment, addNotification, stopEditing} = this.props;
     if (typeof editComment !== 'function') {return;}
     let response;
-    let successfullyEdited = false;
     try {
-      response = await editComment(edit);
-      const errors = (response && response.data && response.data.editComment)
-        ? response.data.editComment.errors
-        : null;
-      if (errors && (errors.length === 1)) {
-        throw errors[0];
-      }
-      successfullyEdited = true;
-    } catch (error) {
-      const errors = error.errors || [error];
-      errors.forEach((e) => {
-        if (e.translation_key) {
-          addNotification('error', t(`error.${e.translation_key}`));
-        } else if (error.networkError) {
-          addNotification('error', t('error.network_error'));
-        } else {
-          addNotification('error', t('edit_comment.unexpected_error'));
-          console.error(e);
-        }
-      });
-    }
-    if (successfullyEdited) {
+      response = await editComment({body: this.state.body});
+      this.setState({loadingState: 'success'});
       const status = response.data.editComment.comment.status;
       notifyForNewCommentStatus(this.props.addNotification, status);
-    }
-    if (successfullyEdited && typeof stopEditing === 'function') {
-      stopEditing();
+      if (typeof stopEditing === 'function') {
+        stopEditing();
+      }
+    } catch (error) {
+      this.setState({loadingState: 'error'});
+      forEachError(error, ({msg}) => addNotification('error', msg));
     }
   }
+
+  getEditableUntil = (props = this.props) => {
+    return getEditableUntilDate(props.comment);
+  }
+
+  isEditWindowExpired = (props = this.props) => {
+    return (this.getEditableUntil(props) - new Date()) < 0;
+  }
+
+  isSubmitEnabled = (comment) => {
+
+    // should be disabled if user hasn't actually changed their
+    // original comment
+    return (comment.body !== this.props.comment.body) && !this.isEditWindowExpired();
+  }
+
   render() {
-    const originalBody = this.props.comment.body;
-    const editableUntil = getEditableUntilDate(this.props.comment);
-    const editWindowExpired = (editableUntil - new Date()) < 0;
     return (
       <div className={styles.editCommentForm}>
         <CommentForm
           defaultValue={this.props.comment.body}
           charCountEnable={this.props.asset.settings.charCountEnable}
           maxCharCount={this.props.maxCharCount}
-          saveCommentEnabled={(comment) => {
-
-            // should be disabled if user hasn't actually changed their
-            // original comment
-            return (comment.body !== originalBody) && !editWindowExpired;
-          }}
-          saveComment={this.editComment}
+          submitEnabled={this.isSubmitEnabled}
+          body={this.state.body}
+          onBodyChange={this.handleBodyChange}
+          onSubmit={this.handleSubmit}
           bodyLabel={t('edit_comment.body_input_label')}
           bodyPlaceholder=""
           submitText={<span>{t('edit_comment.save_button')}</span>}
-          saveButtonCStyle="green"
-          cancelButtonClicked={this.props.stopEditing}
-          buttonClass={styles.button}
+          submitButtonCStyle="green"
+          onCancel={this.props.stopEditing}
+          submitButtonClassName={styles.button}
+          cancelButtonClassName={styles.button}
+          loadingState={this.state.loadingState}
           buttonContainerStart={
             <div className={styles.buttonContainerLeft}>
               <span className={styles.editWindowRemaining}>
                 {
-                  editWindowExpired
+                  this.isEditWindowExpired()
                   ? <span>
                       {t('edit_comment.edit_window_expired')}
                       {
@@ -144,7 +151,7 @@ export class EditableCommentContent extends React.Component {
                   : <span>
                       <Icon name="timer"/> {t('edit_comment.edit_window_timer_prefix')}
                       <CountdownSeconds
-                        until={editableUntil}
+                        until={this.getEditableUntil()}
                         classNameForMsRemaining={(remainingMs) => (remainingMs <= 10 * 1000) ? styles.editWindowAlmostOver : '' }
                       />
                     </span>
diff --git a/client/coral-embed-stream/src/components/LoadMore.js b/client/coral-embed-stream/src/components/LoadMore.js
index 3d1ad4679..e05931581 100644
--- a/client/coral-embed-stream/src/components/LoadMore.js
+++ b/client/coral-embed-stream/src/components/LoadMore.js
@@ -1,12 +1,10 @@
 import React, {PropTypes} from 'react';
 import {Button} from 'coral-ui';
 import t from 'coral-framework/services/i18n';
+import cn from 'classnames';
 
 class LoadMore extends React.Component {
-
-  componentDidMount () {
-    this.initialState = true;
-  }
+  initialState = true;
 
   replyCountFormat = (count) => {
     if (!count) {
@@ -23,17 +21,22 @@ class LoadMore extends React.Component {
     }
   }
 
-  loadMore = () => {
-    this.initialState = false;
-    this.props.loadMore();
+  componentWillReceiveProps(nextProps) {
+    if (['success', 'error'].indexOf(nextProps.loadingState) >= 0) {
+      this.initialState = false;
+    }
   }
 
   render () {
-    const {topLevel, moreComments, replyCount} = this.props;
+    const {topLevel, moreComments, replyCount, loadingState, loadMore} = this.props;
+    const disabled = loadingState === 'loading';
     return moreComments
-      ? <div className='coral-load-more'>
+      ? <div className='talk-load-more'>
         <Button
-          onClick={this.loadMore}>
+          onClick={loadMore}
+          className={cn('talk-load-more-button', {[`talk-load-more-button-${loadingState}`]: loadingState})}
+          disabled={disabled}
+        >
           {topLevel ? t('framework.view_more_comments') : this.replyCountFormat(replyCount)}
         </Button>
       </div>
@@ -44,7 +47,9 @@ class LoadMore extends React.Component {
 LoadMore.propTypes = {
   replyCount: PropTypes.number,
   topLevel: PropTypes.bool.isRequired,
-  loadMore: PropTypes.func.isRequired
+  loadMore: PropTypes.func.isRequired,
+  moreComments: PropTypes.bool,
+  loadingState: PropTypes.oneOf(['', 'loading', 'success', 'error']),
 };
 
 export default LoadMore;
diff --git a/client/coral-embed-stream/src/components/Stream.js b/client/coral-embed-stream/src/components/Stream.js
index 165b3ce4c..0245466a5 100644
--- a/client/coral-embed-stream/src/components/Stream.js
+++ b/client/coral-embed-stream/src/components/Stream.js
@@ -14,6 +14,7 @@ import QuestionBox from 'coral-plugin-questionbox/QuestionBox';
 import IgnoredCommentTombstone from './IgnoredCommentTombstone';
 import NewCount from './NewCount';
 import {TransitionGroup} from 'react-transition-group';
+import {forEachError} from 'coral-framework/utils';
 
 const hasComment = (nodes, id) => nodes.some((node) => node.id === id);
 
@@ -53,13 +54,12 @@ function invalidateCursor(invalidated, state, props) {
 
 class Stream extends React.Component {
 
-  isLoadingMore = false;
-
   constructor(props) {
     super(props);
     this.state = {
       ...resetCursors(this.state, props),
       keepCommentBox: false,
+      loadingState: '',
     };
   }
 
@@ -107,15 +107,15 @@ class Stream extends React.Component {
   };
 
   loadMoreComments = () => {
-    if (!this.isLoadingMore) {
-      this.isLoadingMore = true;
-      this.props.loadMoreComments()
-        .then(() => this.isLoadingMore = false)
-        .catch((e) => {
-          this.isLoadingMore = false;
-          throw e;
-        });
-    }
+    this.setState({loadingState: 'loading'});
+    this.props.loadMoreComments()
+      .then(() => {
+        this.setState({loadingState: 'success'});
+      })
+      .catch((error) => {
+        this.setState({loadingState: 'error'});
+        forEachError(error, ({msg}) => {this.props.addNotification('error', msg);});
+      });
   }
 
   // getVisibileComments returns a list containing comments
@@ -163,7 +163,7 @@ class Stream extends React.Component {
       pluginProps,
       editName
     } = this.props;
-    const {keepCommentBox} = this.state;
+    const {keepCommentBox, loadingState} = this.state;
     const view = this.getVisibleComments();
     const open = asset.closedAt === null;
 
@@ -317,6 +317,7 @@ class Stream extends React.Component {
                 topLevel={true}
                 moreComments={asset.comments.hasNextPage}
                 loadMore={this.loadMoreComments}
+                loadingState={loadingState}
               />
             </div>}
       </div>
diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css
index a752493a3..9b1232e3b 100644
--- a/client/coral-embed-stream/style/default.css
+++ b/client/coral-embed-stream/style/default.css
@@ -197,12 +197,12 @@ hr {
 }
 
 /* Comment Box Styles */
-.coral-plugin-commentbox-container {
+.talk-plugin-commentbox-container {
   display: flex;
   width: 100%;
 }
 
-.coral-plugin-commentbox-textarea {
+.talk-plugin-commentbox-textarea {
   color: #262626;
   flex: 1;
   padding: 1em;
@@ -212,13 +212,13 @@ hr {
   border: 1px solid #9E9E9E;
 }
 
-.coral-plugin-commentbox-button-container {
+.talk-plugin-commentbox-button-container {
   display: flex;
   justify-content: flex-end;
   margin-top: 10px;
 }
 
-.coral-plugin-commentbox-button {
+.talk-plugin-commentbox-button {
   float: right;
   margin-top: 10px;
   padding: 5px 10px;
@@ -228,18 +228,18 @@ hr {
   border-radius: 2px;
 }
 
-.coral-plugin-commentbox-username {
+.talk-plugin-commentbox-username {
   width: 50%;
   padding-left: 5px;
   margin-bottom: 5px;
 }
 
-.coral-plugin-commentbox-char-count {
+.talk-plugin-commentbox-char-count {
   color: #ccc;
   text-align: right;
 }
 
-.coral-plugin-commentbox-char-max {
+.talk-plugin-commentbox-char-max {
   color: #d50000;
 }
 
@@ -417,11 +417,11 @@ button.comment__action-button[disabled],
 
 /* Load More */
 
-.coral-load-more {
+.talk-load-more {
   text-align: center;
 }
 
-.coral-load-more button {
+.talk-load-more button {
   text-align: center;
   color: #FFF;
   background-color: #2376D8;
@@ -433,11 +433,11 @@ button.comment__action-button[disabled],
   display: inline-block;
 }
 
-.coral-load-more:hover button {
+.talk-load-more:hover button {
   background-color: #4399FF;
 }
 
-.coral-load-more-replies, .coral-new-comments {
+.talk-load-more-replies, .coral-new-comments {
   width: 100%;
   display: flex;
   justify-content: center;
@@ -450,7 +450,7 @@ button.comment__action-button[disabled],
   z-index: 100;
 }
 
-.coral-load-more-replies button.coral-load-more, .coral-new-comments  button.coral-load-more{
+.talk-load-more-replies button.talk-load-more, .coral-new-comments  button.talk-load-more{
   width: initial;
 }
 
diff --git a/client/coral-framework/utils/index.js b/client/coral-framework/utils/index.js
index 0b79b7b02..1866005be 100644
--- a/client/coral-framework/utils/index.js
+++ b/client/coral-framework/utils/index.js
@@ -1,4 +1,5 @@
 import {gql} from 'react-apollo';
+import t from 'coral-framework/services/i18n';
 
 export const getTotalActionCount = (type, comment) => {
   return comment.action_summaries
@@ -126,3 +127,20 @@ export function createDefaultResponseFragments(...names) {
   });
   return result;
 }
+
+export function forEachError(error, callback) {
+  const errors = error.errors || [error];
+  errors.forEach((e) => {
+    console.error(e);
+
+    let msg = '';
+    if (e.translation_key) {
+      msg = t(`error.${e.translation_key}`);
+    } else if (error.networkError) {
+      msg = t('error.network_error');
+    } else {
+      msg = t('error.unexpected');
+    }
+    callback({error: e, msg});
+  });
+}
diff --git a/client/coral-plugin-commentbox/CommentBox.js b/client/coral-plugin-commentbox/CommentBox.js
index efa1d27ed..6e17b119f 100644
--- a/client/coral-plugin-commentbox/CommentBox.js
+++ b/client/coral-plugin-commentbox/CommentBox.js
@@ -2,12 +2,13 @@ import React, {PropTypes} from 'react';
 
 import t from 'coral-framework/services/i18n';
 import {can} from 'coral-framework/services/perms';
+import {forEachError} from 'coral-framework/utils';
 
 import Slot from 'coral-framework/components/Slot';
 import {connect} from 'react-redux';
 import {CommentForm} from './CommentForm';
 
-export const name = 'coral-plugin-commentbox';
+export const name = 'talk-plugin-commentbox';
 
 // Given a newly posted comment's status, show a notification to the user
 // if needed
@@ -28,16 +29,17 @@ class CommentBox extends React.Component {
 
     this.state = {
       username: '',
+      body: '',
+      loadingState: '',
 
-      // incremented on successful post to clear form
-      postedCount: 0,
       hooks: {
         preSubmit: [],
         postSubmit: []
       }
     };
   }
-  postComment = ({body}) => {
+
+  handleSubmit = () => {
     const {
       commentPostedHandler,
       postComment,
@@ -55,15 +57,17 @@ class CommentBox extends React.Component {
     let comment = {
       asset_id: assetId,
       parent_id: parentId,
-      body,
+      body: this.state.body,
       ...this.props.commentBox
     };
 
     // Execute preSubmit Hooks
     this.state.hooks.preSubmit.forEach((hook) => hook());
+    this.setState({loadingState: 'loading'});
 
     postComment(comment, 'comments')
       .then(({data}) => {
+        this.setState({loadingState: 'success'});
         const postedComment = data.createComment.comment;
 
         // Execute postSubmit Hooks
@@ -74,12 +78,17 @@ class CommentBox extends React.Component {
         if (commentPostedHandler) {
           commentPostedHandler();
         }
+
+        this.setState({body: ''});
       })
       .catch((err) => {
-        console.error(err);
+        this.setState({loadingState: 'error'});
+        forEachError(err, ({msg}) => addNotification('error', msg));
       });
+  }
 
-    this.setState({postedCount: this.state.postedCount + 1});
+  handleBodyChange = (body) => {
+    this.setState({body});
   }
 
   registerHook = (hookType = '', hook = () => {}) => {
@@ -130,21 +139,17 @@ class CommentBox extends React.Component {
     });
   }
 
-  handleChange = (e) => this.setState({body: e.target.value});
-
   render () {
-    const {styles, isReply, currentUser, maxCharCount} = this.props;
-    let {cancelButtonClicked} = this.props;
+    const {isReply, maxCharCount} = this.props;
+    let {onCancel} = this.props;
 
-    if (isReply && typeof cancelButtonClicked !== 'function') {
-      console.warn('the CommentBox component should have a cancelButtonClicked callback defined if it lives in a Reply');
-      cancelButtonClicked = () => {};
+    if (isReply && typeof onCancel !== 'function') {
+      console.warn('the CommentBox component should have a onCancel callback defined if it lives in a Reply');
+      onCancel = () => {};
     }
 
     return <div>
       <CommentForm
-        styles={styles}
-        key={this.state.postedCount}
         defaultValue={this.props.defaultValue}
         bodyInputId={isReply ? 'replyText' : 'commentText'}
         bodyLabel={isReply ? t('comment_box.reply') : t('comment.comment')}
@@ -152,7 +157,7 @@ class CommentBox extends React.Component {
         charCountEnable={this.props.charCountEnable}
         bodyPlaceholder={t('comment.comment')}
         bodyInputId={isReply ? 'replyText' : 'commentText'}
-        saveComment={currentUser && this.postComment}
+        body={this.state.body}
         buttonContainerStart={<Slot
           fill="commentInputDetailArea"
           registerHook={this.registerHook}
@@ -160,7 +165,10 @@ class CommentBox extends React.Component {
           isReply={isReply}
           inline
         />}
-        cancelButtonClicked={cancelButtonClicked}
+        onBodyChange={this.handleBodyChange}
+        loadingState={this.state.loadingState}
+        onCancel={onCancel}
+        onSubmit={this.handleSubmit}
       />
     </div>;
   }
@@ -174,12 +182,13 @@ CommentBox.propTypes = {
   maxCharCount: PropTypes.number,
   commentPostedHandler: PropTypes.func,
   postComment: PropTypes.func.isRequired,
-  cancelButtonClicked: PropTypes.func,
+  onCancel: PropTypes.func,
   assetId: PropTypes.string.isRequired,
   parentId: PropTypes.string,
   currentUser: PropTypes.object.isRequired,
   isReply: PropTypes.bool.isRequired,
   canPost: PropTypes.bool,
+  addNotification: PropTypes.func.isRequired,
 };
 
 const mapStateToProps = ({commentBox}) => ({commentBox});
diff --git a/client/coral-plugin-commentbox/CommentForm.js b/client/coral-plugin-commentbox/CommentForm.js
index 4ce32c11f..fe0f9f6d9 100644
--- a/client/coral-plugin-commentbox/CommentForm.js
+++ b/client/coral-plugin-commentbox/CommentForm.js
@@ -1,9 +1,10 @@
 import React, {PropTypes} from 'react';
 import {Button} from 'coral-ui';
-import classnames from 'classnames';
+import cn from 'classnames';
 import Slot from 'coral-framework/components/Slot';
 
 import {name} from './CommentBox';
+import styles from './styles.css';
 
 import t from 'coral-framework/services/i18n';
 
@@ -13,15 +14,8 @@ import t from 'coral-framework/services/i18n';
 export class CommentForm extends React.Component {
   static propTypes = {
 
-    // Initial value for underlying comment body textarea
-    defaultValue: PropTypes.string,
     charCountEnable: PropTypes.bool.isRequired,
     maxCharCount: PropTypes.number,
-    cancelButtonClicked: PropTypes.func,
-
-    // Save the comment in the form.
-    // Will be passed { body: String }
-    saveComment: PropTypes.func.isRequired,
 
     // DOM ID for form input that edits comment body
     bodyInputId: PropTypes.string,
@@ -38,53 +32,63 @@ export class CommentForm extends React.Component {
     // render inside submit button
     submitText: PropTypes.node,
 
-    styles: PropTypes.shape({
-      textarea: PropTypes.string
-    }),
+    // cStyle for enabled submit <coral-ui/Button>
+    submitButtonCStyle: PropTypes.string,
 
-    // cStyle for enabled save <coral-ui/Button>
-    saveButtonCStyle: PropTypes.string,
-
-    // return whether the save button should be enabled for the provided
+    // return whether the submit button should be enabled for the provided
     // comment ({ body }) (for reasons other than charCount)
-    saveCommentEnabled: PropTypes.func,
+    submitEnabled: PropTypes.func,
 
     // className to add to buttons
-    buttonClass: PropTypes.string,
+    submitButtonClassName: PropTypes.string,
+    cancelButtonClassName: PropTypes.string,
+
+    body: PropTypes.string.isRequired,
+    onBodyChange: PropTypes.func.isRequired,
+    onSubmit: PropTypes.func.isRequired,
+    onCancel: PropTypes.func,
+    state: PropTypes.string,
+    loadingState: PropTypes.oneOf(['', 'loading', 'success', 'error']),
   }
   static get defaultProps() {
     return {
       bodyLabel: t('comment_box.comment'),
       bodyPlaceholder: t('comment_box.comment'),
       submitText: t('comment_box.post'),
-      saveButtonCStyle: 'darkGrey',
-      saveCommentEnabled: () => true,
+      submitButtonCStyle: 'darkGrey',
+      submitEnabled: () => true,
     };
   }
-  constructor(props) {
-    super(props);
-    this.onBodyChange = this.onBodyChange.bind(this);
-    this.onClickSubmit = this.onClickSubmit.bind(this);
-    this.state = {
-      body: props.defaultValue || ''
-    };
-  }
-  onBodyChange(e) {
-    this.setState({body: e.target.value});
-  }
-  onClickSubmit(e) {
-    e.preventDefault();
-    const {saveComment} = this.props;
-    const {body} = this.state;
-    saveComment({body});
-  }
-  render() {
-    const {maxCharCount, styles, saveCommentEnabled, buttonClass, charCountEnable} = this.props;
 
-    const body = this.state.body;
+  onBodyChange = (e) => {
+    this.props.onBodyChange(e.target.value);
+  }
+
+  onClickSubmit = () => {
+    this.props.onSubmit();
+  }
+
+  getButtonClassName = () => {
+    switch (this.props.loadingState) {
+    case 'loading':
+      return cn(`${name}-button-loading`, styles.buttonLoading);
+    case 'success':
+      return cn(`${name}-button-success`, styles.buttonSuccess);
+    case 'error':
+      return cn(`${name}-button-error`, styles.buttonError);
+    default:
+      return '';
+    }
+  }
+
+  render() {
+    const {maxCharCount, submitEnabled, cancelButtonClassName, submitButtonClassName, charCountEnable, body, loadingState} = this.props;
+
     const length = body.length;
     const isRespectingMaxCount = (length) => charCountEnable && maxCharCount && length > maxCharCount;
-    const disablePostComment = !length || isRespectingMaxCount(length) || !saveCommentEnabled({body});
+    const disableSubmitButton = !length || isRespectingMaxCount(length) || !submitEnabled({body}) || loadingState === 'loading';
+    const disableCancelButton = loadingState === 'loading';
+    const disableTextArea = loadingState === 'loading';
 
     return <div>
       <div className={`${name}-container`}>
@@ -95,13 +99,14 @@ export class CommentForm extends React.Component {
           {this.props.bodyLabel}
         </label>
         <textarea
-          style={styles && styles.textarea}
           className={`${name}-textarea`}
-          value={this.state.body}
+          value={body}
           placeholder={this.props.bodyPlaceholder}
           id={this.props.bodyInputId}
           onChange={this.onBodyChange}
-          rows={3}/>
+          rows={3}
+          disabled={disableTextArea}
+        />
         <Slot fill='commentInputArea' />
       </div>
       {
@@ -113,20 +118,22 @@ export class CommentForm extends React.Component {
       <div className={`${name}-button-container`}>
         { this.props.buttonContainerStart }
         {
-          typeof this.props.cancelButtonClicked === 'function' && (
+          typeof this.props.onCancel === 'function' && (
             <Button
               cStyle='darkGrey'
-              className={classnames(`${name}-cancel-button`, buttonClass)}
-              onClick={this.props.cancelButtonClicked}>
+              className={cn(`${name}-cancel-button`, cancelButtonClassName)}
+              onClick={this.props.onCancel}
+              disabled={disableCancelButton}
+            >
               {t('comment_box.cancel')}
             </Button>
           )
         }
         <Button
-          cStyle={disablePostComment ? 'lightGrey' : this.props.saveButtonCStyle}
-          className={classnames(`${name}-button`, buttonClass)}
+          cStyle={disableSubmitButton ? 'lightGrey' : this.props.submitButtonCStyle}
+          className={cn(`${name}-button`, submitButtonClassName, this.getButtonClassName())}
           onClick={this.onClickSubmit}
-          disabled={disablePostComment ? 'disabled' : ''}>
+          disabled={disableSubmitButton ? 'disabled' : ''}>
           {this.props.submitText}
         </Button>
       </div>
diff --git a/client/coral-plugin-commentbox/styles.css b/client/coral-plugin-commentbox/styles.css
index d0f851f18..23b6564b5 100644
--- a/client/coral-plugin-commentbox/styles.css
+++ b/client/coral-plugin-commentbox/styles.css
@@ -1,6 +1,90 @@
-.slot {
-  display: inline-block;
-  div {
-    display: inline-block;
-    }
+/**
+ * Example loading state animations on the button.
+ */
+
+/*
+
+@-webkit-keyframes sk-scaleout {
+  0% { -webkit-transform: scale(0) }
+  100% {
+    -webkit-transform: scale(1.0);
+    opacity: 0;
+  }
 }
+
+@keyframes sk-scaleout {
+  0% {
+    -webkit-transform: scale(0);
+    transform: scale(0);
+  } 100% {
+    -webkit-transform: scale(1.0);
+    transform: scale(1.0);
+    opacity: 0;
+  }
+}
+
+@keyframes comeAndGo {
+  0% {
+    opacity: 0;
+  }
+  50% {
+    opacity: 1.0;
+  }
+  100% {
+    opacity: 0;
+  }
+}
+
+.buttonLoading, .buttonLoading:disabled, .buttonLoading:hover {
+  transition: none;
+  font-weight: normal;
+}
+
+.buttonSuccess, .buttonSuccess:disabled, .buttonSuccess:hover  {
+}
+
+.buttonSuccess::before {
+  content: '✓';
+  display: block;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  padding: 3px 0px;
+  animation: comeAndGo 2s forwards;
+  background: rgb(51, 204, 51);
+  color: white;
+}
+
+.buttonLoading::before {
+  content: '';
+  display: inline-block;
+  width: 40px;
+  height: 40px;
+  position: absolute;
+  top: 0px;
+  background-color: #333;
+  border-radius: 100%;
+  -webkit-animation: sk-scaleout 1.0s infinite ease-in-out;
+  animation: sk-scaleout 1.0s infinite ease-in-out;
+}
+
+.buttonError, .buttonError:disabled, .buttonError:hover  {
+}
+
+.buttonError::before {
+  content: '×';
+  display: block;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  padding: 3px 0px;
+  animation: comeAndGo 2s forwards;
+  background: rgb(250, 100, 100);
+  color: white;
+}
+
+*/
diff --git a/client/coral-plugin-replies/ReplyBox.js b/client/coral-plugin-replies/ReplyBox.js
index cc8e8045f..7e0bd04d5 100644
--- a/client/coral-plugin-replies/ReplyBox.js
+++ b/client/coral-plugin-replies/ReplyBox.js
@@ -31,7 +31,7 @@ class ReplyBox extends Component {
         charCountEnable={charCountEnable}
         commentPostedHandler={commentPostedHandler}
         parentId={parentId}
-        cancelButtonClicked={this.cancelReply}
+        onCancel={this.cancelReply}
         addNotification={addNotification}
         currentUser={currentUser}
         assetId={assetId}
diff --git a/client/coral-ui/components/Button.css b/client/coral-ui/components/Button.css
index 409fc1bc6..7bd1d4379 100644
--- a/client/coral-ui/components/Button.css
+++ b/client/coral-ui/components/Button.css
@@ -24,12 +24,6 @@
     margin: 2px;
     letter-spacing: 0.7px;
     font-weight: 400;
-
-    &:disabled {
-      background: #E0E0E0;
-      color: #4f5c67;
-      font-weight: bold;
-    }
 }
 
 .icon {
@@ -224,3 +218,11 @@
 .raised {
   box-shadow: 0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);
 }
+
+
+.button:disabled {
+  background: #E0E0E0;
+  color: #4f5c67;
+  font-weight: bold;
+  cursor: default;
+}
diff --git a/locales/en.yml b/locales/en.yml
index 03256e75e..cb8927534 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -166,7 +166,6 @@ en:
     edit_window_timer_prefix: "Edit Window: "
     second: "second"
     seconds_plural: "seconds"
-    unexpected_error: "Unexpected error while saving changes. Sorry!"
   email:
     confirm:
       has_been_requested: "A email confirmation has been requested for the following account:"
@@ -207,6 +206,7 @@ en:
     organization_name: "Organization name must only contain letters or numbers."
     password: "Password must be at least 8 characters"
     username: "Usernames can contain letters numbers and _ only"
+    unexpected: "Unexpected error occurred. Sorry!"
   flag_comment: "Report comment"
   flag_reason: "Reason for reporting (Optional)"
   flag_username: "Report username"
diff --git a/locales/es.yml b/locales/es.yml
index 7297fedd5..c8a4ddab3 100644
--- a/locales/es.yml
+++ b/locales/es.yml
@@ -165,7 +165,6 @@ es:
     edit_window_timer_prefix: "Ventana Edición:"
     second: "segundo"
     seconds_plural: "segundos"
-    unexpected_error: "Lo siento. Ha habido un error no previsto al guardar los cambios."
   email:
     confirm:
       has_been_requested: "Un correo de confirmación ha sido pedido para la siguiente cuenta:"
@@ -192,6 +191,7 @@ es:
     email_required: "Se requiere un correo"
     email_username_in_use: "Correo o nombre en uso."
     INVALID_ASSET_URL: "La URL del articulo no es valida"
+    unexpected_error: "Lo siento. Ha habido un error no previsto."
     login_maximum_exceeded: "Ha realizado demasiados intentos fallidos de usar la contraseña. Por favor espere."
     network_error: "Error al conectar con el servidor. Compruebe su conexión a Internet y vuelva a intentarlo."
     NOT_AUTHORIZED: "Acción no autorizada."

From c1807daeafcdd0a099e8e1e56c2b51cad58418a1 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 30 Jun 2017 21:10:19 +0700
Subject: [PATCH 257/264] Correct spanish translation key

---
 locales/es.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/es.yml b/locales/es.yml
index ef29e9873..6a0334fcd 100644
--- a/locales/es.yml
+++ b/locales/es.yml
@@ -192,7 +192,7 @@ es:
     email_required: "Se requiere un correo"
     email_username_in_use: "Correo o nombre en uso."
     INVALID_ASSET_URL: "La URL del articulo no es valida"
-    unexpected_error: "Lo siento. Ha habido un error no previsto."
+    unexpected: "Lo siento. Ha habido un error no previsto."
     login_maximum_exceeded: "Ha realizado demasiados intentos fallidos de usar la contraseña. Por favor espere."
     network_error: "Error al conectar con el servidor. Compruebe su conexión a Internet y vuelva a intentarlo."
     NOT_AUTHORIZED: "Acción no autorizada."

From 7858ccc45db57dd3e64dd56a575b7e43c663a262 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 30 Jun 2017 23:25:11 +0700
Subject: [PATCH 258/264] Switch to prop-types

---
 client/coral-embed-stream/src/components/LoadMore.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/coral-embed-stream/src/components/LoadMore.js b/client/coral-embed-stream/src/components/LoadMore.js
index e05931581..a2f3d7824 100644
--- a/client/coral-embed-stream/src/components/LoadMore.js
+++ b/client/coral-embed-stream/src/components/LoadMore.js
@@ -1,4 +1,5 @@
-import React, {PropTypes} from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import {Button} from 'coral-ui';
 import t from 'coral-framework/services/i18n';
 import cn from 'classnames';

From 0973600e68d6026f6f722d7b4acbfa544b56ed01 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Fri, 30 Jun 2017 17:45:45 +0100
Subject: [PATCH 259/264] Update yarn.lock

---
 yarn.lock | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/yarn.lock b/yarn.lock
index f98887478..9de2c35fa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8283,6 +8283,10 @@ urijs@1.16.1:
   version "1.16.1"
   resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.16.1.tgz#859ad31890f5f9528727be89f1932c94fb4731e2"
 
+url-search-params@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/url-search-params/-/url-search-params-0.9.0.tgz#e71d7764a6503533cbfe9771b2963cb61ea1c225"
+
 url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"

From 270c3b76349b7c239e0cd165c745416c4f7a518e Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Mon, 3 Jul 2017 19:01:17 +0700
Subject: [PATCH 260/264] Disable plugin components via plugin_config

---
 client/coral-framework/helpers/plugins.js | 22 +++++++++++++++++-----
 plugin-api/beta/client/services/index.js  |  1 +
 views/article.ejs                         |  7 +++++++
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/client/coral-framework/helpers/plugins.js b/client/coral-framework/helpers/plugins.js
index e0aa05c80..bb21bef6c 100644
--- a/client/coral-framework/helpers/plugins.js
+++ b/client/coral-framework/helpers/plugins.js
@@ -7,17 +7,29 @@ import flatten from 'lodash/flatten';
 import flattenDeep from 'lodash/flattenDeep';
 import {getDefinitionName, mergeDocuments} from 'coral-framework/utils';
 import {loadTranslations} from 'coral-framework/services/i18n';
-import {injectReducers} from 'coral-framework/services/store';
+import {injectReducers, getStore} from 'coral-framework/services/store';
 import camelize from './camelize';
 
+function getSlotComponents(slot) {
+  const pluginConfig = getStore().getState().config.plugin_config;
+  return flatten(plugins
+
+    // Filter out components that have been disabled in `plugin_config`
+    .filter((o) => !pluginConfig[o.plugin] || !pluginConfig[o.plugin].disable_components)
+
+    .filter((o) => o.module.slots[slot])
+    .map((o) => o.module.slots[slot]));
+}
+
+export function isSlotEmpty(slot) {
+  return !!getSlotComponents(slot).length;
+}
+
 /**
  * Returns React Elements for given slot.
  */
 export function getSlotElements(slot, props = {}) {
-  const components = flatten(plugins
-    .filter((o) => o.module.slots[slot])
-    .map((o) => o.module.slots[slot]));
-  return components
+  return getSlotComponents(slot)
     .map((component, i) => React.createElement(component, {key: i, ...props}));
 }
 
diff --git a/plugin-api/beta/client/services/index.js b/plugin-api/beta/client/services/index.js
index 509d4f55c..ddaa346ab 100644
--- a/plugin-api/beta/client/services/index.js
+++ b/plugin-api/beta/client/services/index.js
@@ -1,2 +1,3 @@
 export {t} from 'coral-framework/services/i18n';
 export {can} from 'coral-framework/services/perms';
+export {isSlotEmpty} from 'coral-framework/helpers/plugins';
diff --git a/views/article.ejs b/views/article.ejs
index c216f158d..d803b6295 100644
--- a/views/article.ejs
+++ b/views/article.ejs
@@ -31,6 +31,13 @@
         asset_id: '<%= asset_id ? asset_id : '' %>',
         auth_token: '',
         plugin_config: {
+          /**
+           *  You can disable rendering slot components of a plugin by doing:
+           *
+           *  'coral-plugin-love': {
+           *    disable_components: true,
+           *  },
+           */
           test: 'data',
           debug: false
         }

From fd1f8b24c141fb3987b085762b5863b49b57f772 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Mon, 3 Jul 2017 19:33:33 +0700
Subject: [PATCH 261/264] Don't show popup when empty

---
 client/coral-framework/actions/auth.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js
index 05e078010..53d0f1212 100644
--- a/client/coral-framework/actions/auth.js
+++ b/client/coral-framework/actions/auth.js
@@ -7,8 +7,12 @@ import pym from '../services/PymConnection';
 
 import {resetWebsocket} from 'coral-framework/services/client';
 import t from 'coral-framework/services/i18n';
+import {isSlotEmpty} from 'plugin-api/beta/client/services';
 
 export const showSignInDialog = () => (dispatch, getState) => {
+  if (isSlotEmpty('login')) {
+    return;
+  }
   const signInPopUp = window.open(
     '/embed/stream/login',
     'Login',

From 2f0628143961a6bf7364d5bbb766f24aa67a5124 Mon Sep 17 00:00:00 2001
From: David Erwin <davidjerwin@gmail.com>
Date: Mon, 3 Jul 2017 10:03:51 -0400
Subject: [PATCH 262/264] Move contributor's guide

---
 CONTRIBUTING.md            | 89 +++++++++++++++++++++++++++++++++++
 docs/contributors-guide.md | 96 +-------------------------------------
 2 files changed, 90 insertions(+), 95 deletions(-)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..3b316dbce
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,89 @@
+# Contributor's Guide
+
+Welcome! We are very excited that you are interested in contributing to Talk.
+
+This document is a companion to help you approach contributing. If it does not do so, please [let us know how we can improve it](https://github.com/coralproject/talk/issues)!
+
+By contributing to this project you agree to the [Code of Conduct](https://coralproject.net/code-of-conduct.html).
+
+## What should I Contribute?
+
+There are four main ways to contribute to Talk:
+
+* Writing Code
+* Writing Docs
+* Participating in conversation
+* Providing Translations
+
+## Contributing Code
+
+### Create an Issue
+
+Conversation surrounding contributions begins in [issues](https://github.com/coralproject/talk/issues).
+
+#### When should I file?
+
+File early, preferably before beginning any programming in earnest.
+
+Please file issues if:
+
+* you would like to contribute to Talk Core.
+* you are building a Plugin that the current Plugin API doesn't support.
+* you are building a Plugin and want advice
+
+#### What should I include?
+
+Coral has adopted an iterative, agile development philosophy. All contributions that make it into the Talk repo should start with a story or this form:
+
+`As a [type of person] I'd like to be able to [do something] so that I can [get some result].`
+
+This exercise does two things:
+
+* allows us to ground our technical choices in a clear, simple product need.
+* expresses that product need in a way that doesn't imply a specific technical solution allowing for debate as to the best way to solve the problem.
+
+Please feel free to provide as much detail as possible when filing the issue but please do keep the initial issue specific to one need and try to avoid including technical or design solutions.
+
+If you have a specific technical or design solution in mind, please submit it as the first comment on the thread.
+
+## Contributing Documentation
+
+Clear docs are a prerequisite for a successful open source project. Contributing to the documentation is often more important than contributing to the code!
+
+We are looking for _documentarians_ to:
+
+* make clarity, grammar and completeness updates,
+* create new / missing sections, and
+* take the lead in making sections, or the over all structure better.
+
+Information about how to update docs can be found in our [FAQ](faq.html#how-do-i-contribute-to-these-docs).
+
+If you'd like to discuss a contribution, please [file an issue](https://github.com/coralproject/talk/issues) describing the changes you would like to see.
+
+## Contributing Translations
+
+Talk's tranlations are stored in `.yml` files [here](https://github.com/coralproject/talk/tree/master/locales).
+
+Translations can be submitted via pull request. If you do not use github, you can use 'en.yml' as a template and [email](https://coralproject.net/contact.html) the translations to us. We can import it into the repo.  
+
+## I want to contribute but I'm not sure what to do!
+
+If you want to contribute but don't have a clear idea of exactly what that may be, here are some resources that may help:
+
+### Product Roadmap
+
+Please visit our product roadmap here: https://www.pivotaltracker.com/n/projects/1863625. If you'd like to take on any of our scheduled tasks we'd be forever grateful!
+
+### Discussion Forum
+
+If you'd like to discuss what we're up to, please visit or [community](https://community.coralproject.net/) or [contact us](https://coralproject.net/contact.html).
+
+### Integrations
+
+Have a favorite analytics engine? Data science service? CMS? Auth platform? Deployment platform or pipeline? Pet project? Consider building a plugin to integrate them!
+
+### Favorite Features?
+
+Do you have a favorite feature of an existing platform that's not yet been done in Talk? Sounds like Talk needs that feature.
+
+## Thanks!
diff --git a/docs/contributors-guide.md b/docs/contributors-guide.md
index 7b4fe4562..792055772 100644
--- a/docs/contributors-guide.md
+++ b/docs/contributors-guide.md
@@ -6,98 +6,4 @@ permalink: contribute.html
 summary:
 ---
 
-
-Welcome! This guide is meant 
-
-## What should I Contribute?
-
-There are three main ways to contribute to Talk:
-
-* Writing Code
-* Writing Docs
-* Participating in conversation
-* Translating
-
-## Contributing Code
-
-The first question to ask is where your contribution fits into Talk's plugin / core architecture. 
-
-Talk core consists of architecture and functionality that deliver stability, security, scalability, extendability and other *abilities. In addition, the Core contains features and functionality that is essential to the operation of Talk as a product.
-
-Talk plugins deliver the featuers and functionality that can be changed or removed. Much of the default functionality is delivered by plugins allowing developers to change behavior along product lines that we've found to be important.
-
-Our goal is to continually extend our plugin infrastructure making the Core as pluggable as possible. Ultimately, a day may come where the Core of Talk is simply a framework for delivering a certain flavor of web applications.
-
-### Should I contribute via a Plugin or to the Core?
-
-Ask these questions:
-
-1) Does Talk's exiting Plugin APIs support the thing you want to build? 
-
-If so, then you should build it as a plugin. Feel free to explore here on your own or reach out to us. We love to advise on plugins, so please feel free to _specify your contribution_ as described below to start a conversation. We will help you conceptualize, architect and promote your plugin if it is in line with our values.
-
-2) If the current Plugin API doesn't support your idea, should the API be extended to do so?
-
-As mentioned above, we seek to interatively extend the Talk Plugin API. How do we know what the next iteration will be? Your ideas. If you want to build a plugin that isn't supported, please _specify your contribution_ as described below and we will discuss how the Core may be extended to support not only your specific idea, but other's ideas as well.
-
-Quite often the only things missing from Core are things like _events_, _slots_, _CSS classes_, etc... Adding these is a great way to become a Core Contibutor and break new ground as a Plugin Developer.
-
-3) Is my idea really just Core?
-
-Amazing! We are always looking to extend the capabilities of Talk. We look forward to discussing what you've got to bring!
-
-
-### Specify your Contribution
-
-Coral has adopted an iterative, agile development philosophy. All contributions that make it into the Talk repo should start with a story or this form:
-
-`As a [type of person] I'd like to be able to [do something] so that I can [get some result].`
-
-We have found that the exercise of expressing our next steps in this format allows us to ground our technical choices in a clear, simple product need. It also expresses that product need in a way that doesn't imply a specific technical solution allowing for debate as to the best way to solve the problem.
-
-
-## Contributing Documentation
-
-Clear docs are a prerequisite for a successful open source project. Contributing to the documentation is often more important than contributing to the code!
-
-We are looking for _documentarians_ to:
-
-* make clarity, grammar and completeness updates,
-* create new / missing sections, and
-* take the lead in making sections, or the over all structure better.
-
-Information about how to update docs can be found in our [FAQ](faq.html#how-do-i-contribute-to-these-docs).
-
-If you'd like to make a significant contribution, please [file an issue](https://github.com/coralproject/talk/issues) describing the changes you would like to make and we'll begin the conversation. 
-
-## Contributing Translations
-
-Talk's tranlations are stored in `.yml` files [here](https://github.com/coralproject/talk/tree/master/locales). 
-
-Translations can be submitted via pull request. localIf you do not use github, you can use 'en.yml' as a template and email the translations to us and we can import it into the repo.  
-
-## I want to contribute but I'm not sure what to do!
-
-If you want to contribute but don't have a clear idea of exactly what that may be, here are some resources that may help:
-
-### Product Roadmap
-
-Please visit our product roadmap here: https://www.pivotaltracker.com/n/projects/1863625. If you'd like to take on any of our scheduled tasks we'd be forever grateful!
-
-### Discussion Forum
-
-If you'd like to discuss what we're up to, please visit or [community](https://community.coralproject.net/) or [contact us](https://coralproject.net/contact.html).
-
-### Integrations
-
-Have a favorite analytics engine? Data science service? CMS? Auth platform? Deployment platform or pipeline? Pet project? Consider building a plugin to integrate them!
-
-### Favorite Features?
-
-Do you have a favorite feature of an exisitng platform that's not yet been done in Talk? Sounds like Talk needs that feature.
-
-## Thanks!
-
-By contributing to this project you agree to the [Code of Conduct](https://coralproject.net/code-of-conduct.html).
-
-
+Our Contributor's Guide can be found [here](https://github.com/coralproject/talk/blob/master/CONTRIBUTING.md).

From a50b39091fe8ddf597c2d92937095ae246f8c263 Mon Sep 17 00:00:00 2001
From: David Erwin <davidjerwin@gmail.com>
Date: Mon, 3 Jul 2017 10:13:09 -0400
Subject: [PATCH 263/264] ABC Always Be Clarifying

---
 CONTRIBUTING.md | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3b316dbce..140105723 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,30 +8,27 @@ By contributing to this project you agree to the [Code of Conduct](https://coral
 
 ## What should I Contribute?
 
-There are four main ways to contribute to Talk:
+There are at least three ways to contribute to Talk:
 
 * Writing Code
 * Writing Docs
-* Participating in conversation
 * Providing Translations
 
-## Contributing Code
-
-### Create an Issue
+## Writing Code
 
 Conversation surrounding contributions begins in [issues](https://github.com/coralproject/talk/issues).
 
-#### When should I file?
+### When should I Create an Issue?
 
-File early, preferably before beginning any programming in earnest.
+File an issue as soon as you have an idea of something you'd like to contribute. We would love to hear what you're thinking and help refine the idea to make it into the Talk ecosystem.
 
 Please file issues if:
 
 * you would like to contribute to Talk Core.
 * you are building a Plugin that the current Plugin API doesn't support.
-* you are building a Plugin and want advice
+* you are building a Plugin and want advice.
 
-#### What should I include?
+### What should I include?
 
 Coral has adopted an iterative, agile development philosophy. All contributions that make it into the Talk repo should start with a story or this form:
 

From cfa7a74742d77307fa1f94d6c9bf16bd681ac189 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 4 Jul 2017 22:22:52 +0700
Subject: [PATCH 264/264] Fix isSlotEmpty logic and handle empty plugin_config

---
 client/coral-framework/helpers/plugins.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/coral-framework/helpers/plugins.js b/client/coral-framework/helpers/plugins.js
index bb21bef6c..ab5e3080e 100644
--- a/client/coral-framework/helpers/plugins.js
+++ b/client/coral-framework/helpers/plugins.js
@@ -12,17 +12,19 @@ import camelize from './camelize';
 
 function getSlotComponents(slot) {
   const pluginConfig = getStore().getState().config.plugin_config;
+
+    // Filter out components that have been disabled in `plugin_config`
   return flatten(plugins
 
     // Filter out components that have been disabled in `plugin_config`
-    .filter((o) => !pluginConfig[o.plugin] || !pluginConfig[o.plugin].disable_components)
+    .filter((o) => !pluginConfig || !pluginConfig[o.plugin] || !pluginConfig[o.plugin].disable_components)
 
     .filter((o) => o.module.slots[slot])
     .map((o) => o.module.slots[slot]));
 }
 
 export function isSlotEmpty(slot) {
-  return !!getSlotComponents(slot).length;
+  return getSlotComponents(slot).length === 0;
 }
 
 /**