From d497ad33694633d40e4768fd1dbbdfa04bdafe6e Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 11 May 2017 17:27:02 -0600
Subject: [PATCH 01/16] initial pagination rewrite, cleanups to comment edit

---
 client/coral-framework/translations.json   |   2 +-
 errors.js                                  |  13 +-
 graph/loaders/assets.js                    |  31 +-
 graph/loaders/comments.js                  |  34 +-
 graph/mutators/action.js                   |  20 +-
 graph/mutators/comment.js                  | 233 +++---
 graph/mutators/user.js                     |  16 +-
 graph/resolvers/asset.js                   |   2 +-
 graph/typeDefs.graphql                     |  43 +-
 package.json                               |   6 +-
 services/comments.js                       | 149 ++--
 test/server/graph/mutations/editComment.js |  11 +-
 test/server/graph/queries/asset.js         | 113 +--
 yarn.lock                                  | 791 +++++++++++----------
 14 files changed, 721 insertions(+), 743 deletions(-)

diff --git a/client/coral-framework/translations.json b/client/coral-framework/translations.json
index 40860fc3a..f2b0ad1cc 100644
--- a/client/coral-framework/translations.json
+++ b/client/coral-framework/translations.json
@@ -33,7 +33,7 @@
       "unexpectedError": "Unexpected error while saving changes. Sorry!"
     },
     "error": {
-      "editWindowExpired": "You can no longer edit this comment. The time window to do so has expired.",
+      "EDIT_WINDOW_ENDED": "You can no longer edit this comment. The time window to do so has expired.",
       "emailNotVerified": "Email address {0} not verified.",
       "email": "Not a valid E-Mail",
       "networkError": "Failed to connect to server. Check your internet connection and try again.",
diff --git a/errors.js b/errors.js
index 19b0ec90c..94bed0d12 100644
--- a/errors.js
+++ b/errors.js
@@ -112,10 +112,12 @@ const ErrContainsProfanity = new APIError('This username contains elements which
 });
 
 const ErrNotFound = new APIError('not found', {
+  translation_key: 'NOT_FOUND',
   status: 404
 });
 
 const ErrInvalidAssetURL = new APIError('asset_url is invalid', {
+  translation_key: 'INVALID_ASSET_URL',
   status: 400
 });
 
@@ -148,16 +150,17 @@ const ErrPermissionUpdateUsername = new APIError('You do not have permission to
   status: 500
 });
 
+// ErrLoginAttemptMaximumExceeded is returned when the login maximum is exceeded.
 const ErrLoginAttemptMaximumExceeded = new APIError('You have made too many incorrect password attempts.', {
   translation_key: 'LOGIN_MAXIMUM_EXCEEDED',
   status: 429
 });
 
-class ErrEditWindowHasEnded extends APIError {
-  constructor(message) {
-    super(message || 'Edit window is over.', {status: 403, translation_key: 'error.editWindowExpired'});
-  }
-}
+// ErrEditWindowHasEnded is returned when the edit window has expired.
+const ErrEditWindowHasEnded = new APIError('Edit window is over', {
+  translation_key: 'EDIT_WINDOW_ENDED',
+  status: 403
+});
 
 module.exports = {
   ExtendableError,
diff --git a/graph/loaders/assets.js b/graph/loaders/assets.js
index ba8fb3751..d74199279 100644
--- a/graph/loaders/assets.js
+++ b/graph/loaders/assets.js
@@ -25,34 +25,31 @@ const genAssetsByID = (context, ids) => AssetModel.find({
  * @param   {String} asset_url the url passed in from the query
  * @returns {Promise}          resolves to the asset
  */
-const findOrCreateAssetByURL = (context, asset_url) => {
+const findOrCreateAssetByURL = async (context, asset_url) => {
 
   // Verify that the asset_url is parsable.
   let parsed_asset_url = url.parse(asset_url);
   if (!parsed_asset_url.protocol) {
-    return Promise.reject(errors.ErrInvalidAssetURL);
+    throw errors.ErrInvalidAssetURL;
   }
 
-  return AssetsService.findOrCreateByUrl(asset_url)
-    .then((asset) => {
+  let asset = await AssetsService.findOrCreateByUrl(asset_url);
 
-      // If the asset wasn't scraped before, scrape it! Otherwise just return
-      // the asset.
-      if (!asset.scraped) {
-        return scraper.create(asset).then(() => asset);
-      }
+  // If the asset wasn't scraped before, scrape it! Otherwise just return
+  // the asset.
+  if (!asset.scraped) {
+    await scraper.create(asset);
+  }
 
-      return asset;
-    });
+  return asset;
 };
 
-const getAssetsForMetrics = ({loaders: {Actions, Comments}}) => {
-  return Actions.getByTypes({action_type: 'FLAG', item_type: 'COMMENT'})
-    .then((actions) => { // ALL ACTIONS :O
-      const ids = actions.map(({item_id}) => item_id);
+const getAssetsForMetrics = async ({loaders: {Actions, Comments}}) => {
+  let actions = await Actions.getByTypes({action_type: 'FLAG', item_type: 'COMMENT'});
 
-      return Comments.getByQuery({ids});
-    });
+  const ids = actions.map(({item_id}) => item_id);
+
+  return Comments.getByQuery({ids});
 };
 
 /**
diff --git a/graph/loaders/comments.js b/graph/loaders/comments.js
index 0faa124da..cc2a5dd09 100644
--- a/graph/loaders/comments.js
+++ b/graph/loaders/comments.js
@@ -120,8 +120,8 @@ const getParentCountByAssetIDPersonalized = async (context, {assetId, excludeIgn
     const ignoredUsers = freshUser.ignoresUsers;
     query.author_id = {$nin: ignoredUsers};
   }
-  const count = await CommentModel.where(query).count();
-  return count;
+  
+  return CommentModel.where(query).count();
 };
 
 /**
@@ -263,13 +263,9 @@ const getCommentsByQuery = async ({user}, {ids, statuses, asset_id, parent_id, a
     comments = comments.where({parent_id});
   }
 
-  if (excludeIgnored && user) {
-
-    // load afresh, as `user` may be from cache and not have recent ignores
-    const freshUser = await UsersService.findById(user.id);
-    const ignoredUsers = freshUser.ignoresUsers;
+  if (excludeIgnored && user && user.ignoresUsers) {
     comments = comments.where({
-      author_id: {$nin: ignoredUsers}
+      author_id: {$nin: user.ignoresUsers}
     });
   }
 
@@ -294,6 +290,27 @@ const getCommentsByQuery = async ({user}, {ids, statuses, asset_id, parent_id, a
     .limit(limit);
 };
 
+const getCommentsConnection = async ({user}, query) => {
+  let {limit} = query;
+  
+  // Increate the limit by one.
+  query.limit++;
+
+  let comments = await getCommentsByQuery({user}, query);
+
+  if (!comments) {
+    comments = [];
+  }
+
+  return {
+    edges: comments.slice(0, limit),
+    pageInfo: {
+      hasNextPage: Boolean(comments.length > limit),
+      cursor: comments.length > 0 ? comments[comments.length - 1].created_at : null
+    }
+  };
+};
+
 /**
  * Gets the recent replies.
  * @param  {Object}        context   graph context
@@ -431,6 +448,7 @@ module.exports = (context) => ({
   Comments: {
     get: new DataLoader((ids) => genComments(context, ids)),
     getByQuery: (query) => getCommentsByQuery(context, query),
+    getConnection: (query) => getCommentsConnection(context, query),
     getCountByQuery: (query) => getCommentCountByQuery(context, query),
     countByAssetID: new SharedCounterDataLoader('Comments.totalCommentCount', 3600, (ids) => getCountsByAssetID(context, ids)),
     countByAssetIDPersonalized: (query) => getCountsByAssetIDPersonalized(context, query),
diff --git a/graph/mutators/action.js b/graph/mutators/action.js
index a572a641c..c5f225e33 100644
--- a/graph/mutators/action.js
+++ b/graph/mutators/action.js
@@ -12,23 +12,23 @@ const errors = require('../../errors');
  * @param  {String} action_type type of the action
  * @return {Promise}            resolves to the action created
  */
-const createAction = ({user = {}}, {item_id, item_type, action_type, group_id, metadata = {}}) => {
-  return ActionsService.insertUserAction({
+const createAction = async ({user = {}}, {item_id, item_type, action_type, group_id, metadata = {}}) => {
+  let action = await ActionsService.insertUserAction({
     item_id,
     item_type,
     user_id: user.id,
     group_id,
     action_type,
     metadata
-  }).then((action) => {
-    if (item_type === 'USERS' && action_type === 'FLAG') {
-      return UsersService
-        .setStatus(item_id, 'PENDING')
-        .then(() => action);
-    }
-
-    return action;
   });
+
+  if (item_type === 'USERS' && action_type === 'FLAG') {
+
+    // Set the user as pending if it was a user flag.
+    await UsersService.setStatus(item_id, 'PENDING');
+  }
+
+  return action;
 };
 
 /**
diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index 7e5bc3a1b..ddbcf9c5d 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 = async ({user, loaders: {Comments}, pubsub}, {body, asset_id, parent_id = null, tags = []}, status = 'NONE') => {
 
   // Building array of tags
   tags = tags.map(tag => ({name: tag}));
@@ -26,37 +26,35 @@ const createComment = ({user, loaders: {Comments}, pubsub}, {body, asset_id, par
     tags.push({name: 'STAFF'});
   }
 
-  return CommentsService.publicCreate({
+  let comment = await CommentsService.publicCreate({
     body,
     asset_id,
     parent_id,
     status,
     tags,
     author_id: 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
-    // perform these increments in the event that we do have a new comment that
-    // is approved or without a comment.
-    if (status === 'NONE' || status === 'APPROVED') {
-      if (parent_id != null) {
-        Comments.countByParentID.incr(parent_id);
-      } else {
-        Comments.parentCountByAssetID.incr(asset_id);
-      }
-      Comments.countByAssetID.incr(asset_id);
-
-      if (pubsub) {
-
-        // Publish the newly added comment via the subscription.
-        pubsub.publish('commentAdded', comment);
-      }
-    }
-
-    return 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
+  // perform these increments in the event that we do have a new comment that
+  // is approved or without a comment.
+  if (status === 'NONE' || status === 'APPROVED') {
+    if (parent_id != null) {
+      Comments.countByParentID.incr(parent_id);
+    } else {
+      Comments.parentCountByAssetID.incr(asset_id);
+    }
+    Comments.countByAssetID.incr(asset_id);
+
+    if (pubsub) {
+
+      // Publish the newly added comment via the subscription.
+      pubsub.publish('commentAdded', comment);
+    }
+  }
+
+  return comment;
 };
 
 /**
@@ -65,7 +63,7 @@ const createComment = ({user, loaders: {Comments}, pubsub}, {body, asset_id, par
  * @param  {String} [asset_id]  id of asset comment is posted on
  * @return {Object}         resolves to the wordlist results
  */
-const filterNewComment = ({body, asset_id}) => {
+const filterNewComment = (context, {body, asset_id}) => {
 
   // Create a new instance of the Wordlist.
   const wl = new Wordlist();
@@ -85,50 +83,40 @@ const filterNewComment = ({body, asset_id}) => {
  * @param  {Object} [wordlist={}] the results of the wordlist scan
  * @return {Promise}              resolves to the comment's status
  */
-const resolveNewCommentStatus = ({asset_id, body}, wordlist = {}, settings = {}) => {
+const resolveNewCommentStatus = async (context, {asset_id, body}, wordlist = {}, settings = {}) => {
 
   // Decide the status based on whether or not the current asset/settings
   // has pre-mod enabled or not. If the comment was rejected based on the
   // wordlist, then reject it, otherwise if the moderation setting is
   // premod, set it to `premod`.
-  let status;
-
   if (wordlist.banned) {
-    status = Promise.resolve('REJECTED');
-  } else if (settings.premodLinksEnable && linkify.test(body)) {
-    status = Promise.resolve('PREMOD');
-  } else if (asset_id) {
-    status = AssetsService
-      .rectifySettings(AssetsService.findById(asset_id).then((asset) => {
-        if (!asset) {
-          return Promise.reject(errors.ErrNotFound);
-        }
-
-        // Check to see if the asset has closed commenting...
-        if (asset.isClosed) {
-
-          // They have, ensure that we send back an error.
-          return Promise.reject(new errors.ErrAssetCommentingClosed(asset.closedMessage));
-        }
-
-        return asset;
-      }))
-
-      // Return `premod` if pre-moderation is enabled and an empty "new" status
-      // in the event that it is not in pre-moderation mode.
-      .then(({moderation, charCountEnable, charCount}) => {
-
-        // Reject if the comment is too long
-        if (charCountEnable && body.length > charCount) {
-          return 'REJECTED';
-        }
-        return moderation === 'PRE' ? 'PREMOD' : 'NONE';
-      });
-  } else {
-    status = 'NONE';
+    return 'REJECTED';
+  }
+  
+  if (settings.premodLinksEnable && linkify.test(body)) {
+    return 'PREMOD';
   }
 
-  return status;
+  let asset = await AssetsService.findById(asset_id);
+  if (!asset) {
+    throw errors.ErrNotFound;
+  }
+
+  // Check to see if the asset has closed commenting...
+  if (asset.isClosed) {
+    throw new errors.ErrAssetCommentingClosed(asset.closedMessage);
+  }
+
+  // Return `premod` if pre-moderation is enabled and an empty "new" status
+  // in the event that it is not in pre-moderation mode.
+  let {moderation, charCountEnable, charCount} = await AssetsService.rectifySettings(asset);
+
+  // Reject if the comment is too long
+  if (charCountEnable && body.length > charCount) {
+    return 'REJECTED';
+  }
+
+  return moderation === 'PRE' ? 'PREMOD' : 'NONE';
 };
 
 /**
@@ -139,45 +127,42 @@ const resolveNewCommentStatus = ({asset_id, body}, wordlist = {}, settings = {})
  * @param  {Object} commentInput the new comment to be created
  * @return {Promise}             resolves to a new comment
  */
-const createPublicComment = (context, commentInput) => {
+const createPublicComment = async (context, commentInput) => {
 
   // First we filter the comment contents to ensure that we note any validation
   // issues.
-  return filterNewComment(commentInput)
+  let [wordlist, settings] = await filterNewComment(context, commentInput);
 
-    // We then take the wordlist and the comment into consideration when
-    // considering what status to assign the new comment, and resolve the new
-    // status to set the comment to.
-    .then(([wordlist, settings]) => resolveNewCommentStatus(commentInput, wordlist, settings)
+  // We then take the wordlist and the comment into consideration when
+  // considering what status to assign the new comment, and resolve the new
+  // status to set the comment to.
+  let status = await resolveNewCommentStatus(context, commentInput, wordlist, settings);
 
-      // Then we actually create the comment with the new status.
-      .then((status) => createComment(context, commentInput, status))
-      .then((comment) => {
+  // Then we actually create the comment with the new status.
+  let comment = await createComment(context, commentInput, status);
 
-        // If the comment has a suspect word or a link, we need to add a
-        // flag to it to indicate that it needs to be looked at.
-        // Otherwise just return the new comment.
+  // If the comment has a suspect word or a link, we need to add a
+  // flag to it to indicate that it needs to be looked at.
+  // Otherwise just return the new comment.
 
-        // TODO: Check why the wordlist is undefined
-        if (wordlist != null && wordlist.suspect != null) {
+  // TODO: Check why the wordlist is undefined
+  if (wordlist != null && wordlist.suspect != null) {
 
-          // TODO: this is kind of fragile, we should refactor this to resolve
-          // all these const's that we're using like 'COMMENTS', 'FLAG' to be
-          // defined in a checkable schema.
-          return ActionsService.insertUserAction({
-            item_id: comment.id,
-            item_type: 'COMMENTS',
-            action_type: 'FLAG',
-            user_id: null,
-            group_id: 'Matched suspect word filter',
-            metadata: {}
-          })
-          .then(() => comment);
-        }
+    // TODO: this is kind of fragile, we should refactor this to resolve
+    // all these const's that we're using like 'COMMENTS', 'FLAG' to be
+    // defined in a checkable schema.
+    await ActionsService.insertUserAction({
+      item_id: comment.id,
+      item_type: 'COMMENTS',
+      action_type: 'FLAG',
+      user_id: null,
+      group_id: 'Matched suspect word filter',
+      metadata: {}
+    });
+  }
 
-        // Finally, we return the comment.
-        return comment;
-      }));
+  // Finally, we return the comment.
+  return comment;
 };
 
 /**
@@ -187,26 +172,23 @@ const createPublicComment = (context, commentInput) => {
  * @param {String} status      the new status of the comment
  */
 
-const setCommentStatus = ({user, loaders: {Comments}}, {id, status}) => {
-  return CommentsService
-    .pushStatus(id, status, user ? user.id : null)
-    .then((comment) => {
+const setCommentStatus = async ({user, loaders: {Comments}}, {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
-      // just added a new comment, hence the counts should be updated. It would
-      // be nice if we could decrement the counters here, but that would result
-      // in us having to know the initial state of the comment, which would
-      // require another database query.
-      if (comment.parent_id != null) {
-        Comments.countByParentID.clear(comment.parent_id);
-      } else {
-        Comments.parentCountByAssetID.clear(comment.asset_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. It would
+  // be nice if we could decrement the counters here, but that would result
+  // in us having to know the initial state of the comment, which would
+  // require another database query.
+  if (comment.parent_id != null) {
+    Comments.countByParentID.clear(comment.parent_id);
+  } else {
+    Comments.parentCountByAssetID.clear(comment.asset_id);
+  }
 
-      Comments.countByAssetID.clear(comment.asset_id);
+  Comments.countByAssetID.clear(comment.asset_id);
 
-      return comment;
-    });
+  return comment;
 };
 
 /**
@@ -233,29 +215,16 @@ const removeCommentTag = ({user, loaders: {Comments}}, {id, tag}) => {
  * @param {Object} edit       describes how to edit the comment
  * @param {String} edit.body  the new Comment body
  */
-const editComment = async ({user, loaders: {Comments}}, {id, asset_id, edit}) => {
-  const {body} = edit;
-  const determineStatusForComment = async ({body, asset_id}) => {
-    const [wordlist, settings] = await filterNewComment({asset_id, body});
-    const status = await resolveNewCommentStatus({asset_id, body}, wordlist, settings);    
-    return status;
-  };
-  const status = await determineStatusForComment({body, asset_id});
-  try {
-    await CommentsService.edit(id, asset_id, user.id, Object.assign({status}, edit));
-  } catch (error) {
-    switch (error.name) {
-    case 'CommentNotFound':
-      throw new errors.APIError('Comment not found', {
-        status: 404,
-        translation_key: 'NOT_FOUND',
-      });
-    case 'NotAuthorizedToEdit':
-      throw errors.ErrNotAuthorized;
-    default:
-      throw error;
-    }
-  }
+const editComment = async (context, {id, asset_id, edit: {body}}) => {
+
+  // Get the wordlist and the settings object.
+  const [wordlist, settings] = await filterNewComment(context, {asset_id, body});
+
+  // Determine the new status of the comment.
+  const status = await resolveNewCommentStatus(context, {asset_id, body}, wordlist, settings);    
+
+  await CommentsService.edit(id, context.user.id, {body, status});
+
   return {status};
 };
 
diff --git a/graph/mutators/user.js b/graph/mutators/user.js
index d68351701..2cc1962be 100644
--- a/graph/mutators/user.js
+++ b/graph/mutators/user.js
@@ -2,23 +2,19 @@ const errors = require('../../errors');
 const UsersService = require('../../services/users');
 
 const setUserStatus = ({user}, {id, status}) => {
-  return UsersService.setStatus(id, status)
-  .then(res => res);
+  return UsersService.setStatus(id, status);
 };
 
 const suspendUser = ({user}, {id, message}) => {
-  return UsersService.suspendUser(id, message)
-  .then(res => {
-    return res;
-  });
+  return UsersService.suspendUser(id, message);
 };
 
-const ignoreUser = async ({user}, userToIgnore) => {
-  return await UsersService.ignoreUsers(user.id, [userToIgnore.id]);
+const ignoreUser = ({user}, userToIgnore) => {
+  return UsersService.ignoreUsers(user.id, [userToIgnore.id]);
 };
 
-const stopIgnoringUser = async ({user}, userToStopIgnoring) => {
-  return await UsersService.stopIgnoringUsers(user.id, [userToStopIgnoring.id]);
+const stopIgnoringUser = ({user}, userToStopIgnoring) => {
+  return UsersService.stopIgnoringUsers(user.id, [userToStopIgnoring.id]);
 };
 
 module.exports = (context) => {
diff --git a/graph/resolvers/asset.js b/graph/resolvers/asset.js
index c260d0070..7d356aac9 100644
--- a/graph/resolvers/asset.js
+++ b/graph/resolvers/asset.js
@@ -10,7 +10,7 @@ const Asset = {
     return Comments.genRecentComments.load(id);
   },
   comments({id}, {sort, limit, excludeIgnored}, {loaders: {Comments}}) {
-    return Comments.getByQuery({
+    return Comments.getConnection({
       asset_id: id,
       sort,
       limit,
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 26e7349ec..4a6224ee9 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -1,3 +1,12 @@
+################################################################################
+## Pagination
+################################################################################
+
+type PageInfo {
+  hasNextPage: Boolean!
+  cursor: String
+}
+
 ################################################################################
 ## Custom Scalar Types
 ################################################################################
@@ -37,16 +46,13 @@ type User {
   actions: [Action]
 
   # the current roles of the user.
-  roles: [USER_ROLES]
+  roles: [USER_ROLES!]
 
   # determines whether the user can edit their username
   canEditName: Boolean
 
   # returns all comments based on a query.
-  comments(query: CommentsQuery): [Comment]
-
-  # returns all users based on a query.
-  users(query: UsersQuery): [User]
+  comments(query: CommentsQuery): [Comment!]
 
   # returns user status
   status: USER_STATUS
@@ -81,6 +87,12 @@ input UsersQuery {
 ## Comments
 ################################################################################
 
+# CommentConnection provides Comments with PageInfo.
+type CommentConnection {
+  edges: [Comment!]
+  pageInfo: PageInfo!
+}
+
 # The statuses that a comment may have.
 enum COMMENT_STATUS {
 
@@ -190,7 +202,7 @@ type Comment {
   recentReplies: [Comment]
 
   # the replies that were made to the comment.
-  replies(sort: SORT_ORDER = CHRONOLOGICAL, limit: Int = 3, excludeIgnored: Boolean): [Comment]
+  replies(sort: SORT_ORDER = CHRONOLOGICAL, limit: Int = 3, excludeIgnored: Boolean): CommentConnection
 
   # The count of replies on a comment.
   replyCount(excludeIgnored: Boolean): Int
@@ -429,7 +441,7 @@ type Asset {
   recentComments: [Comment]
 
   # The top level comments that are attached to the asset.
-  comments(sort: SORT_ORDER = REVERSE_CHRONOLOGICAL, limit: Int = 10, excludeIgnored: Boolean): [Comment]
+  comments(sort: SORT_ORDER = REVERSE_CHRONOLOGICAL, limit: Int = 10, excludeIgnored: Boolean): CommentConnection
 
   # The count of top level comments on the asset.
   commentCount(excludeIgnored: Boolean): Int
@@ -536,7 +548,7 @@ type RootQuery {
   asset(id: ID, url: String): Asset
 
   # Comments returned based on a query.
-  comments(query: CommentsQuery!): [Comment]
+  comments(query: CommentsQuery!): CommentConnection!
 
   # Return the count of comments satisfied by the query. Note that this edge is
   # expensive as it is not batched. Requires the `ADMIN` role.
@@ -600,6 +612,7 @@ enum TAG_TYPE {
   STAFF
 }
 
+# CreateCommentInput is the input content used to create a new comment.
 input CreateCommentInput {
 
   # The asset id
@@ -729,19 +742,19 @@ type StopIgnoringUserResponse implements Response {
   errors: [UserError]
 }
 
-# Input to editComment mutation
+# Input to editComment mutation.
 input EditCommentInput {
+
   # Update body of the comment
   body: String!
 }
 
-type CommentInfoAfterEdit {
-  # New status of the edited comment
-  status: COMMENT_STATUS!
-}
-
+# EditCommentResponse contains the updated comment and any errors that occured.
 type EditCommentResponse implements Response {
-  comment: CommentInfoAfterEdit!
+
+  # The edited comment.
+  comment: Comment
+
   # An array of errors relating to the mutation that occured.
   errors: [UserError]  
 }
diff --git a/package.json b/package.json
index 6476223b3..1af9203e7 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
     "marked": "^0.3.6",
     "metascraper": "^1.0.6",
     "minimist": "^1.2.0",
-    "mongoose": "^4.9.1",
+    "mongoose": "^4.9.8",
     "morgan": "^1.8.1",
     "natural": "^0.5.0",
     "node-emoji": "^1.5.1",
@@ -99,12 +99,10 @@
     "react-recaptcha": "^2.2.6",
     "recompose": "^0.23.1",
     "redis": "^2.7.1",
-    "uuid": "^3.0.1",
-    "simplemde": "^1.11.2",
-    "subscriptions-transport-ws": "^0.5.5-alpha.0",
     "resolve": "^1.3.2",
     "semver": "^5.3.0",
     "simplemde": "^1.11.2",
+    "subscriptions-transport-ws": "^0.5.5-alpha.0",
     "timekeeper": "^1.0.0",
     "uuid": "^3.0.1"
   },
diff --git a/services/comments.js b/services/comments.js
index 9325cdb8b..f46e318d7 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -3,19 +3,7 @@ const CommentModel = require('../models/comment');
 const ActionModel = require('../models/action');
 const ActionsService = require('./actions');
 
-const {ErrEditWindowHasEnded} = require('../errors');
-
-// const ALLOWED_TAGS = [
-//   {name: 'STAFF'},
-//   {name: 'BEST'},
-// ];
-
-const STATUSES = [
-  'ACCEPTED',
-  'REJECTED',
-  'PREMOD',
-  'NONE',
-];
+const errors = require('../errors');
 
 const EDIT_WINDOW_MS = 30 * 1000; // 30 seconds
 
@@ -54,84 +42,69 @@ module.exports = class CommentsService {
   /**
    * Edit a Comment
    * @param {String} id    comment.id you want to edit (or its ID)
-   * @param {String} asset_id   asset_id of the comment
-   * @param {String} editor     user.id of the user trying to edit the comment (will err if not comment author)
+   * @param {String} author_id     user.id of the user trying to edit the comment (will err if not comment author)
    * @param {String} body       the new Comment body
    * @param {String} status     the new Comment status
    */
-  static async edit(id, asset_id, editor, {body, status, ignoreEditWindow}) {
-    if (status && ! STATUSES.includes(status)) {
-      throw new Error(`status ${status} is not supported`);
-    }
+  static async edit(id, author_id, {body, status, ignoreEditWindow = false}) {
+    const query = {
+      id,
+      author_id
+    };
+
+    // Establish the edit window (if it exists) and add the condition to the
+    // original query.
     const lastEditableCommentCreatedAt = new Date((new Date()).getTime() - EDIT_WINDOW_MS);
-    const filter = Object.assign(
-      {
-        id,
-        asset_id,
-        author_id: editor,
-      },
-      ignoreEditWindow ? {} : {
-        created_at: {
-          $gt: lastEditableCommentCreatedAt,
-        },
-      }
-    );
-    const {nModified} = await CommentModel.update(
-      filter,
-      {
-        $set: {
-          body,
-          status,
-        },
-        $push: {
-          body_history: {
-            body,
-            created_at: new Date(),
-          },
-          status_history: {
-            type: status,
-            created_at: new Date(),
-          }
-        },
-      }
-    );
-    switch (nModified) {
-    case 0: {
-
-          // disambiguate possible error cases
-      const comment = await this.findById(id);
-
-          // return whether the comment should no longer be editable
-          // because its edit window expired
-      const editWindowExpired = (comment) => {
-        const now = new Date;
-        const editableUntil = this.getEditableUntilDate(comment);
-        return now > editableUntil;
+    if (!ignoreEditWindow) {
+      query.created_at = {
+        $gt: lastEditableCommentCreatedAt,
       };
-      if ( ! comment || (comment.asset_id !== asset_id)) {
-        throw Object.assign(new Error('Comment not found'), {
-          name: 'CommentNotFound'
-        });         
-      } else if (comment.author_id !== editor) {
-        throw Object.assign(new Error('You aren\'t allowed to edit that comment'), {
-          name: 'NotAuthorizedToEdit'
-        });
-      } else if (( ! ignoreEditWindow) && editWindowExpired(comment)) {
-        throw new ErrEditWindowHasEnded();
-      }
-      throw new Error('Failed to edit comment. This could be because it can\'t be found, the edit window expired, or because you\'re not allowed to edit it.');
     }
-    }
-  }
 
-  /**
-   * Until when can the provided comment be edited?
-   * @param {Comment} comment - comment to check last edit date of
-   * @returns {Date} last date at which comment can be edited
-   */
-  static getEditableUntilDate(comment) {
-    const {created_at} = comment;
-    return new Date(Number(created_at) + EDIT_WINDOW_MS);
+    const {
+      value: comment
+    } = await CommentModel.findOneAndUpdate(query, {
+      $set: {
+        body,
+        status,
+      },
+      $push: {
+        body_history: {
+          body,
+          created_at: new Date(),
+        },
+        status_history: {
+          type: status,
+          created_at: new Date(),
+        }
+      },
+    }, {
+      new: true,
+      rawResult: true
+    });
+
+    if (comment === null) {
+
+      // Try to get the comment.
+      const comment = await CommentsService.findById(id);
+      if (comment === null) {
+        throw errors.ErrNotFound;
+      }
+
+      // Check to see if the user was't allowed to edit it.
+      if (comment.author_id !== author_id) {
+        throw errors.ErrNotAuthorized;
+      }
+
+      // Check to see if the edit window expired.
+      if (!ignoreEditWindow && comment.created_at <= lastEditableCommentCreatedAt) {
+        throw errors.ErrEditWindowHasEnded;
+      }
+
+      throw new Error('comment edit failed for an unexpected reason');
+    }
+
+    return comment;
   }
 
   /**
@@ -304,14 +277,6 @@ module.exports = class CommentsService {
    * @return {Promise}
    */
   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) {
-
-      // Comment status is not supported! Error out here.
-      return Promise.reject(new Error(`status ${status} is not supported`));
-    }
-
     return CommentModel.findOneAndUpdate({id}, {
       $push: {
         status_history: {
diff --git a/test/server/graph/mutations/editComment.js b/test/server/graph/mutations/editComment.js
index f449e37a8..5e64ac5d5 100644
--- a/test/server/graph/mutations/editComment.js
+++ b/test/server/graph/mutations/editComment.js
@@ -64,6 +64,9 @@ describe('graph.mutations.editComment', () => {
       console.error(response.errors);
     }
     expect(response.errors).to.be.empty;
+    if (response.data.editComment.errors && response.data.editComment.errors.length > 0) {
+      console.error(response.data.editComment.errors);
+    }
     expect(response.data.editComment.errors).to.be.null;
 
     // assert body has changed
@@ -97,9 +100,12 @@ describe('graph.mutations.editComment', () => {
         body: newBody
       }
     });
+    if (response.errors && response.errors.length > 0) {
+      console.error(response.errors);
+    }
     expect(response.errors).to.be.empty;
     expect(response.data.editComment.errors).to.not.be.empty;
-    expect(response.data.editComment.errors[0].translation_key).to.equal('error.editWindowExpired');
+    expect(response.data.editComment.errors[0].translation_key).to.equal('EDIT_WINDOW_ENDED');
     const commentAfterEdit = await CommentsService.findById(comment.id);
 
     // it *hasn't* changed from the original
@@ -144,6 +150,9 @@ describe('graph.mutations.editComment', () => {
         body: newBody
       }
     });
+    if (response.errors && response.errors.length > 0) {
+      console.error(response.errors);
+    }
     expect(response.errors).to.be.empty;
     expect(response.data.editComment.errors[0].translation_key).to.equal('NOT_FOUND');
   });
diff --git a/test/server/graph/queries/asset.js b/test/server/graph/queries/asset.js
index 79abeda0e..f25711809 100644
--- a/test/server/graph/queries/asset.js
+++ b/test/server/graph/queries/asset.js
@@ -9,85 +9,94 @@ const Asset = require('../../../../models/asset');
 const CommentsService = require('../../../../services/comments');
 
 describe('graph.queries.asset', () => {
+  let asset, users;
   beforeEach(async () => {
     await SettingsService.init();
+    asset = await Asset.create({id: '1', url: 'https://example.com'});
+    users = await UsersService.createLocalUsers([
+      {
+        email: 'usernameA@example.com',
+        password: 'password',
+        username: 'usernameA'
+      },
+      {
+        email: 'usernameB@example.com',
+        password: 'password',
+        username: 'usernameB'
+      },
+      {
+        email: 'usernameC@example.com',
+        password: 'password',
+        username: 'usernameC'
+      }
+    ]);
   });
 
   it('can get comments edge', async () => {
-    const assetId = 'fakeAssetId';
-    const assetUrl = 'https://bengo.is';
-    await Asset.create({id: assetId, url: assetUrl});
-
-    const user = await UsersService.createLocalUser('usernameA@example.com', 'password', 'usernameA');
-    const context = new Context({user});
+    const context = new Context({user: users[0]});
 
     await CommentsService.publicCreate([1, 2].map(() => ({
-      author_id: user.id,
-      asset_id: assetId,
-      body: `hello there! ${  String(Math.random()).slice(2)}`,
+      author_id: users[0].id,
+      asset_id: asset.id,
+      body: `hello there! ${String(Math.random()).slice(2)}`,
     })));
 
     const assetCommentsQuery = `
-      query assetCommentsQuery($assetId: ID!, $assetUrl: String!) {
-        asset(id: $assetId, url: $assetUrl) {
+      query assetCommentsQuery($id: ID!) {
+        asset(id: $id) {
           comments(limit: 10) {
-            id,
-            body,
+            edges {
+              id
+              body
+            }
           }
         }
       }
     `;
-    const assetCommentsResponse = await graphql(schema, assetCommentsQuery, {}, context, {assetId, assetUrl});
-    const comments = assetCommentsResponse.data.asset.comments;
+    const res = await graphql(schema, assetCommentsQuery, {}, context, {id: asset.id});
+    expect(res.erros).is.empty;
+    const comments = res.data.asset.comments.edges;
     expect(comments.length).to.equal(2);
   });
 
   it('can query comments edge to exclude comments ignored by user', async () => {
-    const assetId = 'fakeAssetId1';
-    const assetUrl = 'https://bengo.is/1';
-    await Asset.create({id: assetId, url: assetUrl});
+    const context = new Context({user: users[0]});
 
-    const userA = await UsersService.createLocalUser('usernameA@example.com', 'password', 'usernameA');
-    const userB = await UsersService.createLocalUser('usernameB@example.com', 'password', 'usernameB');
-    const userC = await UsersService.createLocalUser('usernameC@example.com', 'password', 'usernameC');
-    const context = new Context({user: userA});
-
-    // create 2 comments each for userB, userC
-    await Promise.all([userB, userC].map(user => CommentsService.publicCreate([1, 2].map(() => ({
+    await Promise.all(users.slice(1, 3).map((user) => CommentsService.publicCreate({
       author_id: user.id,
-      asset_id: assetId,
-      body: `hello there! ${  String(Math.random()).slice(2)}`,
-    })))));
+      asset_id: asset.id,
+      body: `hello there! ${String(Math.random()).slice(2)}`,
+    })));
+    
+    // Add the second user to the list of ignored users.
+    context.user.ignoresUsers.push(users[1].id);
 
-    // ignore userB
-    const ignoreUserMutation = `
-      mutation ignoreUser ($id: ID!) {
-        ignoreUser(id:$id) {
-          errors {
-            translation_key
-          }
-        }
-      }
-    `;
-    const ignoreUserResponse = await graphql(schema, ignoreUserMutation, {}, context, {id: userB.id});
-    if (ignoreUserResponse.errors && ignoreUserResponse.errors.length) {
-      console.error(ignoreUserResponse.errors);
-    }
-    expect(ignoreUserResponse.errors).to.be.empty;
-
-    const assetCommentsWithoutIgnoredQuery = `
-      query assetCommentsQuery($assetId: ID!, $assetUrl: String!, $excludeIgnored: Boolean!) {
-        asset(id: $assetId, url: $assetUrl) {
+    const query = `
+      query assetCommentsQuery($id: ID!, $url: String!, $excludeIgnored: Boolean!) {
+        asset(id: $id, url: $url) {
           comments(limit: 10, excludeIgnored: $excludeIgnored) {
-            id,
-            body,
+            edges {
+              id
+              body
+            }
           }
         }
       }
     `;
-    const assetCommentsResponse = await graphql(schema, assetCommentsWithoutIgnoredQuery, {}, context, {assetId, assetUrl, excludeIgnored: true});
-    const comments = assetCommentsResponse.data.asset.comments;
-    expect(comments.length).to.equal(2);
+
+    {
+      const res = await graphql(schema, query, {}, context, {
+        id: asset.id,
+        url: asset.url,
+        excludeIgnored: true
+      });
+      if (res.errors && res.errors.length) {
+        console.error(res.errors);
+      }
+      expect(res.errors).is.empty;
+      const comments = res.data.asset.comments.edges;
+      expect(comments.length).to.equal(1);
+    }
   });
 
 });
diff --git a/yarn.lock b/yarn.lock
index 7a1930df8..a87eed6ae 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1,5 +1,7 @@
 # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 # yarn lockfile v1
+
+
 "@kadira/storybook-deployer@^1.1.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@kadira/storybook-deployer/-/storybook-deployer-1.2.0.tgz#1708f5cb37fa08ab4173b1bd99df6f4717dfae12"
@@ -294,28 +296,28 @@ asn1@~0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
 
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+
 assert-plus@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
 
-assert-plus@^1.0.0, assert-plus@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-
 assert@^1.1.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
   dependencies:
     util "0.10.3"
 
-assertion-error@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.0.2.tgz#13ca515d86206da0bac66e834dd397d87581094c"
-
 assertion-error@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.0.0.tgz#c7f85438fdd466bc7ca16ab90c81513797a5d23b"
 
+assertion-error@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.0.2.tgz#13ca515d86206da0bac66e834dd397d87581094c"
+
 ast-traverse@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ast-traverse/-/ast-traverse-0.1.1.tgz#69cf2b8386f19dcda1bb1e05d68fe359d8897de6"
@@ -332,10 +334,20 @@ async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
 
-async@^1.4.0, async@^1.5.2, async@1.x:
+async@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.2.1.tgz#a4816a17cd5ff516dfa2c7698a453369b9790de0"
+
+async@1.x, async@^1.4.0, async@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
+async@2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.1.4.tgz#2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4"
+  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"
@@ -346,16 +358,6 @@ async@~0.9.0:
   version "0.9.2"
   resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
 
-async@1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.2.1.tgz#a4816a17cd5ff516dfa2c7698a453369b9790de0"
-
-async@2.1.4:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.1.4.tgz#2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4"
-  dependencies:
-    lodash "^4.14.0"
-
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -1145,6 +1147,10 @@ backo2@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
 
+balanced-match@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.1.0.tgz#b504bd05869b39259dd0c5efc35d843176dccc4a"
+
 balanced-match@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.2.1.tgz#7bc658b4bed61eee424ad74f75f5c3e2c4df3cc7"
@@ -1153,15 +1159,11 @@ balanced-match@^0.4.1, balanced-match@^0.4.2:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
 
-balanced-match@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.1.0.tgz#b504bd05869b39259dd0c5efc35d843176dccc4a"
-
 base64-js@^1.0.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1"
 
-base64url@^2.0.0, base64url@2.0.0:
+base64url@2.0.0, base64url@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/base64url/-/base64url-2.0.0.tgz#eac16e03ea1438eff9423d69baa36262ed1f70bb"
 
@@ -1191,7 +1193,7 @@ binary-extensions@^1.0.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.8.0.tgz#48ec8d16df4377eae5fa5884682480af4d95c774"
 
-bindings@^1.2.1, bindings@1.2.1:
+bindings@1.2.1, bindings@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.2.1.tgz#14ad6113812d2d37d72e67b4cacb4bb726505f11"
 
@@ -1207,14 +1209,6 @@ block-stream@*:
   dependencies:
     inherits "~2.0.0"
 
-bluebird@^2.10.2:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
-
-bluebird@^3.4.6, bluebird@3.4.7:
-  version "3.4.7"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3"
-
 bluebird@2.10.2:
   version "2.10.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.10.2.tgz#024a5517295308857f14f91f1106fc3b555f446b"
@@ -1227,6 +1221,14 @@ bluebird@3.4.6:
   version "3.4.6"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.6.tgz#01da8d821d87813d158967e743d5fe6c62cf8c0f"
 
+bluebird@3.4.7, bluebird@^3.4.6:
+  version "3.4.7"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3"
+
+bluebird@^2.10.2:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
+
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.6"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215"
@@ -1474,7 +1476,7 @@ chai@^3.5.0:
     deep-eql "^0.1.3"
     type-detect "^1.0.0"
 
-chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3, chalk@1.1.3:
+chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   dependencies:
@@ -1639,7 +1641,7 @@ cli-cursor@^2.1.0:
   dependencies:
     restore-cursor "^2.0.0"
 
-cli-table@^0.3.1, cli-table@0.3.1:
+cli-table@0.3.1, cli-table@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"
   dependencies:
@@ -1733,7 +1735,11 @@ colormin@^1.0.5:
     css-color-names "0.0.4"
     has "^1.0.1"
 
-colors@^1.1.2, colors@~1.1.2, colors@1.1.2:
+colors@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
+
+colors@1.1.2, colors@^1.1.2, colors@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
 
@@ -1741,10 +1747,6 @@ colors@~0.6.0-1:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-0.6.2.tgz#2423fe6678ac0c5dae8852e5d0e5be08c997abcc"
 
-colors@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
-
 combined-stream@^1.0.5, combined-stream@~1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
@@ -1757,16 +1759,6 @@ combined-stream@~0.0.4:
   dependencies:
     delayed-stream "0.0.5"
 
-commander@^2.5.0, commander@^2.8.1, commander@^2.9.0, commander@2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
-  dependencies:
-    graceful-readlink ">= 1.0.0"
-
-commander@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.1.0.tgz#d121bbae860d9992a3d517ba96f56588e47c6781"
-
 commander@2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.6.0.tgz#9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"
@@ -1777,6 +1769,16 @@ commander@2.8.x:
   dependencies:
     graceful-readlink ">= 1.0.0"
 
+commander@2.9.0, commander@^2.5.0, commander@^2.8.1, commander@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
+  dependencies:
+    graceful-readlink ">= 1.0.0"
+
+commander@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.1.0.tgz#d121bbae860d9992a3d517ba96f56588e47c6781"
+
 common-tags@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.4.0.tgz#1187be4f3d4cf0c0427d43f74eef1f73501614c0"
@@ -1914,7 +1916,7 @@ cookie@0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
 
-cookiejar@^2.0.6, cookiejar@2.0.x:
+cookiejar@2.0.x, cookiejar@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.0.6.tgz#0abf356ad00d1c5a219d88d44518046dd026acfe"
 
@@ -1939,7 +1941,7 @@ core-js@^2.4.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
 
-core-util-is@~1.0.0, core-util-is@1.0.2:
+core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
@@ -2152,7 +2154,7 @@ csso@~2.3.1:
     clap "^1.0.9"
     source-map "^0.5.3"
 
-"cssom@>= 0.3.0 < 0.4.0", "cssom@>= 0.3.2 < 0.4.0", cssom@0.3.x:
+cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0", "cssom@>= 0.3.2 < 0.4.0":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
 
@@ -2188,16 +2190,16 @@ cz-conventional-changelog@1.2.0:
     right-pad "^1.0.1"
     word-wrap "^1.0.3"
 
+d3-helpers@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/d3-helpers/-/d3-helpers-0.3.0.tgz#4b31dce4a2121a77336384574d893fbed5fb293d"
+
 d@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
   dependencies:
     es5-ext "^0.10.9"
 
-d3-helpers@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/d3-helpers/-/d3-helpers-0.3.0.tgz#4b31dce4a2121a77336384574d893fbed5fb293d"
-
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
@@ -2224,17 +2226,13 @@ date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
 
-debug@*, debug@^2.1.1, debug@^2.2.0, debug@^2.3.3, debug@^2.6.3, debug@2, debug@2.6.4:
+debug@*, debug@2, debug@2.6.4, debug@^2.1.1, debug@^2.2.0, debug@^2.3.3, debug@^2.6.3:
   version "2.6.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.4.tgz#7586a9b3c39741c0282ae33445c4e8ac74734fe0"
   dependencies:
     ms "0.7.3"
 
-debug@~0.7.4:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39"
-
-debug@~2.2.0, debug@2.2.0:
+debug@2.2.0, debug@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
   dependencies:
@@ -2264,11 +2262,15 @@ debug@2.6.3:
   dependencies:
     ms "0.7.2"
 
+debug@~0.7.4:
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39"
+
 decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
-deep-eql@^0.1.3, deep-eql@0.1.3:
+deep-eql@0.1.3, deep-eql@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-0.1.3.tgz#ef558acab8de25206cd713906d74e56930eb69f2"
   dependencies:
@@ -2334,19 +2336,19 @@ del@^2.0.2:
     pinkie-promise "^2.0.0"
     rimraf "^2.2.8"
 
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-
 delayed-stream@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-0.0.5.tgz#d4b1f43a93e8296dfe02694f4680bc37a313c73f"
 
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
 
-depd@~1.1.0, depd@1.1.0:
+depd@1.1.0, depd@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.0.tgz#e1bd82c6aab6ced965b97b88b17ed3e528ca18c3"
 
@@ -2402,7 +2404,7 @@ dns-prefetch-control@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/dns-prefetch-control/-/dns-prefetch-control-0.1.0.tgz#60ddb457774e178f1f9415f0cabb0e85b0b300b2"
 
-doctrine@^1.2.2, doctrine@1.5.0:
+doctrine@1.5.0, doctrine@^1.2.2:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
   dependencies:
@@ -2420,7 +2422,7 @@ doctypes@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/doctypes/-/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9"
 
-dom-serializer@~0.1.0, dom-serializer@0:
+dom-serializer@0, dom-serializer@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
   dependencies:
@@ -2431,21 +2433,21 @@ domain-browser@^1.1.1:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
 
+domelementtype@1, domelementtype@~1.1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
+
 domelementtype@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
 
-domelementtype@~1.1.1, domelementtype@1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
-
-domhandler@^2.3.0, domhandler@2.3:
+domhandler@2.3, domhandler@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.3.0.tgz#2de59a0822d5027fabff6f032c2b25a2a8abe738"
   dependencies:
     domelementtype "1"
 
-domutils@^1.5.1, domutils@1.5, domutils@1.5.1:
+domutils@1.5, domutils@1.5.1, domutils@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
   dependencies:
@@ -2494,14 +2496,14 @@ ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
 
-ejs@^2.5.6:
-  version "2.5.6"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.6.tgz#479636bfa3fe3b1debd52087f0acb204b4f19c88"
-
 ejs@0.8.3:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-0.8.3.tgz#db8aac47ff80a7df82b4c82c126fe8970870626f"
 
+ejs@^2.5.6:
+  version "2.5.6"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.6.tgz#479636bfa3fe3b1debd52087f0acb204b4f19c88"
+
 electron-to-chromium@^1.2.7:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.8.tgz#b2c8a2c79bb89fbbfd3724d9555e15095b5f5fb6"
@@ -2532,18 +2534,18 @@ encoding@^0.1.11:
   dependencies:
     iconv-lite "~0.4.13"
 
-end-of-stream@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.0.tgz#7a90d833efda6cfa6eac0f4949dbb0fad3a63206"
-  dependencies:
-    once "^1.4.0"
-
 end-of-stream@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.0.0.tgz#d4596e702734a93e40e9af864319eabd99ff2f0e"
   dependencies:
     once "~1.3.0"
 
+end-of-stream@^1.0.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.0.tgz#7a90d833efda6cfa6eac0f4949dbb0fad3a63206"
+  dependencies:
+    once "^1.4.0"
+
 enhanced-resolve@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz#9f4b626f577245edcf4b2ad83d86e17f4f421dec"
@@ -2553,14 +2555,14 @@ enhanced-resolve@^3.0.0:
     object-assign "^4.0.1"
     tapable "^0.2.5"
 
-entities@^1.1.1, entities@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
-
 entities@1.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.0.0.tgz#b2987aa3821347fcde642b24fdfc9e4fb712bf26"
 
+entities@^1.1.1, entities@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
+
 env-rewrite@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/env-rewrite/-/env-rewrite-1.0.2.tgz#3e344a95af1bdaab34a559479b8be3abd0804183"
@@ -2616,7 +2618,7 @@ es5-ext@^0.10.14, es5-ext@^0.10.9, es5-ext@~0.10.14:
     es6-iterator "2"
     es6-symbol "~3.1"
 
-es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@2:
+es6-iterator@2, es6-iterator@^2.0.1, es6-iterator@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.1.tgz#8e319c9f0453bf575d374940a655920e59ca5512"
   dependencies:
@@ -2635,14 +2637,14 @@ es6-map@^0.1.3:
     es6-symbol "~3.1.1"
     event-emitter "~0.3.5"
 
-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@3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.2.1.tgz#ec56233868032909207170c39448e24449dd1fc4"
 
+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-set@~0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
@@ -2653,7 +2655,7 @@ es6-set@~0.1.5:
     es6-symbol "3.1.1"
     event-emitter "~0.3.5"
 
-es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1, es6-symbol@3.1.1:
+es6-symbol@3.1.1, es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
   dependencies:
@@ -2677,11 +2679,11 @@ escape-regexp-component@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/escape-regexp-component/-/escape-regexp-component-1.0.2.tgz#9c63b6d0b25ff2a88c3adbd18c5b61acc3b9faa2"
 
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5, escape-string-regexp@1.0.5:
+escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
-escodegen@^1.6.1, escodegen@1.x.x:
+escodegen@1.x.x, escodegen@^1.6.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018"
   dependencies:
@@ -2820,14 +2822,14 @@ esprima-fb@~15001.1001.0-dev-harmony-fb:
   version "15001.1001.0-dev-harmony-fb"
   resolved "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz#43beb57ec26e8cf237d3dd8b33e42533577f2659"
 
+esprima@3.x.x, esprima@^3.1.1, esprima@~3.1.0:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+
 esprima@^2.6.0, esprima@^2.7.1:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
 
-esprima@^3.1.1, esprima@~3.1.0, esprima@3.x.x:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
-
 esquery@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa"
@@ -2964,14 +2966,14 @@ express@^4.12.2, express@^4.15.2:
     utils-merge "1.0.0"
     vary "~1.1.0"
 
+extend@3, extend@^3.0.0, extend@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.0.tgz#5a474353b9f3353ddd8176dfd37b91c83a46f1d4"
+
 extend@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extend/-/extend-1.3.0.tgz#d1516fb0ff5624d2ebf9123ea1dac5a1994004f8"
 
-extend@^3.0.0, extend@~3.0.0, extend@3:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.0.tgz#5a474353b9f3353ddd8176dfd37b91c83a46f1d4"
-
 external-editor@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.0.1.tgz#4c597c6c88fa6410e41dbbaa7b1be2336aa31095"
@@ -3067,11 +3069,11 @@ fill-range@^2.1.0:
     repeat-element "^1.1.2"
     repeat-string "^1.5.2"
 
-finalhandler@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.2.tgz#d0e36f9dbc557f2de14423df6261889e9d60c93a"
+finalhandler@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.0.tgz#b5691c2c0912092f18ac23e9416bde5cd7dc6755"
   dependencies:
-    debug "2.6.4"
+    debug "2.6.1"
     encodeurl "~1.0.1"
     escape-html "~1.0.3"
     on-finished "~2.3.0"
@@ -3079,11 +3081,11 @@ finalhandler@~1.0.0:
     statuses "~1.3.1"
     unpipe "~1.0.0"
 
-finalhandler@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.0.tgz#b5691c2c0912092f18ac23e9416bde5cd7dc6755"
+finalhandler@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.2.tgz#d0e36f9dbc557f2de14423df6261889e9d60c93a"
   dependencies:
-    debug "2.6.1"
+    debug "2.6.4"
     encodeurl "~1.0.1"
     escape-html "~1.0.3"
     on-finished "~2.3.0"
@@ -3150,6 +3152,14 @@ forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
 
+form-data@1.0.0-rc4:
+  version "1.0.0-rc4"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-1.0.0-rc4.tgz#05ac6bc22227b43e4461f488161554699d4f8b5e"
+  dependencies:
+    async "^1.5.2"
+    combined-stream "^1.0.5"
+    mime-types "^2.1.10"
+
 form-data@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-0.2.0.tgz#26f8bc26da6440e299cbdcfb69035c4f77a6e466"
@@ -3166,14 +3176,6 @@ form-data@^2.1.2, form-data@~2.1.1:
     combined-stream "^1.0.5"
     mime-types "^2.1.12"
 
-form-data@1.0.0-rc4:
-  version "1.0.0-rc4"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-1.0.0-rc4.tgz#05ac6bc22227b43e4461f488161554699d4f8b5e"
-  dependencies:
-    async "^1.5.2"
-    combined-stream "^1.0.5"
-    mime-types "^2.1.10"
-
 formidable@^1.0.17:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.1.1.tgz#96b8886f7c3c3508b932d6bd70c4d3a88f35f1a9"
@@ -3392,37 +3394,6 @@ glob-to-regexp@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
 
-glob@^5.0.15, glob@^5.0.3:
-  version "5.0.15"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^6.0.4:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.2"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 glob@7.0.5:
   version "7.0.5"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.5.tgz#b4202a69099bbb4d292a7c1b95b6682b67ebdc95"
@@ -3445,6 +3416,37 @@ glob@7.0.x:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@7.1.1, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.2"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@^5.0.15, glob@^5.0.3:
+  version "5.0.15"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
+  dependencies:
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "2 || 3"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@^6.0.4:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
+  dependencies:
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "2 || 3"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 globals@^9.0.0, globals@^9.14.0:
   version "9.17.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.17.0.tgz#0c0ca696d9b9bb694d2e5470bd37777caad50286"
@@ -3861,15 +3863,15 @@ https-proxy-agent@1:
     debug "2"
     extend "3"
 
-iconv-lite@^0.4.5, iconv-lite@~0.4.13, iconv-lite@0.4.15:
-  version "0.4.15"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
-
 iconv-lite@0.4.13:
   version "0.4.13"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
 
-icss-replace-symbols@^1.0.2, icss-replace-symbols@1.0.2:
+iconv-lite@0.4.15, iconv-lite@^0.4.5, iconv-lite@~0.4.13:
+  version "0.4.15"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
+
+icss-replace-symbols@1.0.2, icss-replace-symbols@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.0.2.tgz#cb0b6054eb3af6edc9ab1d62d01933e2d4c8bfa5"
 
@@ -3933,7 +3935,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@2, inherits@2.0.3:
+inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -3952,7 +3954,24 @@ inquirer-confirm@0.2.2:
     bluebird "2.9.24"
     inquirer "0.8.2"
 
-inquirer@^0.12.0, inquirer@0.12.0:
+inquirer@0.11.1:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.11.1.tgz#623b6e0c101d2fe9e8e8ed902e651e0519d143e5"
+  dependencies:
+    ansi-escapes "^1.1.0"
+    ansi-regex "^2.0.0"
+    chalk "^1.0.0"
+    cli-cursor "^1.0.1"
+    cli-width "^1.0.1"
+    figures "^1.3.5"
+    lodash "^3.3.1"
+    readline2 "^1.0.1"
+    run-async "^0.1.0"
+    rx-lite "^3.1.2"
+    strip-ansi "^3.0.0"
+    through "^2.3.6"
+
+inquirer@0.12.0, inquirer@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e"
   dependencies:
@@ -3970,6 +3989,19 @@ inquirer@^0.12.0, inquirer@0.12.0:
     strip-ansi "^3.0.0"
     through "^2.3.6"
 
+inquirer@0.8.2:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.8.2.tgz#41586548e1c5d9b3f81df7325034baacab6f58ab"
+  dependencies:
+    ansi-regex "^1.1.1"
+    chalk "^1.0.0"
+    cli-width "^1.0.1"
+    figures "^1.3.5"
+    lodash "^3.3.1"
+    readline2 "^0.1.1"
+    rx "^2.4.3"
+    through "^2.3.6"
+
 inquirer@^3.0.6:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.0.6.tgz#e04aaa9d05b7a3cb9b0f407d04375f0447190347"
@@ -3988,36 +4020,6 @@ inquirer@^3.0.6:
     strip-ansi "^3.0.0"
     through "^2.3.6"
 
-inquirer@0.11.1:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.11.1.tgz#623b6e0c101d2fe9e8e8ed902e651e0519d143e5"
-  dependencies:
-    ansi-escapes "^1.1.0"
-    ansi-regex "^2.0.0"
-    chalk "^1.0.0"
-    cli-cursor "^1.0.1"
-    cli-width "^1.0.1"
-    figures "^1.3.5"
-    lodash "^3.3.1"
-    readline2 "^1.0.1"
-    run-async "^0.1.0"
-    rx-lite "^3.1.2"
-    strip-ansi "^3.0.0"
-    through "^2.3.6"
-
-inquirer@0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.8.2.tgz#41586548e1c5d9b3f81df7325034baacab6f58ab"
-  dependencies:
-    ansi-regex "^1.1.1"
-    chalk "^1.0.0"
-    cli-width "^1.0.1"
-    figures "^1.3.5"
-    lodash "^3.3.1"
-    readline2 "^0.1.1"
-    rx "^2.4.3"
-    through "^2.3.6"
-
 interpret@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90"
@@ -4271,14 +4273,14 @@ is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
 
-isarray@^1.0.0, isarray@~1.0.0, isarray@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
 
+isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+
 isemail@1.x.x:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/isemail/-/isemail-1.2.0.tgz#be03df8cc3e29de4d2c5df6501263f1fa4595e9a"
@@ -4435,7 +4437,7 @@ js-tokens@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
 
-js-yaml@^3.4.3, js-yaml@^3.5.1, js-yaml@^3.7.0, js-yaml@3.x:
+js-yaml@3.x, js-yaml@^3.4.3, js-yaml@^3.5.1, js-yaml@^3.7.0:
   version "3.8.3"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.3.tgz#33a05ec481c850c8875929166fe1beb61c728766"
   dependencies:
@@ -4598,9 +4600,9 @@ jws@^3.1.4:
     jwa "^1.1.4"
     safe-buffer "^5.0.1"
 
-kareem@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/kareem/-/kareem-1.4.0.tgz#640285bc0174f10d4bf2127bb30e861bc0372c1c"
+kareem@1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/kareem/-/kareem-1.4.1.tgz#ed76200044fa041ef32b4da8261e2553f1173531"
 
 keymaster@^1.6.2:
   version "1.6.2"
@@ -4949,7 +4951,7 @@ lodash.pick@^4.2.1, lodash.pick@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
 
-lodash.reduce@^4.4.0, lodash.reduce@4.6.0:
+lodash.reduce@4.6.0, lodash.reduce@^4.4.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b"
 
@@ -4973,18 +4975,18 @@ lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
 
-lodash@^3.3.1, lodash@3.10.1:
+lodash@3.10.1, lodash@^3.3.1:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
-lodash@^4.0.0, lodash@^4.1.0, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.6, lodash@^4.17.2, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0:
-  version "4.17.4"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
-
 lodash@3.9.3:
   version "3.9.3"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.9.3.tgz#0159e86832feffc6d61d852b12a953b99496bd32"
 
+lodash@^4.0.0, lodash@^4.1.0, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.6, lodash@^4.17.2, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0:
+  version "4.17.4"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
+
 longest@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
@@ -5081,7 +5083,7 @@ metascraper@^1.0.6:
     popsicle "^6.2.0"
     to-title-case "^1.0.0"
 
-methods@^1.1.1, methods@^1.1.2, methods@~1.1.2, methods@1.x:
+methods@1.x, methods@^1.1.1, methods@^1.1.2, methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
 
@@ -5130,7 +5132,7 @@ mime-types@~2.0.3:
   dependencies:
     mime-db "~1.12.0"
 
-mime@^1.3.4, mime@1.3.4:
+mime@1.3.4, mime@^1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
 
@@ -5146,17 +5148,13 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
-minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, "minimatch@2 || 3", minimatch@3.0.3:
+"minimatch@2 || 3", minimatch@3.0.3, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
   dependencies:
     brace-expansion "^1.0.0"
 
-minimist@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-
-minimist@~0.0.1, minimist@0.0.8:
+minimist@0.0.8, minimist@~0.0.1:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
@@ -5164,11 +5162,9 @@ minimist@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.1.0.tgz#cdf225e8898f840a258ded44fc91776770afdc93"
 
-mkdirp@^0.5.0, mkdirp@^0.5.1, "mkdirp@>=0.5 0", mkdirp@~0.5.0, mkdirp@~0.5.1, mkdirp@0.5.1, mkdirp@0.5.x:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  dependencies:
-    minimist "0.0.8"
+minimist@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
 mkdirp@0.5.0:
   version "0.5.0"
@@ -5176,6 +5172,12 @@ mkdirp@0.5.0:
   dependencies:
     minimist "0.0.8"
 
+mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  dependencies:
+    minimist "0.0.8"
+
 mkpath@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/mkpath/-/mkpath-1.0.0.tgz#ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"
@@ -5221,14 +5223,14 @@ mocha@^3.1.2:
     mkdirp "0.5.1"
     supports-color "3.1.2"
 
-moment@^2.10.3, moment@2.x.x:
-  version "2.18.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"
-
 moment@2.17.0:
   version "2.17.0"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.17.0.tgz#a4c292e02aac5ddefb29a6eed24f51938dd3b74f"
 
+moment@2.x.x, moment@^2.10.3:
+  version "2.18.1"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"
+
 mongodb-core@2.1.10:
   version "2.1.10"
   resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-2.1.10.tgz#eb290681d196d3346a492161aa2ea0905e63151b"
@@ -5244,14 +5246,14 @@ mongodb@2.2.26:
     mongodb-core "2.1.10"
     readable-stream "2.2.7"
 
-mongoose@^4.9.1:
-  version "4.9.6"
-  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-4.9.6.tgz#8485879893a33fe4b8c8b596950cfa9a8d597ec1"
+mongoose@^4.9.8:
+  version "4.9.8"
+  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-4.9.8.tgz#ef64304231dc2455ab15a0c0cb6c149ce8c787bb"
   dependencies:
     async "2.1.4"
     bson "~1.0.4"
     hooks-fixed "2.0.0"
-    kareem "1.4.0"
+    kareem "1.4.1"
     mongodb "2.2.26"
     mpath "0.2.1"
     mpromise "0.5.5"
@@ -5288,10 +5290,6 @@ mquery@2.3.0:
     regexp-clone "0.0.1"
     sliced "0.0.5"
 
-ms@^0.7.1, ms@0.7.3:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.3.tgz#708155a5e44e33f5fd0fc53e81d0d40a91be1fff"
-
 ms@0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
@@ -5300,6 +5298,10 @@ ms@0.7.2:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
 
+ms@0.7.3, ms@^0.7.1:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.3.tgz#708155a5e44e33f5fd0fc53e81d0d40a91be1fff"
+
 muri@1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/muri/-/muri-1.2.1.tgz#ec7ea5ce6ca6a523eb1ab35bacda5fa816c9aa3c"
@@ -5316,7 +5318,7 @@ mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
 
-nan@^2.3.0, nan@^2.4.0, nan@2.5.0:
+nan@2.5.0, nan@^2.3.0, nan@^2.4.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.0.tgz#aa8f1e34531d807e9e27755b234b4a6ec0c152a8"
 
@@ -5427,7 +5429,7 @@ node-libs-browser@^2.0.0:
     util "^0.10.3"
     vm-browserify "0.0.4"
 
-node-pre-gyp@^0.6.29, node-pre-gyp@0.6.32:
+node-pre-gyp@0.6.32, node-pre-gyp@^0.6.29:
   version "0.6.32"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz#fc452b376e7319b3d255f5f34853ef6fd8fe1fd5"
   dependencies:
@@ -5519,15 +5521,15 @@ nodemon@^1.11.0:
     undefsafe "0.0.3"
     update-notifier "0.5.0"
 
-nopt@~1.0.10:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"
+nopt@3.x, nopt@~3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
   dependencies:
     abbrev "1"
 
-nopt@~3.0.6, nopt@3.x:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+nopt@~1.0.10:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"
   dependencies:
     abbrev "1"
 
@@ -5671,7 +5673,7 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
-optimist@^0.6.1, optimist@0.6.1:
+optimist@0.6.1, optimist@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
   dependencies:
@@ -5864,16 +5866,16 @@ path-parse@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
 
+path-to-regexp@0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+
 path-to-regexp@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
   dependencies:
     isarray "0.0.1"
 
-path-to-regexp@0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
-
 path-type@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
@@ -6183,33 +6185,33 @@ postcss-mixins@^2.1.0:
     postcss "^5.0.10"
     postcss-simple-vars "^1.0.1"
 
-postcss-modules-extract-imports@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.0.1.tgz#8fb3fef9a6dd0420d3f6d4353cf1ff73f2b2a341"
-  dependencies:
-    postcss "^5.0.4"
-
 postcss-modules-extract-imports@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.0.0.tgz#5b07f368e350cda6fd5c8844b79123a7bd3e37be"
   dependencies:
     postcss "^5.0.4"
 
-postcss-modules-local-by-default@^1.0.1, postcss-modules-local-by-default@1.1.1:
+postcss-modules-extract-imports@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.0.1.tgz#8fb3fef9a6dd0420d3f6d4353cf1ff73f2b2a341"
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-modules-local-by-default@1.1.1, postcss-modules-local-by-default@^1.0.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.1.1.tgz#29a10673fa37d19251265ca2ba3150d9040eb4ce"
   dependencies:
     css-selector-tokenizer "^0.6.0"
     postcss "^5.0.4"
 
-postcss-modules-scope@^1.0.0, postcss-modules-scope@1.0.2:
+postcss-modules-scope@1.0.2, postcss-modules-scope@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.0.2.tgz#ff977395e5e06202d7362290b88b1e8cd049de29"
   dependencies:
     css-selector-tokenizer "^0.6.0"
     postcss "^5.0.4"
 
-postcss-modules-values@^1.1.0, postcss-modules-values@1.2.2:
+postcss-modules-values@1.2.2, postcss-modules-values@^1.1.0:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.2.2.tgz#f0e7d476fe1ed88c5e4c7f97533a3e772ad94ca1"
   dependencies:
@@ -6375,6 +6377,14 @@ postcss-zindex@^2.0.1:
     postcss "^5.0.4"
     uniqs "^2.0.0"
 
+postcss@5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.1.2.tgz#bd84886a66bcad489afaf7c673eed5ef639551e2"
+  dependencies:
+    js-base64 "^2.1.9"
+    source-map "^0.5.6"
+    supports-color "^3.1.2"
+
 postcss@^5.0.0, postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.19, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.1.2, postcss@^5.2.13, postcss@^5.2.15, postcss@^5.2.16, postcss@^5.2.17, postcss@^5.2.4, postcss@^5.2.5:
   version "5.2.17"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b"
@@ -6384,14 +6394,6 @@ postcss@^5.0.0, postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.
     source-map "^0.5.6"
     supports-color "^3.2.3"
 
-postcss@5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.1.2.tgz#bd84886a66bcad489afaf7c673eed5ef639551e2"
-  dependencies:
-    js-base64 "^2.1.9"
-    source-map "^0.5.6"
-    supports-color "^3.1.2"
-
 pre-git@^3.10.0:
   version "3.14.0"
   resolved "https://registry.yarnpkg.com/pre-git/-/pre-git-3.14.0.tgz#abe7d6411febe8c908a6a89a94f9ae02a63aa81f"
@@ -6456,7 +6458,7 @@ process@^0.11.0:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
 
-progress@^1.1.8, progress@1.1.8:
+progress@1.1.8, progress@^1.1.8:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
 
@@ -6619,26 +6621,26 @@ pug@^2.0.0-beta3:
     pug-runtime "^2.0.3"
     pug-strip-comments "^1.0.2"
 
-punycode@^1.2.4, punycode@^1.4.1, punycode@1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-
 punycode@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
 
+punycode@1.4.1, punycode@^1.2.4, punycode@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+
 pym.js@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pym.js/-/pym.js-1.2.0.tgz#feb1e2c9b396613e5172192b0cdd75408f9c8322"
 
-q@^1.1.2, q@1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
-
 q@1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/q/-/q-1.1.2.tgz#6357e291206701d99f197ab84e57e8ad196f2a89"
 
+q@1.4.1, q@^1.1.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
+
 q@2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/q/-/q-2.0.3.tgz#75b8db0255a1a5af82f58c3f3aaa1efec7d0d134"
@@ -6647,7 +6649,7 @@ q@2.0.3:
     pop-iterate "^1.0.1"
     weak-map "^1.0.5"
 
-qs@^6.1.0, qs@^6.2.0, qs@~6.4.0, qs@6.4.0:
+qs@6.4.0, qs@^6.1.0, qs@^6.2.0, qs@~6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
 
@@ -6674,14 +6676,14 @@ quote@0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/quote/-/quote-0.4.0.tgz#10839217f6c1362b89194044d29b233fd7f32f01"
 
-ramda@^0.23.0:
-  version "0.23.0"
-  resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.23.0.tgz#ccd13fff73497a93974e3e86327bfd87bd6e8e2b"
-
 ramda@0.9.1:
   version "0.9.1"
   resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.9.1.tgz#cc914dc3a82c608d003090203787c3f6826c1d87"
 
+ramda@^0.23.0:
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.23.0.tgz#ccd13fff73497a93974e3e86327bfd87bd6e8e2b"
+
 random-bytes@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/random-bytes/-/random-bytes-1.0.0.tgz#4f68a1dc0ae58bd3fb95848c30324db75d64360b"
@@ -6743,7 +6745,7 @@ react-apollo@^1.1.0:
   optionalDependencies:
     react-dom "0.14.x || 15.* || ^15.0.0"
 
-react-dom@^15.3.1, react-dom@^15.4.2, "react-dom@0.14.x || 15.* || ^15.0.0":
+"react-dom@0.14.x || 15.* || ^15.0.0", react-dom@^15.3.1, react-dom@^15.4.2:
   version "15.5.4"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.5.4.tgz#ba0c28786fd52ed7e4f2135fe0288d462aef93da"
   dependencies:
@@ -6858,7 +6860,16 @@ read-pkg@^1.0.0:
     normalize-package-data "^2.3.2"
     path-type "^1.0.0"
 
-readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.2.6, readable-stream@2, readable-stream@2.2.7:
+readable-stream@1.1, readable-stream@1.1.x:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.13.tgz#f6eef764f514c89e2b9e23146a75ba106756d23e"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
+readable-stream@2, readable-stream@2.2.7, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.2.6:
   version "2.2.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.7.tgz#07057acbe2467b22042d36f98c5ad507054e95b1"
   dependencies:
@@ -6882,15 +6893,6 @@ readable-stream@~2.1.4:
     string_decoder "~0.10.x"
     util-deprecate "~1.0.1"
 
-readable-stream@1.1, readable-stream@1.1.x:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.13.tgz#f6eef764f514c89e2b9e23146a75ba106756d23e"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
 readdirp@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
@@ -6915,15 +6917,6 @@ readline2@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     mute-stream "0.0.5"
 
-recast@^0.11.17:
-  version "0.11.23"
-  resolved "https://registry.yarnpkg.com/recast/-/recast-0.11.23.tgz#451fd3004ab1e4df9b4e4b66376b2a21912462d3"
-  dependencies:
-    ast-types "0.9.6"
-    esprima "~3.1.0"
-    private "~0.1.5"
-    source-map "~0.5.0"
-
 recast@0.10.33:
   version "0.10.33"
   resolved "https://registry.yarnpkg.com/recast/-/recast-0.10.33.tgz#942808f7aa016f1fa7142c461d7e5704aaa8d697"
@@ -6933,6 +6926,15 @@ recast@0.10.33:
     private "~0.1.5"
     source-map "~0.5.0"
 
+recast@^0.11.17:
+  version "0.11.23"
+  resolved "https://registry.yarnpkg.com/recast/-/recast-0.11.23.tgz#451fd3004ab1e4df9b4e4b66376b2a21912462d3"
+  dependencies:
+    ast-types "0.9.6"
+    esprima "~3.1.0"
+    private "~0.1.5"
+    source-map "~0.5.0"
+
 rechoir@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
@@ -7117,6 +7119,31 @@ repeating@^2.0.0:
   dependencies:
     is-finite "^1.0.0"
 
+request@2.79.0:
+  version "2.79.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
+  dependencies:
+    aws-sign2 "~0.6.0"
+    aws4 "^1.2.1"
+    caseless "~0.11.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.0"
+    forever-agent "~0.6.1"
+    form-data "~2.1.1"
+    har-validator "~2.0.6"
+    hawk "~3.1.3"
+    http-signature "~1.1.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.7"
+    oauth-sign "~0.8.1"
+    qs "~6.3.0"
+    stringstream "~0.0.4"
+    tough-cookie "~2.3.0"
+    tunnel-agent "~0.4.1"
+    uuid "^3.0.0"
+
 request@^2.55.0, request@^2.74.0, request@^2.79.0:
   version "2.81.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
@@ -7144,38 +7171,6 @@ request@^2.55.0, request@^2.74.0, request@^2.79.0:
     tunnel-agent "^0.6.0"
     uuid "^3.0.0"
 
-request@2.79.0:
-  version "2.79.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.11.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~2.0.6"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    oauth-sign "~0.8.1"
-    qs "~6.3.0"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "~0.4.1"
-    uuid "^3.0.0"
-
-require_optional@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/require_optional/-/require_optional-1.0.0.tgz#52a86137a849728eb60a55533617f8f914f59abf"
-  dependencies:
-    resolve-from "^2.0.0"
-    semver "^5.1.0"
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -7199,6 +7194,13 @@ require-uncached@^1.0.2:
     caller-path "^0.1.0"
     resolve-from "^1.0.0"
 
+require_optional@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/require_optional/-/require_optional-1.0.0.tgz#52a86137a849728eb60a55533617f8f914f59abf"
+  dependencies:
+    resolve-from "^2.0.0"
+    semver "^5.1.0"
+
 resolve-from@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
@@ -7241,7 +7243,7 @@ right-pad@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/right-pad/-/right-pad-1.0.1.tgz#8ca08c2cbb5b55e74dafa96bf7fd1a27d568c8d0"
 
-rimraf@^2.2.8, rimraf@^2.4.4, rimraf@~2.5.1, rimraf@~2.5.4, rimraf@2:
+rimraf@2, rimraf@^2.2.8, rimraf@^2.4.4, rimraf@~2.5.1, rimraf@~2.5.4:
   version "2.5.4"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04"
   dependencies:
@@ -7283,14 +7285,14 @@ safe-buffer@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
 
-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"
-
 sax@0.5.x:
   version "0.5.8"
   resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
 
+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"
+
 selenium-standalone@^5.11.2:
   version "5.11.2"
   resolved "https://registry.yarnpkg.com/selenium-standalone/-/selenium-standalone-5.11.2.tgz#724ccaa72fb26f3711e0e20989e478c4133df844"
@@ -7317,18 +7319,18 @@ semver-regex@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-1.0.0.tgz#92a4969065f9c70c694753d55248fc68f8f652c9"
 
-semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@~5.3.0, "semver@2 || 3 || 4 || 5":
+"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
 
-semver@~5.0.1:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.0.3.tgz#77466de589cd5d3c95f138aa78bc569a3cb5d27a"
-
 semver@5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.1.0.tgz#85f2cf8550465c4df000cf7d86f6b054106ab9e5"
 
+semver@~5.0.1:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.0.3.tgz#77466de589cd5d3c95f138aa78bc569a3cb5d27a"
+
 send@0.15.1:
   version "0.15.1"
   resolved "https://registry.yarnpkg.com/send/-/send-0.15.1.tgz#8a02354c26e6f5cca700065f5f0cdeba90ec7b5f"
@@ -7392,6 +7394,10 @@ shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
 
+shelljs@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.6.0.tgz#ce1ed837b4b0e55b5ec3dab84251ab9dbdc0c7ec"
+
 shelljs@^0.7.0, shelljs@^0.7.5:
   version "0.7.7"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.7.tgz#b2f5c77ef97148f4b4f6e22682e10bba8667cff1"
@@ -7400,10 +7406,6 @@ shelljs@^0.7.0, shelljs@^0.7.5:
     interpret "^1.0.0"
     rechoir "^0.6.2"
 
-shelljs@0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.6.0.tgz#ce1ed837b4b0e55b5ec3dab84251ab9dbdc0c7ec"
-
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
@@ -7482,7 +7484,7 @@ socks-proxy-agent@2:
     extend "3"
     socks "~1.1.5"
 
-socks@~1.1.5, socks@1.1.9:
+socks@1.1.9, socks@~1.1.5:
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/socks/-/socks-1.1.9.tgz#628d7e4d04912435445ac0b6e459376cb3e6d691"
   dependencies:
@@ -7509,13 +7511,19 @@ source-map-support@^0.4.2:
   dependencies:
     source-map "^0.5.6"
 
-source-map@^0.4.4, source-map@0.4.x:
+source-map@0.1.x:
+  version "0.1.43"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
+  dependencies:
+    amdefine ">=0.0.4"
+
+source-map@0.4.x, source-map@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3, source-map@0.5.x:
+source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
 
@@ -7525,12 +7533,6 @@ source-map@~0.2.0:
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@0.1.x:
-  version "0.1.43"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
-  dependencies:
-    amdefine ">=0.0.4"
-
 spdx-correct@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
@@ -7627,16 +7629,6 @@ strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
 
-string_decoder@^0.10.25, string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-
-string_decoder@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.0.tgz#f06f41157b664d86069f84bdbdc9b0d8ab281667"
-  dependencies:
-    buffer-shims "~1.0.0"
-
 string-hash@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/string-hash/-/string-hash-1.1.3.tgz#e8aafc0ac1855b4666929ed7dd1275df5d6c811b"
@@ -7666,6 +7658,16 @@ string.prototype.codepointat@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/string.prototype.codepointat/-/string.prototype.codepointat-0.2.0.tgz#6b26e9bd3afcaa7be3b4269b526de1b82000ac78"
 
+string_decoder@^0.10.25, string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+
+string_decoder@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.0.tgz#f06f41157b664d86069f84bdbdc9b0d8ab281667"
+  dependencies:
+    buffer-shims "~1.0.0"
+
 stringmap@~0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/stringmap/-/stringmap-0.2.2.tgz#556c137b258f942b8776f5b2ef582aa069d7d1b1"
@@ -7710,7 +7712,7 @@ style-loader@^0.16.0:
   dependencies:
     loader-utils "^1.0.2"
 
-stylus@~0.54.5, stylus@0.54.5:
+stylus@0.54.5, stylus@~0.54.5:
   version "0.54.5"
   resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.5.tgz#42b9560931ca7090ce8515a798ba9e6aa3d6dc79"
   dependencies:
@@ -7763,16 +7765,16 @@ supertest@^2.0.1:
     methods "1.x"
     superagent "^2.0.0"
 
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-
-supports-color@^3.1.0, supports-color@3.1.2:
+supports-color@3.1.2, supports-color@^3.1.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
   dependencies:
     has-flag "^1.0.0"
 
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+
 supports-color@^3.1.2, supports-color@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
@@ -7799,7 +7801,7 @@ symbol-observable@^1.0.2, symbol-observable@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
 
-symbol-tree@^3.2.1, "symbol-tree@>= 3.1.0 < 4.0.0":
+"symbol-tree@>= 3.1.0 < 4.0.0", symbol-tree@^3.2.1:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
 
@@ -7866,7 +7868,7 @@ text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
-through@^2.3.6, through@~2.3, through@~2.3.1, through@~2.3.8, through@2:
+through@2, through@^2.3.6, through@~2.3, through@~2.3.1, through@~2.3.8:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
@@ -8023,14 +8025,14 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
-type-detect@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-1.0.0.tgz#762217cc06db258ec48908a1298e8b95121e8ea2"
-
 type-detect@0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-0.1.1.tgz#0ba5ec2a885640e470ea4e8505971900dac58822"
 
+type-detect@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-1.0.0.tgz#762217cc06db258ec48908a1298e8b95121e8ea2"
+
 type-is@~1.6.14:
   version "1.6.15"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410"
@@ -8071,7 +8073,7 @@ uid-number@~0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
 
-uid-safe@~2.1.4, uid-safe@2.1.4:
+uid-safe@2.1.4, uid-safe@~2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/uid-safe/-/uid-safe-2.1.4.tgz#3ad6f38368c6d4c8c75ec17623fb79aa1d071d81"
   dependencies:
@@ -8107,7 +8109,7 @@ uniqs@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
 
-unpipe@~1.0.0, unpipe@1.0.0:
+unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
 
@@ -8148,7 +8150,7 @@ util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
-util@^0.10.3, util@0.10.3:
+util@0.10.3, util@^0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
   dependencies:
@@ -8287,7 +8289,7 @@ whatwg-encoding@^1.0.1:
   dependencies:
     iconv-lite "0.4.13"
 
-whatwg-fetch@^2.0.0, whatwg-fetch@>=0.10.0:
+whatwg-fetch@>=0.10.0, whatwg-fetch@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84"
 
@@ -8312,24 +8314,28 @@ which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
 
-which@^1.1.1, which@^1.2.9:
-  version "1.2.14"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
-  dependencies:
-    isexe "^2.0.0"
-
 which@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.1.1.tgz#9ce512459946166e12c083f08ec073380fc8cbbb"
   dependencies:
     is-absolute "^0.1.7"
 
+which@^1.1.1, which@^1.2.9:
+  version "1.2.14"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
+  dependencies:
+    isexe "^2.0.0"
+
 wide-align@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.0.tgz#40edde802a71fea1f070da3e62dcda2e7add96ad"
   dependencies:
     string-width "^1.0.1"
 
+window-size@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
+
 window-size@^0.1.2:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"
@@ -8338,10 +8344,6 @@ window-size@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075"
 
-window-size@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
-
 with@^5.0.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/with/-/with-5.1.1.tgz#fa4daa92daf32c4ea94ed453c81f04686b575dfe"
@@ -8349,22 +8351,22 @@ with@^5.0.0:
     acorn "^3.1.0"
     acorn-globals "^3.0.0"
 
-word-wrap@^1.0.3, word-wrap@1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.1.tgz#248f459b465d179a17bc407c854d3151d07e45d8"
-
 word-wrap@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.1.0.tgz#356153d61d10610d600785c5d701288e0ae764a6"
 
+word-wrap@1.2.1, word-wrap@^1.0.3:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.1.tgz#248f459b465d179a17bc407c854d3151d07e45d8"
+
+wordwrap@0.0.2, wordwrap@~0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+
 wordwrap@^1.0.0, wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
 
-wordwrap@~0.0.2, wordwrap@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
-
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
@@ -8407,7 +8409,7 @@ xdg-basedir@^2.0.0:
   dependencies:
     os-homedir "^1.0.0"
 
-xml-name-validator@^2.0.1, "xml-name-validator@>= 2.0.1 < 3.0.0":
+"xml-name-validator@>= 2.0.1 < 3.0.0", xml-name-validator@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"
 
@@ -8533,4 +8535,3 @@ yauzl@^2.5.0:
   dependencies:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.0.1"
-

From 547ba126bef5cde43c500f7dd72d9a36a4e7b4ad Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 11 May 2017 17:31:22 -0600
Subject: [PATCH 02/16] cleanup to mutators

---
 graph/mutators/comment.js        | 14 +++++++-------
 graph/resolvers/root_mutation.js |  4 ++--
 models/user.js                   |  3 ++-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index ddbcf9c5d..048e24fac 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -172,7 +172,7 @@ const createPublicComment = async (context, commentInput) => {
  * @param {String} status      the new status of the comment
  */
 
-const setCommentStatus = async ({user, loaders: {Comments}}, {id, status}) => {
+const setStatus = async ({user, loaders: {Comments}}, {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
@@ -215,7 +215,7 @@ const removeCommentTag = ({user, loaders: {Comments}}, {id, tag}) => {
  * @param {Object} edit       describes how to edit the comment
  * @param {String} edit.body  the new Comment body
  */
-const editComment = async (context, {id, asset_id, edit: {body}}) => {
+const edit = async (context, {id, asset_id, edit: {body}}) => {
 
   // Get the wordlist and the settings object.
   const [wordlist, settings] = await filterNewComment(context, {asset_id, body});
@@ -232,10 +232,10 @@ module.exports = (context) => {
   let mutators = {
     Comment: {
       create: () => Promise.reject(errors.ErrNotAuthorized),
-      setCommentStatus: () => Promise.reject(errors.ErrNotAuthorized),
+      setStatus: () => Promise.reject(errors.ErrNotAuthorized),
       addCommentTag: () => Promise.reject(errors.ErrNotAuthorized),
       removeCommentTag: () => Promise.reject(errors.ErrNotAuthorized),
-      editComment: () => Promise.reject(errors.ErrNotAuthorized),
+      edit: () => Promise.reject(errors.ErrNotAuthorized),
     }
   };
 
@@ -244,7 +244,7 @@ module.exports = (context) => {
   }
 
   if (context.user && context.user.can('mutation:setCommentStatus')) {
-    mutators.Comment.setCommentStatus = (action) => setCommentStatus(context, action);
+    mutators.Comment.setStatus = (action) => setStatus(context, action);
   }
 
   if (context.user && context.user.can('mutation:addCommentTag')) {
@@ -255,8 +255,8 @@ module.exports = (context) => {
     mutators.Comment.removeCommentTag = (action) => removeCommentTag(context, action);
   }
 
-  if (context.user) {
-    mutators.Comment.editComment = (action) => editComment(context, action);
+  if (context.user && context.user.can('mutation:editComment')) {
+    mutators.Comment.edit = (action) => edit(context, action);
   }
 
   return mutators;
diff --git a/graph/resolvers/root_mutation.js b/graph/resolvers/root_mutation.js
index d3cee718c..3ad6fbfd8 100644
--- a/graph/resolvers/root_mutation.js
+++ b/graph/resolvers/root_mutation.js
@@ -6,7 +6,7 @@ const RootMutation = {
     return wrapResponse('comment')(Comment.create(comment));
   },
   editComment(_, args, {mutators: {Comment}}) {
-    return wrapResponse('comment')(Comment.editComment(args));
+    return wrapResponse('comment')(Comment.edit(args));
   },
   createFlag(_, {flag: {item_id, item_type, reason, message}}, {mutators: {Action}}) {
     return wrapResponse('flag')(Action.create({item_id, item_type, action_type: 'FLAG', group_id: reason, metadata: {message}}));
@@ -30,7 +30,7 @@ const RootMutation = {
     return wrapResponse(null)(User.stopIgnoringUser({id}));
   },
   setCommentStatus(_, {id, status}, {mutators: {Comment}}) {
-    return wrapResponse(null)(Comment.setCommentStatus({id, status}));
+    return wrapResponse(null)(Comment.setStatus({id, status}));
   },
   addCommentTag(_, {id, tag}, {mutators: {Comment}}) {
     return wrapResponse('comment')(Comment.addCommentTag({id, tag}).then(() => CommentsService.findById(id)));
diff --git a/models/user.js b/models/user.js
index 458ac68f0..3544dd309 100644
--- a/models/user.js
+++ b/models/user.js
@@ -199,7 +199,8 @@ const USER_GRAPH_OPERATIONS = [
   'mutation:suspendUser',
   'mutation:setCommentStatus',
   'mutation:addCommentTag',
-  'mutation:removeCommentTag'
+  'mutation:removeCommentTag',
+  'mutation:editComment'
 ];
 
 /**

From 08e7a90d6926c6d772f697e37b16c6ceb49a11ad Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 11 May 2017 17:34:47 -0600
Subject: [PATCH 03/16] lint fixes

---
 .eslintrc.json                                              | 1 +
 .../coral-admin/src/containers/Community/components/User.js | 4 ++--
 client/coral-embed-stream/src/components/Comment.js         | 4 ++--
 client/coral-embed-stream/src/containers/Embed.js           | 2 +-
 client/coral-plugin-best/BestButton.js                      | 6 +++---
 client/coral-plugin-infobox/Markdown.js                     | 2 +-
 graph/resolvers/root_query.js                               | 2 +-
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 293657679..65be1bab6 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -36,6 +36,7 @@
         "no-unneeded-ternary": [1],
         "object-curly-spacing": [1],
         "space-infix-ops": ["error"],
+        "space-in-parens": ["error", "never"],
         "no-const-assign": [2],
         "no-duplicate-imports": [2],
         "prefer-template": [1],
diff --git a/client/coral-admin/src/containers/Community/components/User.js b/client/coral-admin/src/containers/Community/components/User.js
index 20b599a7a..b6e4a0cc6 100644
--- a/client/coral-admin/src/containers/Community/components/User.js
+++ b/client/coral-admin/src/containers/Community/components/User.js
@@ -37,7 +37,7 @@ const User = props => {
             <div className={styles.flaggedByCount}>
               <i className="material-icons">flag</i><span className={styles.flaggedByLabel}>{lang.t('community.flags')}({ user.actions.length })</span>:
                 { user.action_summaries.map(
-                (action, i ) => {
+                (action, i) => {
                   return <span className={styles.flaggedBy} key={i}>
                     {lang.t(`community.${action.reason}`)} ({action.count})
                   </span>;
@@ -46,7 +46,7 @@ const User = props => {
             </div>
             <div className={styles.flaggedReasons}>
               { user.action_summaries.map(
-                (action_sum, i ) => {
+                (action_sum, i) => {
                   return <div key={i}>
                     <span className={styles.flaggedByLabel}>
                       {lang.t(`community.${action_sum.reason}`)} ({action_sum.count})
diff --git a/client/coral-embed-stream/src/components/Comment.js b/client/coral-embed-stream/src/components/Comment.js
index 13d286296..a7f7b760a 100644
--- a/client/coral-embed-stream/src/components/Comment.js
+++ b/client/coral-embed-stream/src/components/Comment.js
@@ -427,7 +427,7 @@ export default Comment;
 // return whether the comment is editable
 function commentIsStillEditable (comment) {
   const editing = comment && comment.editing;
-  if ( ! editing) {return false;}
+  if (! editing) {return false;}
   const editableUntil = getEditableUntilDate(comment);
   const editWindowExpired = (editableUntil - new Date) < 0;
   return ! editWindowExpired;  
@@ -436,7 +436,7 @@ function commentIsStillEditable (comment) {
 // return number of milliseconds before edit window expires
 function editWindowRemainingMs (comment) {
   const editableUntil = getEditableUntilDate(comment);
-  if ( ! editableUntil) {return;}
+  if (! editableUntil) {return;}
   const now = new Date();
   const editWindowRemainingMs = (editableUntil - now);
   return editWindowRemainingMs;
diff --git a/client/coral-embed-stream/src/containers/Embed.js b/client/coral-embed-stream/src/containers/Embed.js
index 0d21aac0a..3cc84a097 100644
--- a/client/coral-embed-stream/src/containers/Embed.js
+++ b/client/coral-embed-stream/src/containers/Embed.js
@@ -124,7 +124,7 @@ export default compose(
  * producing a new queryStream result where asset.comments reflects the edit
  */
 function reduceEditCommentActionsToUpdateStreamQuery(previousResult, action) {
-  if ( ! (action.type === 'APOLLO_MUTATION_RESULT' && action.operationName === 'editComment')) {
+  if (! (action.type === 'APOLLO_MUTATION_RESULT' && action.operationName === 'editComment')) {
     return previousResult;
   }
   const resultHasErrors = (result) => {
diff --git a/client/coral-plugin-best/BestButton.js b/client/coral-plugin-best/BestButton.js
index 96ef45f86..df20bf53d 100644
--- a/client/coral-plugin-best/BestButton.js
+++ b/client/coral-plugin-best/BestButton.js
@@ -29,7 +29,7 @@ export const BestIndicator = ({children = <Icon name='star'/>}) => (
  * Component that only renders children if the provided user prop can modify best tags
  */
 export const IfUserCanModifyBest = ({user, children}) => {
-  if ( ! ( user && canModifyBestTag(user))) {return null;}
+  if (! (user && canModifyBestTag(user))) {return null;}
   return children;
 };
 
@@ -63,7 +63,7 @@ export class BestButton extends Component {
   async onClickAddBest(e) {
     e.preventDefault();
     const {addBest} = this.props;
-    if ( ! addBest) {
+    if (! addBest) {
       console.warn('BestButton#onClickAddBest called even though there is no addBest prop. doing nothing');
       return;
     }
@@ -78,7 +78,7 @@ export class BestButton extends Component {
   async onClickRemoveBest(e) {
     e.preventDefault();
     const {removeBest} = this.props;
-    if ( ! removeBest) {
+    if (! removeBest) {
       console.warn('BestButton#onClickAddBest called even though there is no removeBest prop. doing nothing');
       return;
     }
diff --git a/client/coral-plugin-infobox/Markdown.js b/client/coral-plugin-infobox/Markdown.js
index 59b63bcb0..b5cf88d22 100644
--- a/client/coral-plugin-infobox/Markdown.js
+++ b/client/coral-plugin-infobox/Markdown.js
@@ -4,7 +4,7 @@ import marked from 'marked';
 const renderer = new marked.Renderer();
 
 // Set link target to `_parent` to work properly in an embed.
-renderer.link = ( href, title, text ) =>
+renderer.link = (href, title, text) =>
   `<a target="_parent" href="${href}" title="${title}">${text}</a>`;
 
 marked.setOptions({renderer});
diff --git a/graph/resolvers/root_query.js b/graph/resolvers/root_query.js
index 4dcb7ea11..749660acb 100644
--- a/graph/resolvers/root_query.js
+++ b/graph/resolvers/root_query.js
@@ -90,7 +90,7 @@ const RootQuery = {
 
     // get currentUser again since context.user was out of date when running test/graph/mutations/ignoreUser
     const currentUser = (await Users.getByQuery({ids: [user.id], limit: 1}))[0];
-    if ( ! (currentUser && Array.isArray(currentUser.ignoresUsers) && currentUser.ignoresUsers.length)) {
+    if (! (currentUser && Array.isArray(currentUser.ignoresUsers) && currentUser.ignoresUsers.length)) {
       return [];
     }
     return await Users.getByQuery({ids: currentUser.ignoresUsers});

From a65d045c6583e1ddd0c5d93ebda258cb1e4ac6d0 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 11 May 2017 17:38:49 -0600
Subject: [PATCH 04/16] lint fixes

---
 .eslintrc.json                                            | 4 ++++
 client/coral-embed-stream/src/components/Comment.js       | 6 +++---
 .../src/components/EditableCommentContent.js              | 2 +-
 client/coral-embed-stream/src/components/TopRightMenu.js  | 2 +-
 client/coral-embed-stream/src/containers/Embed.js         | 4 ++--
 client/coral-plugin-best/BestButton.js                    | 8 ++++----
 client/coral-plugin-commentbox/CommentForm.js             | 2 +-
 graph/resolvers/root_query.js                             | 2 +-
 models/user.js                                            | 2 +-
 9 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 65be1bab6..f27e2a1bc 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -37,6 +37,10 @@
         "object-curly-spacing": [1],
         "space-infix-ops": ["error"],
         "space-in-parens": ["error", "never"],
+        "space-unary-ops": ["error", {
+          "words": true,
+          "nonwords": false
+        }],
         "no-const-assign": [2],
         "no-duplicate-imports": [2],
         "prefer-template": [1],
diff --git a/client/coral-embed-stream/src/components/Comment.js b/client/coral-embed-stream/src/components/Comment.js
index a7f7b760a..715d5b954 100644
--- a/client/coral-embed-stream/src/components/Comment.js
+++ b/client/coral-embed-stream/src/components/Comment.js
@@ -427,16 +427,16 @@ export default Comment;
 // return whether the comment is editable
 function commentIsStillEditable (comment) {
   const editing = comment && comment.editing;
-  if (! editing) {return false;}
+  if (!editing) {return false;}
   const editableUntil = getEditableUntilDate(comment);
   const editWindowExpired = (editableUntil - new Date) < 0;
-  return ! editWindowExpired;  
+  return !editWindowExpired;  
 }
 
 // return number of milliseconds before edit window expires
 function editWindowRemainingMs (comment) {
   const editableUntil = getEditableUntilDate(comment);
-  if (! editableUntil) {return;}
+  if (!editableUntil) {return;}
   const now = new Date();
   const editWindowRemainingMs = (editableUntil - now);
   return editWindowRemainingMs;
diff --git a/client/coral-embed-stream/src/components/EditableCommentContent.js b/client/coral-embed-stream/src/components/EditableCommentContent.js
index 03b61edce..052da8e48 100644
--- a/client/coral-embed-stream/src/components/EditableCommentContent.js
+++ b/client/coral-embed-stream/src/components/EditableCommentContent.js
@@ -113,7 +113,7 @@ export class EditableCommentContent extends React.Component {
 
             // should be disabled if user hasn't actually changed their
             // original comment
-            return (comment.body !== originalBody) && ! editWindowExpired;
+            return (comment.body !== originalBody) && !editWindowExpired;
           }}
           saveComment={this.editComment}
           bodyLabel={lang.t('editComment.bodyInputLabel')}
diff --git a/client/coral-embed-stream/src/components/TopRightMenu.js b/client/coral-embed-stream/src/components/TopRightMenu.js
index e6b264c27..84d64f061 100644
--- a/client/coral-embed-stream/src/components/TopRightMenu.js
+++ b/client/coral-embed-stream/src/components/TopRightMenu.js
@@ -72,7 +72,7 @@ class Toggleable extends React.Component {
     };
   }
   toggle() {
-    this.setState({isOpen: ! this.state.isOpen});
+    this.setState({isOpen: !this.state.isOpen});
   }
   close() {
     this.setState({isOpen: false});
diff --git a/client/coral-embed-stream/src/containers/Embed.js b/client/coral-embed-stream/src/containers/Embed.js
index 3cc84a097..dcf531fa7 100644
--- a/client/coral-embed-stream/src/containers/Embed.js
+++ b/client/coral-embed-stream/src/containers/Embed.js
@@ -124,7 +124,7 @@ export default compose(
  * producing a new queryStream result where asset.comments reflects the edit
  */
 function reduceEditCommentActionsToUpdateStreamQuery(previousResult, action) {
-  if (! (action.type === 'APOLLO_MUTATION_RESULT' && action.operationName === 'editComment')) {
+  if (!(action.type === 'APOLLO_MUTATION_RESULT' && action.operationName === 'editComment')) {
     return previousResult;
   }
   const resultHasErrors = (result) => {
@@ -151,7 +151,7 @@ function reduceEditCommentActionsToUpdateStreamQuery(previousResult, action) {
     return editedComment;
   };
   const commentIsStillVisible = (comment) => {
-    return ! ((id === comment.id) && (['PREMOD', 'REJECTED'].includes(status)));
+    return !((id === comment.id) && (['PREMOD', 'REJECTED'].includes(status)));
   };
   const resultReflectingEdit = update(previousResult, {
     asset: {
diff --git a/client/coral-plugin-best/BestButton.js b/client/coral-plugin-best/BestButton.js
index df20bf53d..43bea7624 100644
--- a/client/coral-plugin-best/BestButton.js
+++ b/client/coral-plugin-best/BestButton.js
@@ -29,7 +29,7 @@ export const BestIndicator = ({children = <Icon name='star'/>}) => (
  * Component that only renders children if the provided user prop can modify best tags
  */
 export const IfUserCanModifyBest = ({user, children}) => {
-  if (! (user && canModifyBestTag(user))) {return null;}
+  if (!(user && canModifyBestTag(user))) {return null;}
   return children;
 };
 
@@ -63,7 +63,7 @@ export class BestButton extends Component {
   async onClickAddBest(e) {
     e.preventDefault();
     const {addBest} = this.props;
-    if (! addBest) {
+    if (!addBest) {
       console.warn('BestButton#onClickAddBest called even though there is no addBest prop. doing nothing');
       return;
     }
@@ -78,7 +78,7 @@ export class BestButton extends Component {
   async onClickRemoveBest(e) {
     e.preventDefault();
     const {removeBest} = this.props;
-    if (! removeBest) {
+    if (!removeBest) {
       console.warn('BestButton#onClickAddBest called even though there is no removeBest prop. doing nothing');
       return;
     }
@@ -93,7 +93,7 @@ export class BestButton extends Component {
   render() {
     const {isBest, addBest, removeBest} = this.props;
     const {isSaving} = this.state;
-    const disabled = isSaving || ! (isBest ? removeBest : addBest);
+    const disabled = isSaving || !(isBest ? removeBest : addBest);
     return (
       <button onClick={isBest ? this.onClickRemoveBest : this.onClickAddBest}
               disabled={disabled}
diff --git a/client/coral-plugin-commentbox/CommentForm.js b/client/coral-plugin-commentbox/CommentForm.js
index dc27a1906..7f037d6e5 100644
--- a/client/coral-plugin-commentbox/CommentForm.js
+++ b/client/coral-plugin-commentbox/CommentForm.js
@@ -86,7 +86,7 @@ export class CommentForm extends React.Component {
     const body = this.state.body;
     const length = body.length;
     const isNotValidLength = (length) => !length || (maxCharCount && length > maxCharCount);
-    const disablePostComment = (charCountEnable && isNotValidLength(length)) || ! saveCommentEnabled({body});
+    const disablePostComment = (charCountEnable && isNotValidLength(length)) || !saveCommentEnabled({body});
 
     return <div>
       <div className={`${name}-container`}>
diff --git a/graph/resolvers/root_query.js b/graph/resolvers/root_query.js
index 749660acb..7faa8cb1d 100644
--- a/graph/resolvers/root_query.js
+++ b/graph/resolvers/root_query.js
@@ -90,7 +90,7 @@ const RootQuery = {
 
     // get currentUser again since context.user was out of date when running test/graph/mutations/ignoreUser
     const currentUser = (await Users.getByQuery({ids: [user.id], limit: 1}))[0];
-    if (! (currentUser && Array.isArray(currentUser.ignoresUsers) && currentUser.ignoresUsers.length)) {
+    if (!(currentUser && Array.isArray(currentUser.ignoresUsers) && currentUser.ignoresUsers.length)) {
       return [];
     }
     return await Users.getByQuery({ids: currentUser.ignoresUsers});
diff --git a/models/user.js b/models/user.js
index 3544dd309..2539ee142 100644
--- a/models/user.js
+++ b/models/user.js
@@ -222,7 +222,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'].includes(a)) && !userCanModifyTags(this)) {
     return false;
   }
 

From ae5da93730132b896210acbd36919d004912d058 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 11 May 2017 17:44:51 -0600
Subject: [PATCH 05/16] linting fixes

---
 .eslintrc.json                                |  2 +
 client/coral-admin/src/actions/assets.js      |  6 +--
 client/coral-admin/src/actions/auth.js        | 22 ++++----
 client/coral-admin/src/actions/community.js   |  6 +--
 client/coral-admin/src/actions/config.js      |  2 +-
 client/coral-admin/src/actions/install.js     | 22 ++++----
 client/coral-admin/src/actions/moderation.js  |  2 +-
 client/coral-admin/src/actions/settings.js    | 10 ++--
 client/coral-admin/src/actions/users.js       |  8 +--
 .../coral-admin/src/components/AdminLogin.js  | 12 ++---
 .../coral-admin/src/components/EmptyCard.js   |  2 +-
 .../src/components/ModerationKeysModal.js     |  4 +-
 .../src/components/ModerationList.js          |  2 +-
 .../Community/CommunityContainer.js           |  6 +--
 .../containers/Community/CommunityLayout.js   |  2 +-
 .../src/containers/Community/Table.js         |  6 +--
 .../containers/Community/components/User.js   |  2 +-
 .../src/containers/Configure/Configure.js     |  2 +-
 .../src/containers/Configure/Domainlist.js    |  4 +-
 .../src/containers/Configure/EmbedLink.js     |  2 +-
 .../containers/Configure/StreamSettings.js    |  4 +-
 .../src/containers/Configure/Wordlist.js      |  8 +--
 .../containers/Dashboard/ActivityWidget.js    |  2 +-
 .../src/containers/Dashboard/Dashboard.js     |  2 +-
 .../src/containers/Dashboard/FlagWidget.js    |  4 +-
 .../src/containers/Dashboard/LikeWidget.js    |  4 +-
 .../Dashboard/MostLikedCommentsWidget.js      |  2 +-
 .../containers/Install/InstallContainer.js    | 18 +++----
 .../components/Steps/AddOrganizationName.js   |  2 +-
 .../components/Steps/CreateYourAccount.js     |  2 +-
 .../Install/components/Steps/InitialStep.js   |  2 +-
 .../components/Steps/InviteTeamMembers.js     |  2 +-
 .../components/Steps/PermittedDomainsStep.js  |  6 +--
 .../src/containers/LayoutContainer.js         |  8 +--
 .../ModerationQueue/ModerationContainer.js    | 14 ++---
 .../ModerationQueue/ModerationLayout.js       |  2 +-
 .../ModerationQueue/components/Comment.js     |  6 +--
 .../ModerationQueue/components/CommentType.js |  4 +-
 .../ModerationQueue/components/FlagBox.js     |  2 +-
 .../components/ModerationHeader.js            |  2 +-
 .../components/ModerationMenu.js              |  2 +-
 .../components/NotFoundAsset.js               |  2 +-
 .../src/containers/Stories/Stories.js         |  4 +-
 .../src/containers/Streams/Stories.js         |  4 +-
 .../src/graphql/mutations/index.js            | 16 +++---
 client/coral-admin/src/reducers/community.js  |  8 +--
 .../containers/ConfigureStreamContainer.js    |  6 +--
 .../coral-embed-stream/src/actions/config.js  |  2 +-
 .../src/components/Comment.js                 | 10 ++--
 .../src/components/Stream.js                  |  6 +--
 .../src/containers/Embed.js                   | 14 ++---
 .../src/containers/Stream.js                  |  8 +--
 client/coral-embed-stream/src/index.js        |  2 +-
 client/coral-framework/actions/asset.js       | 16 +++---
 client/coral-framework/actions/auth.js        | 54 +++++++++----------
 client/coral-framework/actions/user.js        |  4 +-
 .../graphql/mutations/index.js                |  2 +-
 client/coral-framework/helpers/plugins.js     | 20 +++----
 client/coral-framework/helpers/response.js    |  4 +-
 client/coral-framework/helpers/validate.js    |  8 +--
 client/coral-framework/hocs/withFragments.js  |  2 +-
 client/coral-framework/hocs/withReaction.js   |  8 +--
 .../coral-framework/loaders/plugins-loader.js |  2 +-
 client/coral-framework/reducers/auth.js       |  2 +-
 client/coral-framework/reducers/user.js       |  6 +--
 client/coral-framework/services/store.js      |  2 +-
 client/coral-framework/utils/index.js         | 12 ++---
 client/coral-plugin-author-name/AuthorName.js |  2 +-
 client/coral-plugin-best/BestButton.js        |  4 +-
 client/coral-plugin-commentbox/CommentBox.js  | 12 ++---
 client/coral-plugin-commentbox/actions.js     |  4 +-
 client/coral-plugin-flags/FlagButton.js       |  4 +-
 client/coral-plugin-history/Comment.js        |  2 +-
 client/coral-plugin-history/CommentHistory.js |  2 +-
 .../__tests__/infoBox.spec.js                 |  2 +-
 .../__tests__/markdown.spec.js                |  2 +-
 .../coral-plugin-moderation/ModerationLink.js |  2 +-
 .../PermalinkButton.js                        |  6 +--
 client/coral-plugin-pubdate/PubDate.js        |  2 +-
 .../containers/ProfileContainer.js            |  6 +--
 .../coral-sign-in/components/ForgotContent.js |  2 +-
 .../containers/ChangeUsernameContainer.js     | 14 ++---
 .../containers/SignInContainer.js             | 20 +++----
 client/coral-ui/components/Dialog.js          |  6 +--
 client/coral-ui/components/List.js            |  2 +-
 client/coral-ui/components/Option.js          |  2 +-
 client/coral-ui/components/Select.js          |  2 +-
 client/coral-ui/components/TabBar.js          |  2 +-
 client/coral-ui/components/WizardNav.js       |  2 +-
 graph/mutators/comment.js                     |  2 +-
 graph/resolvers/asset.js                      |  2 +-
 models/user.js                                |  4 +-
 .../client/containers/RespectButton.js        |  2 +-
 routes/api/users/index.js                     |  2 +-
 routes/assets/index.js                        |  6 +--
 services/assets.js                            |  2 +-
 services/comments.js                          |  2 +-
 services/mailer.js                            |  2 +-
 services/users.js                             |  4 +-
 test/e2e/pages/embedStreamPage.js             |  2 +-
 test/e2e/tests/00_AppTest.js                  |  2 +-
 test/e2e/tests/01_EmbedStreamTest.js          | 14 ++---
 test/e2e/tests/Admin/LoginTest.js             |  4 +-
 test/e2e/tests/Commenter/BestCommentTest.js   |  6 +--
 test/e2e/tests/Commenter/FlagCommentTest.js   |  6 +--
 test/e2e/tests/Commenter/FlagUsernameTest.js  |  6 +--
 test/e2e/tests/Commenter/LikeCommentTest.js   |  6 +--
 test/e2e/tests/Commenter/LoginTest.js         |  6 +--
 test/e2e/tests/Commenter/PermalinkTest.js     | 10 ++--
 test/e2e/tests/Commenter/PostComment.js       |  6 +--
 test/e2e/tests/EmbedStreamTests.js            | 10 ++--
 test/e2e/tests/Moderator/BestCommentTest.js   |  6 +--
 test/e2e/tests/Moderator/LoginTest.js         |  6 +--
 test/e2e/tests/Visitor/FlagCommentTest.js     |  6 +--
 test/e2e/tests/Visitor/LikeCommentTest.js     |  6 +--
 test/e2e/tests/Visitor/SignUpTest.js          |  6 +--
 test/server/graph/mutations/addCommentTag.js  |  2 +-
 test/server/graph/mutations/editComment.js    |  6 +--
 test/server/graph/mutations/ignoreUser.js     |  4 +-
 .../graph/mutations/removeCommentTag.js       |  2 +-
 test/server/services/comments.js              |  4 +-
 test/server/services/settings.js              |  6 +--
 test/server/services/users.js                 |  4 +-
 webpack.config.js                             |  6 +--
 124 files changed, 360 insertions(+), 358 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index f27e2a1bc..2186efd8b 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -20,6 +20,8 @@
         "no-template-curly-in-string": [1],
         "no-unsafe-negation": [1],
         "array-callback-return": [1],
+        "arrow-parens": ["warn", "always"],
+        "template-curly-spacing": "warn",
         "eqeqeq": [2, "smart"],
         "no-eval": [2],
         "no-global-assign": [2],
diff --git a/client/coral-admin/src/actions/assets.js b/client/coral-admin/src/actions/assets.js
index a4a3513a8..f5c2f848a 100644
--- a/client/coral-admin/src/actions/assets.js
+++ b/client/coral-admin/src/actions/assets.js
@@ -24,7 +24,7 @@ export const fetchAssets = (skip = '', limit = '', search = '', sort = '', filte
       assets: result,
       count
     }))
-    .catch(error => dispatch({type: FETCH_ASSETS_FAILURE, error}));
+    .catch((error) => dispatch({type: FETCH_ASSETS_FAILURE, error}));
 };
 
 // Update an asset state
@@ -34,9 +34,9 @@ export const updateAssetState = (id, closedAt) => (dispatch) => {
   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}));
+    .catch((error) => dispatch({type: UPDATE_ASSET_STATE_FAILURE, error}));
 };
 
-export const updateAssets = assets => dispatch => {
+export const updateAssets = (assets) => (dispatch) => {
   dispatch({type: UPDATE_ASSETS, assets});
 };
diff --git a/client/coral-admin/src/actions/auth.js b/client/coral-admin/src/actions/auth.js
index 89b56d4dc..99a852421 100644
--- a/client/coral-admin/src/actions/auth.js
+++ b/client/coral-admin/src/actions/auth.js
@@ -2,7 +2,7 @@ import * as actions from '../constants/auth';
 import coralApi from 'coral-framework/helpers/response';
 
 // Log In.
-export const handleLogin = (email, password, recaptchaResponse) => dispatch => {
+export const handleLogin = (email, password, recaptchaResponse) => (dispatch) => {
   dispatch({type: actions.LOGIN_REQUEST});
   const params = {method: 'POST', body: {email, password}};
   if (recaptchaResponse) {
@@ -14,10 +14,10 @@ export const handleLogin = (email, password, recaptchaResponse) => dispatch => {
         return dispatch(checkLoginFailure('not logged in'));
       }
 
-      const isAdmin = !!user.roles.filter(i => i === 'ADMIN').length;
+      const isAdmin = !!user.roles.filter((i) => i === 'ADMIN').length;
       dispatch(checkLoginSuccess(user, isAdmin));
     })
-    .catch(error => {
+    .catch((error) => {
 
       if (error.translation_key === 'LOGIN_MAXIMUM_EXCEEDED') {
         dispatch({type: actions.LOGIN_MAXIMUM_EXCEEDED, message: error.translation_key});
@@ -31,20 +31,20 @@ const forgotPassowordRequest = () => ({type: actions.FETCH_FORGOT_PASSWORD_REQUE
 const forgotPassowordSuccess = () => ({type: actions.FETCH_FORGOT_PASSWORD_SUCCESS});
 const forgotPassowordFailure = () => ({type: actions.FETCH_FORGOT_PASSWORD_FAILURE});
 
-export const requestPasswordReset = email => dispatch => {
+export const requestPasswordReset = (email) => (dispatch) => {
   dispatch(forgotPassowordRequest(email));
   return coralApi('/account/password/reset', {method: 'POST', body: {email}})
     .then(() => dispatch(forgotPassowordSuccess()))
-    .catch(error => dispatch(forgotPassowordFailure(error)));
+    .catch((error) => dispatch(forgotPassowordFailure(error)));
 };
 
 // Check Login
 
 const checkLoginRequest = () => ({type: actions.CHECK_LOGIN_REQUEST});
 const checkLoginSuccess = (user, isAdmin) => ({type: actions.CHECK_LOGIN_SUCCESS, user, isAdmin});
-const checkLoginFailure = error => ({type: actions.CHECK_LOGIN_FAILURE, error});
+const checkLoginFailure = (error) => ({type: actions.CHECK_LOGIN_FAILURE, error});
 
-export const checkLogin = () => dispatch => {
+export const checkLogin = () => (dispatch) => {
   dispatch(checkLoginRequest());
   return coralApi('/auth')
     .then(({user}) => {
@@ -52,10 +52,10 @@ export const checkLogin = () => dispatch => {
         return dispatch(checkLoginFailure('not logged in'));
       }
 
-      const isAdmin = !!user.roles.filter(i => i === 'ADMIN').length;
+      const isAdmin = !!user.roles.filter((i) => i === 'ADMIN').length;
       dispatch(checkLoginSuccess(user, isAdmin));
     })
-    .catch(error => {
+    .catch((error) => {
       console.error(error);
       dispatch(checkLoginFailure(`${error.translation_key}`));
     });
@@ -67,9 +67,9 @@ const logOutRequest = () => ({type: actions.LOGOUT_REQUEST});
 const logOutSuccess = () => ({type: actions.LOGOUT_SUCCESS});
 const logOutFailure = () => ({type: actions.LOGOUT_FAILURE});
 
-export const logout = () => dispatch => {
+export const logout = () => (dispatch) => {
   dispatch(logOutRequest());
   return coralApi('/auth', {method: 'DELETE'})
     .then(() => dispatch(logOutSuccess()))
-    .catch(error => dispatch(logOutFailure(error)));
+    .catch((error) => dispatch(logOutFailure(error)));
 };
diff --git a/client/coral-admin/src/actions/community.js b/client/coral-admin/src/actions/community.js
index 0f53ea3da..9a8743762 100644
--- a/client/coral-admin/src/actions/community.js
+++ b/client/coral-admin/src/actions/community.js
@@ -16,7 +16,7 @@ import {
 
 import coralApi from '../../../coral-framework/helpers/response';
 
-export const fetchAccounts = (query = {}) => dispatch => {
+export const fetchAccounts = (query = {}) => (dispatch) => {
 
   dispatch(requestFetchAccounts());
   coralApi(`/users?${qs.stringify(query)}`)
@@ -30,14 +30,14 @@ export const fetchAccounts = (query = {}) => dispatch => {
         totalPages
       });
     })
-    .catch(error => dispatch({type: FETCH_COMMENTERS_FAILURE, error}));
+    .catch((error) => dispatch({type: FETCH_COMMENTERS_FAILURE, error}));
 };
 
 const requestFetchAccounts = () => ({
   type: FETCH_COMMENTERS_REQUEST
 });
 
-export const updateSorting = sort => ({
+export const updateSorting = (sort) => ({
   type: SORT_UPDATE,
   sort
 });
diff --git a/client/coral-admin/src/actions/config.js b/client/coral-admin/src/actions/config.js
index dca0f7117..4f3528be0 100644
--- a/client/coral-admin/src/actions/config.js
+++ b/client/coral-admin/src/actions/config.js
@@ -1,6 +1,6 @@
 export const CONFIG_UPDATED = 'CONFIG_UPDATED';
 
-export const fetchConfig = () => dispatch => {
+export const fetchConfig = () => (dispatch) => {
   let json = document.getElementById('data');
   let data = JSON.parse(json.textContent);
   dispatch({type: CONFIG_UPDATED, data});
diff --git a/client/coral-admin/src/actions/install.js b/client/coral-admin/src/actions/install.js
index ceecf16c9..21ff58de1 100644
--- a/client/coral-admin/src/actions/install.js
+++ b/client/coral-admin/src/actions/install.js
@@ -5,14 +5,14 @@ import errorMsj from 'coral-framework/helpers/error';
 
 export const nextStep = () => ({type: actions.NEXT_STEP});
 export const previousStep = () => ({type: actions.PREVIOUS_STEP});
-export const goToStep = step => ({type: actions.GO_TO_STEP, step});
+export const goToStep = (step) => ({type: actions.GO_TO_STEP, step});
 
 const installRequest = () => ({type: actions.INSTALL_REQUEST});
 const installSuccess = () => ({type: actions.INSTALL_SUCCESS});
-const installFailure = error => ({type: actions.INSTALL_FAILURE, error});
+const installFailure = (error) => ({type: actions.INSTALL_FAILURE, error});
 
 const addError = (name, error) => ({type: actions.ADD_ERROR, name, error});
-const hasError = error => ({type: actions.HAS_ERROR, error});
+const hasError = (error) => ({type: actions.HAS_ERROR, error});
 const clearErrors = () => ({type: actions.CLEAR_ERRORS});
 
 const validation = (formData, dispatch, next) => {
@@ -21,11 +21,11 @@ const validation = (formData, dispatch, next) => {
   }
 
   const validKeys = Object.keys(formData)
-    .filter(name => name !== 'domains');
+    .filter((name) => name !== 'domains');
 
   // Required Validation
   const empty = validKeys
-  .filter(name => {
+  .filter((name) => {
     const cond = !formData[name].length;
 
     if (cond) {
@@ -45,7 +45,7 @@ const validation = (formData, dispatch, next) => {
 
   // RegExp Validation
   const validation = validKeys
-    .filter(name => {
+    .filter((name) => {
       const cond = !validate[name](formData[name]);
       if (cond) {
 
@@ -88,7 +88,7 @@ export const finishInstall = () => (dispatch, getState) => {
       dispatch(installSuccess());
       dispatch(nextStep());
     })
-    .catch(error => {
+    .catch((error) => {
       console.error(error);
       dispatch(installFailure(`${error.translation_key}`));
     });
@@ -99,10 +99,10 @@ export const updateUserFormData = (name, value) => ({type: actions.UPDATE_FORMDA
 export const updatePermittedDomains = (value) => ({type: actions.UPDATE_PERMITTED_DOMAINS_SETTINGS, value});
 
 const checkInstallRequest = () => ({type: actions.CHECK_INSTALL_REQUEST});
-const checkInstallSuccess = installed => ({type: actions.CHECK_INSTALL_SUCCESS, installed});
-const checkInstallFailure = error => ({type: actions.CHECK_INSTALL_FAILURE, error});
+const checkInstallSuccess = (installed) => ({type: actions.CHECK_INSTALL_SUCCESS, installed});
+const checkInstallFailure = (error) => ({type: actions.CHECK_INSTALL_FAILURE, error});
 
-export const checkInstall = next => dispatch => {
+export const checkInstall = (next) => (dispatch) => {
   dispatch(checkInstallRequest());
   coralApi('/setup')
     .then(({installed}) => {
@@ -111,7 +111,7 @@ export const checkInstall = next => dispatch => {
         next();
       }
     })
-    .catch(error => {
+    .catch((error) => {
       console.error(error);
       dispatch(checkInstallFailure(`${error.translation_key}`));
     });
diff --git a/client/coral-admin/src/actions/moderation.js b/client/coral-admin/src/actions/moderation.js
index c93dc0c76..9c9d5a571 100644
--- a/client/coral-admin/src/actions/moderation.js
+++ b/client/coral-admin/src/actions/moderation.js
@@ -1,6 +1,6 @@
 import * as actions from 'constants/moderation';
 
-export const toggleModal = open => ({type: actions.TOGGLE_MODAL, open});
+export const toggleModal = (open) => ({type: actions.TOGGLE_MODAL, open});
 export const singleView = () => ({type: actions.SINGLE_VIEW});
 
 // Ban User Dialog
diff --git a/client/coral-admin/src/actions/settings.js b/client/coral-admin/src/actions/settings.js
index d6eb183ad..b0530e77e 100644
--- a/client/coral-admin/src/actions/settings.js
+++ b/client/coral-admin/src/actions/settings.js
@@ -13,19 +13,19 @@ export const SAVE_SETTINGS_FAILED = 'SAVE_SETTINGS_FAILED';
 export const WORDLIST_UPDATED = 'WORDLIST_UPDATED';
 export const DOMAINLIST_UPDATED = 'DOMAINLIST_UPDATED';
 
-export const fetchSettings = () => dispatch => {
+export const fetchSettings = () => (dispatch) => {
   dispatch({type: SETTINGS_LOADING});
   coralApi('/settings')
-    .then(settings => {
+    .then((settings) => {
       dispatch({type: SETTINGS_RECEIVED, settings});
     })
-    .catch(error => {
+    .catch((error) => {
       dispatch({type: SETTINGS_FETCH_ERROR, error});
     });
 };
 
 // for updating top-level settings
-export const updateSettings = settings => {
+export const updateSettings = (settings) => {
   return {type: SETTINGS_UPDATED, settings};
 };
 
@@ -48,7 +48,7 @@ export const saveSettingsToServer = () => (dispatch, getState) => {
     .then(() => {
       dispatch({type: SAVE_SETTINGS_SUCCESS, settings});
     })
-    .catch(error => {
+    .catch((error) => {
       dispatch({type: SAVE_SETTINGS_FAILED, error});
     });
 };
diff --git a/client/coral-admin/src/actions/users.js b/client/coral-admin/src/actions/users.js
index 954d89820..2642db90d 100644
--- a/client/coral-admin/src/actions/users.js
+++ b/client/coral-admin/src/actions/users.js
@@ -9,8 +9,8 @@ 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}})
-      .then(res => dispatch({type: userTypes.UPDATE_STATUS_SUCCESS, res}))
-      .catch(error => dispatch({type: userTypes.UPDATE_STATUS_FAILURE, error}));
+      .then((res) => dispatch({type: userTypes.UPDATE_STATUS_SUCCESS, res}))
+      .catch((error) => dispatch({type: userTypes.UPDATE_STATUS_FAILURE, error}));
   };
 };
 
@@ -18,7 +18,7 @@ export const userStatusUpdate = (status, userId, commentId) => {
 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}));
+      .catch((error) => dispatch({type: userTypes.USER_EMAIL_FAILURE, error}));
   };
 };
 
@@ -26,6 +26,6 @@ export const sendNotificationEmail = (userId, subject, body) => {
 export const enableUsernameEdit = (userId) => {
   return (dispatch) => {
     return coralApi(`/users/${userId}/username-enable`, {method: 'POST'})
-      .catch(error => dispatch({type: userTypes.USERNAME_ENABLE_FAILURE, error}));
+      .catch((error) => dispatch({type: userTypes.USERNAME_ENABLE_FAILURE, error}));
   };
 };
diff --git a/client/coral-admin/src/components/AdminLogin.js b/client/coral-admin/src/components/AdminLogin.js
index e7e41eb48..2b8625f4f 100644
--- a/client/coral-admin/src/components/AdminLogin.js
+++ b/client/coral-admin/src/components/AdminLogin.js
@@ -14,7 +14,7 @@ class AdminLogin extends React.Component {
     this.state = {email: '', password: '', requestPassword: false};
   }
 
-  handleSignIn = e => {
+  handleSignIn = (e) => {
     e.preventDefault();
     this.props.handleLogin(this.state.email, this.state.password);
   }
@@ -28,7 +28,7 @@ class AdminLogin extends React.Component {
     this.props.handleLogin(this.state.email, this.state.password, recaptchaResponse);
   }
 
-  handleRequestPassword = e => {
+  handleRequestPassword = (e) => {
     e.preventDefault();
     this.props.requestPasswordReset(this.state.email);
   }
@@ -41,11 +41,11 @@ class AdminLogin extends React.Component {
         <TextField
           label='Email Address'
           value={this.state.email}
-          onChange={e => this.setState({email: e.target.value})} />
+          onChange={(e) => this.setState({email: e.target.value})} />
         <TextField
           label='Password'
           value={this.state.password}
-          onChange={e => this.setState({password: e.target.value})}
+          onChange={(e) => this.setState({password: e.target.value})}
           type='password' />
         <div style={{height: 10}}></div>
         <Button
@@ -54,7 +54,7 @@ class AdminLogin extends React.Component {
           full
           onClick={this.handleSignIn}>Sign In</Button>
         <p className={styles.forgotPasswordCTA}>
-          Forgot your password? <a href="#" className={styles.forgotPasswordLink} onClick={e => {
+          Forgot your password? <a href="#" className={styles.forgotPasswordLink} onClick={(e) => {
             e.preventDefault();
             this.setState({requestPassword: true});
           }}>Request a new one.</a>
@@ -82,7 +82,7 @@ class AdminLogin extends React.Component {
         <TextField
           label='Email Address'
           value={this.state.email}
-          onChange={e => this.setState({email: e.target.value})} />
+          onChange={(e) => this.setState({email: e.target.value})} />
         <Button
           type='submit'
           cStyle='black'
diff --git a/client/coral-admin/src/components/EmptyCard.js b/client/coral-admin/src/components/EmptyCard.js
index 42337a892..ae291bcad 100644
--- a/client/coral-admin/src/components/EmptyCard.js
+++ b/client/coral-admin/src/components/EmptyCard.js
@@ -1,7 +1,7 @@
 import React, {PropTypes} from 'react';
 import {Card} from 'coral-ui';
 
-const EmptyCard = props => (
+const EmptyCard = (props) => (
   <Card style={{textAlign: 'center', maxWidth: 400, margin: '0 auto'}}>
     {props.children}
   </Card>
diff --git a/client/coral-admin/src/components/ModerationKeysModal.js b/client/coral-admin/src/components/ModerationKeysModal.js
index 55bee3082..e3ea9e743 100644
--- a/client/coral-admin/src/components/ModerationKeysModal.js
+++ b/client/coral-admin/src/components/ModerationKeysModal.js
@@ -59,8 +59,8 @@ export default class ModerationKeysModal extends React.Component {
                   </tr>
                 </thead>
                 <tbody>
-                  {Object.keys(shortcut.shortcuts).map(key => (
-                    <tr key={`${key  }tr`}>
+                  {Object.keys(shortcut.shortcuts).map((key) => (
+                    <tr key={`${key}tr`}>
                       <td className={styles.shortcut}><span className={styles.key}>{key}</span></td>
                       <td>{lang.t(shortcut.shortcuts[key])}</td>
                     </tr>
diff --git a/client/coral-admin/src/components/ModerationList.js b/client/coral-admin/src/components/ModerationList.js
index 47e91e551..fae85e492 100644
--- a/client/coral-admin/src/components/ModerationList.js
+++ b/client/coral-admin/src/components/ModerationList.js
@@ -72,7 +72,7 @@ export default class ModerationList extends React.Component {
   // Add key handlers. Each action has one and added j/k for moving around
   bindKeyHandlers () {
     const {modActions, isActive} = this.props;
-    modActions.filter(action => menuOptionsMap[action].key).forEach(action => {
+    modActions.filter((action) => menuOptionsMap[action].key).forEach((action) => {
       key(menuOptionsMap[action].key, 'moderationList', () => isActive && this.actionKeyHandler(menuOptionsMap[action].status));
     });
     key('j', 'moderationList', () => isActive && this.moveKeyHandler('down'));
diff --git a/client/coral-admin/src/containers/Community/CommunityContainer.js b/client/coral-admin/src/containers/Community/CommunityContainer.js
index ecee9336c..899958e17 100644
--- a/client/coral-admin/src/containers/Community/CommunityContainer.js
+++ b/client/coral-admin/src/containers/Community/CommunityContainer.js
@@ -148,12 +148,12 @@ class CommunityContainer extends Component {
   }
 }
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   community: state.community.toJS()
 });
 
-const mapDispatchToProps = dispatch => ({
-  fetchAccounts: query => dispatch(fetchAccounts(query)),
+const mapDispatchToProps = (dispatch) => ({
+  fetchAccounts: (query) => dispatch(fetchAccounts(query)),
   showBanUserDialog: (user) => dispatch(showBanUserDialog(user)),
   hideBanUserDialog: () => dispatch(hideBanUserDialog(false)),
   showSuspendUserDialog: (user) => dispatch(showSuspendUserDialog(user)),
diff --git a/client/coral-admin/src/containers/Community/CommunityLayout.js b/client/coral-admin/src/containers/Community/CommunityLayout.js
index d6022fed9..0665b967d 100644
--- a/client/coral-admin/src/containers/Community/CommunityLayout.js
+++ b/client/coral-admin/src/containers/Community/CommunityLayout.js
@@ -1,6 +1,6 @@
 import React from 'react';
 
-const CommunityLayout = props => (
+const CommunityLayout = (props) => (
   <div>
     {props.children}
   </div>
diff --git a/client/coral-admin/src/containers/Community/Table.js b/client/coral-admin/src/containers/Community/Table.js
index aacc9c82f..44c06eed4 100644
--- a/client/coral-admin/src/containers/Community/Table.js
+++ b/client/coral-admin/src/containers/Community/Table.js
@@ -54,7 +54,7 @@ class Table extends Component {
                 <SelectField label={'Select me'} value={row.status || ''}
                   className={styles.selectField}
                   label={lang.t('community.status')}
-                  onChange={status => this.onCommenterStatusChange(row.id, status)}>
+                  onChange={(status) => this.onCommenterStatusChange(row.id, status)}>
                   <Option value={'ACTIVE'}>{lang.t('community.active')}</Option>
                   <Option value={'BANNED'}>{lang.t('community.banned')}</Option>
                 </SelectField>
@@ -63,7 +63,7 @@ class Table extends Component {
                 <SelectField label={'Select me'} value={row.roles[0] || ''}
                   className={styles.selectField}
                   label={lang.t('community.role')}
-                  onChange={role => this.onRoleChange(row.id, role)}>
+                  onChange={(role) => this.onRoleChange(row.id, role)}>
                   <Option value={''}>.</Option>
                   <Option value={'MODERATOR'}>{lang.t('community.moderator')}</Option>
                   <Option value={'ADMIN'}>{lang.t('community.admin')}</Option>
@@ -77,4 +77,4 @@ class Table extends Component {
   }
 }
 
-export default connect(state => ({commenters: state.community.get('accounts')}))(Table);
+export default connect((state) => ({commenters: state.community.get('accounts')}))(Table);
diff --git a/client/coral-admin/src/containers/Community/components/User.js b/client/coral-admin/src/containers/Community/components/User.js
index b6e4a0cc6..af4b72c0b 100644
--- a/client/coral-admin/src/containers/Community/components/User.js
+++ b/client/coral-admin/src/containers/Community/components/User.js
@@ -9,7 +9,7 @@ import translations from '../../../translations.json';
 const lang = new I18n(translations);
 
 // Render a single user for the list
-const User = props => {
+const User = (props) => {
   const {user, modActionButtons} = props;
   let userStatus = user.status;
 
diff --git a/client/coral-admin/src/containers/Configure/Configure.js b/client/coral-admin/src/containers/Configure/Configure.js
index b94394c61..e041edfe3 100644
--- a/client/coral-admin/src/containers/Configure/Configure.js
+++ b/client/coral-admin/src/containers/Configure/Configure.js
@@ -171,7 +171,7 @@ class Configure extends Component {
   }
 }
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   settings: state.settings.toJS()
 });
 export default connect(mapStateToProps)(Configure);
diff --git a/client/coral-admin/src/containers/Configure/Domainlist.js b/client/coral-admin/src/containers/Configure/Domainlist.js
index f1fc25dd0..0ccc4158f 100644
--- a/client/coral-admin/src/containers/Configure/Domainlist.js
+++ b/client/coral-admin/src/containers/Configure/Domainlist.js
@@ -18,8 +18,8 @@ const Domainlist = ({domains, onChangeDomainlist}) => {
             value={domains}
             inputProps={{placeholder: 'URL'}}
             addOnPaste={true}
-            pasteSplit={data => data.split(',').map(d => d.trim())}
-            onChange={tags => onChangeDomainlist('whitelist', tags)}
+            pasteSplit={(data) => data.split(',').map((d) => d.trim())}
+            onChange={(tags) => onChangeDomainlist('whitelist', tags)}
           />
         </div>
       </div>
diff --git a/client/coral-admin/src/containers/Configure/EmbedLink.js b/client/coral-admin/src/containers/Configure/EmbedLink.js
index 86ab8b1f8..d61c64c11 100644
--- a/client/coral-admin/src/containers/Configure/EmbedLink.js
+++ b/client/coral-admin/src/containers/Configure/EmbedLink.js
@@ -30,7 +30,7 @@ class EmbedLink extends Component {
       location.protocol,
       '//',
       location.hostname,
-      location.port ? (`:${  window.location.port}`) : ''
+      location.port ? (`:${window.location.port}`) : ''
     ].join('');
     const coralJsUrl = [talkBaseUrl, '/embed.js'].join('');
     const nonce = String(Math.random()).slice(2);
diff --git a/client/coral-admin/src/containers/Configure/StreamSettings.js b/client/coral-admin/src/containers/Configure/StreamSettings.js
index 08ec062c8..646eb9d9e 100644
--- a/client/coral-admin/src/containers/Configure/StreamSettings.js
+++ b/client/coral-admin/src/containers/Configure/StreamSettings.js
@@ -170,7 +170,7 @@ export default StreamSettings;
 
 // To see if we are talking about weeks, days or hours
 // We talk the remainder of the division and see if it's 0
-const getTimeoutMeasure = ts => {
+const getTimeoutMeasure = (ts) => {
   if (ts % TIMESTAMPS['weeks'] === 0) {
     return 'weeks';
   } else if (ts % TIMESTAMPS['days'] === 0) {
@@ -182,6 +182,6 @@ const getTimeoutMeasure = ts => {
 
 // Dividing the amount by it's measure (hours, days, weeks) we
 // obtain the amount of time
-const getTimeoutAmount = ts => ts / TIMESTAMPS[getTimeoutMeasure(ts)];
+const getTimeoutAmount = (ts) => ts / TIMESTAMPS[getTimeoutMeasure(ts)];
 
 const lang = new I18n(translations);
diff --git a/client/coral-admin/src/containers/Configure/Wordlist.js b/client/coral-admin/src/containers/Configure/Wordlist.js
index 8eb010b79..983047acf 100644
--- a/client/coral-admin/src/containers/Configure/Wordlist.js
+++ b/client/coral-admin/src/containers/Configure/Wordlist.js
@@ -15,8 +15,8 @@ const Wordlist = ({suspectWords, bannedWords, onChangeWordlist}) => (
           value={bannedWords}
           inputProps={{placeholder: 'word or phrase'}}
           addOnPaste={true}
-          pasteSplit={data => data.split(',').map(d => d.trim())}
-          onChange={tags => onChangeWordlist('banned', tags)}
+          pasteSplit={(data) => data.split(',').map((d) => d.trim())}
+          onChange={(tags) => onChangeWordlist('banned', tags)}
         />
       </div>
     </Card>
@@ -28,8 +28,8 @@ const Wordlist = ({suspectWords, bannedWords, onChangeWordlist}) => (
           value={suspectWords}
           inputProps={{placeholder: 'word or phrase'}}
           addOnPaste={true}
-          pasteSplit={data => data.split(',').map(d => d.trim())}
-          onChange={tags => onChangeWordlist('suspect', tags)} />
+          pasteSplit={(data) => data.split(',').map((d) => d.trim())}
+          onChange={(tags) => onChangeWordlist('suspect', tags)} />
       </div>
     </Card>
   </div>
diff --git a/client/coral-admin/src/containers/Dashboard/ActivityWidget.js b/client/coral-admin/src/containers/Dashboard/ActivityWidget.js
index a6e293b82..d6cbb8edd 100644
--- a/client/coral-admin/src/containers/Dashboard/ActivityWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/ActivityWidget.js
@@ -17,7 +17,7 @@ const ActivityWidget = ({assets}) => {
       <div className={styles.widgetTable}>
         {
           assets.length
-          ? assets.map(asset => {
+          ? assets.map((asset) => {
             return (
               <div className={styles.rowLinkify} key={asset.id}>
                 <Link className={styles.linkToModerate} to={`/admin/moderate/flagged/${asset.id}`}>Moderate</Link>
diff --git a/client/coral-admin/src/containers/Dashboard/Dashboard.js b/client/coral-admin/src/containers/Dashboard/Dashboard.js
index e6cfa27cd..e764bf596 100644
--- a/client/coral-admin/src/containers/Dashboard/Dashboard.js
+++ b/client/coral-admin/src/containers/Dashboard/Dashboard.js
@@ -35,7 +35,7 @@ class Dashboard extends React.Component {
   }
 }
 
-const mapStateToProps = state => {
+const mapStateToProps = (state) => {
   return {
     settings: state.settings.toJS(),
     moderation: state.moderation.toJS()
diff --git a/client/coral-admin/src/containers/Dashboard/FlagWidget.js b/client/coral-admin/src/containers/Dashboard/FlagWidget.js
index ea72cddc6..6a50223bc 100644
--- a/client/coral-admin/src/containers/Dashboard/FlagWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/FlagWidget.js
@@ -18,10 +18,10 @@ const FlagWidget = ({assets}) => {
       <div className={styles.widgetTable}>
         {
           assets.length
-          ? assets.map(asset => {
+          ? assets.map((asset) => {
             let flagSummary = null;
             if (asset.action_summaries) {
-              flagSummary = asset.action_summaries.find(s => s.__typename === 'FlagAssetActionSummary');
+              flagSummary = asset.action_summaries.find((s) => s.__typename === 'FlagAssetActionSummary');
             }
 
             return (
diff --git a/client/coral-admin/src/containers/Dashboard/LikeWidget.js b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
index b878c281b..4d7483667 100644
--- a/client/coral-admin/src/containers/Dashboard/LikeWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
@@ -18,8 +18,8 @@ const LikeWidget = ({assets}) => {
       <div className={styles.widgetTable}>
         {
           assets.length
-          ? assets.map(asset => {
-            const likeSummary = asset.action_summaries.find(s => s.type === 'LikeAssetActionSummary');
+          ? assets.map((asset) => {
+            const likeSummary = asset.action_summaries.find((s) => s.type === 'LikeAssetActionSummary');
             return (
               <div className={styles.rowLinkify} key={asset.id}>
                 <Link className={styles.linkToModerate} to={`/admin/moderate/flagged/${asset.id}`}>Moderate</Link>
diff --git a/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js b/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
index 0c41ac7c6..c29c9ad43 100644
--- a/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
@@ -7,7 +7,7 @@ import BanUserDialog from 'coral-admin/src/components/BanUserDialog';
 
 const lang = new I18n(translations);
 
-const MostLikedCommentsWidget = props => {
+const MostLikedCommentsWidget = (props) => {
   const {
     comments,
     moderation,
diff --git a/client/coral-admin/src/containers/Install/InstallContainer.js b/client/coral-admin/src/containers/Install/InstallContainer.js
index 75c41387a..67f266123 100644
--- a/client/coral-admin/src/containers/Install/InstallContainer.js
+++ b/client/coral-admin/src/containers/Install/InstallContainer.js
@@ -64,32 +64,32 @@ InstallContainer.contextTypes = {
   router: React.PropTypes.object
 };
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   install: state.install.toJS()
 });
 
-const mapDispatchToProps = dispatch => ({
+const mapDispatchToProps = (dispatch) => ({
   nextStep: () => dispatch(nextStep()),
-  goToStep: step => dispatch(goToStep(step)),
+  goToStep: (step) => dispatch(goToStep(step)),
   previousStep: () => dispatch(previousStep()),
   finishInstall: () => dispatch(finishInstall()),
-  checkInstall: next => dispatch(checkInstall(next)),
-  handleDomainsChange: value => {
+  checkInstall: (next) => dispatch(checkInstall(next)),
+  handleDomainsChange: (value) => {
     dispatch(updatePermittedDomains(value));
   },
-  handleSettingsChange: e => {
+  handleSettingsChange: (e) => {
     const {name, value} = e.currentTarget;
     dispatch(updateSettingsFormData(name, value));
   },
-  handleUserChange: e => {
+  handleUserChange: (e) => {
     const {name, value} = e.currentTarget;
     dispatch(updateUserFormData(name, value));
   },
-  handleSettingsSubmit: e => {
+  handleSettingsSubmit: (e) => {
     e.preventDefault();
     dispatch(submitSettings());
   },
-  handleUserSubmit: e => {
+  handleUserSubmit: (e) => {
     e.preventDefault();
     dispatch(submitUser());
   }
diff --git a/client/coral-admin/src/containers/Install/components/Steps/AddOrganizationName.js b/client/coral-admin/src/containers/Install/components/Steps/AddOrganizationName.js
index bcac6ef29..b25ddf143 100644
--- a/client/coral-admin/src/containers/Install/components/Steps/AddOrganizationName.js
+++ b/client/coral-admin/src/containers/Install/components/Steps/AddOrganizationName.js
@@ -6,7 +6,7 @@ const lang = new I18n(translations);
 import translations from '../../translations.json';
 import I18n from 'coral-framework/modules/i18n/i18n';
 
-const AddOrganizationName = props => {
+const AddOrganizationName = (props) => {
   const {handleSettingsChange, handleSettingsSubmit, install} = props;
   return (
     <div className={styles.step}>
diff --git a/client/coral-admin/src/containers/Install/components/Steps/CreateYourAccount.js b/client/coral-admin/src/containers/Install/components/Steps/CreateYourAccount.js
index 416fac195..e46f013a8 100644
--- a/client/coral-admin/src/containers/Install/components/Steps/CreateYourAccount.js
+++ b/client/coral-admin/src/containers/Install/components/Steps/CreateYourAccount.js
@@ -6,7 +6,7 @@ const lang = new I18n(translations);
 import translations from '../../translations.json';
 import I18n from 'coral-framework/modules/i18n/i18n';
 
-const InitialStep = props => {
+const InitialStep = (props) => {
   const {handleUserChange, handleUserSubmit, install} = props;
   return (
     <div className={styles.step}>
diff --git a/client/coral-admin/src/containers/Install/components/Steps/InitialStep.js b/client/coral-admin/src/containers/Install/components/Steps/InitialStep.js
index 1838e3178..18b49ce64 100644
--- a/client/coral-admin/src/containers/Install/components/Steps/InitialStep.js
+++ b/client/coral-admin/src/containers/Install/components/Steps/InitialStep.js
@@ -6,7 +6,7 @@ const lang = new I18n(translations);
 import translations from '../../translations.json';
 import I18n from 'coral-framework/modules/i18n/i18n';
 
-const InitialStep = props => {
+const InitialStep = (props) => {
   const {nextStep} = props;
   return (
     <div className={styles.step}>
diff --git a/client/coral-admin/src/containers/Install/components/Steps/InviteTeamMembers.js b/client/coral-admin/src/containers/Install/components/Steps/InviteTeamMembers.js
index 35a4a41de..880aa69a4 100644
--- a/client/coral-admin/src/containers/Install/components/Steps/InviteTeamMembers.js
+++ b/client/coral-admin/src/containers/Install/components/Steps/InviteTeamMembers.js
@@ -2,7 +2,7 @@ import React from 'react';
 import styles from './style.css';
 import {Button, Select, Option, TextField} from 'coral-ui';
 
-const InviteTeamMembers = props => {
+const InviteTeamMembers = (props) => {
   const {nextStep} = props;
   return (
     <div className={styles.step}>
diff --git a/client/coral-admin/src/containers/Install/components/Steps/PermittedDomainsStep.js b/client/coral-admin/src/containers/Install/components/Steps/PermittedDomainsStep.js
index f2c1546f6..9058db4c2 100644
--- a/client/coral-admin/src/containers/Install/components/Steps/PermittedDomainsStep.js
+++ b/client/coral-admin/src/containers/Install/components/Steps/PermittedDomainsStep.js
@@ -7,7 +7,7 @@ const lang = new I18n(translations);
 import translations from '../../translations.json';
 import I18n from 'coral-framework/modules/i18n/i18n';
 
-const PermittedDomainsStep = props => {
+const PermittedDomainsStep = (props) => {
   const {finishInstall, install, handleDomainsChange} = props;
   const domains = install.data.settings.domains.whitelist;
   return (
@@ -19,8 +19,8 @@ const PermittedDomainsStep = props => {
           value={domains}
           inputProps={{placeholder: 'URL'}}
           addOnPaste={true}
-          pasteSplit={data => data.split(',').map(d => d.trim())}
-          onChange={tags => handleDomainsChange(tags)}
+          pasteSplit={(data) => data.split(',').map((d) => d.trim())}
+          onChange={(tags) => handleDomainsChange(tags)}
         />
       </Card>
       <Button cStyle='green' onClick={finishInstall} raised>{lang.t('PERMITTED_DOMAINS.SUBMIT')}</Button>
diff --git a/client/coral-admin/src/containers/LayoutContainer.js b/client/coral-admin/src/containers/LayoutContainer.js
index 42e2baade..5515cdda4 100644
--- a/client/coral-admin/src/containers/LayoutContainer.js
+++ b/client/coral-admin/src/containers/LayoutContainer.js
@@ -42,17 +42,17 @@ class LayoutContainer extends Component {
   }
 }
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   auth: state.auth.toJS(),
   TALK_RECAPTCHA_PUBLIC: state.config.get('data').get('TALK_RECAPTCHA_PUBLIC', null)
 });
 
-const mapDispatchToProps = dispatch => ({
+const mapDispatchToProps = (dispatch) => ({
   checkLogin: () => dispatch(checkLogin()),
   fetchConfig: () => dispatch(fetchConfig()),
   handleLogin: (username, password, recaptchaResponse) => dispatch(handleLogin(username, password, recaptchaResponse)),
-  requestPasswordReset: email => dispatch(requestPasswordReset(email)),
-  toggleShortcutModal: toggle => dispatch(toggleShortcutModal(toggle)),
+  requestPasswordReset: (email) => dispatch(requestPasswordReset(email)),
+  toggleShortcutModal: (toggle) => dispatch(toggleShortcutModal(toggle)),
   handleLogout: () => dispatch(logout())
 });
 
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
index 9606be543..3d1c1dd7a 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
@@ -61,14 +61,14 @@ class ModerationContainer extends Component {
 
   select = (next) => () => {
     if (next) {
-      this.setState(prevState =>
+      this.setState((prevState) =>
         ({
           ...prevState,
           selectedIndex: prevState.selectedIndex < this.getComments().length - 1
             ? prevState.selectedIndex + 1 : prevState.selectedIndex
         }));
     } else {
-      this.setState(prevState =>
+      this.setState((prevState) =>
         ({
           ...prevState,
           selectedIndex: prevState.selectedIndex > 0 ?
@@ -126,7 +126,7 @@ class ModerationContainer extends Component {
     }
 
     if (providedAssetId) {
-      asset = assets.find(asset => asset.id === this.props.params.id);
+      asset = assets.find((asset) => asset.id === this.props.params.id);
 
       if (!asset) {
         return <NotFoundAsset assetId={providedAssetId} />;
@@ -202,17 +202,17 @@ class ModerationContainer extends Component {
   }
 }
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   moderation: state.moderation.toJS(),
   settings: state.settings.toJS(),
   assets: state.assets.get('assets')
 });
 
-const mapDispatchToProps = dispatch => ({
-  toggleModal: toggle => dispatch(toggleModal(toggle)),
+const mapDispatchToProps = (dispatch) => ({
+  toggleModal: (toggle) => dispatch(toggleModal(toggle)),
   onClose: () => dispatch(toggleModal(false)),
   singleView: () => dispatch(singleView()),
-  updateAssets: assets => dispatch(updateAssets(assets)),
+  updateAssets: (assets) => dispatch(updateAssets(assets)),
   fetchSettings: () => dispatch(fetchSettings()),
   showBanUserDialog: (user, commentId, commentStatus, showRejectedNote) => dispatch(showBanUserDialog(user, commentId, commentStatus, showRejectedNote)),
   hideBanUserDialog: () => dispatch(hideBanUserDialog(false)),
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationLayout.js b/client/coral-admin/src/containers/ModerationQueue/ModerationLayout.js
index 0db97cda0..02a798900 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationLayout.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationLayout.js
@@ -1,6 +1,6 @@
 import React from 'react';
 
-const ModerationLayout = props => (
+const ModerationLayout = (props) => (
   <div>
     {props.children}
   </div>
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
index 55a00096d..0f31210c0 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
@@ -27,11 +27,11 @@ const Comment = ({
   ...props
 }) => {
   const links = linkify.getMatches(comment.body);
-  const linkText = links ? links.map(link => link.raw) : [];
+  const linkText = links ? links.map((link) => link.raw) : [];
   const flagActionSummaries = getActionSummary('FlagActionSummary', comment);
   const flagActions =
     comment.actions &&
-    comment.actions.filter(a => a.__typename === 'FlagAction');
+    comment.actions.filter((a) => a.__typename === 'FlagAction');
   let commentType = '';
   if (comment.status === 'PREMOD') {
     commentType = 'premod';
@@ -43,7 +43,7 @@ const Comment = ({
   // this should be the behavior on the front end as well.
   // currently the highlighter plugin does not support this out of the box.
   const searchWords = [...suspectWords, ...bannedWords]
-    .filter(w => {
+    .filter((w) => {
       return new RegExp(`(^|\\s)${w}(\\s|$)`).test(comment.body);
     })
     .concat(linkText);
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/CommentType.js b/client/coral-admin/src/containers/ModerationQueue/components/CommentType.js
index 5ad4138ca..346b5f1e6 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/CommentType.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/CommentType.js
@@ -2,7 +2,7 @@ import React, {PropTypes} from 'react';
 import styles from './CommentType.css';
 import {Icon} from 'coral-ui';
 
-const CommentType = props => {
+const CommentType = (props) => {
   const typeData = getTypeData(props.type);
 
   return (
@@ -12,7 +12,7 @@ const CommentType = props => {
   );
 };
 
-const getTypeData = type => {
+const getTypeData = (type) => {
   switch (type) {
   case 'premod':
     return {icon: 'query_builder', text: 'Pre-Mod', className: 'premod'};
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.js b/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.js
index 62b4e554d..f2f52e75e 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.js
@@ -55,7 +55,7 @@ class FlagBox extends Component {
               <ul>
                 {actionSummaries.map((summary, i) => {
 
-                  const actionList = actions.filter(a => a.reason === summary.reason);
+                  const actionList = actions.filter((a) => a.reason === summary.reason);
 
                   return (
                     <li key={i}>
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/ModerationHeader.js b/client/coral-admin/src/containers/ModerationQueue/components/ModerationHeader.js
index e823be9fe..5d6e8b9de 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/ModerationHeader.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/ModerationHeader.js
@@ -3,7 +3,7 @@ import {Link} from 'react-router';
 import {Icon} from 'coral-ui';
 import styles from './styles.css';
 
-const ModerationHeader = props => (
+const ModerationHeader = (props) => (
     <div className=''>
       <div className={`mdl-tabs ${styles.header}`}>
         {
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js
index 7a50e6270..10f6732fd 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js
@@ -57,7 +57,7 @@ const ModerationMenu = (
           className={styles.selectField}
           label="Sort"
           value={sort}
-          onChange={sort => selectSort(sort)}>
+          onChange={(sort) => selectSort(sort)}>
           <Option value={'REVERSE_CHRONOLOGICAL'}>Newest First</Option>
           <Option value={'CHRONOLOGICAL'}>Oldest First</Option>
         </SelectField>
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/NotFoundAsset.js b/client/coral-admin/src/containers/ModerationQueue/components/NotFoundAsset.js
index 90610a577..ee5d2ccd1 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/NotFoundAsset.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/NotFoundAsset.js
@@ -2,7 +2,7 @@ import React from 'react';
 import {Link} from 'react-router';
 import styles from './styles.css';
 
-const NotFound = props => (
+const NotFound = (props) => (
   <div className={`mdl-card mdl-shadow--2dp ${styles.notFound}`}>
     <p>
       The provided asset id <Link to={`/admin/moderate/${props.assetId}`}>{props.assetId}</Link> does not exist.
diff --git a/client/coral-admin/src/containers/Stories/Stories.js b/client/coral-admin/src/containers/Stories/Stories.js
index 1264663f0..62393cb04 100644
--- a/client/coral-admin/src/containers/Stories/Stories.js
+++ b/client/coral-admin/src/containers/Stories/Stories.js
@@ -55,7 +55,7 @@ class Stories extends Component {
 
   onStatusClick = (closeStream, id, statusMenuOpen) => () => {
     if (statusMenuOpen) {
-      this.setState(prev => {
+      this.setState((prev) => {
         prev.statusMenus[id] = false;
         return prev;
       });
@@ -65,7 +65,7 @@ class Stories extends Component {
           this.props.fetchAssets(page, limit, search, sort, filter);
         });
     } else {
-      this.setState(prev => {
+      this.setState((prev) => {
         prev.statusMenus[id] = true;
         return prev;
       });
diff --git a/client/coral-admin/src/containers/Streams/Stories.js b/client/coral-admin/src/containers/Streams/Stories.js
index 4d2ad086a..7c7a65389 100644
--- a/client/coral-admin/src/containers/Streams/Stories.js
+++ b/client/coral-admin/src/containers/Streams/Stories.js
@@ -54,7 +54,7 @@ class Stories extends Component {
 
   onStatusClick = (closeStream, id, statusMenuOpen) => () => {
     if (statusMenuOpen) {
-      this.setState(prev => {
+      this.setState((prev) => {
         prev.statusMenus[id] = false;
         return prev;
       });
@@ -64,7 +64,7 @@ class Stories extends Component {
           this.props.fetchAssets(page, limit, search, sort, filter);
         });
     } else {
-      this.setState(prev => {
+      this.setState((prev) => {
         prev.statusMenus[id] = true;
         return prev;
       });
diff --git a/client/coral-admin/src/graphql/mutations/index.js b/client/coral-admin/src/graphql/mutations/index.js
index 6b21c8421..16c391907 100644
--- a/client/coral-admin/src/graphql/mutations/index.js
+++ b/client/coral-admin/src/graphql/mutations/index.js
@@ -56,7 +56,7 @@ export const setCommentStatus = graphql(SET_COMMENT_STATUS, {
         updateQueries: {
           ModQueue: (oldData) => {
             const comment = views.reduce((comment, view) => {
-              return comment ? comment : oldData[view].find(c => c.id === commentId);
+              return comment ? comment : oldData[view].find((c) => c.id === commentId);
             }, null);
             let accepted;
             let acceptedCount = oldData.acceptedCount;
@@ -70,9 +70,9 @@ export const setCommentStatus = graphql(SET_COMMENT_STATUS, {
               accepted = [comment, ...oldData.accepted];
             }
 
-            const premod = oldData.premod.filter(c => c.id !== commentId);
-            const flagged = oldData.flagged.filter(c => c.id !== commentId);
-            const rejected = oldData.rejected.filter(c => c.id !== commentId);
+            const premod = oldData.premod.filter((c) => c.id !== commentId);
+            const flagged = oldData.flagged.filter((c) => c.id !== commentId);
+            const rejected = oldData.rejected.filter((c) => c.id !== commentId);
             const premodCount = premod.length < oldData.premod.length ? oldData.premodCount - 1 : oldData.premodCount;
             const flaggedCount = flagged.length < oldData.flagged.length ? oldData.flaggedCount - 1 : oldData.flaggedCount;
             const rejectedCount = rejected.length < oldData.rejected.length ? oldData.rejectedCount - 1 : oldData.rejectedCount;
@@ -101,7 +101,7 @@ export const setCommentStatus = graphql(SET_COMMENT_STATUS, {
         updateQueries: {
           ModQueue: (oldData) => {
             const comment = views.reduce((comment, view) => {
-              return comment ? comment : oldData[view].find(c => c.id === commentId);
+              return comment ? comment : oldData[view].find((c) => c.id === commentId);
             }, null);
             let rejected;
             let rejectedCount = oldData.rejectedCount;
@@ -115,9 +115,9 @@ export const setCommentStatus = graphql(SET_COMMENT_STATUS, {
               rejected = [comment, ...oldData.rejected];
             }
 
-            const premod = oldData.premod.filter(c => c.id !== commentId);
-            const flagged = oldData.flagged.filter(c => c.id !== commentId);
-            const accepted = oldData.accepted.filter(c => c.id !== commentId);
+            const premod = oldData.premod.filter((c) => c.id !== commentId);
+            const flagged = oldData.flagged.filter((c) => c.id !== commentId);
+            const accepted = oldData.accepted.filter((c) => c.id !== commentId);
             const premodCount = premod.length < oldData.premod.length ? oldData.premodCount - 1 : oldData.premodCount;
             const flaggedCount = flagged.length < oldData.flagged.length ? oldData.flaggedCount - 1 : oldData.flaggedCount;
             const acceptedCount = accepted.length < oldData.accepted.length ? oldData.acceptedCount - 1 : oldData.acceptedCount;
diff --git a/client/coral-admin/src/reducers/community.js b/client/coral-admin/src/reducers/community.js
index d051ae0ff..7127c6fbe 100644
--- a/client/coral-admin/src/reducers/community.js
+++ b/client/coral-admin/src/reducers/community.js
@@ -53,17 +53,17 @@ export default function community (state = initialState, action) {
   }
   case SET_ROLE : {
     const commenters = state.get('accounts');
-    const idx = commenters.findIndex(el => el.id === action.id);
+    const idx = commenters.findIndex((el) => el.id === action.id);
 
     commenters[idx].roles[0] = action.role;
-    return state.set('accounts', commenters.map(id => id));
+    return state.set('accounts', commenters.map((id) => id));
   }
   case SET_COMMENTER_STATUS: {
     const commenters = state.get('accounts');
-    const idx = commenters.findIndex(el => el.id === action.id);
+    const idx = commenters.findIndex((el) => el.id === action.id);
 
     commenters[idx].status = action.status;
-    return state.set('accounts', commenters.map(id => id));
+    return state.set('accounts', commenters.map((id) => id));
 
   }
   case SORT_UPDATE :
diff --git a/client/coral-configure/containers/ConfigureStreamContainer.js b/client/coral-configure/containers/ConfigureStreamContainer.js
index aef7093f2..60ece7cf1 100644
--- a/client/coral-configure/containers/ConfigureStreamContainer.js
+++ b/client/coral-configure/containers/ConfigureStreamContainer.js
@@ -123,9 +123,9 @@ const mapStateToProps = (state) => ({
   asset: state.asset.toJS()
 });
 
-const mapDispatchToProps = dispatch => ({
-  updateStatus: status => dispatch(updateOpenStatus(status)),
-  updateConfiguration: newConfig => dispatch(updateConfiguration(newConfig)),
+const mapDispatchToProps = (dispatch) => ({
+  updateStatus: (status) => dispatch(updateOpenStatus(status)),
+  updateConfiguration: (newConfig) => dispatch(updateConfiguration(newConfig)),
 });
 
 export default compose(
diff --git a/client/coral-embed-stream/src/actions/config.js b/client/coral-embed-stream/src/actions/config.js
index 7e07c4c35..4aecb808b 100644
--- a/client/coral-embed-stream/src/actions/config.js
+++ b/client/coral-embed-stream/src/actions/config.js
@@ -1,6 +1,6 @@
 import {ADD_EXTERNAL_CONFIG} from '../constants/config';
 
-export const addExternalConfig = config => ({
+export const addExternalConfig = (config) => ({
   type: ADD_EXTERNAL_CONFIG,
   config
 });
diff --git a/client/coral-embed-stream/src/components/Comment.js b/client/coral-embed-stream/src/components/Comment.js
index 715d5b954..c3a870989 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.name !== 'STAFF');
+const isStaff = (tags) => !tags.every((t) => t.name !== 'STAFF');
 
 // hold actions links (e.g. Reply) along the comment footer
 const ActionButton = ({children}) => {
@@ -187,9 +187,9 @@ class Comment extends React.Component {
     );
     let myFlag = null;
     if (iPerformedThisAction('FlagActionSummary', comment)) {
-      myFlag = flagSummary.find(s => s.current_user);
+      myFlag = flagSummary.find((s) => s.current_user);
     } else if (iPerformedThisAction('DontAgreeActionSummary', comment)) {
-      myFlag = dontAgreeSummary.find(s => s.current_user);
+      myFlag = dontAgreeSummary.find((s) => s.current_user);
     }
 
     let commentClass = parentId
@@ -201,7 +201,7 @@ class Comment extends React.Component {
     const notifyOnError = (fn, errorToMessage) =>
       async function(...args) {
         if (typeof errorToMessage !== 'function') {
-          errorToMessage = error => error.message;
+          errorToMessage = (error) => error.message;
         }
         try {
           return await fn(...args);
@@ -375,7 +375,7 @@ class Comment extends React.Component {
             />
           : null}
         {comment.replies &&
-          comment.replies.map(reply => {
+          comment.replies.map((reply) => {
             return commentIsIgnored(reply)
               ? <IgnoredCommentTombstone key={reply.id} />
               : <Comment
diff --git a/client/coral-embed-stream/src/components/Stream.js b/client/coral-embed-stream/src/components/Stream.js
index 121aa7993..f08151eb9 100644
--- a/client/coral-embed-stream/src/components/Stream.js
+++ b/client/coral-embed-stream/src/components/Stream.js
@@ -15,7 +15,7 @@ import ChangeUsernameContainer
   from 'coral-sign-in/containers/ChangeUsernameContainer';
 
 class Stream extends React.Component {
-  setActiveReplyBox = reactKey => {
+  setActiveReplyBox = (reactKey) => {
     if (!this.props.auth.user) {
       this.props.showSignInDialog();
     } else {
@@ -58,7 +58,7 @@ class Stream extends React.Component {
     const firstCommentDate = asset.comments[0]
       ? asset.comments[0].created_at
       : new Date(Date.now() - 1000 * 60 * 60 * 24 * 7).toISOString();
-    const commentIsIgnored = comment =>
+    const commentIsIgnored = (comment) =>
       myIgnoredUsers && myIgnoredUsers.includes(comment.user.id);
     return (
       <div id="stream">
@@ -150,7 +150,7 @@ class Stream extends React.Component {
               />
               <div className="embed__stream">
                 {comments.map(
-                  comment =>
+                  (comment) =>
                     (commentIsIgnored(comment)
                       ? <IgnoredCommentTombstone key={comment.id} />
                       : <Comment
diff --git a/client/coral-embed-stream/src/containers/Embed.js b/client/coral-embed-stream/src/containers/Embed.js
index dcf531fa7..e3fa82107 100644
--- a/client/coral-embed-stream/src/containers/Embed.js
+++ b/client/coral-embed-stream/src/containers/Embed.js
@@ -90,7 +90,7 @@ export const withQuery = graphql(EMBED_QUERY, {
   props: ({data}) => separateDataAndRoot(data)
 });
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   auth: state.auth.toJS(),
   commentCountCache: state.stream.commentCountCache,
   commentId: state.stream.commentId,
@@ -100,7 +100,7 @@ const mapStateToProps = state => ({
   config: state.config
 });
 
-const mapDispatchToProps = dispatch =>
+const mapDispatchToProps = (dispatch) =>
   bindActionCreators(
     {
       logout,
@@ -115,7 +115,7 @@ const mapDispatchToProps = dispatch =>
 
 export default compose(
   connect(mapStateToProps, mapDispatchToProps),
-  branch(props => !props.auth.checkedInitialLogin && props.config, renderComponent(Spinner)),
+  branch((props) => !props.auth.checkedInitialLogin && props.config, renderComponent(Spinner)),
   withQuery
 )(EmbedContainer);
 
@@ -156,8 +156,8 @@ function reduceEditCommentActionsToUpdateStreamQuery(previousResult, action) {
   const resultReflectingEdit = update(previousResult, {
     asset: {
       comments: {
-        $apply: comments => {
-          return comments.filter(commentIsStillVisible).map(comment => {
+        $apply: (comments) => {
+          return comments.filter(commentIsStillVisible).map((comment) => {
             let replyWasEditedToBeHidden = false;
             if (comment.id === id) {
               return updateCommentWithEdit(comment, edit);
@@ -166,14 +166,14 @@ function reduceEditCommentActionsToUpdateStreamQuery(previousResult, action) {
               replies: {
                 $apply: (comments) => {
                   return comments
-                    .filter(c => {
+                    .filter((c) => {
                       if (commentIsStillVisible(c)) {
                         return true;
                       }
                       replyWasEditedToBeHidden = true;
                       return false;
                     })
-                    .map(comment => {
+                    .map((comment) => {
                       if (comment.id === id) {
                         return updateCommentWithEdit(comment, edit);                          
                       }
diff --git a/client/coral-embed-stream/src/containers/Stream.js b/client/coral-embed-stream/src/containers/Stream.js
index 443008913..c6ab222ee 100644
--- a/client/coral-embed-stream/src/containers/Stream.js
+++ b/client/coral-embed-stream/src/containers/Stream.js
@@ -25,7 +25,7 @@ class StreamContainer extends React.Component {
       variables,
 
       // Apollo requires this, even though we don't use it...
-      updateQuery: data => data,
+      updateQuery: (data) => data,
     });
   };
 
@@ -75,7 +75,7 @@ class StreamContainer extends React.Component {
             ...oldData,
             asset: {
               ...oldData.asset,
-              comments: oldData.asset.comments.map(comment => {
+              comments: oldData.asset.comments.map((comment) => {
 
                 // since the dipslayed replies and the returned replies can overlap,
                 // pull out the unique ones.
@@ -213,7 +213,7 @@ const fragments = {
   `,
 };
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   auth: state.auth.toJS(),
   commentCountCache: state.stream.commentCountCache,
   activeReplyBox: state.stream.activeReplyBox,
@@ -224,7 +224,7 @@ const mapStateToProps = state => ({
   previousTab: state.embed.previousTab,
 });
 
-const mapDispatchToProps = dispatch =>
+const mapDispatchToProps = (dispatch) =>
   bindActionCreators({
     showSignInDialog,
     addNotification,
diff --git a/client/coral-embed-stream/src/index.js b/client/coral-embed-stream/src/index.js
index 52a585fb2..3565b9d4e 100644
--- a/client/coral-embed-stream/src/index.js
+++ b/client/coral-embed-stream/src/index.js
@@ -21,7 +21,7 @@ if (store === localStore) {
 
   pym.sendMessage('getConfig');
 
-  pym.onMessage('config', config => {
+  pym.onMessage('config', (config) => {
     store.dispatch(addExternalConfig(JSON.parse(config)));
   });
 }
diff --git a/client/coral-framework/actions/asset.js b/client/coral-framework/actions/asset.js
index 6de4eaf9f..129cd1c3c 100644
--- a/client/coral-framework/actions/asset.js
+++ b/client/coral-framework/actions/asset.js
@@ -7,14 +7,14 @@ import translations from './../translations';
 const lang = new I18n(translations);
 
 export const fetchAssetRequest = () => ({type: actions.FETCH_ASSET_REQUEST});
-export const fetchAssetSuccess = asset => ({type: actions.FETCH_ASSET_SUCCESS, asset});
-export const fetchAssetFailure = error => ({type: actions.FETCH_ASSET_FAILURE, error});
+export const fetchAssetSuccess = (asset) => ({type: actions.FETCH_ASSET_SUCCESS, asset});
+export const fetchAssetFailure = (error) => ({type: actions.FETCH_ASSET_FAILURE, error});
 
 const updateAssetSettingsRequest = () => ({type: actions.UPDATE_ASSET_SETTINGS_REQUEST});
-const updateAssetSettingsSuccess = settings => ({type: actions.UPDATE_ASSET_SETTINGS_SUCCESS, settings});
+const updateAssetSettingsSuccess = (settings) => ({type: actions.UPDATE_ASSET_SETTINGS_SUCCESS, settings});
 const updateAssetSettingsFailure = () => ({type: actions.UPDATE_ASSET_SETTINGS_FAILURE});
 
-export const updateConfiguration = newConfig => (dispatch, getState) => {
+export const updateConfiguration = (newConfig) => (dispatch, getState) => {
   const assetId = getState().asset.toJS().id;
   dispatch(updateAssetSettingsRequest());
   coralApi(`/assets/${assetId}/settings`, {method: 'PUT', body: newConfig})
@@ -22,10 +22,10 @@ export const updateConfiguration = newConfig => (dispatch, getState) => {
       dispatch(addNotification('success', lang.t('successUpdateSettings')));
       dispatch(updateAssetSettingsSuccess(newConfig));
     })
-    .catch(error => dispatch(updateAssetSettingsFailure(error)));
+    .catch((error) => dispatch(updateAssetSettingsFailure(error)));
 };
 
-export const updateOpenStream = closedBody => (dispatch, getState) => {
+export const updateOpenStream = (closedBody) => (dispatch, getState) => {
   const assetId = getState().asset.toJS().id;
   dispatch(fetchAssetRequest());
   coralApi(`/assets/${assetId}/status`, {method: 'PUT', body: closedBody})
@@ -33,13 +33,13 @@ export const updateOpenStream = closedBody => (dispatch, getState) => {
       dispatch(addNotification('success', lang.t('successUpdateSettings')));
       dispatch(fetchAssetSuccess(closedBody));
     })
-    .catch(error => dispatch(fetchAssetFailure(error)));
+    .catch((error) => dispatch(fetchAssetFailure(error)));
 };
 
 const openStream = () => ({type: actions.OPEN_COMMENTS});
 const closeStream = () => ({type: actions.CLOSE_COMMENTS});
 
-export const updateOpenStatus = status => dispatch => {
+export const updateOpenStatus = (status) => (dispatch) => {
   if (status === 'open') {
     dispatch(openStream());
     dispatch(updateOpenStream({closedAt: null}));
diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js
index d689aeb63..29057a6e3 100644
--- a/client/coral-framework/actions/auth.js
+++ b/client/coral-framework/actions/auth.js
@@ -32,7 +32,7 @@ function fetchMe() {
 }
 
 // Dialog Actions
-export const showSignInDialog = () => dispatch => {
+export const showSignInDialog = () => (dispatch) => {
   const signInPopUp = window.open(
     '/embed/stream/login',
     'Login',
@@ -56,7 +56,7 @@ export const showSignInDialog = () => dispatch => {
 
   dispatch({type: actions.SHOW_SIGNIN_DIALOG});
 };
-export const hideSignInDialog = () => dispatch => {
+export const hideSignInDialog = () => (dispatch) => {
   dispatch({type: actions.HIDE_SIGNIN_DIALOG});
   window.close();
 };
@@ -66,11 +66,11 @@ export const showCreateUsernameDialog = () => ({type: actions.SHOW_CREATEUSERNAM
 export const hideCreateUsernameDialog = () => ({type: actions.HIDE_CREATEUSERNAME_DIALOG});
 
 const createUsernameSuccess = () => ({type: actions.CREATE_USERNAME_SUCCESS});
-const createUsernameFailure = error => ({type: actions.CREATE_USERNAME_FAILURE, error});
+const createUsernameFailure = (error) => ({type: actions.CREATE_USERNAME_FAILURE, error});
 
 export const updateUsername = ({username}) => ({type: actions.UPDATE_USERNAME, username});
 
-export const createUsername = (userId, formData) => dispatch => {
+export const createUsername = (userId, formData) => (dispatch) => {
   dispatch(createUsernameRequest());
   coralApi('/account/username', {method: 'PUT', body: formData})
     .then(() => {
@@ -78,12 +78,12 @@ export const createUsername = (userId, formData) => dispatch => {
       dispatch(hideCreateUsernameDialog());
       dispatch(updateUsername(formData));
     })
-    .catch(error => {
+    .catch((error) => {
       dispatch(createUsernameFailure(lang.t(`error.${error.translation_key}`)));
     });
 };
 
-export const changeView = view => dispatch => {
+export const changeView = (view) => (dispatch) => {
   dispatch({
     type: actions.CHANGE_VIEW,
     view
@@ -110,13 +110,13 @@ const signInRequest = () => ({type: actions.FETCH_SIGNIN_REQUEST});
 // TODO: revisit login redux flow.
 // const signInSuccess = (user, isAdmin) => ({type: actions.FETCH_SIGNIN_SUCCESS, user, isAdmin});
 //
-const signInFailure = error => ({type: actions.FETCH_SIGNIN_FAILURE, error});
+const signInFailure = (error) => ({type: actions.FETCH_SIGNIN_FAILURE, error});
 
 export const fetchSignIn = (formData) => (dispatch) => {
   dispatch(signInRequest());
   return coralApi('/auth/local', {method: 'POST', body: formData})
     .then(() => dispatch(hideSignInDialog()))
-    .catch(error => {
+    .catch((error) => {
       if (error.metadata) {
 
         // the user might not have a valid email. prompt the user user re-request the confirmation email
@@ -132,10 +132,10 @@ export const fetchSignIn = (formData) => (dispatch) => {
 // Sign In - Facebook
 
 const signInFacebookRequest = () => ({type: actions.FETCH_SIGNIN_FACEBOOK_REQUEST});
-const signInFacebookSuccess = user => ({type: actions.FETCH_SIGNIN_FACEBOOK_SUCCESS, user});
-const signInFacebookFailure = error => ({type: actions.FETCH_SIGNIN_FACEBOOK_FAILURE, error});
+const signInFacebookSuccess = (user) => ({type: actions.FETCH_SIGNIN_FACEBOOK_SUCCESS, user});
+const signInFacebookFailure = (error) => ({type: actions.FETCH_SIGNIN_FACEBOOK_FAILURE, error});
 
-export const fetchSignInFacebook = () => dispatch => {
+export const fetchSignInFacebook = () => (dispatch) => {
   dispatch(signInFacebookRequest());
   window.open(
     `${base}/auth/facebook`,
@@ -148,7 +148,7 @@ export const fetchSignInFacebook = () => dispatch => {
 
 const signUpFacebookRequest = () => ({type: actions.FETCH_SIGNUP_FACEBOOK_REQUEST});
 
-export const fetchSignUpFacebook = () => dispatch => {
+export const fetchSignUpFacebook = () => (dispatch) => {
   dispatch(signUpFacebookRequest());
   window.open(
     `${base}/auth/facebook`,
@@ -157,7 +157,7 @@ export const fetchSignUpFacebook = () => dispatch => {
   );
 };
 
-export const facebookCallback = (err, data) => dispatch => {
+export const facebookCallback = (err, data) => (dispatch) => {
   if (err) {
     dispatch(signInFacebookFailure(err));
     return;
@@ -177,8 +177,8 @@ export const facebookCallback = (err, data) => dispatch => {
 // Sign Up Actions
 
 const signUpRequest = () => ({type: actions.FETCH_SIGNUP_REQUEST});
-const signUpSuccess = user => ({type: actions.FETCH_SIGNUP_SUCCESS, user});
-const signUpFailure = error => ({type: actions.FETCH_SIGNUP_FAILURE, error});
+const signUpSuccess = (user) => ({type: actions.FETCH_SIGNUP_SUCCESS, user});
+const signUpFailure = (error) => ({type: actions.FETCH_SIGNUP_FAILURE, error});
 
 export const fetchSignUp = (formData, redirectUri) => (dispatch) => {
   dispatch(signUpRequest());
@@ -187,7 +187,7 @@ export const fetchSignUp = (formData, redirectUri) => (dispatch) => {
     .then(({user}) => {
       dispatch(signUpSuccess(user));
     })
-    .catch(error => {
+    .catch((error) => {
       let errorMessage = lang.t(`error.${error.message}`);
 
       // if there is no translation defined, just show the error string
@@ -204,12 +204,12 @@ const forgotPassowordRequest = () => ({type: actions.FETCH_FORGOT_PASSWORD_REQUE
 const forgotPassowordSuccess = () => ({type: actions.FETCH_FORGOT_PASSWORD_SUCCESS});
 const forgotPassowordFailure = () => ({type: actions.FETCH_FORGOT_PASSWORD_FAILURE});
 
-export const fetchForgotPassword = email => (dispatch) => {
+export const fetchForgotPassword = (email) => (dispatch) => {
   dispatch(forgotPassowordRequest(email));
   const redirectUri = pym.parentUrl || location.href;
   coralApi('/account/password/reset', {method: 'POST', body: {email, loc: redirectUri}})
     .then(() => dispatch(forgotPassowordSuccess()))
-    .catch(error => dispatch(forgotPassowordFailure(error)));
+    .catch((error) => dispatch(forgotPassowordFailure(error)));
 };
 
 // LogOut Actions
@@ -218,28 +218,28 @@ const logOutRequest = () => ({type: actions.LOGOUT_REQUEST});
 const logOutSuccess = () => ({type: actions.LOGOUT_SUCCESS});
 const logOutFailure = () => ({type: actions.LOGOUT_FAILURE});
 
-export const logout = () => dispatch => {
+export const logout = () => (dispatch) => {
   dispatch(logOutRequest());
   return coralApi('/auth', {method: 'DELETE'})
     .then(() => {
       dispatch(logOutSuccess());
       fetchMe();
     })
-    .catch(error => dispatch(logOutFailure(error)));
+    .catch((error) => dispatch(logOutFailure(error)));
 };
 
 // LogOut Actions
 
 export const validForm = () => ({type: actions.VALID_FORM});
-export const invalidForm = error => ({type: actions.INVALID_FORM, error});
+export const invalidForm = (error) => ({type: actions.INVALID_FORM, error});
 
 // Check Login
 
 const checkLoginRequest = () => ({type: actions.CHECK_LOGIN_REQUEST});
 const checkLoginSuccess = (user, isAdmin) => ({type: actions.CHECK_LOGIN_SUCCESS, user, isAdmin});
-const checkLoginFailure = error => ({type: actions.CHECK_LOGIN_FAILURE, error});
+const checkLoginFailure = (error) => ({type: actions.CHECK_LOGIN_FAILURE, error});
 
-export const checkLogin = () => dispatch => {
+export const checkLogin = () => (dispatch) => {
   dispatch(checkLoginRequest());
   coralApi('/auth')
     .then((result) => {
@@ -247,10 +247,10 @@ export const checkLogin = () => dispatch => {
         throw new Error('Not logged in');
       }
 
-      const isAdmin = !!result.user.roles.filter(i => i === 'ADMIN').length;
+      const isAdmin = !!result.user.roles.filter((i) => i === 'ADMIN').length;
       dispatch(checkLoginSuccess(result.user, isAdmin));
     })
-    .catch(error => {
+    .catch((error) => {
       console.error(error);
       dispatch(checkLoginFailure(`${error.translation_key}`));
     });
@@ -260,13 +260,13 @@ const verifyEmailRequest = () => ({type: actions.VERIFY_EMAIL_REQUEST});
 const verifyEmailSuccess = () => ({type: actions.VERIFY_EMAIL_SUCCESS});
 const verifyEmailFailure = () => ({type: actions.VERIFY_EMAIL_FAILURE});
 
-export const requestConfirmEmail = (email, redirectUri) => dispatch => {
+export const requestConfirmEmail = (email, redirectUri) => (dispatch) => {
   dispatch(verifyEmailRequest());
   return coralApi('/users/resend-verify', {method: 'POST', body: {email}, headers: {'X-Pym-Url': redirectUri}})
     .then(() => {
       dispatch(verifyEmailSuccess());
     })
-    .catch(err => {
+    .catch((err) => {
 
       // email might have already been verifyed
       dispatch(verifyEmailFailure(err));
diff --git a/client/coral-framework/actions/user.js b/client/coral-framework/actions/user.js
index 3e80b718c..910fe0865 100644
--- a/client/coral-framework/actions/user.js
+++ b/client/coral-framework/actions/user.js
@@ -6,7 +6,7 @@ import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from './../translations';
 const lang = new I18n(translations);
 
-const editUsernameFailure = error => ({type: actions.EDIT_USERNAME_FAILURE, error});
+const editUsernameFailure = (error) => ({type: actions.EDIT_USERNAME_FAILURE, error});
 const editUsernameSuccess = () => ({type: actions.EDIT_USERNAME_SUCCESS});
 
 export const editName = (username) => (dispatch) => {
@@ -15,7 +15,7 @@ export const editName = (username) => (dispatch) => {
       dispatch(editUsernameSuccess());
       dispatch(addNotification('success', lang.t('successNameUpdate')));
     })
-    .catch(error => {
+    .catch((error) => {
       dispatch(editUsernameFailure(lang.t(`error.${error.translation_key}`)));
     });
 };
diff --git a/client/coral-framework/graphql/mutations/index.js b/client/coral-framework/graphql/mutations/index.js
index 4fb87c42c..0249bbe4e 100644
--- a/client/coral-framework/graphql/mutations/index.js
+++ b/client/coral-framework/graphql/mutations/index.js
@@ -16,7 +16,7 @@ export const postComment = graphql(POST_COMMENT, {
     fragments: commentView
   }),
   props: ({ownProps, mutate}) => ({
-    postItem: comment => {
+    postItem: (comment) => {
       const {asset_id, body, parent_id, tags = []} = comment;
       return mutate({
         variables: {
diff --git a/client/coral-framework/helpers/plugins.js b/client/coral-framework/helpers/plugins.js
index d701b933f..eaeb71110 100644
--- a/client/coral-framework/helpers/plugins.js
+++ b/client/coral-framework/helpers/plugins.js
@@ -9,8 +9,8 @@ import {getDefinitionName} from 'coral-framework/utils';
 
 export const pluginReducers = merge(
   ...plugins
-    .filter(o => o.module.reducer)
-    .map(o => ({...o.module.reducer}))
+    .filter((o) => o.module.reducer)
+    .map((o) => ({...o.module.reducer}))
 );
 
 /**
@@ -18,18 +18,18 @@ export const pluginReducers = merge(
  */
 export function getSlotElements(slot, props = {}) {
   const components = flatten(plugins
-    .filter(o => o.module.slots[slot])
-    .map(o => o.module.slots[slot]));
+    .filter((o) => o.module.slots[slot])
+    .map((o) => o.module.slots[slot]));
   return components
     .map((component, i) => React.createElement(component, {key: i, ...props}));
 }
 
 function getComponentFragments(components) {
   return components
-    .map(c => c.fragments)
-    .filter(fragments => fragments)
+    .map((c) => c.fragments)
+    .filter((fragments) => fragments)
     .reduce((res, fragments) => {
-      Object.keys(fragments).forEach(key => {
+      Object.keys(fragments).forEach((key) => {
         if (!(key in res)) {
           res[key] = {spreads: '', definitions: ''};
         }
@@ -56,10 +56,10 @@ export function getSlotsFragments(slots) {
   if (!Array.isArray(slots)) {
     slots = [slots];
   }
-  const components = uniq(flattenDeep(slots.map(slot => {
+  const components = uniq(flattenDeep(slots.map((slot) => {
     return plugins
-    .filter(o => o.module.slots[slot])
-    .map(o => o.module.slots[slot]);
+    .filter((o) => o.module.slots[slot])
+    .map((o) => o.module.slots[slot]);
   })));
 
   const fragments = getComponentFragments(components);
diff --git a/client/coral-framework/helpers/response.js b/client/coral-framework/helpers/response.js
index 0fce878cd..27691793a 100644
--- a/client/coral-framework/helpers/response.js
+++ b/client/coral-framework/helpers/response.js
@@ -34,9 +34,9 @@ const buildOptions = (inputOptions = {}) => {
   return options;
 };
 
-const handleResp = res => {
+const handleResp = (res) => {
   if (res.status > 399) {
-    return res.json().then(err => {
+    return res.json().then((err) => {
       let message = err.message || res.status;
       const error = new Error();
 
diff --git a/client/coral-framework/helpers/validate.js b/client/coral-framework/helpers/validate.js
index fc1316723..dd36ae07f 100644
--- a/client/coral-framework/helpers/validate.js
+++ b/client/coral-framework/helpers/validate.js
@@ -1,7 +1,7 @@
 export default {
-  email: email => (/^([A-Za-z0-9_\-\.\+])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/.test(email)),
-  password: pass => (/^(?=.{8,}).*$/.test(pass)),
+  email: (email) => (/^([A-Za-z0-9_\-\.\+])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/.test(email)),
+  password: (pass) => (/^(?=.{8,}).*$/.test(pass)),
   confirmPassword: () => true,
-  username: username => (/^[a-zA-Z0-9_]+$/.test(username)),
-  organizationName: org => (/^[a-zA-Z0-9_ ]+$/).test(org)
+  username: (username) => (/^[a-zA-Z0-9_]+$/.test(username)),
+  organizationName: (org) => (/^[a-zA-Z0-9_ ]+$/).test(org)
 };
diff --git a/client/coral-framework/hocs/withFragments.js b/client/coral-framework/hocs/withFragments.js
index a5060f27a..d62d62ae3 100644
--- a/client/coral-framework/hocs/withFragments.js
+++ b/client/coral-framework/hocs/withFragments.js
@@ -2,7 +2,7 @@ import React from 'react';
 import {getDisplayName} from '../helpers/hoc';
 
 // TODO: revisit `filtering` after https://github.com/apollographql/graphql-anywhere/issues/38.
-export default fragments => WrappedComponent => {
+export default (fragments) => (WrappedComponent) => {
   class WithFragments extends React.Component {
     render() {
       return <WrappedComponent {...this.props} />;
diff --git a/client/coral-framework/hocs/withReaction.js b/client/coral-framework/hocs/withReaction.js
index c383dbed8..f2897e606 100644
--- a/client/coral-framework/hocs/withReaction.js
+++ b/client/coral-framework/hocs/withReaction.js
@@ -10,7 +10,7 @@ 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 => {
+export default (reaction) => (WrappedComponent) => {
   if (typeof reaction !== 'string') {
     console.error('Reaction must be a valid string');
     return null;
@@ -40,7 +40,7 @@ export default reaction => WrappedComponent => {
     }
   }
 
-  const isReaction = a =>
+  const isReaction = (a) =>
     a.__typename === `${capitalize(reaction)}ActionSummary`;
 
   const COMMENT_FRAGMENT = gql`
@@ -88,7 +88,7 @@ export default reaction => WrappedComponent => {
                 errors: null
               }
             },
-            update: proxy => {
+            update: (proxy) => {
               const fragmentId = `Comment_${reactionData.commentId}`;
 
               // Read the data from our cache for this query.
@@ -208,7 +208,7 @@ export default reaction => WrappedComponent => {
     }
   );
 
-  const mapDispatchToProps = dispatch =>
+  const mapDispatchToProps = (dispatch) =>
     bindActionCreators({showSignInDialog}, dispatch);
 
   const enhance = compose(
diff --git a/client/coral-framework/loaders/plugins-loader.js b/client/coral-framework/loaders/plugins-loader.js
index c3534df32..4feae42ca 100644
--- a/client/coral-framework/loaders/plugins-loader.js
+++ b/client/coral-framework/loaders/plugins-loader.js
@@ -11,7 +11,7 @@ const {stripIndent} = require('common-tags');
 
 function getPluginList(config) {
   if (config && config.client) {
-    return config.client.map(x => typeof x === 'string' ? x : Object.keys(x)[0]);
+    return config.client.map((x) => typeof x === 'string' ? x : Object.keys(x)[0]);
   }
 
   return [];
diff --git a/client/coral-framework/reducers/auth.js b/client/coral-framework/reducers/auth.js
index 83ea49ce5..36233c796 100644
--- a/client/coral-framework/reducers/auth.js
+++ b/client/coral-framework/reducers/auth.js
@@ -20,7 +20,7 @@ const initialState = Map({
   fromSignUp: false
 });
 
-const purge = user => {
+const purge = (user) => {
   const {settings, profiles, ...userData} = user; // eslint-disable-line
   return fromJS(userData);
 };
diff --git a/client/coral-framework/reducers/user.js b/client/coral-framework/reducers/user.js
index efa967cf0..2969665e3 100644
--- a/client/coral-framework/reducers/user.js
+++ b/client/coral-framework/reducers/user.js
@@ -12,7 +12,7 @@ const initialState = Map({
   ignoredUsers: Set(),
 });
 
-const purge = user => {
+const purge = (user) => {
   const {_id, created_at, updated_at, __v, roles, ...userData} = user; // eslint-disable-line
   return userData;
 };
@@ -42,9 +42,9 @@ export default function user (state = initialState, action) {
   case 'APOLLO_MUTATION_RESULT':
     switch (action.operationName) {
     case 'ignoreUser':
-      return state.updateIn(['ignoredUsers'], i => i.add(action.variables.id));        
+      return state.updateIn(['ignoredUsers'], (i) => i.add(action.variables.id));        
     case 'stopIgnoringUser':
-      return state.updateIn(['ignoredUsers'], i => i.delete(action.variables.id));
+      return state.updateIn(['ignoredUsers'], (i) => i.delete(action.variables.id));
     }
     break;
   }
diff --git a/client/coral-framework/services/store.js b/client/coral-framework/services/store.js
index f6ace1fd3..22e126d75 100644
--- a/client/coral-framework/services/store.js
+++ b/client/coral-framework/services/store.js
@@ -3,7 +3,7 @@ import thunk from 'redux-thunk';
 import mainReducer from '../reducers';
 import {client} from './client';
 
-const apolloErrorReporter = () => next => action => {
+const apolloErrorReporter = () => (next) => (action) => {
   if (action.type === 'APOLLO_QUERY_ERROR') {
     console.error(action.error);
   }
diff --git a/client/coral-framework/utils/index.js b/client/coral-framework/utils/index.js
index 598fb59ab..244d89d44 100644
--- a/client/coral-framework/utils/index.js
+++ b/client/coral-framework/utils/index.js
@@ -1,6 +1,6 @@
 export const getTotalActionCount = (type, comment) => {
   return comment.action_summaries
-    .filter(s => s.__typename === type)
+    .filter((s) => s.__typename === type)
     .reduce((total, summary) => {
       return total + summary.count;
     }, 0);
@@ -10,14 +10,14 @@ export const iPerformedThisAction = (type, comment) => {
 
   // if there is a current_user on any of the ActionSummary(s), the user performed this action
   return comment.action_summaries
-    .filter(a => a.__typename === type)
-    .some(a => a.current_user);
+    .filter((a) => a.__typename === type)
+    .some((a) => a.current_user);
 };
 
 export const getMyActionSummary = (type, comment) => {
   return comment.action_summaries
-    .filter(a => a.__typename === type)
-    .find(a => a.current_user);
+    .filter((a) => a.__typename === type)
+    .find((a) => a.current_user);
 };
 
  /**
@@ -27,7 +27,7 @@ export const getMyActionSummary = (type, comment) => {
  */
 
 export const getActionSummary = (type, comment) => {
-  return comment.action_summaries.filter(a => a.__typename === type);
+  return comment.action_summaries.filter((a) => a.__typename === type);
 };
 
 /**
diff --git a/client/coral-plugin-author-name/AuthorName.js b/client/coral-plugin-author-name/AuthorName.js
index 67f61bc33..66b907ad8 100644
--- a/client/coral-plugin-author-name/AuthorName.js
+++ b/client/coral-plugin-author-name/AuthorName.js
@@ -6,7 +6,7 @@ export default class AuthorName extends Component {
   state = {showTooltip: false}
 
   handleClick = () => {
-    this.setState(state => ({
+    this.setState((state) => ({
       showTooltip: !state.showTooltip
     }));
   }
diff --git a/client/coral-plugin-best/BestButton.js b/client/coral-plugin-best/BestButton.js
index 43bea7624..639d496cf 100644
--- a/client/coral-plugin-best/BestButton.js
+++ b/client/coral-plugin-best/BestButton.js
@@ -7,7 +7,7 @@ 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);
+  const isBest = Array.isArray(tags) && tags.some((t) => t.name === BEST_TAG);
   return isBest;
 };
 
@@ -15,7 +15,7 @@ const name = 'coral-plugin-best';
 const lang = new I18n(translations);
 
 // It would be best if the backend/api held this business logic
-const canModifyBestTag = ({roles = []} = {}) => roles && ['ADMIN', 'MODERATOR'].some(role => roles.includes(role));
+const canModifyBestTag = ({roles = []} = {}) => roles && ['ADMIN', 'MODERATOR'].some((role) => roles.includes(role));
 
 // Put this on a comment to show that it is best
 
diff --git a/client/coral-plugin-commentbox/CommentBox.js b/client/coral-plugin-commentbox/CommentBox.js
index e703a3058..7c132da7f 100644
--- a/client/coral-plugin-commentbox/CommentBox.js
+++ b/client/coral-plugin-commentbox/CommentBox.js
@@ -62,14 +62,14 @@ class CommentBox extends React.Component {
     !isReply && setCommentCountCache(commentCountCache + 1);
 
     // Execute preSubmit Hooks
-    this.state.hooks.preSubmit.forEach(hook => hook());
+    this.state.hooks.preSubmit.forEach((hook) => hook());
 
     postItem(comment, 'comments')
       .then(({data}) => {
         const postedComment = data.createComment.comment;
 
         // Execute postSubmit Hooks
-        this.state.hooks.postSubmit.forEach(hook => hook(data));
+        this.state.hooks.postSubmit.forEach((hook) => hook(data));
 
         notifyForNewCommentStatus(addNotification, postedComment.status);
 
@@ -95,7 +95,7 @@ class CommentBox extends React.Component {
     if (typeof hook !== 'function') {
       return console.warn(`Hooks must be functions. Please check your ${hookType} hooks`);
     } else if (typeof hookType === 'string') {
-      this.setState(state => ({
+      this.setState((state) => ({
         hooks: {
           ...state.hooks,
           [hookType]: [
@@ -115,10 +115,10 @@ class CommentBox extends React.Component {
     }
   }
 
-  unregisterHook = hookData => {
+  unregisterHook = (hookData) => {
     const {hookType, hook} = hookData;
 
-    this.setState(state => {
+    this.setState((state) => {
       let newHooks = state.hooks[newHooks];
       const idx = state.hooks[hookType].indexOf(hook);
 
@@ -139,7 +139,7 @@ class CommentBox extends React.Component {
     });
   }
 
-  handleChange = e => this.setState({body: e.target.value});
+  handleChange = (e) => this.setState({body: e.target.value});
 
   render () {
     const {styles, isReply, authorId, maxCharCount} = this.props;
diff --git a/client/coral-plugin-commentbox/actions.js b/client/coral-plugin-commentbox/actions.js
index 46bcf4b1b..6de4c6e2c 100644
--- a/client/coral-plugin-commentbox/actions.js
+++ b/client/coral-plugin-commentbox/actions.js
@@ -1,9 +1,9 @@
-export const addTag = tag => ({
+export const addTag = (tag) => ({
   type: 'ADD_TAG',
   tag
 });
 
-export const removeTag = idx => ({
+export const removeTag = (idx) => ({
   type: 'REMOVE_TAG',
   idx
 });
diff --git a/client/coral-plugin-flags/FlagButton.js b/client/coral-plugin-flags/FlagButton.js
index fc7c427b0..1613d5aa2 100644
--- a/client/coral-plugin-flags/FlagButton.js
+++ b/client/coral-plugin-flags/FlagButton.js
@@ -136,7 +136,7 @@ class FlagButton extends Component {
 
     return <div className={`${name}-container`}>
       <button
-        ref={ref => this.flagButton = ref}
+        ref={(ref) => this.flagButton = ref}
         onClick={!this.props.banned && !flaggedByCurrentUser && !localPost ? this.onReportClick : null}
         className={`${name}-button`}>
         {
@@ -150,7 +150,7 @@ class FlagButton extends Component {
       </button>
       {
         this.state.showMenu &&
-        <div className={`${name}-popup`} ref={ref => this.popup = ref}>
+        <div className={`${name}-popup`} ref={(ref) => this.popup = ref}>
           <PopupMenu>
             <div className={`${name}-popup-header`}>{popupMenu.header}</div>
             {
diff --git a/client/coral-plugin-history/Comment.js b/client/coral-plugin-history/Comment.js
index 617d0a04f..b98ed88c3 100644
--- a/client/coral-plugin-history/Comment.js
+++ b/client/coral-plugin-history/Comment.js
@@ -4,7 +4,7 @@ import styles from './Comment.css';
 import PubDate from '../coral-plugin-pubdate/PubDate';
 import Content from '../coral-plugin-commentcontent/CommentContent';
 
-const Comment = props => {
+const Comment = (props) => {
   return (
     <div className={styles.myComment}>
       <div>
diff --git a/client/coral-plugin-history/CommentHistory.js b/client/coral-plugin-history/CommentHistory.js
index a53035fb3..72c4de982 100644
--- a/client/coral-plugin-history/CommentHistory.js
+++ b/client/coral-plugin-history/CommentHistory.js
@@ -2,7 +2,7 @@ import React, {PropTypes} from 'react';
 import Comment from './Comment';
 import styles from './CommentHistory.css';
 
-const CommentHistory = props => {
+const CommentHistory = (props) => {
   return (
     <div className={`${styles.header} commentHistory`}>
       <div className="commentHistory__list">
diff --git a/client/coral-plugin-infobox/__tests__/infoBox.spec.js b/client/coral-plugin-infobox/__tests__/infoBox.spec.js
index 42e57f292..2110f5dc9 100644
--- a/client/coral-plugin-infobox/__tests__/infoBox.spec.js
+++ b/client/coral-plugin-infobox/__tests__/infoBox.spec.js
@@ -3,7 +3,7 @@ import {shallow} from 'enzyme';
 import {expect} from 'chai';
 import InfoBox from '../InfoBox';
 
-const render = props => shallow(<InfoBox {...props} />);
+const render = (props) => shallow(<InfoBox {...props} />);
 
 describe('InfoBox', () => {
   it('should render hidden InfoBox', () => {
diff --git a/client/coral-plugin-infobox/__tests__/markdown.spec.js b/client/coral-plugin-infobox/__tests__/markdown.spec.js
index 8679a8322..1d98dabae 100644
--- a/client/coral-plugin-infobox/__tests__/markdown.spec.js
+++ b/client/coral-plugin-infobox/__tests__/markdown.spec.js
@@ -3,7 +3,7 @@ import {shallow} from 'enzyme';
 import {expect} from 'chai';
 import Markdown from '../Markdown';
 
-const render = props => shallow(<Markdown {...props} />);
+const render = (props) => shallow(<Markdown {...props} />);
 
 describe('Markdown', () => {
   it('should convert Markdown to html', () => {
diff --git a/client/coral-plugin-moderation/ModerationLink.js b/client/coral-plugin-moderation/ModerationLink.js
index 808f79839..812c32eed 100644
--- a/client/coral-plugin-moderation/ModerationLink.js
+++ b/client/coral-plugin-moderation/ModerationLink.js
@@ -4,7 +4,7 @@ import styles from './styles.css';
 import {I18n} from '../coral-framework';
 import translations from './translations.json';
 
-const ModerationLink = props => props.isAdmin ? (
+const ModerationLink = (props) => props.isAdmin ? (
     <div className={styles.moderationLink}>
       <a href={`/admin/moderate/${props.assetId}`} target="_blank">
         {lang.t('MODERATE_THIS_STREAM')}
diff --git a/client/coral-plugin-permalinks/PermalinkButton.js b/client/coral-plugin-permalinks/PermalinkButton.js
index 464155b2e..e43b2936d 100644
--- a/client/coral-plugin-permalinks/PermalinkButton.js
+++ b/client/coral-plugin-permalinks/PermalinkButton.js
@@ -53,19 +53,19 @@ class PermalinkButton extends React.Component {
     return (
       <div className={`${name}-container`}>
         <button
-          ref={ref => this.linkButton = ref}
+          ref={(ref) => this.linkButton = ref}
           onClick={this.toggle}
           className={`${name}-button`}>
           {lang.t('permalink.permalink')}
           <i className={`${name}-icon material-icons`} aria-hidden={true}>link</i>
         </button>
         <div
-          ref={ref => this.popover = ref}
+          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}
+            ref={(input) => this.permalinkInput = input}
             value={`${this.props.articleURL}#${this.props.commentId}`}
             onChange={() => {}} />
           <Button className={`${name}-copy-button ${copySuccessful ? styles.success : ''} ${copyFailure ? styles.failure : ''}`}
diff --git a/client/coral-plugin-pubdate/PubDate.js b/client/coral-plugin-pubdate/PubDate.js
index 81c8495a4..5875d0f83 100644
--- a/client/coral-plugin-pubdate/PubDate.js
+++ b/client/coral-plugin-pubdate/PubDate.js
@@ -4,7 +4,7 @@ import {I18n} from '../coral-framework';
 const lang = new I18n();
 const name = 'coral-plugin-pubdate';
 
-const PubDate = ({created_at}) => <div className={`${name  }-text`}>
+const PubDate = ({created_at}) => <div className={`${name}-text`}>
   {lang.timeago(created_at)}
 </div>;
 
diff --git a/client/coral-settings/containers/ProfileContainer.js b/client/coral-settings/containers/ProfileContainer.js
index 39e615725..d1b81e983 100644
--- a/client/coral-settings/containers/ProfileContainer.js
+++ b/client/coral-settings/containers/ProfileContainer.js
@@ -45,7 +45,7 @@ class ProfileContainer extends Component {
       return <NotLoggedIn showSignInDialog={showSignInDialog} />;
     }
 
-    const localProfile = this.props.user.profiles.find(p => p.provider === 'local');
+    const localProfile = this.props.user.profiles.find((p) => p.provider === 'local');
     const emailAddress = localProfile && localProfile.id;
 
     return (
@@ -88,13 +88,13 @@ class ProfileContainer extends Component {
   }
 }
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   user: state.user.toJS(),
   asset: state.asset.toJS(),
   auth: state.auth.toJS()
 });
 
-const mapDispatchToProps = dispatch =>
+const mapDispatchToProps = (dispatch) =>
   bindActionCreators({showSignInDialog, checkLogin}, dispatch);
 
 export default compose(
diff --git a/client/coral-sign-in/components/ForgotContent.js b/client/coral-sign-in/components/ForgotContent.js
index 307a32b6e..76246fa00 100644
--- a/client/coral-sign-in/components/ForgotContent.js
+++ b/client/coral-sign-in/components/ForgotContent.js
@@ -29,7 +29,7 @@ class ForgotContent extends React.Component {
           <div className={styles.textField}>
             <label htmlFor="email">{lang.t('signIn.email')}</label>
             <input
-              ref={input => this.emailInput = input}
+              ref={(input) => this.emailInput = input}
               type="text"
               style={{fontSize: 16}}
               id="email"
diff --git a/client/coral-sign-in/containers/ChangeUsernameContainer.js b/client/coral-sign-in/containers/ChangeUsernameContainer.js
index a3b4b969d..12a9a75b8 100644
--- a/client/coral-sign-in/containers/ChangeUsernameContainer.js
+++ b/client/coral-sign-in/containers/ChangeUsernameContainer.js
@@ -39,7 +39,7 @@ class ChangeUsernameContainer extends Component {
 
   handleChange(e) {
     const {name, value} = e.target;
-    this.setState(state => ({
+    this.setState((state) => ({
       ...state,
       formData: {
         ...state.formData,
@@ -51,7 +51,7 @@ class ChangeUsernameContainer extends Component {
   }
 
   addError(name, error) {
-    return this.setState(state => ({
+    return this.setState((state) => ({
       errors: {
         ...state.errors,
         [name]: error
@@ -69,13 +69,13 @@ class ChangeUsernameContainer extends Component {
     } else {
       const { [name]: prop, ...errors } = this.state.errors; // eslint-disable-line
       // Removes Error
-      this.setState(state => ({...state, errors}));
+      this.setState((state) => ({...state, errors}));
     }
   }
 
   isCompleted() {
     const {formData} = this.state;
-    return !Object.keys(formData).filter(prop => !formData[prop].length).length;
+    return !Object.keys(formData).filter((prop) => !formData[prop].length).length;
   }
 
   displayErrors(show = true) {
@@ -117,15 +117,15 @@ class ChangeUsernameContainer extends Component {
   }
 }
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   auth: state.auth.toJS()
 });
 
-const mapDispatchToProps = dispatch => ({
+const mapDispatchToProps = (dispatch) => ({
   createUsername: (userid, formData) => dispatch(createUsername(userid, formData)),
   showCreateUsernameDialog: () => dispatch(showCreateUsernameDialog()),
   hideCreateUsernameDialog: () => dispatch(hideCreateUsernameDialog()),
-  invalidForm: error => dispatch(invalidForm(error)),
+  invalidForm: (error) => dispatch(invalidForm(error)),
   validForm: () => dispatch(validForm())
 });
 
diff --git a/client/coral-sign-in/containers/SignInContainer.js b/client/coral-sign-in/containers/SignInContainer.js
index 868ef8456..d2095b527 100644
--- a/client/coral-sign-in/containers/SignInContainer.js
+++ b/client/coral-sign-in/containers/SignInContainer.js
@@ -67,7 +67,7 @@ class SignInContainer extends Component {
 
   handleChange(e) {
     const {name, value} = e.target;
-    this.setState(state => ({
+    this.setState((state) => ({
       ...state,
       formData: {
         ...state.formData,
@@ -96,7 +96,7 @@ class SignInContainer extends Component {
   }
 
   addError(name, error) {
-    return this.setState(state => ({
+    return this.setState((state) => ({
       errors: {
         ...state.errors,
         [name]: error
@@ -117,13 +117,13 @@ class SignInContainer extends Component {
     } else {
       const { [name]: prop, ...errors } = this.state.errors; // eslint-disable-line
       // Removes Error
-      this.setState(state => ({...state, errors}));
+      this.setState((state) => ({...state, errors}));
     }
   }
 
   isCompleted() {
     const {formData} = this.state;
-    return !Object.keys(formData).filter(prop => !formData[prop].length).length;
+    return !Object.keys(formData).filter((prop) => !formData[prop].length).length;
   }
 
   displayErrors(show = true) {
@@ -169,22 +169,22 @@ class SignInContainer extends Component {
   }
 }
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   auth: state.auth.toJS()
 });
 
-const mapDispatchToProps = dispatch => ({
+const mapDispatchToProps = (dispatch) => ({
   checkLogin: () => dispatch(checkLogin()),
   facebookCallback: (err, data) => dispatch(facebookCallback(err, data)),
   fetchSignUp: (formData, url) => dispatch(fetchSignUp(formData, url)),
-  fetchSignIn: formData => dispatch(fetchSignIn(formData)),
+  fetchSignIn: (formData) => dispatch(fetchSignIn(formData)),
   fetchSignInFacebook: () => dispatch(fetchSignInFacebook()),
   fetchSignUpFacebook: () => dispatch(fetchSignUpFacebook()),
-  fetchForgotPassword: formData => dispatch(fetchForgotPassword(formData)),
+  fetchForgotPassword: (formData) => dispatch(fetchForgotPassword(formData)),
   requestConfirmEmail: (email, url) => dispatch(requestConfirmEmail(email, url)),
-  changeView: view => dispatch(changeView(view)),
+  changeView: (view) => dispatch(changeView(view)),
   handleClose: () => dispatch(hideSignInDialog()),
-  invalidForm: error => dispatch(invalidForm(error)),
+  invalidForm: (error) => dispatch(invalidForm(error)),
   validForm: () => dispatch(validForm())
 });
 
diff --git a/client/coral-ui/components/Dialog.js b/client/coral-ui/components/Dialog.js
index 17cb78d28..85ab570d3 100644
--- a/client/coral-ui/components/Dialog.js
+++ b/client/coral-ui/components/Dialog.js
@@ -13,8 +13,8 @@ export default class Dialog extends Component {
   };
 
   static defaultProps = {
-    onCancel: e => e.preventDefault(),
-    onClose: e => e.preventDefault()
+    onCancel: (e) => e.preventDefault(),
+    onClose: (e) => e.preventDefault()
   };
 
   componentDidMount(){
@@ -52,7 +52,7 @@ export default class Dialog extends Component {
 
     return (
       <dialog
-        ref={el => { this.dialog = el; }}
+        ref={(el) => { this.dialog = el; }}
         className={`mdl-dialog ${className}`}
         {...rest}
       >
diff --git a/client/coral-ui/components/List.js b/client/coral-ui/components/List.js
index 500f2307d..1d941bce2 100644
--- a/client/coral-ui/components/List.js
+++ b/client/coral-ui/components/List.js
@@ -18,7 +18,7 @@ export default class List extends Component {
     return (
       <ul className={`${styles.base} ${className}`}>
         {React.Children.toArray(children)
-          .filter(child => !child.props.restricted)
+          .filter((child) => !child.props.restricted)
           .map((child, i) =>
             React.cloneElement(child, {
               i,
diff --git a/client/coral-ui/components/Option.js b/client/coral-ui/components/Option.js
index d322ef0ef..e2c45664c 100644
--- a/client/coral-ui/components/Option.js
+++ b/client/coral-ui/components/Option.js
@@ -2,7 +2,7 @@ import React from 'react';
 import {Option as OptionMDL} from 'react-mdl-selectfield';
 import styles from './Option.css';
 
-const Option = props => {
+const Option = (props) => {
   const {children, ...attrs} = props;
   return (
     <OptionMDL className={styles.Option} {...attrs}>
diff --git a/client/coral-ui/components/Select.js b/client/coral-ui/components/Select.js
index 731c50ddc..2e71d2417 100644
--- a/client/coral-ui/components/Select.js
+++ b/client/coral-ui/components/Select.js
@@ -2,7 +2,7 @@ import React from 'react';
 import {SelectField} from 'react-mdl-selectfield';
 import styles from './Select.css';
 
-const Select = props => {
+const Select = (props) => {
   const {children, ...attrs} = props;
   return (
     <SelectField className={styles.Select} {...attrs}>
diff --git a/client/coral-ui/components/TabBar.js b/client/coral-ui/components/TabBar.js
index f22250194..d03a5d5b1 100644
--- a/client/coral-ui/components/TabBar.js
+++ b/client/coral-ui/components/TabBar.js
@@ -19,7 +19,7 @@ class TabBar extends React.Component {
       <div>
         <ul className={`${styles.base} ${cStyle ? styles[cStyle] : ''}`}>
           {React.Children.toArray(children)
-            .filter(child => !child.props.restricted)
+            .filter((child) => !child.props.restricted)
             .map((child, tabId) =>
               React.cloneElement(child, {
                 tabId,
diff --git a/client/coral-ui/components/WizardNav.js b/client/coral-ui/components/WizardNav.js
index 84f7d30ac..cbcb664be 100644
--- a/client/coral-ui/components/WizardNav.js
+++ b/client/coral-ui/components/WizardNav.js
@@ -2,7 +2,7 @@ import React, {PropTypes} from 'react';
 import styles from './WizardNav.css';
 import Icon from './Icon';
 
-const WizardNav = props => {
+const WizardNav = (props) => {
   const {goToStep = () => {}, currentStep, items, icon} = props;
   return (
     <nav className={styles.WizardNav}>
diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index 048e24fac..89ecfc026 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -19,7 +19,7 @@ const Wordlist = require('../../services/wordlist');
 const createComment = async ({user, loaders: {Comments}, pubsub}, {body, asset_id, parent_id = null, tags = []}, status = 'NONE') => {
 
   // Building array of tags
-  tags = tags.map(tag => ({name: tag}));
+  tags = tags.map((tag) => ({name: tag}));
 
   // If admin or moderator, adding STAFF tag
   if (user.hasRoles('ADMIN') || user.hasRoles('MODERATOR')) {
diff --git a/graph/resolvers/asset.js b/graph/resolvers/asset.js
index 7d356aac9..1a959d423 100644
--- a/graph/resolvers/asset.js
+++ b/graph/resolvers/asset.js
@@ -4,7 +4,7 @@ const Asset = {
       asset_id: id,
       limit: 1,
       parent_id: null
-    }).then(data => data[0]);
+    }).then((data) => data[0]);
   },
   recentComments({id}, _, {loaders: {Comments}}) {
     return Comments.genRecentComments.load(id);
diff --git a/models/user.js b/models/user.js
index 2539ee142..56f750d34 100644
--- a/models/user.js
+++ b/models/user.js
@@ -221,8 +221,8 @@ 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)) {
+  const userCanModifyTags = (user) => ['ADMIN', 'MODERATOR'].some((r) => user.hasRoles(r));
+  if (actions.some((a) => ['mutation:removeCommentTag', 'mutation:addCommentTag'].includes(a)) && !userCanModifyTags(this)) {
     return false;
   }
 
diff --git a/plugins/coral-plugin-respect/client/containers/RespectButton.js b/plugins/coral-plugin-respect/client/containers/RespectButton.js
index 38be8a978..fba54c195 100644
--- a/plugins/coral-plugin-respect/client/containers/RespectButton.js
+++ b/plugins/coral-plugin-respect/client/containers/RespectButton.js
@@ -131,7 +131,7 @@ const withPostRespect = graphql(gql`
   }),
 });
 
-const mapDispatchToProps = dispatch =>
+const mapDispatchToProps = (dispatch) =>
   bindActionCreators({showSignInDialog}, dispatch);
 
 const enhance = compose(
diff --git a/routes/api/users/index.js b/routes/api/users/index.js
index a01fed2c9..2cc7c97bd 100644
--- a/routes/api/users/index.js
+++ b/routes/api/users/index.js
@@ -70,7 +70,7 @@ router.post('/:user_id/username-enable', authorization.needed('ADMIN'), (req, re
 router.post('/:user_id/email', authorization.needed('ADMIN'), (req, res, next) => {
 
   UsersService.findById(req.params.user_id)
-    .then(user => {
+    .then((user) => {
       let localProfile = user.profiles.find((profile) => profile.provider === 'local');
 
       if (localProfile) {
diff --git a/routes/assets/index.js b/routes/assets/index.js
index 54d4e72ed..2032e7be5 100644
--- a/routes/assets/index.js
+++ b/routes/assets/index.js
@@ -8,7 +8,7 @@ const body = 'Lorem ipsum dolor sponge amet, consectetur adipiscing clam. Ut lob
 router.get('/id/:asset_id', (req, res, next) => {
 
   return Assets.findById(req.params.asset_id)
-    .then(asset => {
+    .then((asset) => {
       if (asset === null) {
         return res.json({'message': 'Asset not found'});
       }
@@ -38,12 +38,12 @@ router.get('/', (req, res, next) => {
   let limit = req.query.limit ? parseInt(req.query.limit) : 25;
 
   return Assets.all(skip, limit)
-    .then(assets => {
+    .then((assets) => {
       res.render('articles', {
         assets: assets
       });
     })
-    .catch(err => next(err));
+    .catch((err) => next(err));
 });
 
 module.exports = router;
diff --git a/services/assets.js b/services/assets.js
index 0aa4219da..a86c4281f 100644
--- a/services/assets.js
+++ b/services/assets.js
@@ -129,7 +129,7 @@ module.exports = class AssetsService {
    * @return {Promise}     resolves to list of Assets
    */
   static findMultipleById(ids) {
-    const query = ids.map(id => ({id}));
+    const query = ids.map((id) => ({id}));
     return AssetModel.find(query);
   }
 
diff --git a/services/comments.js b/services/comments.js
index f46e318d7..25e5cc528 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -239,7 +239,7 @@ module.exports = class CommentsService {
   static findIdsByActionType(action_type) {
     return ActionsService
       .findCommentsIdByActionType(action_type, 'COMMENTS')
-      .then((actions) => actions.map(a => a.item_id));
+      .then((actions) => actions.map((a) => a.item_id));
   }
 
   /**
diff --git a/services/mailer.js b/services/mailer.js
index 35741ee9f..6bfa0a5cb 100644
--- a/services/mailer.js
+++ b/services/mailer.js
@@ -12,7 +12,7 @@ const smtpRequiredProps = [
   'TALK_SMTP_HOST'
 ];
 
-if (smtpRequiredProps.some(prop => !process.env[prop])) {
+if (smtpRequiredProps.some((prop) => !process.env[prop])) {
   console.error(`${smtpRequiredProps.join(', ')} should be defined in the environment if you would like to send password reset emails from Talk`);
 }
 
diff --git a/services/users.js b/services/users.js
index 14301ccf4..3123c0890 100644
--- a/services/users.js
+++ b/services/users.js
@@ -845,7 +845,7 @@ module.exports = class UsersService {
    */
   static ignoreUsers(userId, usersToIgnore) {
     assert(Array.isArray(usersToIgnore), 'usersToIgnore is an array');
-    assert(usersToIgnore.every(u => typeof u === 'string'), 'usersToIgnore is an array of string user IDs');
+    assert(usersToIgnore.every((u) => typeof u === 'string'), 'usersToIgnore is an array of string user IDs');
     if (usersToIgnore.includes(userId)) {
       throw new Error('Users cannot ignore themselves');
     }
@@ -867,7 +867,7 @@ module.exports = class UsersService {
    */
   static async stopIgnoringUsers(userId, usersToStopIgnoring) {
     assert(Array.isArray(usersToStopIgnoring), 'usersToStopIgnoring is an array');
-    assert(usersToStopIgnoring.every(u => typeof u === 'string'), 'usersToStopIgnoring is an array of string user IDs');
+    assert(usersToStopIgnoring.every((u) => typeof u === 'string'), 'usersToStopIgnoring is an array of string user IDs');
     await UserModel.update({id: userId}, {
       $pullAll:  {
         ignoresUsers: usersToStopIgnoring
diff --git a/test/e2e/pages/embedStreamPage.js b/test/e2e/pages/embedStreamPage.js
index 12b18874b..2d59d5e57 100644
--- a/test/e2e/pages/embedStreamPage.js
+++ b/test/e2e/pages/embedStreamPage.js
@@ -73,7 +73,7 @@ const embedStreamCommands = {
       .waitForElementVisible('@permalinkButton')
       .click('@permalinkButton')
       .waitForElementVisible('@permalinkPopUp')
-      .getValue('@permalinkInput', result => fn(result.value));
+      .getValue('@permalinkInput', (result) => fn(result.value));
   }
 };
 
diff --git a/test/e2e/tests/00_AppTest.js b/test/e2e/tests/00_AppTest.js
index 27b6dbe75..4294c4483 100644
--- a/test/e2e/tests/00_AppTest.js
+++ b/test/e2e/tests/00_AppTest.js
@@ -1,6 +1,6 @@
 module.exports = {
   '@tags': ['app'],
-  'Base url and Hostname': browser => {
+  'Base url and Hostname': (browser) => {
     const {baseUrl} = browser.globals;
     browser
       .url(baseUrl)
diff --git a/test/e2e/tests/01_EmbedStreamTest.js b/test/e2e/tests/01_EmbedStreamTest.js
index 87e94923e..50d1feef0 100644
--- a/test/e2e/tests/01_EmbedStreamTest.js
+++ b/test/e2e/tests/01_EmbedStreamTest.js
@@ -2,7 +2,7 @@ const mocks = require('../mocks');
 
 module.exports = {
   '@tags': ['embedStream'],
-  before: client => {
+  before: (client) => {
     client.perform((client, done) => {
       mocks.settings({moderation: 'PRE'})
         .then(() => {
@@ -14,29 +14,29 @@ module.exports = {
         });
     });
   },
-  'Login as commenter': client => {
+  'Login as commenter': (client) => {
     const embedStreamPage = client.page.embedStreamPage();
     const {users} = client.globals;
     embedStreamPage
       .login(users.commenter);
   },
-  'Add test comment': client => {
+  'Add test comment': (client) => {
     const embedStreamPage = client.page.embedStreamPage();
     embedStreamPage
       .postComment('Test Comment');
   },
-  'Logout': client => {
+  'Logout': (client) => {
     const embedStreamPage = client.page.embedStreamPage();
     embedStreamPage
       .logout();
   },
-  'Login as admin': client => {
+  'Login as admin': (client) => {
     const embedStreamPage = client.page.embedStreamPage();
     const {users} = client.globals;
     embedStreamPage
       .login(users.admin);
   },
-  'Approve test comment': client => {
+  'Approve test comment': (client) => {
     const adminPage = client.page.adminPage();
 
     adminPage
@@ -46,7 +46,7 @@ module.exports = {
     adminPage
       .approveComment();
   },
-  after: client => {
+  after: (client) => {
     client.end();
   }
 };
diff --git a/test/e2e/tests/Admin/LoginTest.js b/test/e2e/tests/Admin/LoginTest.js
index 9babdf29b..dcc076631 100644
--- a/test/e2e/tests/Admin/LoginTest.js
+++ b/test/e2e/tests/Admin/LoginTest.js
@@ -10,14 +10,14 @@ module.exports = {
     embedStreamPage
       .ready();
   },
-  'Admin logs in': client => {
+  'Admin logs in': (client) => {
     const {users} = client.globals;
     const embedStreamPage = client.page.embedStreamPage();
 
     embedStreamPage
       .login(users.admin);
   },
-  after: client => {
+  after: (client) => {
     client.end();
   }
 };
diff --git a/test/e2e/tests/Commenter/BestCommentTest.js b/test/e2e/tests/Commenter/BestCommentTest.js
index 765ef070f..37e396149 100644
--- a/test/e2e/tests/Commenter/BestCommentTest.js
+++ b/test/e2e/tests/Commenter/BestCommentTest.js
@@ -1,6 +1,6 @@
 module.exports = {
   '@tags': ['like', 'comments', 'commenter'],
-  before: client => {
+  before: (client) => {
     const embedStreamPage = client.page.embedStreamPage();
     const {users} = client.globals;
 
@@ -11,7 +11,7 @@ module.exports = {
     embedStreamPage
       .login(users.commenter);
   },
-  'Commenters should not see the set-best-comment button': client => {
+  'Commenters should not see the set-best-comment button': (client) => {
     const embedStreamPage = client.page.embedStreamPage();
 
     embedStreamPage
@@ -19,7 +19,7 @@ module.exports = {
       .waitForElementVisible('@likeButton')
       .expect.element('@setBestButton').to.not.be.present;
   },
-  after: client => {
+  after: (client) => {
     client.end();
   }
 };
diff --git a/test/e2e/tests/Commenter/FlagCommentTest.js b/test/e2e/tests/Commenter/FlagCommentTest.js
index baff5fdf5..87927528f 100644
--- a/test/e2e/tests/Commenter/FlagCommentTest.js
+++ b/test/e2e/tests/Commenter/FlagCommentTest.js
@@ -1,6 +1,6 @@
 module.exports = {
   '@tags': ['flag', 'comments', 'commenter'],
-  before: client => {
+  before: (client) => {
     const embedStreamPage = client.page.embedStreamPage();
     const {users} = client.globals;
 
@@ -11,7 +11,7 @@ module.exports = {
     embedStreamPage
       .login(users.commenter);
   },
-  'Commenter flags a comment': client => {
+  'Commenter flags a comment': (client) => {
     const embedStreamPage = client.page.embedStreamPage();
 
     embedStreamPage
@@ -28,7 +28,7 @@ module.exports = {
       .click('@flagDoneButton')
       .expect.element('@flagButtonText').text.to.equal('Reported');
   },
-  after: client => {
+  after: (client) => {
     client.end();
   }
 };
diff --git a/test/e2e/tests/Commenter/FlagUsernameTest.js b/test/e2e/tests/Commenter/FlagUsernameTest.js
index d72be5386..c25299df9 100644
--- a/test/e2e/tests/Commenter/FlagUsernameTest.js
+++ b/test/e2e/tests/Commenter/FlagUsernameTest.js
@@ -1,6 +1,6 @@
 module.exports = {
   '@tags': ['flag', 'commenter'],
-  before: client => {
+  before: (client) => {
     const embedStreamPage = client.page.embedStreamPage();
     const {users} = client.globals;
 
@@ -11,7 +11,7 @@ module.exports = {
     embedStreamPage
       .login(users.commenter);
   },
-  'Commenter flags a username': client => {
+  'Commenter flags a username': (client) => {
     const embedStreamPage = client.page.embedStreamPage();
 
     embedStreamPage
@@ -28,7 +28,7 @@ module.exports = {
       .click('@flagDoneButton')
       .click('@flagDoneButton');
   },
-  after: client => {
+  after: (client) => {
     client.end();
   }
 };
diff --git a/test/e2e/tests/Commenter/LikeCommentTest.js b/test/e2e/tests/Commenter/LikeCommentTest.js
index c9915cd81..b8a964558 100644
--- a/test/e2e/tests/Commenter/LikeCommentTest.js
+++ b/test/e2e/tests/Commenter/LikeCommentTest.js
@@ -1,6 +1,6 @@
 module.exports = {
   '@tags': ['like', 'comments', 'commenter'],
-  before: client => {
+  before: (client) => {
     const embedStreamPage = client.page.embedStreamPage();
     const {users} = client.globals;
 
@@ -11,7 +11,7 @@ module.exports = {
     embedStreamPage
       .login(users.commenter);
   },
-  'Commenter likes a comment': client => {
+  'Commenter likes a comment': (client) => {
     const embedStreamPage = client.page.embedStreamPage();
 
     embedStreamPage
@@ -21,7 +21,7 @@ module.exports = {
       .expect.element('@likeText').text.to.equal('Liked');
 
   },
-  after: client => {
+  after: (client) => {
     client.end();
   }
 };
diff --git a/test/e2e/tests/Commenter/LoginTest.js b/test/e2e/tests/Commenter/LoginTest.js
index 15c830c74..bc04f72d3 100644
--- a/test/e2e/tests/Commenter/LoginTest.js
+++ b/test/e2e/tests/Commenter/LoginTest.js
@@ -1,20 +1,20 @@
 module.exports = {
   '@tags': ['login', 'commenter'],
-  before: client => {
+  before: (client) => {
     const embedStreamPage = client.page.embedStreamPage();
 
     embedStreamPage
       .navigate()
       .ready();
   },
-  'Commenter logs in': client => {
+  'Commenter logs in': (client) => {
     const {users} = client.globals;
     const embedStreamPage = client.page.embedStreamPage();
 
     embedStreamPage
       .login(users.commenter);
   },
-  after: client => {
+  after: (client) => {
     client.end();
   }
 };
diff --git a/test/e2e/tests/Commenter/PermalinkTest.js b/test/e2e/tests/Commenter/PermalinkTest.js
index deed9ec90..d3d369264 100644
--- a/test/e2e/tests/Commenter/PermalinkTest.js
+++ b/test/e2e/tests/Commenter/PermalinkTest.js
@@ -2,7 +2,7 @@ let permalink = '';
 
 module.exports = {
   '@tags': ['permalink', 'commenter'],
-  before: client => {
+  before: (client) => {
     const embedStreamPage = client.page.embedStreamPage();
     const {users} = client.globals;
 
@@ -13,21 +13,21 @@ module.exports = {
     embedStreamPage
       .login(users.commenter);
   },
-  'Commenter gets the permalink of a comment': client => {
+  'Commenter gets the permalink of a comment': (client) => {
     const embedStreamPage = client.page.embedStreamPage();
     embedStreamPage
-      .getPermalink(value => {
+      .getPermalink((value) => {
         permalink = value;
       });
   },
-  'Commenter navigates to the permalink': client => {
+  'Commenter navigates to the permalink': (client) => {
     const embedStreamPage = client.page.embedStreamPage();
     embedStreamPage
       .navigate(permalink);
 
     client.assert.urlContains(permalink);
   },
-  after: client => {
+  after: (client) => {
     client.end();
   }
 };
diff --git a/test/e2e/tests/Commenter/PostComment.js b/test/e2e/tests/Commenter/PostComment.js
index 91e28415d..033d52cbe 100644
--- a/test/e2e/tests/Commenter/PostComment.js
+++ b/test/e2e/tests/Commenter/PostComment.js
@@ -1,6 +1,6 @@
 module.exports = {
   '@tags': ['write', 'commenter'],
-  before: client => {
+  before: (client) => {
     const embedStreamPage = client.page.embedStreamPage();
     const {users} = client.globals;
 
@@ -11,13 +11,13 @@ module.exports = {
     embedStreamPage
       .login(users.commenter);
   },
-  'Commenter posts a comment': client => {
+  'Commenter posts a comment': (client) => {
     const embedStreamPage = client.page.embedStreamPage();
 
     embedStreamPage
       .postComment('I read the comments');
   },
-  after: client => {
+  after: (client) => {
     const adminPage = client.page.adminPage();
     const embedStreamPage = client.page.embedStreamPage();
     const {users} = client.globals;
diff --git a/test/e2e/tests/EmbedStreamTests.js b/test/e2e/tests/EmbedStreamTests.js
index ca3a52089..ed1bc9c6f 100644
--- a/test/e2e/tests/EmbedStreamTests.js
+++ b/test/e2e/tests/EmbedStreamTests.js
@@ -20,7 +20,7 @@ module.exports = {
       }
     });
   },
-  'User registers and posts a comment with premod off': client => {
+  'User registers and posts a comment with premod off': (client) => {
     client.perform((client, done) => {
       mocks.settings({moderation: 'POST'})
       .then(() => {
@@ -60,7 +60,7 @@ module.exports = {
       });
     });
   },
-  'User posts a comment with premod on': client => {
+  'User posts a comment with premod on': (client) => {
     client.perform((client, done) => {
       mocks.settings({moderation: 'PRE'})
       .then(() => {
@@ -81,7 +81,7 @@ module.exports = {
       });
     });
   },
-  'User replies to a comment with premod off': client => {
+  'User replies to a comment with premod off': (client) => {
     client.perform((client, done) => {
       mocks.settings({moderation: 'POST'})
       .then(() => {
@@ -160,7 +160,7 @@ module.exports = {
   //     });
   //   });
   // },
-  'Total comment count premod on': client => {
+  'Total comment count premod on': (client) => {
     client.perform((client, done) => {
       client.url(client.globals.baseUrl)
         .frame('coralStreamEmbed_iframe');
@@ -171,7 +171,7 @@ module.exports = {
       done();
     });
   },
-  after: client => {
+  after: (client) => {
     mongoose.disconnect(function(err) {
       if (err) {
         console.error(err);
diff --git a/test/e2e/tests/Moderator/BestCommentTest.js b/test/e2e/tests/Moderator/BestCommentTest.js
index 8b8be708d..5cdc2e5ed 100644
--- a/test/e2e/tests/Moderator/BestCommentTest.js
+++ b/test/e2e/tests/Moderator/BestCommentTest.js
@@ -1,6 +1,6 @@
 module.exports = {
   '@tags': ['like', 'comments', 'commenter'],
-  before: client => {
+  before: (client) => {
     const embedStreamPage = client.page.embedStreamPage();
     const {users} = client.globals;
 
@@ -11,7 +11,7 @@ module.exports = {
     embedStreamPage
       .login(users.moderator);
   },
-  'Moderator marks/unmarks their comment as BEST': client => {
+  'Moderator marks/unmarks their comment as BEST': (client) => {
     const embedStreamPage = client.page.embedStreamPage();
 
     const setBestCommentButton = '.e2e__set-best-comment';
@@ -44,7 +44,7 @@ module.exports = {
       .waitForElementVisible(setBestCommentButton);
 
   },
-  after: client => {
+  after: (client) => {
     client.end();
   }
 };
diff --git a/test/e2e/tests/Moderator/LoginTest.js b/test/e2e/tests/Moderator/LoginTest.js
index d04baabac..bb32679ee 100644
--- a/test/e2e/tests/Moderator/LoginTest.js
+++ b/test/e2e/tests/Moderator/LoginTest.js
@@ -1,6 +1,6 @@
 module.exports = {
   '@tags': ['login', 'MODERATOR'],
-  before: client => {
+  before: (client) => {
     const embedStreamPage = client.page.embedStreamPage();
     const {launchUrl} = client;
 
@@ -10,14 +10,14 @@ module.exports = {
     embedStreamPage
     .ready();
   },
-  'Moderator logs in': client => {
+  'Moderator logs in': (client) => {
     const {users} = client.globals;
     const embedStreamPage = client.page.embedStreamPage();
 
     embedStreamPage
       .login(users.moderator);
   },
-  after: client => {
+  after: (client) => {
     client.end();
   }
 };
diff --git a/test/e2e/tests/Visitor/FlagCommentTest.js b/test/e2e/tests/Visitor/FlagCommentTest.js
index 8fbab04ee..b4a5a802f 100644
--- a/test/e2e/tests/Visitor/FlagCommentTest.js
+++ b/test/e2e/tests/Visitor/FlagCommentTest.js
@@ -1,20 +1,20 @@
 module.exports = {
   '@tags': ['flag', 'comments', 'visitor'],
-  before: client => {
+  before: (client) => {
     const embedStreamPage = client.page.embedStreamPage();
 
     embedStreamPage
       .navigate()
       .ready();
   },
-  'Visitor tries to flag a comment': client => {
+  'Visitor tries to flag a comment': (client) => {
     const embedStreamPage = client.page.embedStreamPage();
 
     embedStreamPage
       .flagComment()
       .waitForElementVisible('@signInDialog', 2000);
   },
-  after: client => {
+  after: (client) => {
     client.end();
   }
 };
diff --git a/test/e2e/tests/Visitor/LikeCommentTest.js b/test/e2e/tests/Visitor/LikeCommentTest.js
index 6aaca5b49..1b931683e 100644
--- a/test/e2e/tests/Visitor/LikeCommentTest.js
+++ b/test/e2e/tests/Visitor/LikeCommentTest.js
@@ -1,20 +1,20 @@
 module.exports = {
   '@tags': ['like', 'comments', 'visitor'],
-  before: client => {
+  before: (client) => {
     const embedStreamPage = client.page.embedStreamPage();
 
     embedStreamPage
       .navigate()
       .ready();
   },
-  'Visitor tries to like a comment': client => {
+  'Visitor tries to like a comment': (client) => {
     const embedStreamPage = client.page.embedStreamPage();
 
     embedStreamPage
       .likeComment()
       .waitForElementVisible('@signInDialog', 2000);
   },
-  after: client => {
+  after: (client) => {
     client.end();
   }
 };
diff --git a/test/e2e/tests/Visitor/SignUpTest.js b/test/e2e/tests/Visitor/SignUpTest.js
index 253b41659..3436ca850 100644
--- a/test/e2e/tests/Visitor/SignUpTest.js
+++ b/test/e2e/tests/Visitor/SignUpTest.js
@@ -1,13 +1,13 @@
 module.exports = {
   '@tags': ['signup', 'visitor'],
-  before: client => {
+  before: (client) => {
     const embedStreamPage = client.page.embedStreamPage();
 
     embedStreamPage
       .navigate()
       .ready();
   },
-  'Visitor signs up': client => {
+  'Visitor signs up': (client) => {
     const embedStreamPage = client.page.embedStreamPage();
 
     embedStreamPage
@@ -17,7 +17,7 @@ module.exports = {
         pass: 'testtest'
       });
   },
-  after: client => {
+  after: (client) => {
     client.end();
   }
 };
diff --git a/test/server/graph/mutations/addCommentTag.js b/test/server/graph/mutations/addCommentTag.js
index 018e96631..f456cda20 100644
--- a/test/server/graph/mutations/addCommentTag.js
+++ b/test/server/graph/mutations/addCommentTag.js
@@ -11,7 +11,7 @@ describe('graph.mutations.addCommentTag', () => {
   let comment;
   beforeEach(async () => {
     await SettingsService.init();
-    comment = await CommentsService.publicCreate({body: `hello there! ${  String(Math.random()).slice(2)}`});
+    comment = await CommentsService.publicCreate({body: `hello there! ${String(Math.random()).slice(2)}`});
   });
 
   const query = `
diff --git a/test/server/graph/mutations/editComment.js b/test/server/graph/mutations/editComment.js
index 5e64ac5d5..3be892f90 100644
--- a/test/server/graph/mutations/editComment.js
+++ b/test/server/graph/mutations/editComment.js
@@ -42,7 +42,7 @@ describe('graph.mutations.editComment', () => {
     const comment = await CommentsService.publicCreate({
       asset_id: asset.id,
       author_id: user.id,
-      body: `hello there! ${  String(Math.random()).slice(2)}`,
+      body: `hello there! ${String(Math.random()).slice(2)}`,
     });
 
     // body_history should be there
@@ -84,7 +84,7 @@ describe('graph.mutations.editComment', () => {
     const comment = await CommentsService.publicCreate({
       asset_id: asset.id,
       author_id: user.id,
-      body: `hello there! ${  String(Math.random()).slice(2)}`,
+      body: `hello there! ${String(Math.random()).slice(2)}`,
     });
 
     const now = new Date();
@@ -116,7 +116,7 @@ describe('graph.mutations.editComment', () => {
     const comment = await CommentsService.publicCreate({
       asset_id: asset.id,
       author_id: user.id,
-      body: `hello there! ${  String(Math.random()).slice(2)}`,
+      body: `hello there! ${String(Math.random()).slice(2)}`,
     });
 
     const userB = await UsersService.createLocalUser(
diff --git a/test/server/graph/mutations/ignoreUser.js b/test/server/graph/mutations/ignoreUser.js
index c2d9ebdd6..c4b27d31d 100644
--- a/test/server/graph/mutations/ignoreUser.js
+++ b/test/server/graph/mutations/ignoreUser.js
@@ -88,8 +88,8 @@ describe('graph.mutations.stopIgnoringUser', () => {
     const context = new Context({user});
 
     // ignore two users
-    const ignoreUserResponses = await Promise.all(usersToIgnore.map(u => graphql(schema, ignoreUserMutation, {}, context, {id: u.id})));
-    ignoreUserResponses.forEach(response => {
+    const ignoreUserResponses = await Promise.all(usersToIgnore.map((u) => graphql(schema, ignoreUserMutation, {}, context, {id: u.id})));
+    ignoreUserResponses.forEach((response) => {
       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 c0d452f37..2b23d28d8 100644
--- a/test/server/graph/mutations/removeCommentTag.js
+++ b/test/server/graph/mutations/removeCommentTag.js
@@ -11,7 +11,7 @@ describe('graph.mutations.removeCommentTag', () => {
   let comment;
   beforeEach(async () => {
     await SettingsService.init();
-    comment = await CommentsService.publicCreate({body: `hello there! ${  String(Math.random()).slice(2)}`});
+    comment = await CommentsService.publicCreate({body: `hello there! ${String(Math.random()).slice(2)}`});
   });
 
   const query = `
diff --git a/test/server/services/comments.js b/test/server/services/comments.js
index 5b9cbf4d1..8d7d5585f 100644
--- a/test/server/services/comments.js
+++ b/test/server/services/comments.js
@@ -204,7 +204,7 @@ describe('services.CommentsService', () => {
     it('should return all comments if admin', () => {
       return CommentsService
         .findByUserId('456', true)
-        .then(comments => {
+        .then((comments) => {
           expect(comments).to.have.length(4);
         });
     });
@@ -212,7 +212,7 @@ describe('services.CommentsService', () => {
     it('should not return premod and rejected comments if not admin', () => {
       return CommentsService
         .findByUserId('456')
-        .then(comments => {
+        .then((comments) => {
           expect(comments).to.have.length(1);
         });
     });
diff --git a/test/server/services/settings.js b/test/server/services/settings.js
index e23548a83..d460ae272 100644
--- a/test/server/services/settings.js
+++ b/test/server/services/settings.js
@@ -7,13 +7,13 @@ describe('services.SettingsService', () => {
 
   describe('#retrieve()', () => {
     it('should have a moderation field defined', () => {
-      return SettingsService.retrieve().then(settings => {
+      return SettingsService.retrieve().then((settings) => {
         expect(settings).to.have.property('moderation').and.to.equal('PRE');
       });
     });
 
     it('should have two infoBox fields defined', () => {
-      return SettingsService.retrieve().then(settings => {
+      return SettingsService.retrieve().then((settings) => {
         expect(settings).to.have.property('infoBoxEnable').and.to.equal(false);
         expect(settings).to.have.property('infoBoxContent').and.to.equal('');
       });
@@ -23,7 +23,7 @@ describe('services.SettingsService', () => {
   describe('#update()', () => {
     it('should update the settings with a passed object', () => {
       const mockSettings = {moderation: 'POST', infoBoxEnable: true, infoBoxContent: 'yeah'};
-      return SettingsService.update(mockSettings).then(updatedSettings => {
+      return SettingsService.update(mockSettings).then((updatedSettings) => {
         expect(updatedSettings).to.be.an('object');
         expect(updatedSettings).to.have.property('moderation').and.to.equal('POST');
         expect(updatedSettings).to.have.property('infoBoxEnable', true);
diff --git a/test/server/services/users.js b/test/server/services/users.js
index 2f8e0adc3..9ee90a693 100644
--- a/test/server/services/users.js
+++ b/test/server/services/users.js
@@ -173,12 +173,12 @@ describe('services.UsersService', () => {
     it('should add user id to ignoredUsers set', async () => {
       const user = mockUsers[0];
       const usersToIgnore = [mockUsers[1], mockUsers[2]];
-      await UsersService.ignoreUsers(user.id, usersToIgnore.map(u => u.id));
+      await UsersService.ignoreUsers(user.id, usersToIgnore.map((u) => u.id));
       const userAfterIgnoring = await UsersService.findById(user.id);
       expect(userAfterIgnoring.ignoresUsers.length).to.equal(2);
 
       // ignore same user another time, make sure it's not added to the list.
-      await UsersService.ignoreUsers(user.id, usersToIgnore.slice(0, 1).map(u => u.id));
+      await UsersService.ignoreUsers(user.id, usersToIgnore.slice(0, 1).map((u) => u.id));
       const userAfterIgnoring2 = await UsersService.findById(user.id);
       expect(userAfterIgnoring2.ignoresUsers.length).to.equal(2);
     });
diff --git a/webpack.config.js b/webpack.config.js
index 3a54e85c0..2d751f8b2 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -124,7 +124,7 @@ module.exports = {
       addUrl: true
     }),
     new Copy([
-      ...buildEmbeds.map(embed => ({
+      ...buildEmbeds.map((embed) => ({
         from: path.join(__dirname, 'client', `coral-embed-${embed}`, 'style'),
         to: path.join(__dirname, 'dist', 'embed', embed)
       })),
@@ -158,8 +158,8 @@ module.exports = {
     modules: [
       path.resolve(__dirname, 'plugins'),
       path.resolve(__dirname, 'client'),
-      ...buildTargets.map(target => path.join(__dirname, 'client', target, 'src')),
-      ...buildEmbeds.map(embed => path.join(__dirname, 'client', `coral-embed-${embed}`, 'src')),
+      ...buildTargets.map((target) => path.join(__dirname, 'client', target, 'src')),
+      ...buildEmbeds.map((embed) => path.join(__dirname, 'client', `coral-embed-${embed}`, 'src')),
       'node_modules'
     ]
   }

From 47186c4eac14be1cba61307e67e07bc2de13a063 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 11 May 2017 17:52:07 -0600
Subject: [PATCH 06/16] some changes to loaders

---
 graph/loaders/assets.js       |  2 +-
 graph/loaders/comments.js     |  1 -
 graph/resolvers/asset.js      |  7 -------
 graph/resolvers/comment.js    |  2 +-
 graph/resolvers/root_query.js |  4 ++--
 graph/resolvers/user.js       |  2 +-
 graph/typeDefs.graphql        | 12 ++++++------
 7 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/graph/loaders/assets.js b/graph/loaders/assets.js
index d74199279..3f87b9dfd 100644
--- a/graph/loaders/assets.js
+++ b/graph/loaders/assets.js
@@ -49,7 +49,7 @@ const getAssetsForMetrics = async ({loaders: {Actions, Comments}}) => {
 
   const ids = actions.map(({item_id}) => item_id);
 
-  return Comments.getByQuery({ids});
+  return Comments.getConnection({ids});
 };
 
 /**
diff --git a/graph/loaders/comments.js b/graph/loaders/comments.js
index cc2a5dd09..ed8f56c95 100644
--- a/graph/loaders/comments.js
+++ b/graph/loaders/comments.js
@@ -447,7 +447,6 @@ const genComments = ({user}, ids) => {
 module.exports = (context) => ({
   Comments: {
     get: new DataLoader((ids) => genComments(context, ids)),
-    getByQuery: (query) => getCommentsByQuery(context, query),
     getConnection: (query) => getCommentsConnection(context, query),
     getCountByQuery: (query) => getCommentCountByQuery(context, query),
     countByAssetID: new SharedCounterDataLoader('Comments.totalCommentCount', 3600, (ids) => getCountsByAssetID(context, ids)),
diff --git a/graph/resolvers/asset.js b/graph/resolvers/asset.js
index 1a959d423..f31782cf6 100644
--- a/graph/resolvers/asset.js
+++ b/graph/resolvers/asset.js
@@ -1,11 +1,4 @@
 const Asset = {
-  lastComment({id}, _, {loaders: {Comments}}) {
-    return Comments.getByQuery({
-      asset_id: id,
-      limit: 1,
-      parent_id: null
-    }).then((data) => data[0]);
-  },
   recentComments({id}, _, {loaders: {Comments}}) {
     return Comments.genRecentComments.load(id);
   },
diff --git a/graph/resolvers/comment.js b/graph/resolvers/comment.js
index b52361f40..ef8985922 100644
--- a/graph/resolvers/comment.js
+++ b/graph/resolvers/comment.js
@@ -15,7 +15,7 @@ const Comment = {
     return Comments.genRecentReplies.load(id);
   },
   replies({id, asset_id}, {sort, limit, excludeIgnored}, {loaders: {Comments}}) {
-    return Comments.getByQuery({
+    return Comments.getConnection({
       asset_id,
       parent_id: id,
       sort,
diff --git a/graph/resolvers/root_query.js b/graph/resolvers/root_query.js
index 7faa8cb1d..c57db89c8 100644
--- a/graph/resolvers/root_query.js
+++ b/graph/resolvers/root_query.js
@@ -27,11 +27,11 @@ const RootQuery = {
         .then((ids) => {
 
           // Perform the query using the available resolver.
-          return Comments.getByQuery({ids, statuses, asset_id, parent_id, limit, cursor, sort, excludeIgnored});
+          return Comments.getConnection({ids, statuses, asset_id, parent_id, limit, cursor, sort, excludeIgnored});
         });
     }
 
-    return Comments.getByQuery(query);
+    return Comments.getConnection(query);
   },
   comment(_, {id}, {loaders: {Comments}}) {
     return Comments.get.load(id);
diff --git a/graph/resolvers/user.js b/graph/resolvers/user.js
index d8ed7ee15..93816223f 100644
--- a/graph/resolvers/user.js
+++ b/graph/resolvers/user.js
@@ -15,7 +15,7 @@ const User = {
     // If the user is not an admin, only return comment list for the owner of
     // the comments.
     if (user && (user.hasRoles('ADMIN') || user.id === id)) {
-      return Comments.getByQuery({author_id: id, sort: 'REVERSE_CHRONOLOGICAL'});
+      return Comments.getConnection({author_id: id, sort: 'REVERSE_CHRONOLOGICAL'});
     }
 
     return null;
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 4a6224ee9..c2413e431 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -40,10 +40,10 @@ type User {
   username: String!
 
   # Action summaries against the user.
-  action_summaries: [ActionSummary]!
+  action_summaries: [ActionSummary!]!
 
   # Actions completed on the parent.
-  actions: [Action]
+  actions: [Action!]
 
   # the current roles of the user.
   roles: [USER_ROLES!]
@@ -199,7 +199,7 @@ type Comment {
   user: User
 
   # the recent replies made against this comment.
-  recentReplies: [Comment]
+  recentReplies: [Comment!]
 
   # the replies that were made to the comment.
   replies(sort: SORT_ORDER = CHRONOLOGICAL, limit: Int = 3, excludeIgnored: Boolean): CommentConnection
@@ -438,7 +438,7 @@ type Asset {
   lastComment: Comment
 
   # Returns recent comments
-  recentComments: [Comment]
+  recentComments: [Comment!]
 
   # The top level comments that are attached to the asset.
   comments(sort: SORT_ORDER = REVERSE_CHRONOLOGICAL, limit: Int = 10, excludeIgnored: Boolean): CommentConnection
@@ -548,7 +548,7 @@ type RootQuery {
   asset(id: ID, url: String): Asset
 
   # Comments returned based on a query.
-  comments(query: CommentsQuery!): CommentConnection!
+  comments(query: CommentsQuery!): CommentConnection
 
   # Return the count of comments satisfied by the query. Note that this edge is
   # expensive as it is not batched. Requires the `ADMIN` role.
@@ -570,7 +570,7 @@ type RootQuery {
 
   # Comment metrics related to user actions are saturated into the comments
   # returned. Parameters `from` and `to` are related to the action created_at field.
-  commentMetrics(from: Date!, to: Date!, sort: ACTION_TYPE!, limit: Int = 10): [Comment!]
+  commentMetrics(from: Date!, to: Date!, sort: ACTION_TYPE!, limit: Int = 10): CommentConnection
 }
 
 ################################################################################

From f4dfb21e15c80d07caa4c3582cba0ef0f568dd6e Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 12 May 2017 09:14:25 -0600
Subject: [PATCH 07/16] reverted pagination work

---
 graph/loaders/assets.js            |  2 +-
 graph/loaders/comments.js          | 23 +----------------------
 graph/resolvers/asset.js           |  2 +-
 graph/resolvers/comment.js         |  2 +-
 graph/resolvers/root_query.js      |  4 ++--
 graph/resolvers/user.js            |  2 +-
 graph/typeDefs.graphql             | 23 ++++-------------------
 test/server/graph/queries/asset.js | 16 ++++++----------
 8 files changed, 17 insertions(+), 57 deletions(-)

diff --git a/graph/loaders/assets.js b/graph/loaders/assets.js
index 3f87b9dfd..d74199279 100644
--- a/graph/loaders/assets.js
+++ b/graph/loaders/assets.js
@@ -49,7 +49,7 @@ const getAssetsForMetrics = async ({loaders: {Actions, Comments}}) => {
 
   const ids = actions.map(({item_id}) => item_id);
 
-  return Comments.getConnection({ids});
+  return Comments.getByQuery({ids});
 };
 
 /**
diff --git a/graph/loaders/comments.js b/graph/loaders/comments.js
index ed8f56c95..ccee16ca7 100644
--- a/graph/loaders/comments.js
+++ b/graph/loaders/comments.js
@@ -290,27 +290,6 @@ const getCommentsByQuery = async ({user}, {ids, statuses, asset_id, parent_id, a
     .limit(limit);
 };
 
-const getCommentsConnection = async ({user}, query) => {
-  let {limit} = query;
-  
-  // Increate the limit by one.
-  query.limit++;
-
-  let comments = await getCommentsByQuery({user}, query);
-
-  if (!comments) {
-    comments = [];
-  }
-
-  return {
-    edges: comments.slice(0, limit),
-    pageInfo: {
-      hasNextPage: Boolean(comments.length > limit),
-      cursor: comments.length > 0 ? comments[comments.length - 1].created_at : null
-    }
-  };
-};
-
 /**
  * Gets the recent replies.
  * @param  {Object}        context   graph context
@@ -447,7 +426,7 @@ const genComments = ({user}, ids) => {
 module.exports = (context) => ({
   Comments: {
     get: new DataLoader((ids) => genComments(context, ids)),
-    getConnection: (query) => getCommentsConnection(context, query),
+    getByQuery: (query) => getCommentsByQuery(context, query),
     getCountByQuery: (query) => getCommentCountByQuery(context, query),
     countByAssetID: new SharedCounterDataLoader('Comments.totalCommentCount', 3600, (ids) => getCountsByAssetID(context, ids)),
     countByAssetIDPersonalized: (query) => getCountsByAssetIDPersonalized(context, query),
diff --git a/graph/resolvers/asset.js b/graph/resolvers/asset.js
index f31782cf6..96bc8c1bc 100644
--- a/graph/resolvers/asset.js
+++ b/graph/resolvers/asset.js
@@ -3,7 +3,7 @@ const Asset = {
     return Comments.genRecentComments.load(id);
   },
   comments({id}, {sort, limit, excludeIgnored}, {loaders: {Comments}}) {
-    return Comments.getConnection({
+    return Comments.getByQuery({
       asset_id: id,
       sort,
       limit,
diff --git a/graph/resolvers/comment.js b/graph/resolvers/comment.js
index ef8985922..b52361f40 100644
--- a/graph/resolvers/comment.js
+++ b/graph/resolvers/comment.js
@@ -15,7 +15,7 @@ const Comment = {
     return Comments.genRecentReplies.load(id);
   },
   replies({id, asset_id}, {sort, limit, excludeIgnored}, {loaders: {Comments}}) {
-    return Comments.getConnection({
+    return Comments.getByQuery({
       asset_id,
       parent_id: id,
       sort,
diff --git a/graph/resolvers/root_query.js b/graph/resolvers/root_query.js
index c57db89c8..7faa8cb1d 100644
--- a/graph/resolvers/root_query.js
+++ b/graph/resolvers/root_query.js
@@ -27,11 +27,11 @@ const RootQuery = {
         .then((ids) => {
 
           // Perform the query using the available resolver.
-          return Comments.getConnection({ids, statuses, asset_id, parent_id, limit, cursor, sort, excludeIgnored});
+          return Comments.getByQuery({ids, statuses, asset_id, parent_id, limit, cursor, sort, excludeIgnored});
         });
     }
 
-    return Comments.getConnection(query);
+    return Comments.getByQuery(query);
   },
   comment(_, {id}, {loaders: {Comments}}) {
     return Comments.get.load(id);
diff --git a/graph/resolvers/user.js b/graph/resolvers/user.js
index 93816223f..d8ed7ee15 100644
--- a/graph/resolvers/user.js
+++ b/graph/resolvers/user.js
@@ -15,7 +15,7 @@ const User = {
     // If the user is not an admin, only return comment list for the owner of
     // the comments.
     if (user && (user.hasRoles('ADMIN') || user.id === id)) {
-      return Comments.getConnection({author_id: id, sort: 'REVERSE_CHRONOLOGICAL'});
+      return Comments.getByQuery({author_id: id, sort: 'REVERSE_CHRONOLOGICAL'});
     }
 
     return null;
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index c2413e431..40fc2c189 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -1,12 +1,3 @@
-################################################################################
-## Pagination
-################################################################################
-
-type PageInfo {
-  hasNextPage: Boolean!
-  cursor: String
-}
-
 ################################################################################
 ## Custom Scalar Types
 ################################################################################
@@ -87,12 +78,6 @@ input UsersQuery {
 ## Comments
 ################################################################################
 
-# CommentConnection provides Comments with PageInfo.
-type CommentConnection {
-  edges: [Comment!]
-  pageInfo: PageInfo!
-}
-
 # The statuses that a comment may have.
 enum COMMENT_STATUS {
 
@@ -202,7 +187,7 @@ type Comment {
   recentReplies: [Comment!]
 
   # the replies that were made to the comment.
-  replies(sort: SORT_ORDER = CHRONOLOGICAL, limit: Int = 3, excludeIgnored: Boolean): CommentConnection
+  replies(sort: SORT_ORDER = CHRONOLOGICAL, limit: Int = 3, excludeIgnored: Boolean): [Comment!]
 
   # The count of replies on a comment.
   replyCount(excludeIgnored: Boolean): Int
@@ -441,7 +426,7 @@ type Asset {
   recentComments: [Comment!]
 
   # The top level comments that are attached to the asset.
-  comments(sort: SORT_ORDER = REVERSE_CHRONOLOGICAL, limit: Int = 10, excludeIgnored: Boolean): CommentConnection
+  comments(sort: SORT_ORDER = REVERSE_CHRONOLOGICAL, limit: Int = 10, excludeIgnored: Boolean): [Comment!]
 
   # The count of top level comments on the asset.
   commentCount(excludeIgnored: Boolean): Int
@@ -548,7 +533,7 @@ type RootQuery {
   asset(id: ID, url: String): Asset
 
   # Comments returned based on a query.
-  comments(query: CommentsQuery!): CommentConnection
+  comments(query: CommentsQuery!): [Comment!]
 
   # Return the count of comments satisfied by the query. Note that this edge is
   # expensive as it is not batched. Requires the `ADMIN` role.
@@ -570,7 +555,7 @@ type RootQuery {
 
   # Comment metrics related to user actions are saturated into the comments
   # returned. Parameters `from` and `to` are related to the action created_at field.
-  commentMetrics(from: Date!, to: Date!, sort: ACTION_TYPE!, limit: Int = 10): CommentConnection
+  commentMetrics(from: Date!, to: Date!, sort: ACTION_TYPE!, limit: Int = 10): [Comment!]
 }
 
 ################################################################################
diff --git a/test/server/graph/queries/asset.js b/test/server/graph/queries/asset.js
index f25711809..757b33874 100644
--- a/test/server/graph/queries/asset.js
+++ b/test/server/graph/queries/asset.js
@@ -45,17 +45,15 @@ describe('graph.queries.asset', () => {
       query assetCommentsQuery($id: ID!) {
         asset(id: $id) {
           comments(limit: 10) {
-            edges {
-              id
-              body
-            }
+            id
+            body
           }
         }
       }
     `;
     const res = await graphql(schema, assetCommentsQuery, {}, context, {id: asset.id});
     expect(res.erros).is.empty;
-    const comments = res.data.asset.comments.edges;
+    const comments = res.data.asset.comments;
     expect(comments.length).to.equal(2);
   });
 
@@ -75,10 +73,8 @@ describe('graph.queries.asset', () => {
       query assetCommentsQuery($id: ID!, $url: String!, $excludeIgnored: Boolean!) {
         asset(id: $id, url: $url) {
           comments(limit: 10, excludeIgnored: $excludeIgnored) {
-            edges {
-              id
-              body
-            }
+            id
+            body
           }
         }
       }
@@ -94,7 +90,7 @@ describe('graph.queries.asset', () => {
         console.error(res.errors);
       }
       expect(res.errors).is.empty;
-      const comments = res.data.asset.comments.edges;
+      const comments = res.data.asset.comments;
       expect(comments.length).to.equal(1);
     }
   });

From ed27209de98e7ccc1b4765a89383e1f5c19b012d Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 12 May 2017 10:09:25 -0600
Subject: [PATCH 08/16] More edit changes

---
 graph/loaders/metrics.js                  | 254 +++++++++++-----------
 graph/mutators/comment.js                 |   1 +
 graph/resolvers/asset.js                  |  26 ++-
 graph/resolvers/comment.js                |  10 +-
 graph/resolvers/root_query.js             |  43 +---
 graph/resolvers/user.js                   |  15 ++
 graph/typeDefs.graphql                    |   6 +-
 models/comment.js                         |  11 +
 services/comments.js                      |   3 +-
 test/server/graph/mutations/ignoreUser.js |  45 ++--
 10 files changed, 218 insertions(+), 196 deletions(-)

diff --git a/graph/loaders/metrics.js b/graph/loaders/metrics.js
index a0408ed4d..e91a1adf4 100644
--- a/graph/loaders/metrics.js
+++ b/graph/loaders/metrics.js
@@ -54,166 +54,158 @@ const getAssetActivityMetrics = ({loaders: {Assets}}, {from, to, limit}) => {
 /**
  * Returns a list of assets with action metadata included on the models.
  */
-const getAssetMetrics = ({loaders: {Metrics, Assets, Comments}}, {from, to, sort, limit}) => {
+const getAssetMetrics = async ({loaders: {Metrics, Assets, Comments}}, {from, to, sort, limit}) => {
 
-  let commentMetrics = {};
-  let assetMetrics = [];
+  // Get the recent actions.
+  let actionSummaries = await Metrics.getRecentActions.load({from, to});
 
-  return Metrics.getRecentActions.load({from, to})
-    .then((actionSummaries) => {
+  let commentMetrics = actionSummaries.reduce((acc, {item_id, action_type, count}) => {
+    if (action_type !== sort) {
+      return acc;
+    }
 
-      commentMetrics = actionSummaries.reduce((acc, {item_id, action_type, count}) => {
-        if (action_type !== sort) {
-          return acc;
-        }
+    if (!(item_id in acc)) {
+      acc[item_id] = [];
+    }
 
-        if (!(item_id in acc)) {
-          acc[item_id] = [];
-        }
+    acc[item_id].push({action_type, count});
 
-        acc[item_id].push({action_type, count});
+    return acc;
+  }, {});
 
-        return acc;
-      }, {});
+  // Collect just the comment id's.
+  let commentIDs = Object.keys(commentMetrics);
 
-      // Collect just the comment id's.
-      let commentIDs = Object.keys(commentMetrics);
+  // Find those comments.
+  let comments = await Comments.get.loadMany(commentIDs);
 
-      // Find those comments.
-      return Comments.get.loadMany(commentIDs);
+  let commentResults = _.groupBy(comments, 'asset_id');
+
+  let assetMetrics = Object.keys(commentResults)
+    .map((asset_id) => {
+      let ids = commentResults[asset_id].map((comment) => comment.id);
+      let summaries = _.groupBy(_.flatten(ids.map((id) => commentMetrics[id])), 'action_type');
+
+      let action_summaries = Object.keys(summaries).map((action_type) => ({
+        action_type,
+        actionCount: summaries[action_type].reduce((acc, {count}) => acc + count, 0),
+        actionableItemCount: summaries[action_type].length
+      }));
+
+      return {action_summaries, id: asset_id};
     })
-    .then((comments) => {
+  
+    .filter((asset) => {
+      let contextActionSummary = asset.action_summaries.find((({action_type}) => action_type === sort));
+      if (contextActionSummary === null || contextActionSummary.actionCount === 0) {
+        return false;
+      }
 
-      let commentResults = _.groupBy(comments, 'asset_id');
-
-      assetMetrics = Object.keys(commentResults).map((asset_id) => {
-        let ids = commentResults[asset_id].map((comment) => comment.id);
-        let summaries = _.groupBy(_.flatten(ids.map((id) => commentMetrics[id])), 'action_type');
-
-        let action_summaries = Object.keys(summaries).map((action_type) => ({
-          action_type,
-          actionCount: summaries[action_type].reduce((acc, {count}) => acc + count, 0),
-          actionableItemCount: summaries[action_type].length
-        }));
-
-        return {action_summaries, id: asset_id};
-      })
-
-      .filter((asset) => {
-        let contextActionSummary = asset.action_summaries.find((({action_type}) => action_type === sort));
-        if (contextActionSummary === null || contextActionSummary.actionCount === 0) {
-          return false;
-        }
-
-        return true;
-      })
-
-      // Sort these metrics by the predefined sort order. This will ensure that
-      // if the action summary does not exist on the object, that it is less
-      // prefered over the one that does have it.
-      .sort((a, b) => {
-        let aActionSummary = a.action_summaries.find((({action_type}) => action_type === sort));
-        let bActionSummary = b.action_summaries.find((({action_type}) => action_type === sort));
-
-        // Both of them had an actionCount, hence we can determine that we could
-        // compare the actual values directly.
-        return bActionSummary.actionCount - aActionSummary.actionCount;
-      });
-
-      // Only keep the top `limit`.
-      assetMetrics = assetMetrics.slice(0, limit);
-
-      // Determine the assets that we need to return.
-      return Assets.getByID.loadMany(assetMetrics.map((asset) => asset.id));
+      return true;
     })
-    .then((assets) => {
 
-      // Join up the assets that are returned by their id.
-      let groupedAssets = _.groupBy(assets, 'id');
+    // Sort these metrics by the predefined sort order. This will ensure that
+    // if the action summary does not exist on the object, that it is less
+    // prefered over the one that does have it.
+    .sort((a, b) => {
+      let aActionSummary = a.action_summaries.find((({action_type}) => action_type === sort));
+      let bActionSummary = b.action_summaries.find((({action_type}) => action_type === sort));
 
-      // Return from the sorted asset metrics and return their assetes.
-      return assetMetrics.map(({id, action_summaries}) => {
-        if (id in groupedAssets) {
-          let asset = groupedAssets[id][0];
-
-          // Add the action summaries to the asset.
-          asset.action_summaries = action_summaries;
-
-          return asset;
-        }
-
-        return null;
-      }).filter((asset) => asset != null);
+      // Both of them had an actionCount, hence we can determine that we could
+      // compare the actual values directly.
+      return bActionSummary.actionCount - aActionSummary.actionCount;
     });
+
+  // Only keep the top `limit`.
+  assetMetrics = assetMetrics.slice(0, limit);
+
+  // Determine the assets that we need to return.
+  let assets = await Assets.getByID.loadMany(assetMetrics.map((asset) => asset.id));
+
+  // Join up the assets that are returned by their id.
+  let groupedAssets = _.groupBy(assets, 'id');
+
+  // Return from the sorted asset metrics and return their assetes.
+  return assetMetrics.map(({id, action_summaries}) => {
+    if (id in groupedAssets) {
+      let asset = groupedAssets[id][0];
+
+      // Add the action summaries to the asset.
+      asset.action_summaries = action_summaries;
+
+      return asset;
+    }
+
+    return null;
+  }).filter((asset) => asset != null);
 };
 
 /**
  * Returns a list of comments that are retrieved based on most activity within
  * the indicated time range.
  */
-const getCommentMetrics = ({loaders: {Metrics, Comments}}, {from, to, sort, limit}) => {
+const getCommentMetrics = async ({loaders: {Metrics, Comments}}, {from, to, sort, limit}) => {
 
   let commentActionSummaries = {};
 
-  return Metrics.getRecentActions.load({from, to})
-    .then((actionSummaries) => {
+  let actionSummaries = await Metrics.getRecentActions.load({from, to});
 
-      actionSummaries.sort((a, b) => {
-        let aActionSummary = a.action_type === sort ? a : null;
-        let bActionSummary = b.action_type === sort ? b : null;
+  actionSummaries.sort((a, b) => {
+    let aActionSummary = a.action_type === sort ? a : null;
+    let bActionSummary = b.action_type === sort ? b : null;
 
-        // If either a or b don't have this action type, then one of them will
-        // automatically win.
-        if (aActionSummary == null || bActionSummary == null) {
-          if (bActionSummary != null) {
-            return 1;
-          }
-
-          if (aActionSummary != null) {
-            return -1;
-          }
-
-          return 0;
-        }
-
-        // Both of them had an actionCount, hence we can determine that we could
-        // compare the actual values directly.
-        return bActionSummary.count - aActionSummary.count;
-      });
-
-      commentActionSummaries = _.groupBy(actionSummaries, 'item_id');
-
-      // Grab the comment id's for comment where they have at least one of the
-      // actions being sorted by.
-      let commentIDs = Object.keys(commentActionSummaries).filter((item_id) => {
-        let contextActionSummary = commentActionSummaries[item_id].find(({action_type}) => action_type === sort);
-        if (contextActionSummary == null) {
-          return false;
-        }
-
-        return true;
-      });
-
-      // Only keep the top `limit`.
-      commentIDs = commentIDs.slice(0, limit);
-
-      // If there are no comment's to get, then just continue with an empty
-      // array.
-      if (commentIDs.length === 0) {
-        return [];
+    // If either a or b don't have this action type, then one of them will
+    // automatically win.
+    if (aActionSummary == null || bActionSummary == null) {
+      if (bActionSummary != null) {
+        return 1;
       }
 
-      // Find those comments, this is the final stage, so let's get all the
-      // fields.
-      return Comments.get.loadMany(commentIDs);
-    })
-    .then((comments) => comments.map((comment) => {
+      if (aActionSummary != null) {
+        return -1;
+      }
 
-      // Add in the action summaries genrerated.
-      comment.action_summaries = commentActionSummaries[comment.id];
+      return 0;
+    }
 
-      return comment;
-    }));
+    // Both of them had an actionCount, hence we can determine that we could
+    // compare the actual values directly.
+    return bActionSummary.count - aActionSummary.count;
+  });
+
+  commentActionSummaries = _.groupBy(actionSummaries, 'item_id');
+
+  // Grab the comment id's for comment where they have at least one of the
+  // actions being sorted by.
+  let commentIDs = Object.keys(commentActionSummaries).filter((item_id) => {
+    let contextActionSummary = commentActionSummaries[item_id].find(({action_type}) => action_type === sort);
+    if (contextActionSummary == null) {
+      return false;
+    }
+
+    return true;
+  });
+
+  // Only keep the top `limit`.
+  commentIDs = commentIDs.slice(0, limit);
+
+  // If there are no comment's to get, then just continue with an empty
+  // array.
+  if (commentIDs.length === 0) {
+    return [];
+  }
+
+  // Find those comments, this is the final stage, so let's get all the
+  // fields.
+  let comments = await Comments.get.loadMany(commentIDs);
+
+  return comments.map((comment) => {
+
+    // Add in the action summaries genrerated.
+    comment.action_summaries = commentActionSummaries[comment.id];
+
+    return comment;
+  });
 };
 
 const getRecentActions = (context, {from, to}) => {
diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index 89ecfc026..aa113e54b 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -223,6 +223,7 @@ const edit = async (context, {id, asset_id, edit: {body}}) => {
   // Determine the new status of the comment.
   const status = await resolveNewCommentStatus(context, {asset_id, body}, wordlist, settings);    
 
+  // Execute the edit.
   await CommentsService.edit(id, context.user.id, {body, status});
 
   return {status};
diff --git a/graph/resolvers/asset.js b/graph/resolvers/asset.js
index 96bc8c1bc..41710ba35 100644
--- a/graph/resolvers/asset.js
+++ b/graph/resolvers/asset.js
@@ -12,6 +12,8 @@ const Asset = {
     });
   },
   commentCount({id, commentCount}, {excludeIgnored}, {user, loaders: {Comments}}) {
+
+    // TODO: remove
     if (user && excludeIgnored) {
       return Comments.parentCountByAssetIDPersonalized({assetId: id, excludeIgnored});
     }
@@ -21,6 +23,8 @@ const Asset = {
     return Comments.parentCountByAssetID.load(id);
   },
   totalCommentCount({id, totalCommentCount}, {excludeIgnored}, {user, loaders: {Comments}}) {
+
+    // TODO: remove
     if (user && excludeIgnored) {
       return Comments.countByAssetIDPersonalized({assetId: id, excludeIgnored});
     }
@@ -29,16 +33,18 @@ const Asset = {
     }
     return Comments.countByAssetID.load(id);
   },
-  settings({settings = null}, _, {loaders: {Settings}}) {
-    return Settings.load()
-      .then((globalSettings) => {
-        if (settings) {
-          settings = Object.assign({}, globalSettings.toObject(), settings);
-        } else {
-          settings = globalSettings.toObject();
-        }
-        return settings;
-      });
+  async settings({settings = null}, _, {loaders: {Settings}}) {
+
+    // Load the global settings, and merge them into the asset specific settings
+    // if we have some.
+    let globalSettings = await Settings.load();
+    if (settings !== null) {
+      settings = Object.assign({}, globalSettings.toObject(), settings);
+    } else {
+      settings = globalSettings.toObject();
+    }
+
+    return settings;
   }
 };
 
diff --git a/graph/resolvers/comment.js b/graph/resolvers/comment.js
index b52361f40..8d0473900 100644
--- a/graph/resolvers/comment.js
+++ b/graph/resolvers/comment.js
@@ -1,5 +1,3 @@
-const CommentsService = require('../../services/comments');
-
 const Comment = {
   parent({parent_id}, _, {loaders: {Comments}}) {
     if (parent_id == null) {
@@ -24,6 +22,8 @@ const Comment = {
     });
   },
   replyCount({id}, {excludeIgnored}, {user, loaders: {Comments}}) {
+
+    // TODO: remove
     if (user && excludeIgnored) {
       return Comments.countByParentIDPersonalized({id, excludeIgnored});      
     }
@@ -49,11 +49,9 @@ const Comment = {
     return Assets.getByID.load(asset_id);
   },
   editing(comment) {
-    const editableUntil = CommentsService.getEditableUntilDate(comment);
-    const edited = comment.body_history.length > 1;
     return {
-      edited,
-      editableUntil,
+      edited: comment.edited,
+      editableUntil: comment.editableUntil
     };
   }
 };
diff --git a/graph/resolvers/root_query.js b/graph/resolvers/root_query.js
index 7faa8cb1d..ad4ed4b0d 100644
--- a/graph/resolvers/root_query.js
+++ b/graph/resolvers/root_query.js
@@ -19,16 +19,14 @@ const RootQuery = {
 
   // This endpoint is used for loading moderation queues, so hide it in the
   // event that we aren't an admin.
-  comments(_, {query: {action_type, statuses, asset_id, parent_id, limit, cursor, sort, excludeIgnored}}, {user, loaders: {Comments, Actions}}) {
+  async comments(_, {query: {action_type, statuses, asset_id, parent_id, limit, cursor, sort, excludeIgnored}}, {user, loaders: {Comments, Actions}}) {
     let query = {statuses, asset_id, parent_id, limit, cursor, sort, excludeIgnored};
 
     if (user != null && user.hasRoles('ADMIN') && action_type) {
-      return Actions.getByTypes({action_type, item_type: 'COMMENTS'})
-        .then((ids) => {
+      let ids = await Actions.getByTypes({action_type, item_type: 'COMMENTS'});
 
-          // Perform the query using the available resolver.
-          return Comments.getByQuery({ids, statuses, asset_id, parent_id, limit, cursor, sort, excludeIgnored});
-        });
+      // Perform the query using the available resolver.
+      return Comments.getByQuery({ids, statuses, asset_id, parent_id, limit, cursor, sort, excludeIgnored});
     }
 
     return Comments.getByQuery(query);
@@ -36,18 +34,16 @@ const RootQuery = {
   comment(_, {id}, {loaders: {Comments}}) {
     return Comments.get.load(id);
   },
-  commentCount(_, {query: {action_type, statuses, asset_id, parent_id}}, {user, loaders: {Actions, Comments}}) {
+  async commentCount(_, {query: {action_type, statuses, asset_id, parent_id}}, {user, loaders: {Actions, Comments}}) {
     if (user == null || !user.hasRoles('ADMIN')) {
       return null;
     }
 
     if (action_type) {
-      return Actions.getByTypes({action_type, item_type: 'COMMENTS'})
-        .then((ids) => {
+      let ids = await Actions.getByTypes({action_type, item_type: 'COMMENTS'});
 
-          // Perform the query using the available resolver.
-          return Comments.getCountByQuery({ids, statuses, asset_id, parent_id});
-        });
+      // Perform the query using the available resolver.
+      return Comments.getCountByQuery({ids, statuses, asset_id, parent_id});
     }
 
     return Comments.getCountByQuery({statuses, asset_id, parent_id});
@@ -83,22 +79,9 @@ const RootQuery = {
     return user;
   },
 
-  myIgnoredUsers: async (_, args, {user, loaders: {Users}}) => {
-    if (!user) {
-      return null;
-    }
-
-    // get currentUser again since context.user was out of date when running test/graph/mutations/ignoreUser
-    const currentUser = (await Users.getByQuery({ids: [user.id], limit: 1}))[0];
-    if (!(currentUser && Array.isArray(currentUser.ignoresUsers) && currentUser.ignoresUsers.length)) {
-      return [];
-    }
-    return await Users.getByQuery({ids: currentUser.ignoresUsers});
-  },
-
   // This endpoint is used for loading the user moderation queues (users whose username has been flagged),
   // so hide it in the event that we aren't an admin.
-  users(_, {query: {action_type, limit, cursor, sort}}, {user, loaders: {Users, Actions}}) {
+  async users(_, {query: {action_type, limit, cursor, sort}}, {user, loaders: {Users, Actions}}) {
 
     if (user == null || !user.hasRoles('ADMIN')) {
       return null;
@@ -107,12 +90,10 @@ const RootQuery = {
     const query = {limit, cursor, sort};
 
     if (action_type) {
-      return Actions.getByTypes({action_type, item_type: 'USERS'})
-        .then((ids) => {
+      let ids = await Actions.getByTypes({action_type, item_type: 'USERS'});
 
-          // Perform the query using the available resolver.
-          return Users.getByQuery({ids, limit, cursor, sort}).find({status: 'PENDING'});
-        });
+      // Perform the query using the available resolver.
+      return Users.getByQuery({ids, limit, cursor, sort}).find({status: 'PENDING'});
     }
 
     return Users.getByQuery(query);
diff --git a/graph/resolvers/user.js b/graph/resolvers/user.js
index d8ed7ee15..9b25c812f 100644
--- a/graph/resolvers/user.js
+++ b/graph/resolvers/user.js
@@ -20,6 +20,21 @@ const User = {
 
     return null;
   },
+  ignoredUsers({id}, args, {user, loaders: {Users}}) {
+
+    // Only allow a logged in user that is either the current user or is a staff
+    // member to access the ignoredUsers of a given user.
+    if (!user || ((user.id !== id) && !(user.hasRoles('ADMIN') || user.hasRoles('MODERATOR')))) {
+      return null;
+    }
+
+    // Return nothing if there is nothing to query for.
+    if (!user.ignoresUsers || user.ignoresUsers.length <= 0) {
+      return [];
+    }
+
+    return Users.getByQuery({ids: user.ignoresUsers});
+  },
   roles({id, roles}, _, {user}) {
 
     // If the user is not an admin, only return the current user's roles.
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 40fc2c189..f51258eb1 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -42,6 +42,9 @@ type User {
   # determines whether the user can edit their username
   canEditName: Boolean
 
+  # ignored users.
+  ignoredUsers: [User!]
+
   # returns all comments based on a query.
   comments(query: CommentsQuery): [Comment!]
 
@@ -543,9 +546,6 @@ type RootQuery {
   # role.
   me: User
 
-  # Users that the currently logged in user ignores
-  myIgnoredUsers: [User]
-
   # Users returned based on a query.
   users(query: UsersQuery): [User]
 
diff --git a/models/comment.js b/models/comment.js
index 68a8f7526..ddd39c68e 100644
--- a/models/comment.js
+++ b/models/comment.js
@@ -2,6 +2,8 @@ const mongoose = require('../services/mongoose');
 const Schema = mongoose.Schema;
 const uuid = require('uuid');
 
+const EDIT_WINDOW_MS = 30 * 1000; // 30 seconds
+
 const STATUSES = [
   'ACCEPTED',
   'REJECTED',
@@ -107,7 +109,16 @@ const CommentSchema = new Schema({
   }
 });
 
+CommentSchema.virtual('edited').get(function() {
+  return this.body_history.length > 1;
+});
+
+CommentSchema.virtual('editableUntil').get(function() {
+  return new Date(Number(this.created_at) + EDIT_WINDOW_MS);
+});
+
 // Comment model.
 const Comment = mongoose.model('Comment', CommentSchema);
 
 module.exports = Comment;
+module.exports.EDIT_WINDOW_MS = EDIT_WINDOW_MS;
diff --git a/services/comments.js b/services/comments.js
index 25e5cc528..272b19cd0 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -1,12 +1,11 @@
 const CommentModel = require('../models/comment');
+const EDIT_WINDOW_MS = CommentModel.EDIT_WINDOW_MS;
 
 const ActionModel = require('../models/action');
 const ActionsService = require('./actions');
 
 const errors = require('../errors');
 
-const EDIT_WINDOW_MS = 30 * 1000; // 30 seconds
-
 module.exports = class CommentsService {
 
   /**
diff --git a/test/server/graph/mutations/ignoreUser.js b/test/server/graph/mutations/ignoreUser.js
index c4b27d31d..256fd732b 100644
--- a/test/server/graph/mutations/ignoreUser.js
+++ b/test/server/graph/mutations/ignoreUser.js
@@ -18,9 +18,11 @@ const ignoreUserMutation = `
 
 const getMyIgnoredUsersQuery = `
   query myIgnoredUsers {
-    myIgnoredUsers {
-      id,
-      username
+    me {
+      ignoredUsers {
+        id
+        username
+      }
     }
   }
 `;
@@ -31,25 +33,32 @@ describe('graph.mutations.ignoreUser', () => {
   });
 
   it('users can ignoreUser', async () => {
-    const user = await UsersService.createLocalUser('usernameA@example.com', 'password', 'usernameA');
+    let currentUser = await UsersService.createLocalUser('usernameA@example.com', 'password', 'usernameA');
     const userToIgnore = await UsersService.createLocalUser('usernameB@example.com', 'password', 'usernameB');
-    const context = new Context({user});
+    let context = new Context({user: currentUser});
+
     const ignoreUserResponse = await graphql(schema, ignoreUserMutation, {}, context, {id: userToIgnore.id});
     if (ignoreUserResponse.errors && ignoreUserResponse.errors.length) {
       console.error(ignoreUserResponse.errors);
     }
     expect(ignoreUserResponse.errors).to.be.empty;
 
+    // Refresh the user from the database and create the new context for the
+    // request.
+    currentUser = await UsersService.findById(currentUser.id);
+    context = new Context({user: currentUser});
+
     // now check my ignored users
     const myIgnoredUsersResponse = await graphql(schema, getMyIgnoredUsersQuery, {}, context, {});
     if (myIgnoredUsersResponse.errors && myIgnoredUsersResponse.errors.length) {
       console.error(myIgnoredUsersResponse.errors);
     }
     expect(myIgnoredUsersResponse.errors).to.be.empty;
-    const myIgnoredUsers = myIgnoredUsersResponse.data.myIgnoredUsers;
-    expect(myIgnoredUsers.length).to.equal(1);
-    expect(myIgnoredUsers[0].id).to.equal(userToIgnore.id);
-    expect(myIgnoredUsers[0].username).to.equal(userToIgnore.username);
+
+    const ignoredUsers = myIgnoredUsersResponse.data.me.ignoredUsers;
+    expect(ignoredUsers.length).to.equal(1);
+    expect(ignoredUsers[0].id).to.equal(userToIgnore.id);
+    expect(ignoredUsers[0].username).to.equal(userToIgnore.username);
   });
 
   it('users cannot ignore themselves', async () => {
@@ -64,7 +73,7 @@ describe('graph.mutations.ignoreUser', () => {
       console.error(myIgnoredUsersResponse.errors);
     }
     expect(myIgnoredUsersResponse.errors).to.be.empty;
-    const myIgnoredUsers = myIgnoredUsersResponse.data.myIgnoredUsers;
+    const myIgnoredUsers = myIgnoredUsersResponse.data.me.ignoredUsers;
     expect(myIgnoredUsers.length).to.equal(0);
   });
 
@@ -80,12 +89,12 @@ describe('graph.mutations.stopIgnoringUser', () => {
     // We're going to ignore 2 users,
     // then stopIgnoring 1 of them
     // then assert myIgnoredUsers only lists the one remaining
-    const user = await UsersService.createLocalUser('usernameA@example.com', 'password', 'usernameA');
+    let currentUser = await UsersService.createLocalUser('usernameA@example.com', 'password', 'usernameA');
     const usersToIgnore = await Promise.all([
       UsersService.createLocalUser('usernameB@example.com', 'password', 'usernameB'),
       UsersService.createLocalUser('usernameC@example.com', 'password', 'usernameC'),
     ]);
-    const context = new Context({user});
+    let context = new Context({user: currentUser});
 
     // ignore two users
     const ignoreUserResponses = await Promise.all(usersToIgnore.map((u) => graphql(schema, ignoreUserMutation, {}, context, {id: u.id})));
@@ -96,6 +105,11 @@ describe('graph.mutations.stopIgnoringUser', () => {
       expect(response.errors).to.be.empty;
     });
 
+    // Refresh the user from the database and create the new context for the
+    // request.
+    currentUser = await UsersService.findById(currentUser.id);
+    context = new Context({user: currentUser});
+
     const stopIgnoringUserMutation = `
       mutation stopIgnoringUser ($id: ID!) {
         stopIgnoringUser(id:$id) {
@@ -113,13 +127,18 @@ describe('graph.mutations.stopIgnoringUser', () => {
     }
     expect(stopIgnoringUserResponse.errors).to.be.empty;
 
+    // Refresh the user from the database and create the new context for the
+    // request.
+    currentUser = await UsersService.findById(currentUser.id);
+    context = new Context({user: currentUser});
+
     // now check my ignored users
     const myIgnoredUsersResponse = await graphql(schema, getMyIgnoredUsersQuery, {}, context, {});
     if (myIgnoredUsersResponse.errors && myIgnoredUsersResponse.errors.length) {
       console.error(myIgnoredUsersResponse.errors);
     }
     expect(myIgnoredUsersResponse.errors).to.be.empty;
-    const myIgnoredUsers = myIgnoredUsersResponse.data.myIgnoredUsers;
+    const myIgnoredUsers = myIgnoredUsersResponse.data.me.ignoredUsers;
     expect(myIgnoredUsers.length).to.equal(1);
     expect(myIgnoredUsers[0].id).to.equal(usersToIgnore[1].id);
     expect(myIgnoredUsers[0].username).to.equal(usersToIgnore[1].username);

From e3017efebfd376cb26dc09e699a191d534fb07ad Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 12 May 2017 10:25:59 -0600
Subject: [PATCH 09/16] Front end edits to accomedate ignoredUsers

---
 client/coral-embed-stream/src/containers/Stream.js        | 8 ++++----
 .../graphql/queries/myIgnoredUsers.graphql                | 8 +++++---
 client/coral-settings/containers/ProfileContainer.js      | 4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/client/coral-embed-stream/src/containers/Stream.js b/client/coral-embed-stream/src/containers/Stream.js
index c6ab222ee..85df2c7b9 100644
--- a/client/coral-embed-stream/src/containers/Stream.js
+++ b/client/coral-embed-stream/src/containers/Stream.js
@@ -199,12 +199,12 @@ const fragments = {
           }
         }
       }
-      myIgnoredUsers {
-        id,
-        username,
-      }
       me {
         status
+        ignoredUsers {
+          id
+          username
+        }
       }
       ...${getDefinitionName(Comment.fragments.root)}
     }
diff --git a/client/coral-framework/graphql/queries/myIgnoredUsers.graphql b/client/coral-framework/graphql/queries/myIgnoredUsers.graphql
index d81531e37..4bdd7fcdd 100644
--- a/client/coral-framework/graphql/queries/myIgnoredUsers.graphql
+++ b/client/coral-framework/graphql/queries/myIgnoredUsers.graphql
@@ -1,6 +1,8 @@
 query myIgnoredUsers {
-  myIgnoredUsers {
-    id,
-    username,
+  me {
+    ignoredUsers {
+      id,
+      username,
+    }
   }
 }
diff --git a/client/coral-settings/containers/ProfileContainer.js b/client/coral-settings/containers/ProfileContainer.js
index d1b81e983..47ad5f4f2 100644
--- a/client/coral-settings/containers/ProfileContainer.js
+++ b/client/coral-settings/containers/ProfileContainer.js
@@ -57,12 +57,12 @@ class ProfileContainer extends Component {
         }
 
         {
-          myIgnoredUsersData.myIgnoredUsers && myIgnoredUsersData.myIgnoredUsers.length
+          myIgnoredUsersData.me.ignoredUsers && myIgnoredUsersData.me.ignoredUsers.length
           ? (
             <div>
               <h3>Ignored users</h3>
               <IgnoredUsers
-                users={myIgnoredUsersData.myIgnoredUsers}
+                users={myIgnoredUsersData.me.ignoredUsers}
                 stopIgnoring={stopIgnoringUser}
               />
             </div>

From ffd96f57e9448e218b1e88b952b13930032f06a9 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 12 May 2017 11:16:52 -0600
Subject: [PATCH 10/16] Comment too short fixes

---
 client/coral-framework/translations.json | 1 +
 errors.js                                | 7 +++++++
 graph/mutators/comment.js                | 5 +++++
 3 files changed, 13 insertions(+)

diff --git a/client/coral-framework/translations.json b/client/coral-framework/translations.json
index f2b0ad1cc..2e4c405b4 100644
--- a/client/coral-framework/translations.json
+++ b/client/coral-framework/translations.json
@@ -33,6 +33,7 @@
       "unexpectedError": "Unexpected error while saving changes. Sorry!"
     },
     "error": {
+      "COMMENT_TOO_SHORT": "Your comment must have something in it",
       "EDIT_WINDOW_ENDED": "You can no longer edit this comment. The time window to do so has expired.",
       "emailNotVerified": "Email address {0} not verified.",
       "email": "Not a valid E-Mail",
diff --git a/errors.js b/errors.js
index 94bed0d12..c203b1d25 100644
--- a/errors.js
+++ b/errors.js
@@ -162,6 +162,12 @@ const ErrEditWindowHasEnded = new APIError('Edit window is over', {
   status: 403
 });
 
+// ErrCommentTooShort is returned when the comment is too short.
+const ErrCommentTooShort = new APIError('Comment was too short', {
+  translation_key: 'COMMENT_TOO_SHORT',
+  status: 400
+});
+
 module.exports = {
   ExtendableError,
   APIError,
@@ -185,4 +191,5 @@ module.exports = {
   ErrInstallLock,
   ErrLoginAttemptMaximumExceeded,
   ErrEditWindowHasEnded,
+  ErrCommentTooShort
 };
diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index aa113e54b..fd1949e43 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -85,6 +85,11 @@ const filterNewComment = (context, {body, asset_id}) => {
  */
 const resolveNewCommentStatus = async (context, {asset_id, body}, wordlist = {}, settings = {}) => {
 
+  // Check to see if the body is too short, if it is, then complain about it!
+  if (body.length < 2) {
+    throw errors.ErrCommentTooShort;
+  }
+
   // Decide the status based on whether or not the current asset/settings
   // has pre-mod enabled or not. If the comment was rejected based on the
   // wordlist, then reject it, otherwise if the moderation setting is

From a5c9a8e4b01b037fdf8b4982f9de4df9a9ef8334 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 12 May 2017 14:04:09 -0600
Subject: [PATCH 11/16] cleaned up graph, standardised mutation

---
 graph/mutators/comment.js        | 3 +++
 graph/resolvers/root_mutation.js | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index fd1949e43..52440593d 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -59,6 +59,7 @@ const createComment = async ({user, loaders: {Comments}, pubsub}, {body, asset_i
 
 /**
  * Filters the comment object and outputs wordlist results.
+ * @param  {Object} context graphql context
  * @param  {String} body        body of a comment
  * @param  {String} [asset_id]  id of asset comment is posted on
  * @return {Object}         resolves to the wordlist results
@@ -78,6 +79,7 @@ const filterNewComment = (context, {body, asset_id}) => {
 /**
  * This resolves a given comment's status to take into account moderator actions
  * are applied.
+ * @param  {Object} context graphql context
  * @param  {String} body          body of the comment
  * @param  {String} [asset_id]    asset for the comment
  * @param  {Object} [wordlist={}] the results of the wordlist scan
@@ -172,6 +174,7 @@ const createPublicComment = async (context, commentInput) => {
 
 /**
  * Sets the status of a comment
+ * @param  {Object} context graphql context
  * @param {String} comment     comment in graphql context
  * @param {String} id          identifier of the comment  (uuid)
  * @param {String} status      the new status of the comment
diff --git a/graph/resolvers/root_mutation.js b/graph/resolvers/root_mutation.js
index 3ad6fbfd8..2abc88f0d 100644
--- a/graph/resolvers/root_mutation.js
+++ b/graph/resolvers/root_mutation.js
@@ -5,8 +5,8 @@ const RootMutation = {
   createComment(_, {comment}, {mutators: {Comment}}) {
     return wrapResponse('comment')(Comment.create(comment));
   },
-  editComment(_, args, {mutators: {Comment}}) {
-    return wrapResponse('comment')(Comment.edit(args));
+  editComment(_, {id, asset_id, edit: {body}}, {mutators: {Comment}}) {
+    return wrapResponse('comment')(Comment.edit({id, asset_id, edit: {body}}));
   },
   createFlag(_, {flag: {item_id, item_type, reason, message}}, {mutators: {Action}}) {
     return wrapResponse('flag')(Action.create({item_id, item_type, action_type: 'FLAG', group_id: reason, metadata: {message}}));

From 06001763fffb31a6fbdb7a54ab08483eced72e06 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 16 May 2017 00:52:37 +0700
Subject: [PATCH 12/16] Remove unused files

---
 .../graphql/mutations/index.js                | 191 ------------------
 .../graphql/queries/myIgnoredUsers.graphql    |   8 -
 2 files changed, 199 deletions(-)
 delete mode 100644 client/coral-framework/graphql/mutations/index.js
 delete mode 100644 client/coral-framework/graphql/queries/myIgnoredUsers.graphql

diff --git a/client/coral-framework/graphql/mutations/index.js b/client/coral-framework/graphql/mutations/index.js
deleted file mode 100644
index 0249bbe4e..000000000
--- a/client/coral-framework/graphql/mutations/index.js
+++ /dev/null
@@ -1,191 +0,0 @@
-import {graphql} from 'react-apollo';
-import POST_COMMENT from './postComment.graphql';
-import POST_FLAG from './postFlag.graphql';
-import POST_DONT_AGREE from './postDontAgree.graphql';
-import DELETE_ACTION from './deleteAction.graphql';
-import ADD_COMMENT_TAG from './addCommentTag.graphql';
-import REMOVE_COMMENT_TAG from './removeCommentTag.graphql';
-import IGNORE_USER from './ignoreUser.graphql';
-import STOP_IGNORING_USER from './stopIgnoringUser.graphql';
-import EDIT_COMMENT from './editComment.graphql';
-
-import commentView from '../fragments/commentView.graphql';
-
-export const postComment = graphql(POST_COMMENT, {
-  options: () => ({
-    fragments: commentView
-  }),
-  props: ({ownProps, mutate}) => ({
-    postItem: (comment) => {
-      const {asset_id, body, parent_id, tags = []} = comment;
-      return mutate({
-        variables: {
-          comment
-        },
-        optimisticResponse: {
-          createComment: {
-            comment: {
-              user: {
-                id: ownProps.auth.user.id,
-                name: ownProps.auth.user.username
-              },
-              created_at: new Date().toISOString(),
-              body,
-              parent_id,
-              asset_id,
-              action_summaries: [],
-              tags,
-              status: null,
-              id: 'pending'
-            }
-          }
-        },
-        updateQueries: {
-          EmbedQuery: (oldData, {mutationResult: {data: {createComment: {comment}}}}) => {
-
-            if (oldData.asset.settings.moderation === 'PRE' || comment.status === 'PREMOD' || comment.status === 'REJECTED') {
-              return oldData;
-            }
-
-            let updatedAsset;
-
-            // If posting a reply
-            if (parent_id) {
-              updatedAsset = {
-                ...oldData,
-                asset: {
-                  ...oldData.asset,
-                  comments: oldData.asset.comments.map((oldComment) => {
-                    return oldComment.id === parent_id
-                      ? {...oldComment, replies: [...oldComment.replies, comment], replyCount: oldComment.replyCount + 1}
-                      : oldComment;
-                  })
-                }
-              };
-            } else {
-
-              // If posting a top-level comment
-              updatedAsset = {
-                ...oldData,
-                asset: {
-                  ...oldData.asset,
-                  commentCount: oldData.asset.commentCount + 1,
-                  comments: [comment, ...oldData.asset.comments]
-                }
-              };
-            }
-
-            return updatedAsset;
-          }
-        }
-      });
-    }
-  }),
-});
-
-export const postFlag = graphql(POST_FLAG, {
-  props: ({mutate}) => ({
-    postFlag: (flag) => {
-      return mutate({
-        variables: {
-          flag
-        }
-      });
-    }}),
-});
-
-export const postDontAgree = graphql(POST_DONT_AGREE, {
-  props: ({mutate}) => ({
-    postDontAgree: (dontagree) => {
-      return mutate({
-        variables: {
-          dontagree
-        }
-      });
-    }}),
-});
-
-export const deleteAction = graphql(DELETE_ACTION, {
-  props: ({mutate}) => ({
-    deleteAction: (id) => {
-      return mutate({
-        variables: {
-          id
-        }
-      });
-    }}),
-});
-
-export const addCommentTag = graphql(ADD_COMMENT_TAG, {
-  props: ({mutate}) => ({
-    addCommentTag: ({id, tag}) => {
-      return mutate({
-        variables: {
-          id,
-          tag
-        }
-      });
-    }}),
-});
-
-export const removeCommentTag = graphql(REMOVE_COMMENT_TAG, {
-  props: ({mutate}) => ({
-    removeCommentTag: ({id, tag}) => {
-      return mutate({
-        variables: {
-          id,
-          tag
-        }
-      });
-    }}),
-});
-
-// TODO: don't rely on refetching.
-export const ignoreUser = graphql(IGNORE_USER, {
-  props: ({mutate}) => ({
-    ignoreUser: ({id}) => {
-      return mutate({
-        variables: {
-          id,
-        },
-        refetchQueries: [
-          'EmbedQuery', 'myIgnoredUsers',
-        ]
-      });
-    }}),
-});
-
-// TODO: don't rely on refetching.
-export const stopIgnoringUser = graphql(STOP_IGNORING_USER, {
-  props: ({mutate}) => {
-    return {
-      stopIgnoringUser: ({id}) => {
-        return mutate({
-          variables: {
-            id,
-          },
-          refetchQueries: [
-            'EmbedQuery', 'myIgnoredUsers',
-          ]
-        });
-      }
-    };
-  }
-});
-
-export const editComment = graphql(EDIT_COMMENT, {
-  props: ({mutate}) => {
-    return {
-      editComment: (id, asset_id, edit) => {
-        return mutate({
-          variables: {
-            id,
-            asset_id,
-            edit,
-          },
-          refetchQueries: []
-        });
-      }
-    };
-  }
-});
diff --git a/client/coral-framework/graphql/queries/myIgnoredUsers.graphql b/client/coral-framework/graphql/queries/myIgnoredUsers.graphql
deleted file mode 100644
index 4bdd7fcdd..000000000
--- a/client/coral-framework/graphql/queries/myIgnoredUsers.graphql
+++ /dev/null
@@ -1,8 +0,0 @@
-query myIgnoredUsers {
-  me {
-    ignoredUsers {
-      id,
-      username,
-    }
-  }
-}

From def35f0a938d75f859422e331e659053da77a16b Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 16 May 2017 00:55:12 +0700
Subject: [PATCH 13/16] Fix login issues

---
 .../src/containers/Embed.js                   |  5 +-
 .../src/containers/Stream.js                  |  4 --
 .../coral-embed-stream/src/graphql/index.js   |  4 +-
 client/coral-framework/actions/auth.js        | 28 ----------
 .../containers/ProfileContainer.js            | 53 +++++++++----------
 5 files changed, 29 insertions(+), 65 deletions(-)

diff --git a/client/coral-embed-stream/src/containers/Embed.js b/client/coral-embed-stream/src/containers/Embed.js
index 12c11c4e4..0ea577530 100644
--- a/client/coral-embed-stream/src/containers/Embed.js
+++ b/client/coral-embed-stream/src/containers/Embed.js
@@ -22,10 +22,9 @@ const {fetchAssetSuccess} = assetActions;
 class EmbedContainer extends React.Component {
 
   componentWillReceiveProps(nextProps) {
-    if (this.props.root.me && !nextProps.root.me) {
+    if (this.props.auth.loggedIn !== nextProps.auth.loggedIn) {
 
-      // Refetch because on logout `excludeIgnored` becomes `false`.
-      // TODO: logout via mutation and obsolete this?
+      // Refetch after login/logout.
       this.props.data.refetch();
     }
 
diff --git a/client/coral-embed-stream/src/containers/Stream.js b/client/coral-embed-stream/src/containers/Stream.js
index 6a31f6f7e..daac49c51 100644
--- a/client/coral-embed-stream/src/containers/Stream.js
+++ b/client/coral-embed-stream/src/containers/Stream.js
@@ -205,10 +205,6 @@ const fragments = {
       }
       me {
         status
-        ignoredUsers {
-          id
-          username
-        }
       }
       ...${getDefinitionName(Comment.fragments.root)}
     }
diff --git a/client/coral-embed-stream/src/graphql/index.js b/client/coral-embed-stream/src/graphql/index.js
index 30db0cb39..5ab1f0c37 100644
--- a/client/coral-embed-stream/src/graphql/index.js
+++ b/client/coral-embed-stream/src/graphql/index.js
@@ -126,14 +126,14 @@ const extension = {
 
       // TODO: don't rely on refetching.
       refetchQueries: [
-        'EmbedQuery', 'myIgnoredUsers',
+        'EmbedQuery', 'EmbedStreamProfileQuery',
       ],
     }),
     StopIgnoringUser: () => ({
 
       // TODO: don't rely on refetching.
       refetchQueries: [
-        'EmbedQuery', 'myIgnoredUsers',
+        'EmbedQuery', 'EmbedStreamProfileQuery',
       ],
     }),
     PostComment: ({
diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js
index 29057a6e3..93f889be2 100644
--- a/client/coral-framework/actions/auth.js
+++ b/client/coral-framework/actions/auth.js
@@ -1,5 +1,3 @@
-import {gql} from 'react-apollo';
-import client from 'coral-framework/services/client';
 import I18n from '../../coral-framework/modules/i18n/i18n';
 import translations from './../translations';
 const lang = new I18n(translations);
@@ -7,30 +5,6 @@ import * as actions from '../constants/auth';
 import coralApi, {base} from '../helpers/response';
 import {pym} from 'coral-framework';
 
-const ME_QUERY = gql`
-  query Me {
-    me {
-      status
-      comments {
-          id
-          body
-          asset {
-            id
-            title
-            url
-          }
-          created_at
-      }
-    }
-  }
-`;
-
-function fetchMe() {
-  return client.query({
-    fetchPolicy: 'network-only',
-    query: ME_QUERY});
-}
-
 // Dialog Actions
 export const showSignInDialog = () => (dispatch) => {
   const signInPopUp = window.open(
@@ -50,7 +24,6 @@ export const showSignInDialog = () => (dispatch) => {
   signInPopUp.onunload = () => {
     if (loaded) {
       dispatch(checkLogin());
-      fetchMe();
     }
   };
 
@@ -223,7 +196,6 @@ export const logout = () => (dispatch) => {
   return coralApi('/auth', {method: 'DELETE'})
     .then(() => {
       dispatch(logOutSuccess());
-      fetchMe();
     })
     .catch((error) => dispatch(logOutFailure(error)));
 };
diff --git a/client/coral-settings/containers/ProfileContainer.js b/client/coral-settings/containers/ProfileContainer.js
index b0b258f92..2d103fedb 100644
--- a/client/coral-settings/containers/ProfileContainer.js
+++ b/client/coral-settings/containers/ProfileContainer.js
@@ -26,6 +26,14 @@ class ProfileContainer extends Component {
     this.handleTabChange = this.handleTabChange.bind(this);
   }
 
+  componentWillReceiveProps(nextProps) {
+    if (this.props.auth.loggedIn !== nextProps.auth.loggedIn) {
+
+      // Refetch after login/logout.
+      this.props.data.refetch();
+    }
+  }
+
   handleTabChange(tab) {
     this.setState({
       activeTab: tab
@@ -33,7 +41,7 @@ class ProfileContainer extends Component {
   }
 
   render() {
-    const {asset, data, showSignInDialog, myIgnoredUsersData, stopIgnoringUser} = this.props;
+    const {asset, data, showSignInDialog, stopIgnoringUser} = this.props;
     const {me} = this.props.data;
 
     if (data.loading) {
@@ -56,12 +64,12 @@ class ProfileContainer extends Component {
         }
 
         {
-          myIgnoredUsersData.me.ignoredUsers && myIgnoredUsersData.me.ignoredUsers.length
+          me.ignoredUsers && me.ignoredUsers.length
           ? (
             <div>
               <h3>Ignored users</h3>
               <IgnoredUsers
-                users={myIgnoredUsersData.me.ignoredUsers}
+                users={me.ignoredUsers}
                 stopIgnoring={stopIgnoringUser}
               />
             </div>
@@ -87,32 +95,22 @@ class ProfileContainer extends Component {
   }
 }
 
-const withMyIgnoredUsersQuery = graphql(gql`
-  query myIgnoredUsers {
-    myIgnoredUsers {
-      id,
-      username,
-    }
-  }`, {
-    props: ({data}) => {
-      return ({
-        myIgnoredUsersData: data
-      });
-    }
-  });
-
-const withMyCommentHistoryQuery = graphql(gql`
-  query myCommentHistory {
+const withQuery = graphql(gql`
+  query EmbedStreamProfileQuery {
     me {
+      ignoredUsers {
+        id,
+        username,
+      }
       comments {
+        id
+        body
+        asset {
           id
-          body
-          asset {
-            id
-            title
-            url
-          }
-          created_at
+          title
+          url
+        }
+        created_at
       }
     }
   }`);
@@ -128,7 +126,6 @@ const mapDispatchToProps = (dispatch) =>
 
 export default compose(
   connect(mapStateToProps, mapDispatchToProps),
-  withMyCommentHistoryQuery,
-  withMyIgnoredUsersQuery,
   withStopIgnoringUser,
+  withQuery,
 )(ProfileContainer);

From 74e1436ae4625cd699db0f83d7a3f0dab58db63f Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 16 May 2017 01:09:33 +0700
Subject: [PATCH 14/16] Use correct error key

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

diff --git a/client/coral-embed-stream/src/components/EditableCommentContent.js b/client/coral-embed-stream/src/components/EditableCommentContent.js
index 052da8e48..186317393 100644
--- a/client/coral-embed-stream/src/components/EditableCommentContent.js
+++ b/client/coral-embed-stream/src/components/EditableCommentContent.js
@@ -65,7 +65,7 @@ export class EditableCommentContent extends React.Component {
   componentWillUnmount() {
     if (this.editWindowExpiryTimeout) {
       this.editWindowExpiryTimeout = clearTimeout(this.editWindowExpiryTimeout);
-    }    
+    }
   }
   async editComment(edit) {
     const {editComment, addNotification, stopEditing} = this.props;
@@ -83,7 +83,7 @@ export class EditableCommentContent extends React.Component {
       successfullyEdited = true;
     } catch (error) {
       if (error.translation_key) {
-        addNotification('error', lang.t(error.translation_key) || error.translation_key);
+        addNotification('error', lang.t(`error.${error.translation_key}`));
       } else if (error.networkError) {
         addNotification('error', lang.t('error.networkError'));
       } else {

From b789a8e107b659d71a3f947b0097db9b33251064 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 15 May 2017 17:23:57 -0300
Subject: [PATCH 15/16] Removing kiwis fix since this was fixed in auth tokens
 branch

---
 client/coral-framework/actions/auth.js        | 26 -------------------
 .../containers/ProfileContainer.js            | 17 ++++--------
 2 files changed, 5 insertions(+), 38 deletions(-)

diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js
index 27e1fed97..5e7c72934 100644
--- a/client/coral-framework/actions/auth.js
+++ b/client/coral-framework/actions/auth.js
@@ -10,31 +10,6 @@ const lang = new I18n(translations);
 import translations from './../translations';
 import I18n from '../../coral-framework/modules/i18n/i18n';
 
-const ME_QUERY = gql`
-  query Me {
-    me {
-      status
-      comments {
-          id
-          body
-          asset {
-            id
-            title
-            url
-          }
-          created_at
-      }
-    }
-  }
-`;
-
-function fetchMe() {
-  return client.query({
-    fetchPolicy: 'network-only',
-    query: ME_QUERY
-  });
-}
-
 // Dialog Actions
 export const showSignInDialog = () => dispatch => {
   const signInPopUp = window.open(
@@ -292,7 +267,6 @@ export const logout = () => dispatch => {
   return coralApi('/auth', {method: 'DELETE'}).then(() => {
     dispatch({type: actions.LOGOUT});
     Storage.removeItem('token');
-    fetchMe();
   });
 };
 
diff --git a/client/coral-settings/containers/ProfileContainer.js b/client/coral-settings/containers/ProfileContainer.js
index eb8cc3e1d..c72536d8a 100644
--- a/client/coral-settings/containers/ProfileContainer.js
+++ b/client/coral-settings/containers/ProfileContainer.js
@@ -25,13 +25,6 @@ class ProfileContainer extends Component {
     };
   }
 
-  componentWillReceiveProps(nextProps) {
-    if (this.props.auth.loggedIn !== nextProps.auth.loggedIn) {
-      // Refetch after login/logout.
-      this.props.data.refetch();
-    }
-  }
-
   handleTabChange = tab => {
     this.setState({
       activeTab: tab
@@ -39,17 +32,17 @@ class ProfileContainer extends Component {
   };
 
   render() {
-    const {asset, data, showSignInDialog, stopIgnoringUser} = this.props;
+    const {auth, asset, data, showSignInDialog, stopIgnoringUser} = this.props;
     const {me} = this.props.data;
 
+    if (!auth.loggedIn) {
+      return <NotLoggedIn showSignInDialog={showSignInDialog} />;
+    }
+
     if (data.loading) {
       return <Spinner />;
     }
 
-    if (!me) {
-      return <NotLoggedIn showSignInDialog={showSignInDialog} />;
-    }
-
     const localProfile = this.props.user.profiles.find(
       p => p.provider === 'local'
     );

From 2b7f545c2d95c4d47b7c6430466b4e7b4adce84d Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 15 May 2017 17:31:53 -0300
Subject: [PATCH 16/16] lint

---
 client/coral-admin/src/actions/auth.js        | 18 ++---
 .../src/containers/LayoutContainer.js         |  8 +-
 .../coral-admin/src/services/PymConnection.js |  2 +-
 client/coral-framework/actions/auth.js        | 81 ++++++++++---------
 .../containers/ProfileContainer.js            |  8 +-
 5 files changed, 59 insertions(+), 58 deletions(-)

diff --git a/client/coral-admin/src/actions/auth.js b/client/coral-admin/src/actions/auth.js
index e50273fa6..e233f3112 100644
--- a/client/coral-admin/src/actions/auth.js
+++ b/client/coral-admin/src/actions/auth.js
@@ -7,7 +7,7 @@ import {handleAuthToken} from 'coral-framework/actions/auth';
 // SIGN IN
 //==============================================================================
 
-export const handleLogin = (email, password, recaptchaResponse) => dispatch => {
+export const handleLogin = (email, password, recaptchaResponse) => (dispatch) => {
   dispatch({type: actions.LOGIN_REQUEST});
   const params = {method: 'POST', body: {email, password}};
   if (recaptchaResponse) {
@@ -20,10 +20,10 @@ export const handleLogin = (email, password, recaptchaResponse) => dispatch => {
         return dispatch(checkLoginFailure('not logged in'));
       }
       dispatch(handleAuthToken(token));
-      const isAdmin = !!user.roles.filter(i => i === 'ADMIN').length;
+      const isAdmin = !!user.roles.filter((i) => i === 'ADMIN').length;
       dispatch(checkLoginSuccess(user, isAdmin));
     })
-    .catch(error => {
+    .catch((error) => {
       if (error.translation_key === 'LOGIN_MAXIMUM_EXCEEDED') {
         dispatch({
           type: actions.LOGIN_MAXIMUM_EXCEEDED,
@@ -51,11 +51,11 @@ const forgotPassowordFailure = () => ({
   type: actions.FETCH_FORGOT_PASSWORD_FAILURE
 });
 
-export const requestPasswordReset = email => dispatch => {
+export const requestPasswordReset = (email) => (dispatch) => {
   dispatch(forgotPassowordRequest(email));
   return coralApi('/account/password/reset', {method: 'POST', body: {email}})
     .then(() => dispatch(forgotPassowordSuccess()))
-    .catch(error => dispatch(forgotPassowordFailure(error)));
+    .catch((error) => dispatch(forgotPassowordFailure(error)));
 };
 
 //==============================================================================
@@ -72,12 +72,12 @@ const checkLoginSuccess = (user, isAdmin) => ({
   isAdmin
 });
 
-const checkLoginFailure = error => ({
+const checkLoginFailure = (error) => ({
   type: actions.CHECK_LOGIN_FAILURE,
   error
 });
 
-export const checkLogin = () => dispatch => {
+export const checkLogin = () => (dispatch) => {
   dispatch(checkLoginRequest());
   return coralApi('/auth')
     .then(({user}) => {
@@ -86,10 +86,10 @@ export const checkLogin = () => dispatch => {
         return dispatch(checkLoginFailure('not logged in'));
       }
 
-      const isAdmin = !!user.roles.filter(i => i === 'ADMIN').length;
+      const isAdmin = !!user.roles.filter((i) => i === 'ADMIN').length;
       dispatch(checkLoginSuccess(user, isAdmin));
     })
-    .catch(error => {
+    .catch((error) => {
       console.error(error);
       dispatch(checkLoginFailure(`${error.translation_key}`));
     });
diff --git a/client/coral-admin/src/containers/LayoutContainer.js b/client/coral-admin/src/containers/LayoutContainer.js
index 9885be0ed..31110d3bd 100644
--- a/client/coral-admin/src/containers/LayoutContainer.js
+++ b/client/coral-admin/src/containers/LayoutContainer.js
@@ -58,20 +58,20 @@ class LayoutContainer extends Component {
   }
 }
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   auth: state.auth.toJS(),
   TALK_RECAPTCHA_PUBLIC: state.config
     .get('data')
     .get('TALK_RECAPTCHA_PUBLIC', null)
 });
 
-const mapDispatchToProps = dispatch => ({
+const mapDispatchToProps = (dispatch) => ({
   checkLogin: () => dispatch(checkLogin()),
   fetchConfig: () => dispatch(fetchConfig()),
   handleLogin: (username, password, recaptchaResponse) =>
     dispatch(handleLogin(username, password, recaptchaResponse)),
-  requestPasswordReset: email => dispatch(requestPasswordReset(email)),
-  toggleShortcutModal: toggle => dispatch(toggleShortcutModal(toggle)),
+  requestPasswordReset: (email) => dispatch(requestPasswordReset(email)),
+  toggleShortcutModal: (toggle) => dispatch(toggleShortcutModal(toggle)),
   handleLogout: () => dispatch(logout())
 });
 
diff --git a/client/coral-admin/src/services/PymConnection.js b/client/coral-admin/src/services/PymConnection.js
index 1ac24ec45..ca592b824 100644
--- a/client/coral-admin/src/services/PymConnection.js
+++ b/client/coral-admin/src/services/PymConnection.js
@@ -3,7 +3,7 @@ import Pym from '../../node_modules/pym.js';
 const pym = new Pym.Child({polling: 100});
 export default pym;
 
-export const link = url => e => {
+export const link = (url) => (e) => {
   e.preventDefault();
   pym.sendMessage('navigate', url);
 };
diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js
index 5e7c72934..b53badf99 100644
--- a/client/coral-framework/actions/auth.js
+++ b/client/coral-framework/actions/auth.js
@@ -1,9 +1,7 @@
-import {gql} from 'react-apollo';
 import {pym} from 'coral-framework';
 import * as Storage from '../helpers/storage';
 import * as actions from '../constants/auth';
 import coralApi, {base} from '../helpers/response';
-import client from 'coral-framework/services/client';
 import jwtDecode from 'jwt-decode';
 
 const lang = new I18n(translations);
@@ -11,7 +9,7 @@ import translations from './../translations';
 import I18n from '../../coral-framework/modules/i18n/i18n';
 
 // Dialog Actions
-export const showSignInDialog = () => dispatch => {
+export const showSignInDialog = () => (dispatch) => {
   const signInPopUp = window.open(
     '/embed/stream/login',
     'Login',
@@ -34,7 +32,7 @@ export const showSignInDialog = () => dispatch => {
 
   dispatch({type: actions.SHOW_SIGNIN_DIALOG});
 };
-export const hideSignInDialog = () => dispatch => {
+export const hideSignInDialog = () => (dispatch) => {
   dispatch({type: actions.HIDE_SIGNIN_DIALOG});
   window.close();
 };
@@ -53,7 +51,7 @@ const createUsernameSuccess = () => ({
   type: actions.CREATE_USERNAME_SUCCESS
 });
 
-const createUsernameFailure = error => ({
+const createUsernameFailure = (error) => ({
   type: actions.CREATE_USERNAME_FAILURE,
   error
 });
@@ -63,7 +61,7 @@ export const updateUsername = ({username}) => ({
   username
 });
 
-export const createUsername = (userId, formData) => dispatch => {
+export const createUsername = (userId, formData) => (dispatch) => {
   dispatch(createUsernameRequest());
   coralApi('/account/username', {method: 'PUT', body: formData})
     .then(() => {
@@ -71,26 +69,26 @@ export const createUsername = (userId, formData) => dispatch => {
       dispatch(hideCreateUsernameDialog());
       dispatch(updateUsername(formData));
     })
-    .catch(error => {
+    .catch((error) => {
       dispatch(createUsernameFailure(lang.t(`error.${error.translation_key}`)));
     });
 };
 
-export const changeView = view => dispatch => {
+export const changeView = (view) => (dispatch) => {
   dispatch({
     type: actions.CHANGE_VIEW,
     view
   });
 
   switch (view) {
-    case 'SIGNUP':
-      window.resizeTo(500, 800);
-      break;
-    case 'FORGOT':
-      window.resizeTo(500, 400);
-      break;
-    default:
-      window.resizeTo(500, 550);
+  case 'SIGNUP':
+    window.resizeTo(500, 800);
+    break;
+  case 'FORGOT':
+    window.resizeTo(500, 400);
+    break;
+  default:
+    window.resizeTo(500, 550);
   }
 };
 
@@ -104,7 +102,7 @@ const signInRequest = () => ({
   type: actions.FETCH_SIGNIN_REQUEST
 });
 
-const signInFailure = error => ({
+const signInFailure = (error) => ({
   type: actions.FETCH_SIGNIN_FAILURE,
   error
 });
@@ -113,7 +111,7 @@ const signInFailure = error => ({
 // AUTH TOKEN
 //==============================================================================
 
-export const handleAuthToken = token => dispatch => {
+export const handleAuthToken = (token) => (dispatch) => {
   Storage.setItem('exp', jwtDecode(token).exp);
   Storage.setItem('token', token);
   dispatch({type: 'HANDLE_AUTH_TOKEN'});
@@ -123,20 +121,22 @@ export const handleAuthToken = token => dispatch => {
 // SIGN IN
 //==============================================================================
 
-export const fetchSignIn = formData => dispatch => {
+export const fetchSignIn = (formData) => (dispatch) => {
   dispatch(signInRequest());
   return coralApi('/auth/local', {method: 'POST', body: formData})
     .then(({token}) => {
       dispatch(handleAuthToken(token));
       dispatch(hideSignInDialog());
     })
-    .catch(error => {
+    .catch((error) => {
       if (error.metadata) {
+
         // the user might not have a valid email. prompt the user user re-request the confirmation email
         dispatch(
           signInFailure(lang.t('error.emailNotVerified', error.metadata))
         );
       } else {
+
         // invalid credentials
         dispatch(signInFailure(lang.t('error.emailPasswordError')));
       }
@@ -150,16 +150,16 @@ export const fetchSignIn = formData => dispatch => {
 const signInFacebookRequest = () => ({
   type: actions.FETCH_SIGNIN_FACEBOOK_REQUEST
 });
-const signInFacebookSuccess = user => ({
+const signInFacebookSuccess = (user) => ({
   type: actions.FETCH_SIGNIN_FACEBOOK_SUCCESS,
   user
 });
-const signInFacebookFailure = error => ({
+const signInFacebookFailure = (error) => ({
   type: actions.FETCH_SIGNIN_FACEBOOK_FAILURE,
   error
 });
 
-export const fetchSignInFacebook = () => dispatch => {
+export const fetchSignInFacebook = () => (dispatch) => {
   dispatch(signInFacebookRequest());
   window.open(
     `${base}/auth/facebook`,
@@ -176,7 +176,7 @@ const signUpFacebookRequest = () => ({
   type: actions.FETCH_SIGNUP_FACEBOOK_REQUEST
 });
 
-export const fetchSignUpFacebook = () => dispatch => {
+export const fetchSignUpFacebook = () => (dispatch) => {
   dispatch(signUpFacebookRequest());
   window.open(
     `${base}/auth/facebook`,
@@ -185,7 +185,7 @@ export const fetchSignUpFacebook = () => dispatch => {
   );
 };
 
-export const facebookCallback = (err, data) => dispatch => {
+export const facebookCallback = (err, data) => (dispatch) => {
   if (err) {
     dispatch(signInFacebookFailure(err));
     return;
@@ -207,10 +207,10 @@ export const facebookCallback = (err, data) => dispatch => {
 //==============================================================================
 
 const signUpRequest = () => ({type: actions.FETCH_SIGNUP_REQUEST});
-const signUpSuccess = user => ({type: actions.FETCH_SIGNUP_SUCCESS, user});
-const signUpFailure = error => ({type: actions.FETCH_SIGNUP_FAILURE, error});
+const signUpSuccess = (user) => ({type: actions.FETCH_SIGNUP_SUCCESS, user});
+const signUpFailure = (error) => ({type: actions.FETCH_SIGNUP_FAILURE, error});
 
-export const fetchSignUp = (formData, redirectUri) => dispatch => {
+export const fetchSignUp = (formData, redirectUri) => (dispatch) => {
   dispatch(signUpRequest());
 
   coralApi('/users', {
@@ -221,7 +221,7 @@ export const fetchSignUp = (formData, redirectUri) => dispatch => {
     .then(({user}) => {
       dispatch(signUpSuccess(user));
     })
-    .catch(error => {
+    .catch((error) => {
       let errorMessage = lang.t(`error.${error.message}`);
 
       // if there is no translation defined, just show the error string
@@ -248,7 +248,7 @@ const forgotPasswordFailure = () => ({
   type: actions.FETCH_FORGOT_PASSWORD_FAILURE
 });
 
-export const fetchForgotPassword = email => dispatch => {
+export const fetchForgotPassword = (email) => (dispatch) => {
   dispatch(forgotPasswordRequest(email));
   const redirectUri = pym.parentUrl || location.href;
   coralApi('/account/password/reset', {
@@ -256,14 +256,14 @@ export const fetchForgotPassword = email => dispatch => {
     body: {email, loc: redirectUri}
   })
     .then(() => dispatch(forgotPasswordSuccess()))
-    .catch(error => dispatch(forgotPasswordFailure(error)));
+    .catch((error) => dispatch(forgotPasswordFailure(error)));
 };
 
 //==============================================================================
 // LOGOUT
 //==============================================================================
 
-export const logout = () => dispatch => {
+export const logout = () => (dispatch) => {
   return coralApi('/auth', {method: 'DELETE'}).then(() => {
     dispatch({type: actions.LOGOUT});
     Storage.removeItem('token');
@@ -275,7 +275,7 @@ export const logout = () => dispatch => {
 //==============================================================================
 
 const checkLoginRequest = () => ({type: actions.CHECK_LOGIN_REQUEST});
-const checkLoginFailure = error => ({type: actions.CHECK_LOGIN_FAILURE, error});
+const checkLoginFailure = (error) => ({type: actions.CHECK_LOGIN_FAILURE, error});
 
 const checkLoginSuccess = (user, isAdmin) => ({
   type: actions.CHECK_LOGIN_SUCCESS,
@@ -283,26 +283,26 @@ const checkLoginSuccess = (user, isAdmin) => ({
   isAdmin
 });
 
-export const checkLogin = () => dispatch => {
+export const checkLogin = () => (dispatch) => {
   dispatch(checkLoginRequest());
   coralApi('/auth')
-    .then(result => {
+    .then((result) => {
       if (!result.user) {
         Storage.removeItem('token');
         throw new Error('Not logged in');
       }
 
-      const isAdmin = !!result.user.roles.filter(i => i === 'ADMIN').length;
+      const isAdmin = !!result.user.roles.filter((i) => i === 'ADMIN').length;
       dispatch(checkLoginSuccess(result.user, isAdmin));
     })
-    .catch(error => {
+    .catch((error) => {
       console.error(error);
       dispatch(checkLoginFailure(`${error.translation_key}`));
     });
 };
 
 export const validForm = () => ({type: actions.VALID_FORM});
-export const invalidForm = error => ({type: actions.INVALID_FORM, error});
+export const invalidForm = (error) => ({type: actions.INVALID_FORM, error});
 
 //==============================================================================
 // VERIFY EMAIL
@@ -320,7 +320,7 @@ const verifyEmailFailure = () => ({
   type: actions.VERIFY_EMAIL_FAILURE
 });
 
-export const requestConfirmEmail = (email, redirectUri) => dispatch => {
+export const requestConfirmEmail = (email, redirectUri) => (dispatch) => {
   dispatch(verifyEmailRequest());
   return coralApi('/users/resend-verify', {
     method: 'POST',
@@ -330,7 +330,8 @@ export const requestConfirmEmail = (email, redirectUri) => dispatch => {
     .then(() => {
       dispatch(verifyEmailSuccess());
     })
-    .catch(err => {
+    .catch((err) => {
+
       // email might have already been verifyed
       dispatch(verifyEmailFailure(err));
     });
diff --git a/client/coral-settings/containers/ProfileContainer.js b/client/coral-settings/containers/ProfileContainer.js
index c72536d8a..04e337b47 100644
--- a/client/coral-settings/containers/ProfileContainer.js
+++ b/client/coral-settings/containers/ProfileContainer.js
@@ -25,7 +25,7 @@ class ProfileContainer extends Component {
     };
   }
 
-  handleTabChange = tab => {
+  handleTabChange = (tab) => {
     this.setState({
       activeTab: tab
     });
@@ -44,7 +44,7 @@ class ProfileContainer extends Component {
     }
 
     const localProfile = this.props.user.profiles.find(
-      p => p.provider === 'local'
+      (p) => p.provider === 'local'
     );
     const emailAddress = localProfile && localProfile.id;
 
@@ -96,13 +96,13 @@ const withQuery = graphql(
   }`
 );
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   user: state.user.toJS(),
   asset: state.asset.toJS(),
   auth: state.auth.toJS()
 });
 
-const mapDispatchToProps = dispatch =>
+const mapDispatchToProps = (dispatch) =>
   bindActionCreators({showSignInDialog, checkLogin}, dispatch);
 
 export default compose(