From f18191793be5adfa9b98426433139fe31c3abbd8 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Sun, 23 Apr 2017 13:09:52 -0300
Subject: [PATCH 001/132] fe plugins

---
 docs/frontend/PLUGINS.md | 208 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 208 insertions(+)
 create mode 100644 docs/frontend/PLUGINS.md

diff --git a/docs/frontend/PLUGINS.md b/docs/frontend/PLUGINS.md
new file mode 100644
index 000000000..94c7b49e9
--- /dev/null
+++ b/docs/frontend/PLUGINS.md
@@ -0,0 +1,208 @@
+# Plugins
+We can build plugins to extend the functionality of Talk.  Our plugins are powered by *React*, *Redux* and *GraphQL*. We can also build them with simple vanilla javascript. 
+The plugins live in the `/plugins` folder. Each plugin must have an `index.js` file and two folders `client` and `server`.
+
+Our plugin folder structure should look like this:
+```
+my-plugin/
+  ├── client/
+  ├── server/
+  └── index.js
+```
+
+
+### The Client Folder
+The frontend of our plugin lives inside the `client` folder. The `client`  folder must have an `index.js` file that exports the configuration of our plugin.
+
+```
+my-plugin/
+  ├── client/
+  │   └── index.js
+  ├── server/
+  └── index.js
+```
+
+For now our `index.js` file should look like this:
+
+```js
+export default {
+	// We will add more here later.
+};
+```
+
+
+###  Components
+We can add our components within the `client` folder.
+
+```
+my-plugin/
+  ├── client/
+  │   ├── MyComponent.js
+  │   └── index.js
+  ├── server/
+  └── index.js
+```
+
+####  Creating a Component
+Our component could look like this: 
+
+```js
+import React, {Component} from 'react';
+
+class MyButton extends Component {
+  render() {
+    return <button>My Button</button>;
+  }
+}
+
+export default MyButton;
+````
+
+We are just creating a component that creates a `button`. Now that we created our component we need to specify where it should get injected within Talk!
+To tell Talk where that Component should get injected we need to specify our *Slots*.
+
+Also, our Component can be a Stateless Component.
+
+```js
+import React from 'react';
+export default = () => <button>My Button</button>;
+````
+
+### Slots
+In Talk we have defined specific *Slots* where we can inject components. 
+
+Here is how we specify our slots config in `my-plugin/index.js`
+
+```js
+import MyButton from './MyButton';
+
+export default {
+  slots: {
+    commentDetail: [MyButton]
+  }
+};
+```
+
+Here I’m specifying that the MyComponent Component will take place within the `commentDetail` in Talk.
+
+`commentDetail` it’s a specific slot in the CommentStream. It means that it will be embedded inside de comment detail.
+
+Slots properties take an`Array` so we can add as many components as we want.
+
+#### Reducers and Actions : Redux
+
+Talk is powered by Redux and our plugins can too! Our plugins can have their own reducers and actions.
+
+```js
+import MyButton from './MyButton';
+import reducer from './reducer';
+
+export default {
+  slots: {
+    commentDetail: [MyButton],
+  },
+	reducer
+};
+```
+
+### Import Actions from Talk
+We can easily trigger `Talk` actions in our plugin Components.
+
+```js
+import React, {Component} from 'react';
+import {connect} from 'react-redux';
+import {bindActionCreators} from 'redux';
+import {addTag, removeTag} from 'coral-plugin-commentbox/actions';
+
+class MyButton extends Component {
+  render() {
+    return <button onClick={this.props.addTag('MY_TAG')}>My Button</button>;
+  }
+}
+
+const mapStateToProps = ({commentBox}) => ({commentBox});
+
+const mapDispatchToProps = dispatch =>
+  bindActionCreators({addTag, removeTag}, dispatch);
+
+export default connect(mapStateToProps, mapDispatchToProps)(OffTopicCheckbox);
+```
+
+### Styling our Plugin
+Talk uses CSS Modules. This basically means that you can also add your CSS Module to your plugin without colliding with the rest of Talk!
+
+##### My Component 
+```js
+import styles from './style.css';
+
+class MyCoralButton extends Component {
+  render() {
+    return <button className={styles.button}>My Button</button>;
+  }
+}
+````
+
+Our `style.css` should could look like this.
+```css
+
+.button {
+	background: coral;
+	border-radius: 3px;
+}
+```
+
+## ESlint and Babel
+In talk we use `eslint:recommended` and Babel with the latest ECMAScript Features. But you can use your own! 
+While building your plugin you need to specify a `.eslintrc.json` file and a`.babelrc` file.
+
+#### `.eslintrc.json`
+```json
+{
+  "env": {
+    "browser": true,
+    "es6": true,
+    "mocha": true
+  },
+  "parserOptions": {
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "experimentalObjectRestSpread": true,
+      "jsx": true
+    }
+  },
+  "parser": "babel-eslint",
+  "plugins": [
+    "react"
+  ],
+  "rules": {
+    "react/jsx-uses-react": "error",
+    "react/jsx-uses-vars": "error",
+    "no-console": ["warn", { "allow": ["warn", "error"] }]
+  }
+}
+````
+
+
+#### `. babelrc `
+```json
+{
+  "presets": [
+    "es2015"
+  ],
+  "plugins": [
+    "add-module-exports",
+    "transform-class-properties",
+    "transform-decorators-legacy",
+    "transform-object-assign",
+    "transform-object-rest-spread",
+    "transform-async-to-generator",
+    "transform-react-jsx"
+  ]
+}
+````
+
+### The server folder and the index file
+Read more about the `/server` and how to extend Talk here.
+[talk/PLUGINS.md at master · coralproject/talk · GitHub](https://github.com/coralproject/talk/blob/master/PLUGINS.md)
+
+

From add7bfc17036e41b5e54f4f6e3b78dbc85065905 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Wed, 26 Apr 2017 10:33:24 -0500
Subject: [PATCH 002/132] Remove commented out css from TopRightMenu.css

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

diff --git a/client/coral-embed-stream/src/TopRightMenu.css b/client/coral-embed-stream/src/TopRightMenu.css
index 5cddae125..0ce8a119b 100644
--- a/client/coral-embed-stream/src/TopRightMenu.css
+++ b/client/coral-embed-stream/src/TopRightMenu.css
@@ -20,5 +20,4 @@
   position: relative;
   transform: rotate(180deg);
   top: 0;
-  /*top: -0.25em;*/
 }

From 84016e362db18f471d79d92de2ab0d2e4e1ddb2b Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Wed, 26 Apr 2017 12:37:33 -0500
Subject: [PATCH 003/132] Delete Comment UI

---
 client/coral-embed-stream/src/Comment.css     | 47 ++++++++++-
 client/coral-embed-stream/src/Comment.js      | 83 +++++++++++++++++--
 .../src/IgnoreUserWizard.css                  | 14 ----
 .../src/IgnoreUserWizard.js                   |  4 +-
 4 files changed, 121 insertions(+), 27 deletions(-)
 delete mode 100644 client/coral-embed-stream/src/IgnoreUserWizard.css

diff --git a/client/coral-embed-stream/src/Comment.css b/client/coral-embed-stream/src/Comment.css
index 8d7c7ebf9..5fe5401fe 100644
--- a/client/coral-embed-stream/src/Comment.css
+++ b/client/coral-embed-stream/src/Comment.css
@@ -13,13 +13,54 @@
   pointer-events: none;
 }
 
-.topRightMenu {
+/* element in the top right of the Comment */
+.topRight {
   float: right;
+  margin-top: 10px;
   text-align: right;
+}
+
+.topRight > * {
+  text-align: initial;
+}
+
+.topRight .popover {
+  margin-top: 1em;
+  right: 0px;
+}
+
+.topRight .popoverMenuOpen .link {
+  padding-bottom: 0.125em;
+  border-bottom: 2px solid currentColor;
+}
+
+.topRightMenu {
   cursor: pointer;
   margin-top: 5px;
 }
 
-.topRightMenu > * {
-  text-align: initial;
+.link {
+  color: #2376D8;
+  cursor: pointer;
+}
+
+.popover {
+  position: absolute;
+  z-index: 1;
+}
+
+/* Wizard used for Ignore User, Delete Comment confirmations */
+.Wizard {
+  background-color: #2E343B;
+  color: white;
+  padding: 1em;
+  max-width: 220px; /* consider moving to better class */
+}
+
+.Wizard header {
+  font-weight: bold;
+}
+
+.Wizard .textAlignRight {
+  text-align: right;
 }
diff --git a/client/coral-embed-stream/src/Comment.js b/client/coral-embed-stream/src/Comment.js
index 63b3ef8dc..b5a7dfeb3 100644
--- a/client/coral-embed-stream/src/Comment.js
+++ b/client/coral-embed-stream/src/Comment.js
@@ -23,6 +23,8 @@ import Slot from 'coral-framework/components/Slot';
 import IgnoredCommentTombstone from './IgnoredCommentTombstone';
 import {TopRightMenu} from './TopRightMenu';
 import {getActionSummary, getTotalActionCount, iPerformedThisAction} from 'coral-framework/utils';
+import {Button} from 'coral-ui';
+import classnames from 'classnames';
 
 import styles from './Comment.css';
 
@@ -161,6 +163,55 @@ class Comment extends React.Component {
       tag: BEST_TAG,
     }), () => 'Failed to remove best comment tag');
 
+    class PopoverMenu extends React.Component {
+      static propTypes = {
+        children: PropTypes.node,
+        Popover: PropTypes.oneOfType([PropTypes.element, PropTypes.func]),
+        openClassName: PropTypes.string,
+      }
+      constructor(props) {
+        super(props);
+        this.toggle = this.toggle.bind(this);
+        this.close = this.close.bind(this);
+        this.state = {
+          isOpen: false
+        };
+      }
+      toggle() {
+        this.setState({isOpen: ! this.state.isOpen});
+      }
+      close() {
+        this.setState({isOpen: false});
+      }
+      render() {
+        const {isOpen} = this.state;
+        const {children, Popover, openClassName} = this.props;
+        return (
+          <span className={classnames({[openClassName]: isOpen})}>
+            <span onClick={this.toggle}>
+              { children }
+            </span>
+            <span>
+              { isOpen ? <Popover close={this.close} /> : null }
+            </span>
+          </span>
+        );
+      }
+    }
+
+    const DeleteCommentConfirmation = ({cancel, deleteComment}) => {
+      return (
+        <div className={classnames(styles.popover, styles.Wizard)}>
+          <header>Delete a comment</header>
+          <p>Are you sure you want to delete that comment</p>
+          <div className={styles.textAlignRight}>
+            <Button cStyle='cancel' onClick={cancel}>Cancel</Button>
+            <Button onClick={() => deleteComment()}>Delete comment</Button>
+          </div>
+        </div>
+      );
+    };
+
     return (
       <div
         className={commentClass}
@@ -180,14 +231,30 @@ class Comment extends React.Component {
           <PubDate created_at={comment.created_at} />
           <Slot fill="commentInfoBar" comment={comment} commentId={comment.id} inline/>
 
-          { (currentUser && (comment.user.id !== currentUser.id))
-            ? <span className={styles.topRightMenu}>
-                <TopRightMenu
-                  comment={comment}
-                  ignoreUser={ignoreUser}
-                  addNotification={addNotification} />
-              </span>
-            : null
+          { (currentUser &&
+              (comment.user.id === currentUser.id))
+
+              /* User can edit/delete their own comment for a short window after posting */
+              ? <span className={classnames(styles.topRight)}>
+                  <PopoverMenu
+                    className={styles.popoverMenu}
+                    openClassName={styles.popoverMenuOpen}
+                    Popover={ ({close}) =>
+                      <DeleteCommentConfirmation
+                        cancel={close}
+                        deleteComment={() => { /*console.log('delete comment', comment)*/ }}
+                      /> }>
+                    <a className={styles.link}>Delete</a>
+                  </PopoverMenu>
+                </span>
+
+              /* TopRightMenu allows currentUser to ignore other users' comments */
+              : <span className={classnames(styles.topRight, styles.topRightMenu)}>
+                  <TopRightMenu
+                    comment={comment}
+                    ignoreUser={ignoreUser}
+                    addNotification={addNotification} />
+                </span>
           }
 
           <Content body={comment.body} />
diff --git a/client/coral-embed-stream/src/IgnoreUserWizard.css b/client/coral-embed-stream/src/IgnoreUserWizard.css
deleted file mode 100644
index 838f2f76a..000000000
--- a/client/coral-embed-stream/src/IgnoreUserWizard.css
+++ /dev/null
@@ -1,14 +0,0 @@
-.IgnoreUserWizard {
-  background-color: #2E343B;
-  color: white;
-  padding: 1em;
-  max-width: 220px;
-}
-
-.IgnoreUserWizard header {
-  font-weight: bold;
-}
-
-.IgnoreUserWizard .textAlignRight {
-  text-align: right;
-}
diff --git a/client/coral-embed-stream/src/IgnoreUserWizard.js b/client/coral-embed-stream/src/IgnoreUserWizard.js
index 371e6d48b..7e72bb924 100644
--- a/client/coral-embed-stream/src/IgnoreUserWizard.js
+++ b/client/coral-embed-stream/src/IgnoreUserWizard.js
@@ -1,5 +1,5 @@
 import React, {PropTypes} from 'react';
-import styles from './IgnoreUserWizard.css';
+import styles from './Comment.css';
 import {Button} from 'coral-ui';
 
 // Guides the user through ignoring another user, including confirming their decision
@@ -58,7 +58,7 @@ export class IgnoreUserWizard extends React.Component {
     const {step} = this.state;
     const elForThisStep = elsForStep[step - 1];
     return (
-      <div className={styles.IgnoreUserWizard}>
+      <div className={styles.Wizard}>
         { elForThisStep }
       </div>
     );

From 00a2a65d3160a1656e9a96a14f006c65d9a7254d Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Mon, 1 May 2017 16:58:24 -0500
Subject: [PATCH 004/132] Edit Comment UI

---
 client/coral-embed-stream/src/Comment.css     |   3 +-
 client/coral-embed-stream/src/Comment.js      |  91 +++-----
 .../src/EditableCommentContent.js             |  62 +++++
 client/coral-plugin-commentbox/CommentBox.js  | 218 +++++++++++++-----
 4 files changed, 254 insertions(+), 120 deletions(-)
 create mode 100644 client/coral-embed-stream/src/EditableCommentContent.js

diff --git a/client/coral-embed-stream/src/Comment.css b/client/coral-embed-stream/src/Comment.css
index 5fe5401fe..24124f9ae 100644
--- a/client/coral-embed-stream/src/Comment.css
+++ b/client/coral-embed-stream/src/Comment.css
@@ -29,7 +29,8 @@
   right: 0px;
 }
 
-.topRight .popoverMenuOpen .link {
+.topRight .link.active,
+.topRight .active .link {
   padding-bottom: 0.125em;
   border-bottom: 2px solid currentColor;
 }
diff --git a/client/coral-embed-stream/src/Comment.js b/client/coral-embed-stream/src/Comment.js
index b5a7dfeb3..442c79bc1 100644
--- a/client/coral-embed-stream/src/Comment.js
+++ b/client/coral-embed-stream/src/Comment.js
@@ -23,8 +23,8 @@ import Slot from 'coral-framework/components/Slot';
 import IgnoredCommentTombstone from './IgnoredCommentTombstone';
 import {TopRightMenu} from './TopRightMenu';
 import {getActionSummary, getTotalActionCount, iPerformedThisAction} from 'coral-framework/utils';
-import {Button} from 'coral-ui';
 import classnames from 'classnames';
+import {EditableCommentContent} from './EditableCommentContent';
 
 import styles from './Comment.css';
 
@@ -39,7 +39,13 @@ class Comment extends React.Component {
 
   constructor(props) {
     super(props);
-    this.state = {replyBoxVisible: false};
+    this.onClickEdit = this.onClickEdit.bind(this);
+    this.state = {
+
+      // Whether the comment should be editable (e.g. after a commenter clicking the 'Edit' button on their own comment)
+      isEditing: false,
+      replyBoxVisible: false,
+    };
   }
 
   static propTypes = {
@@ -102,6 +108,11 @@ class Comment extends React.Component {
     ignoreUser: React.PropTypes.func,
   }
 
+  onClickEdit (e) {
+    e.preventDefault();
+    this.setState({isEditing: true});
+  }
+
   render () {
     const {
       comment,
@@ -163,55 +174,6 @@ class Comment extends React.Component {
       tag: BEST_TAG,
     }), () => 'Failed to remove best comment tag');
 
-    class PopoverMenu extends React.Component {
-      static propTypes = {
-        children: PropTypes.node,
-        Popover: PropTypes.oneOfType([PropTypes.element, PropTypes.func]),
-        openClassName: PropTypes.string,
-      }
-      constructor(props) {
-        super(props);
-        this.toggle = this.toggle.bind(this);
-        this.close = this.close.bind(this);
-        this.state = {
-          isOpen: false
-        };
-      }
-      toggle() {
-        this.setState({isOpen: ! this.state.isOpen});
-      }
-      close() {
-        this.setState({isOpen: false});
-      }
-      render() {
-        const {isOpen} = this.state;
-        const {children, Popover, openClassName} = this.props;
-        return (
-          <span className={classnames({[openClassName]: isOpen})}>
-            <span onClick={this.toggle}>
-              { children }
-            </span>
-            <span>
-              { isOpen ? <Popover close={this.close} /> : null }
-            </span>
-          </span>
-        );
-      }
-    }
-
-    const DeleteCommentConfirmation = ({cancel, deleteComment}) => {
-      return (
-        <div className={classnames(styles.popover, styles.Wizard)}>
-          <header>Delete a comment</header>
-          <p>Are you sure you want to delete that comment</p>
-          <div className={styles.textAlignRight}>
-            <Button cStyle='cancel' onClick={cancel}>Cancel</Button>
-            <Button onClick={() => deleteComment()}>Delete comment</Button>
-          </div>
-        </div>
-      );
-    };
-
     return (
       <div
         className={commentClass}
@@ -236,16 +198,9 @@ class Comment extends React.Component {
 
               /* User can edit/delete their own comment for a short window after posting */
               ? <span className={classnames(styles.topRight)}>
-                  <PopoverMenu
-                    className={styles.popoverMenu}
-                    openClassName={styles.popoverMenuOpen}
-                    Popover={ ({close}) =>
-                      <DeleteCommentConfirmation
-                        cancel={close}
-                        deleteComment={() => { /*console.log('delete comment', comment)*/ }}
-                      /> }>
-                    <a className={styles.link}>Delete</a>
-                  </PopoverMenu>
+                  <a
+                    className={classnames(styles.link, {[styles.active]: this.state.isEditing})}
+                    onClick={this.onClickEdit}>Edit</a>
                 </span>
 
               /* TopRightMenu allows currentUser to ignore other users' comments */
@@ -257,7 +212,19 @@ class Comment extends React.Component {
                 </span>
           }
 
-          <Content body={comment.body} />
+          { 
+            this.state.isEditing
+            ? <EditableCommentContent
+                addNotification={addNotification}
+                asset={asset}
+                comment={comment}
+                currentUser={currentUser}
+                maxCharCount={maxCharCount}
+                parentId={parentId}
+                />
+            : <Content body={comment.body} />
+          }
+          
           <div className="commentActionsLeft comment__action-container">
             <ActionButton>
               {/* TODO implmement iPerformedThisAction for the like */}
diff --git a/client/coral-embed-stream/src/EditableCommentContent.js b/client/coral-embed-stream/src/EditableCommentContent.js
new file mode 100644
index 000000000..09c5fae9b
--- /dev/null
+++ b/client/coral-embed-stream/src/EditableCommentContent.js
@@ -0,0 +1,62 @@
+import React, {PropTypes} from 'react';
+import {CommentForm} from 'coral-plugin-commentbox/CommentBox';
+
+/**
+ * Renders a Comment's body in such a way that the end-user can edit it and save changes
+ */
+export class EditableCommentContent extends React.Component {
+
+  // @TODO (bengo) make sure these are accurate wrt isRequired
+  static propTypes = {
+
+    // show notification to the user (e.g. for errors)
+    addNotification: PropTypes.func.isRequired,
+    asset: PropTypes.shape({
+      id: PropTypes.string.isRequired,
+      settings: PropTypes.shape({
+        charCountEnable: PropTypes.bool,
+      }),
+    }).isRequired,
+
+    // comment that is being edited
+    comment: PropTypes.shape({
+      body: PropTypes.string
+    }).isRequired,
+
+    // logged in user
+    currentUser: PropTypes.shape({
+      id: PropTypes.string.isRequired
+    }),
+    maxCharCount: PropTypes.number,
+
+    parentId: PropTypes.string,
+  }
+  constructor(props) {
+    super(props);
+  }
+  render() {
+    const saveComment = function () {
+    };
+    const originalBody = this.props.comment.body;
+    return (
+      <div style={{marginBottom: '10px'}}>
+        <CommentForm
+          defaultValue={this.props.comment.body}
+          charCountEnable={this.props.asset.settings.charCountEnable}
+          maxCharCount={this.props.maxCharCount}
+          saveCommentEnabled={(comment) => {
+
+            // should be disabled if user hasn't actually changed their
+            // original comment
+            return comment.body !== originalBody;
+          }}
+          saveComment={saveComment}
+          bodyLabel={'Edit this comment' /* @TODO (bengo) i18n */}
+          bodyPlaceholder=""
+          submitText={'Save changes' /* @TODO (bengo) i18n */}
+          saveButtonCStyle="green"
+        />
+      </div>
+    );
+  }
+}
diff --git a/client/coral-plugin-commentbox/CommentBox.js b/client/coral-plugin-commentbox/CommentBox.js
index 261c95414..ee3b9722c 100644
--- a/client/coral-plugin-commentbox/CommentBox.js
+++ b/client/coral-plugin-commentbox/CommentBox.js
@@ -7,6 +7,132 @@ import {connect} from 'react-redux';
 
 const name = 'coral-plugin-commentbox';
 
+/**
+ * Common UI for Creating or Editing a Comment
+ */
+export class CommentForm extends Component {
+  static propTypes = {
+
+    // Initial value for underlying comment body textarea
+    defaultValue: PropTypes.string,
+    charCountEnable: PropTypes.bool.isRequired,
+    maxCharCount: PropTypes.number,
+    cancelButtonClicked: PropTypes.func,
+
+    // Save the comment in the form.
+    // Will be passed { body: String }
+    saveComment: PropTypes.func.isRequired,
+
+    // DOM ID for form input that edits comment body
+    bodyInputId: PropTypes.string,
+
+    // screen reader label for input that edits comment body
+    bodyLabel: PropTypes.string,
+
+    // Placeholder for input that edits comment body
+    bodyPlaceholder: PropTypes.string,
+
+    // render at start of button container (useful for extra buttons)
+    buttonContainerStart: PropTypes.node,
+
+    // render inside submit button
+    submitText: PropTypes.node,
+
+    styles: PropTypes.shape({
+      textarea: PropTypes.string
+    }),
+
+    // cStyle for enabled save <coral-ui/Button>
+    saveButtonCStyle: PropTypes.string,
+
+    // return whether the save button should be enabled for the provided
+    // comment ({ body }) (for reasons other than charCount)
+    saveCommentEnabled: PropTypes.func,
+  }
+  static get defaultProps() {
+    return {
+      bodyLabel: lang.t('comment'),
+      bodyPlaceholder: lang.t('comment'),
+      submitText: lang.t('post'),
+      saveButtonCStyle: 'darkGrey',
+      saveCommentEnabled: () => true,
+    };
+  }
+  constructor(props) {
+    super(props);
+    this.onBodyChange = this.onBodyChange.bind(this);
+    this.onClickSubmit = this.onClickSubmit.bind(this);
+    this.state = {
+      body: props.defaultValue || ''
+    };
+  }
+  onBodyChange(e) {
+    this.setState({body: e.target.value});
+  }
+  onClickSubmit(e) {
+    e.preventDefault();
+    const {saveComment} = this.props;
+    const {body} = this.state;
+    saveComment({body});
+  }
+  render() {
+    const {maxCharCount, styles, saveCommentEnabled} = this.props;
+
+    const body = this.state.body;
+    const length = body.length;
+    const isNotValidLength = (length) => !length || (maxCharCount && length > maxCharCount);
+    const disablePostComment = isNotValidLength(length) || ! saveCommentEnabled({body});
+
+    return <div>
+      <div className={`${name}-container`}>
+        <label
+          htmlFor={this.props.bodyInputId}
+          className="screen-reader-text"
+          aria-hidden={true}>
+          {this.props.bodyLabel}
+        </label>
+        <textarea
+          style={styles && styles.textarea}
+          className={`${name}-textarea`}
+          value={this.state.body}
+          placeholder={this.props.bodyPlaceholder}
+          id={this.props.bodyInputId}
+          onChange={this.onBodyChange}
+          rows={3}/>
+      </div>
+      { 
+        this.props.charCountEnable && 
+        <div className={`${name}-char-count ${length > maxCharCount ? `${name}-char-max` : ''}`}>
+          {maxCharCount && `${maxCharCount - length} ${lang.t('characters-remaining')}`}
+        </div>
+      }
+      <div className={`${name}-button-container`}>
+        { this.props.buttonContainerStart }
+        {
+          typeof this.props.cancelButtonClicked === 'function' && (
+            <Button
+              cStyle='darkGrey'
+              className={`${name}-cancel-button`}
+              onClick={this.props.cancelButtonClicked}>
+              {lang.t('cancel')}
+            </Button>
+          )
+        }
+        <Button
+          cStyle={disablePostComment ? 'lightGrey' : this.props.saveButtonCStyle}
+          className={`${name}-button`}
+          onClick={this.onClickSubmit}
+          disabled={disablePostComment ? 'disabled' : ''}>
+          {this.props.submitText}
+        </Button>
+      </div>
+    </div>;
+  }
+}
+
+/**
+ * Container for posting a new Comment
+ */
 class CommentBox extends Component {
 
   constructor(props) {
@@ -14,15 +140,21 @@ class CommentBox extends Component {
 
     this.state = {
       username: '',
-      body: '',
+
+      // incremented on successful post to clear form
+      postedCount: 0,
       hooks: {
         preSubmit: [],
         postSubmit: []
       }
     };
   }
-
-  postComment = () => {
+  static get defaultProps() {
+    return {
+      updateCountCache: () => {}
+    };
+  }
+  postComment = ({body}) => {
     const {
       isReply,
       assetId,
@@ -37,7 +169,7 @@ class CommentBox extends Component {
     let comment = {
       asset_id: assetId,
       parent_id: parentId,
-      body: this.state.body,
+      body: body,
       ...this.props.commentBox
     };
 
@@ -67,7 +199,7 @@ class CommentBox extends Component {
       })
       .catch((err) => console.error(err));
 
-    this.setState({body: ''});
+    this.setState({postedCount: this.state.postedCount + 1});
   }
 
   registerHook = (hookType = '', hook = () => {}) => {
@@ -124,68 +256,39 @@ class CommentBox extends Component {
     const {styles, isReply, authorId, maxCharCount} = this.props;
     let {cancelButtonClicked} = this.props;
 
-    const length = this.state.body.length;
-    const enablePostComment = !length || (maxCharCount && length > maxCharCount);
-
     if (isReply && typeof cancelButtonClicked !== 'function') {
       console.warn('the CommentBox component should have a cancelButtonClicked callback defined if it lives in a Reply');
       cancelButtonClicked = () => {};
     }
 
     return <div>
-      <div
-        className={`${name}-container`}>
-          <label
-            htmlFor={ isReply ? 'replyText' : 'commentText'}
-            className="screen-reader-text"
-            aria-hidden={true}>
-            {isReply ? lang.t('reply') : lang.t('comment')}
-          </label>
-          <textarea
-            className={`${name}-textarea`}
-            style={styles && styles.textarea}
-            value={this.state.body}
-            placeholder={lang.t('comment')}
-            id={isReply ? 'replyText' : 'commentText'}
-            onChange={this.handleChange}
-            rows={3}/>
-        </div>
-        <div className={`${name}-char-count ${length > maxCharCount ? `${name}-char-max` : ''}`}>
-          {maxCharCount && `${maxCharCount - length} ${lang.t('characters-remaining')}`}
-        </div>
-        <div className={`${name}-button-container`}>
-          <Slot
-            fill="commentBoxDetail"
-            registerHook={this.registerHook}
-            unregisterHook={this.unregisterHook}
-            inline
-          />
-          {
-            isReply && (
-              <Button
-                cStyle='darkGrey'
-                className={`${name}-cancel-button`}
-                onClick={() => cancelButtonClicked('')}>
-                {lang.t('cancel')}
-              </Button>
-            )
-          }
-          { authorId && (
-              <Button
-                cStyle={enablePostComment ? 'lightGrey' : 'darkGrey'}
-                className={`${name}-button`}
-                onClick={this.postComment}
-                disabled={enablePostComment ? 'disabled' : ''}>
-                {lang.t('post')}
-              </Button>
-            )
-          }
-      </div>
+      <CommentForm
+        styles={styles}
+        key={this.state.postedCount}
+        defaultValue={this.props.defaultValue}
+        bodyInputId={isReply ? 'replyText' : 'commentText'}
+        bodyLabel={isReply ? lang.t('reply') : lang.t('comment')}
+        maxCharCount={maxCharCount}
+        charCountEnable={this.props.charCountEnable}
+        bodyPlaceholder={lang.t('comment')}
+        bodyInputId={isReply ? 'replyText' : 'commentText'}
+        saveComment={authorId && this.postComment}
+        buttonContainerStart={<Slot
+          fill="commentBoxDetail"
+          registerHook={this.registerHook}
+          unregisterHook={this.unregisterHook}
+          inline
+        />}
+        cancelButtonClicked={cancelButtonClicked}
+      />
     </div>;
   }
 }
 
 CommentBox.propTypes = {
+
+  // Initial value for underlying comment body textarea
+  defaultValue: PropTypes.string,
   charCountEnable: PropTypes.bool.isRequired,
   maxCharCount: PropTypes.number,
   commentPostedHandler: PropTypes.func,
@@ -196,7 +299,8 @@ CommentBox.propTypes = {
   authorId: PropTypes.string.isRequired,
   isReply: PropTypes.bool.isRequired,
   canPost: PropTypes.bool,
-  currentUser: PropTypes.object
+  currentUser: PropTypes.object,
+  updateCountCache: PropTypes.func,
 };
 
 const mapStateToProps = ({commentBox}) => ({commentBox});

From f0c846493a144ee3bbb8b04e3583864fc418d9d2 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Tue, 2 May 2017 14:51:09 -0300
Subject: [PATCH 005/132] Passing data from script tag, into Talk

---
 .../src/containers/Embed.js                   |  8 ++
 client/coral-embed/src/index.js               | 93 ++++++++++++-------
 2 files changed, 69 insertions(+), 32 deletions(-)

diff --git a/client/coral-embed-stream/src/containers/Embed.js b/client/coral-embed-stream/src/containers/Embed.js
index d5399fc60..bdcc1a63f 100644
--- a/client/coral-embed-stream/src/containers/Embed.js
+++ b/client/coral-embed-stream/src/containers/Embed.js
@@ -21,6 +21,14 @@ class EmbedContainer extends React.Component {
 
   componentDidMount() {
     pym.sendMessage('childReady');
+
+    pym.onMessage('config', config => {
+      console.log(JSON.parse(config));
+    });
+  }
+
+  componentWillUnmount() {
+    pym.remove();
   }
 
   componentWillReceiveProps(nextProps) {
diff --git a/client/coral-embed/src/index.js b/client/coral-embed/src/index.js
index 950fa91bc..cc2612376 100644
--- a/client/coral-embed/src/index.js
+++ b/client/coral-embed/src/index.js
@@ -22,18 +22,18 @@ const snackbarStyles = {
   transform: 'translate(-50%, 20px)',
   bottom: 0,
   boxSizing: 'border-box',
-  fontFamily: 'Helvetica, \'Helvetica Neue\', Verdana, sans-serif'
+  fontFamily: 'Helvetica, "Helvetica Neue", Verdana, sans-serif'
 };
 
 // This function should return value of window.Coral
 const Coral = {};
-const Talk = Coral.Talk = {};
+const Talk = (Coral.Talk = {});
 
 // build the URL to load in the pym iframe
 function buildStreamIframeUrl(talkBaseUrl, query) {
   let url = [
     talkBaseUrl,
-    (talkBaseUrl.match(/\/$/) ? '' : '/'), // make sure no double-'/' if opts.talk already ends with '/'
+    talkBaseUrl.match(/\/$/) ? '' : '/', // make sure no double-'/' if opts.talk already ends with '/'
     'embed/stream?'
   ].join('');
 
@@ -44,11 +44,22 @@ function buildStreamIframeUrl(talkBaseUrl, query) {
 
 // Set up postMessage listeners/handlers on the pymParent
 // e.g. to resize the iframe, and navigate the host page
-function configurePymParent(pymParent) {
+function configurePymParent(pymParent, opts) {
   let notificationOffset = 200;
-  let ready = false;
+  let DOMReady = false;
   let cachedHeight;
   const snackbar = document.createElement('div');
+
+  // Sets DOMReady
+  function completed() {
+    DOMReady = true;
+  }
+
+  // Sends config to pymChild
+  function sendConfig(config) {
+    pymParent.sendMessage('config', JSON.stringify(config));
+  }
+
   snackbar.id = 'coral-notif';
 
   for (let key in snackbarStyles) {
@@ -69,12 +80,12 @@ function configurePymParent(pymParent) {
     }
   });
 
-  pymParent.onMessage('coral-clear-notification', function () {
+  pymParent.onMessage('coral-clear-notification', function() {
     snackbar.style.opacity = 0;
   });
 
   // remove the permalink comment id from the hash
-  pymParent.onMessage('coral-view-all-comments', function () {
+  pymParent.onMessage('coral-view-all-comments', function() {
     window.history.replaceState(
       {},
       document.title,
@@ -82,7 +93,7 @@ function configurePymParent(pymParent) {
     );
   });
 
-  pymParent.onMessage('coral-alert', function (message) {
+  pymParent.onMessage('coral-alert', function(message) {
     const [type, text] = message.split('|');
     snackbar.style.transform = 'translate(-50%, 20px)';
     snackbar.style.opacity = 0;
@@ -110,39 +121,46 @@ function configurePymParent(pymParent) {
     pymParent.sendMessage('position', position);
   });
 
+  // Sends config to the child
+  pymParent.onMessage('getConfig', function() {
+    sendConfig(opts || {});
+  });
+
+  document.addEventListener('DOMContentLoaded', completed, false);
+
+  // A fallback to window.onload, that will always work
+  window.addEventListener('load', completed, false);
+
   // Tell child when parent's DOMContentLoaded
-  pymParent.onMessage('childReady', function () {
-    const interval = setInterval(function () {
-      if (ready) {
+  pymParent.onMessage('childReady', function() {
+    const interval = setInterval(function() {
+      if (DOMReady) {
         window.clearInterval(interval);
 
-        // TODO: It's weird to me that this is sent here
+        // DOMContentLoaded is ready
         pymParent.sendMessage('DOMContentLoaded');
+
+        // Sending the config to the child
+        sendConfig(opts || {});
       }
     }, 100);
   });
 
   // When end-user clicks link in iframe, open it in parent context
-  pymParent.onMessage('navigate', function (url) {
+  pymParent.onMessage('navigate', function(url) {
     window.open(url, '_blank').focus();
   });
 
-  // wait till images and other iframes are loaded before scrolling the page.
-  // or do we want to be more aggressive and scroll when we hit DOM ready?
-  document.addEventListener('DOMContentLoaded', function () {
-    ready = true;
-  });
-
   // get dimensions of viewport
   const viewport = () => {
     let e = window, a = 'inner';
-    if ( !( 'innerWidth' in window ) ){
+    if (!('innerWidth' in window)) {
       a = 'client';
       e = document.documentElement || document.body;
     }
     return {
-      width : e[`${a}Width`],
-      height : e[`${a}Height`]
+      width: e[`${a}Width`],
+      height: e[`${a}Height`]
     };
   };
 }
@@ -156,18 +174,24 @@ function configurePymParent(pymParent) {
  * @param {String} [opts.asset_url] - Asset URL
  * @param {String} [opts.asset_id] - Asset ID
  */
-Talk.render = function (el, opts) {
+Talk.render = function(el, opts) {
   if (!el) {
-    throw new Error('Please provide Coral.Talk.render() the HTMLElement you want to render Talk in.');
+    throw new Error(
+      'Please provide Coral.Talk.render() the HTMLElement you want to render Talk in.'
+    );
   }
   if (typeof el !== 'object') {
-    throw new Error(`Coral.Talk.render() expected HTMLElement but got ${el} (${typeof el})`);
+    throw new Error(
+      `Coral.Talk.render() expected HTMLElement but got ${el} (${typeof el})`
+    );
   }
   opts = opts || {};
 
   // TODO: infer this URL without explicit user input (if possible, may have to be added at build/render time of this script)
   if (!opts.talk) {
-    throw new Error('Coral.Talk.render() expects opts.talk as the Talk Base URL');
+    throw new Error(
+      'Coral.Talk.render() expects opts.talk as the Talk Base URL'
+    );
   }
 
   // Ensure el has an id, as pym can't directly accept the HTMLElement.
@@ -186,16 +210,21 @@ Talk.render = function (el, opts) {
     try {
       query.asset_url = document.querySelector('link[rel="canonical"]').href;
     } catch (e) {
-      console.warn('This page does not include a canonical link tag. Talk has inferred this asset_url from the window object. Query params have been stripped, which may cause a single thread to be present across multiple pages.');
+      console.warn(
+        'This page does not include a canonical link tag. Talk has inferred this asset_url from the window object. Query params have been stripped, which may cause a single thread to be present across multiple pages.'
+      );
       query.asset_url = window.location.origin + window.location.pathname;
     }
   }
 
-  configurePymParent(new pym.Parent(el.id, buildStreamIframeUrl(opts.talk, query), {
-    title: opts.title,
-    id: `${el.id}_iframe`,
-    name: `${el.id}_iframe`
-  }));
+  configurePymParent(
+    new pym.Parent(el.id, buildStreamIframeUrl(opts.talk, query), {
+      title: opts.title,
+      id: `${el.id}_iframe`,
+      name: `${el.id}_iframe`
+    }),
+    opts
+  );
 };
 
 export default Coral;

From 17128e9a47ce718f7a11351d7637b786d5a5dc4a Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Tue, 2 May 2017 15:18:04 -0300
Subject: [PATCH 006/132] Adds redux to handle external config data

---
 .../src/containers/Embed.js                   | 56 ++++++++++---------
 client/coral-framework/actions/config.js      |  6 ++
 client/coral-framework/constants/asset.js     |  1 -
 client/coral-framework/constants/config.js    |  4 ++
 client/coral-framework/reducers/config.js     | 15 +++++
 client/coral-framework/reducers/index.js      |  2 +
 views/article.ejs                             |  3 +-
 7 files changed, 58 insertions(+), 29 deletions(-)
 create mode 100644 client/coral-framework/actions/config.js
 create mode 100644 client/coral-framework/reducers/config.js

diff --git a/client/coral-embed-stream/src/containers/Embed.js b/client/coral-embed-stream/src/containers/Embed.js
index bdcc1a63f..5b324b35b 100644
--- a/client/coral-embed-stream/src/containers/Embed.js
+++ b/client/coral-embed-stream/src/containers/Embed.js
@@ -8,22 +8,24 @@ import renderComponent from 'recompose/renderComponent';
 
 import {Spinner} from 'coral-ui';
 import {authActions, assetActions, pym} from 'coral-framework';
-import {getDefinitionName, separateDataAndRoot} from 'coral-framework/utils';
-import Embed from '../components/Embed';
-import {setCommentCountCache, viewAllComments} from '../actions/stream';
-import {setActiveTab} from '../actions/embed';
+
 import Stream from './Stream';
+import Embed from '../components/Embed';
+
+import {setActiveTab} from '../actions/embed';
+import {addExternalConfig} from 'coral-framework/actions/config';
+import {setCommentCountCache, viewAllComments} from '../actions/stream';
+import {getDefinitionName, separateDataAndRoot} from 'coral-framework/utils';
 
 const {logout, checkLogin} = authActions;
 const {fetchAssetSuccess} = assetActions;
 
 class EmbedContainer extends React.Component {
-
   componentDidMount() {
     pym.sendMessage('childReady');
 
     pym.onMessage('config', config => {
-      console.log(JSON.parse(config));
+      this.props.addExternalConfig(JSON.parse(config));
     });
   }
 
@@ -32,7 +34,7 @@ class EmbedContainer extends React.Component {
   }
 
   componentWillReceiveProps(nextProps) {
-    if(this.props.root.me && !nextProps.root.me) {
+    if (this.props.root.me && !nextProps.root.me) {
 
       // Refetch because on logout `excludeIgnored` becomes `false`.
       // TODO: logout via mutation and obsolete this?
@@ -40,7 +42,7 @@ class EmbedContainer extends React.Component {
     }
 
     const {fetchAssetSuccess} = this.props;
-    if(!isEqual(nextProps.root.asset, this.props.root.asset)) {
+    if (!isEqual(nextProps.root.asset, this.props.root.asset)) {
 
       // TODO: remove asset data from redux store.
       fetchAssetSuccess(nextProps.root.asset);
@@ -55,7 +57,7 @@ class EmbedContainer extends React.Component {
   }
 
   componentDidUpdate(prevProps) {
-    if(!isEqual(prevProps.root.comment, this.props.root.comment)) {
+    if (!isEqual(prevProps.root.comment, this.props.root.comment)) {
 
       // Scroll to a permalinked comment if one is in the URL once the page is done rendering.
       setTimeout(() => pym.scrollParentToChildEl('coralStream'), 0);
@@ -90,10 +92,10 @@ export const withQuery = graphql(EMBED_QUERY, {
       assetUrl,
       commentId,
       hasComment: commentId !== '',
-      excludeIgnored: Boolean(auth && auth.user && auth.user.id),
-    },
+      excludeIgnored: Boolean(auth && auth.user && auth.user.id)
+    }
   }),
-  props: ({data}) => separateDataAndRoot(data),
+  props: ({data}) => separateDataAndRoot(data)
 });
 
 const mapStateToProps = state => ({
@@ -102,25 +104,25 @@ const mapStateToProps = state => ({
   commentId: state.stream.commentId,
   assetId: state.stream.assetId,
   assetUrl: state.stream.assetUrl,
-  activeTab: state.embed.activeTab,
+  activeTab: state.embed.activeTab
 });
 
 const mapDispatchToProps = dispatch =>
-  bindActionCreators({
-    fetchAssetSuccess,
-    checkLogin,
-    setCommentCountCache,
-    viewAllComments,
-    logout,
-    setActiveTab,
-  }, dispatch);
+  bindActionCreators(
+    {
+      logout,
+      checkLogin,
+      setActiveTab,
+      viewAllComments,
+      addExternalConfig,
+      fetchAssetSuccess,
+      setCommentCountCache
+    },
+    dispatch
+  );
 
 export default compose(
   connect(mapStateToProps, mapDispatchToProps),
-  branch(
-    props => !props.auth.checkedInitialLogin,
-    renderComponent(Spinner),
-  ),
-  withQuery,
+  branch(props => !props.auth.checkedInitialLogin, renderComponent(Spinner)),
+  withQuery
 )(EmbedContainer);
-
diff --git a/client/coral-framework/actions/config.js b/client/coral-framework/actions/config.js
new file mode 100644
index 000000000..7e07c4c35
--- /dev/null
+++ b/client/coral-framework/actions/config.js
@@ -0,0 +1,6 @@
+import {ADD_EXTERNAL_CONFIG} from '../constants/config';
+
+export const addExternalConfig = config => ({
+  type: ADD_EXTERNAL_CONFIG,
+  config
+});
diff --git a/client/coral-framework/constants/asset.js b/client/coral-framework/constants/asset.js
index c26dd099d..40f746706 100644
--- a/client/coral-framework/constants/asset.js
+++ b/client/coral-framework/constants/asset.js
@@ -8,4 +8,3 @@ export const UPDATE_ASSET_SETTINGS_FAILURE = 'UPDATE_ASSET_SETTINGS_FAILURE';
 
 export const OPEN_COMMENTS = 'OPEN_COMMENTS';
 export const CLOSE_COMMENTS = 'CLOSE_COMMENTS';
-
diff --git a/client/coral-framework/constants/config.js b/client/coral-framework/constants/config.js
index 5dca44ba9..a7b2fa8fb 100644
--- a/client/coral-framework/constants/config.js
+++ b/client/coral-framework/constants/config.js
@@ -7,3 +7,7 @@ export const UPDATE_CONFIG = 'UPDATE_CONFIG';
 export const OPEN_COMMENTS = 'OPEN_COMMENTS';
 export const CLOSE_COMMENTS = 'CLOSE_COMMENTS';
 export const ADD_ITEM = 'ADD_ITEM';
+
+// TODO: Deprecate old constants
+
+export const ADD_EXTERNAL_CONFIG = 'ADD_EXTERNAL_CONFIG';
diff --git a/client/coral-framework/reducers/config.js b/client/coral-framework/reducers/config.js
new file mode 100644
index 000000000..a602e7f59
--- /dev/null
+++ b/client/coral-framework/reducers/config.js
@@ -0,0 +1,15 @@
+import {ADD_EXTERNAL_CONFIG} from '../constants/config';
+
+const initialState = {};
+
+export default function config(state = initialState, action) {
+  switch (action.type) {
+  case ADD_EXTERNAL_CONFIG:
+    return {
+      ...state,
+      ...action.config
+    };
+  default:
+    return state;
+  }
+}
diff --git a/client/coral-framework/reducers/index.js b/client/coral-framework/reducers/index.js
index d5b66bbae..7067bfb55 100644
--- a/client/coral-framework/reducers/index.js
+++ b/client/coral-framework/reducers/index.js
@@ -1,6 +1,7 @@
 import auth from './auth';
 import user from './user';
 import asset from './asset';
+import config from './config';
 import {reducer as commentBox} from '../../coral-plugin-commentbox';
 import {pluginReducers} from '../helpers/plugins';
 
@@ -8,6 +9,7 @@ export default {
   auth,
   user,
   asset,
+  config,
   commentBox,
   ...pluginReducers
 };
diff --git a/views/article.ejs b/views/article.ejs
index e20f91117..463076db0 100644
--- a/views/article.ejs
+++ b/views/article.ejs
@@ -28,7 +28,8 @@
       Coral.Talk.render(document.getElementById('coralStreamEmbed'), {
         talk: '/',
         asset_url: '<%= asset_url ? asset_url : '' %>',
-        asset_id: '<%= asset_id ? asset_id : '' %>'
+        asset_id: '<%= asset_id ? asset_id : '' %>',
+        hola: 'asd'
       })
     "></script>
   </main>

From b444316e1cb1fc8466e898421e415bf41a155d98 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Tue, 2 May 2017 15:31:58 -0300
Subject: [PATCH 007/132] Adding debug plugins

---
 client/coral-framework/components/Slot.css |  4 ++++
 client/coral-framework/components/Slot.js  | 11 +++++++++--
 views/article.ejs                          |  5 ++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/client/coral-framework/components/Slot.css b/client/coral-framework/components/Slot.css
index 6048da181..6a95d79ad 100644
--- a/client/coral-framework/components/Slot.css
+++ b/client/coral-framework/components/Slot.css
@@ -1,3 +1,7 @@
 .inline {
   display: inline-block;
 }
+
+.debug {
+  background-color: coral;
+}
\ No newline at end of file
diff --git a/client/coral-framework/components/Slot.js b/client/coral-framework/components/Slot.js
index 8e2dd9502..b08484353 100644
--- a/client/coral-framework/components/Slot.js
+++ b/client/coral-framework/components/Slot.js
@@ -1,11 +1,13 @@
 import React from 'react';
 import cn from 'classnames';
 import styles from './Slot.css';
+import {connect} from 'react-redux';
 import {getSlotElements} from 'coral-framework/helpers/plugins';
 
-export default function Slot ({fill, inline = false, ...rest}) {
+function Slot ({fill, inline = false, config: {plugin_config = {}}, ...rest}) {
+  const {debug} = plugin_config;
   return (
-    <div className={cn({[styles.inline]: inline})}>
+    <div className={cn({[styles.inline]: inline, [styles.debug]: debug})}>
       {getSlotElements(fill, rest)}
     </div>
   );
@@ -14,3 +16,8 @@ export default function Slot ({fill, inline = false, ...rest}) {
 Slot.propTypes = {
   fill: React.PropTypes.string
 };
+
+const mapStateToProps = ({config}) => ({config});
+
+export default connect(mapStateToProps, null)(Slot);
+
diff --git a/views/article.ejs b/views/article.ejs
index 463076db0..bc29467f1 100644
--- a/views/article.ejs
+++ b/views/article.ejs
@@ -29,7 +29,10 @@
         talk: '/',
         asset_url: '<%= asset_url ? asset_url : '' %>',
         asset_id: '<%= asset_id ? asset_id : '' %>',
-        hola: 'asd'
+        plugin_config: {
+          test: 'data',
+          debug: false
+        }
       })
     "></script>
   </main>

From cc0a23c295c9bef2bb68e87d60a9cac5391c3241 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Tue, 2 May 2017 15:40:37 -0300
Subject: [PATCH 008/132] Deconstruct plugin config

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

diff --git a/client/coral-framework/components/Slot.js b/client/coral-framework/components/Slot.js
index b08484353..eac90c6df 100644
--- a/client/coral-framework/components/Slot.js
+++ b/client/coral-framework/components/Slot.js
@@ -4,11 +4,10 @@ import styles from './Slot.css';
 import {connect} from 'react-redux';
 import {getSlotElements} from 'coral-framework/helpers/plugins';
 
-function Slot ({fill, inline = false, config: {plugin_config = {}}, ...rest}) {
-  const {debug} = plugin_config;
+function Slot ({fill, inline = false, plugin_config: {debug, config}, ...rest}) {
   return (
     <div className={cn({[styles.inline]: inline, [styles.debug]: debug})}>
-      {getSlotElements(fill, rest)}
+      {getSlotElements(fill, {config, ...rest})}
     </div>
   );
 }
@@ -17,7 +16,7 @@ Slot.propTypes = {
   fill: React.PropTypes.string
 };
 
-const mapStateToProps = ({config}) => ({config});
+const mapStateToProps = ({config: {plugin_config = {}}}) => ({plugin_config});
 
 export default connect(mapStateToProps, null)(Slot);
 

From a46773887f10690b7914a252ca939ae49e1c420e Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Tue, 2 May 2017 14:27:16 -0500
Subject: [PATCH 009/132] Initial working editComment mutation

---
 graph/mutators/comment.js                  | 47 ++++++++---
 graph/resolvers/root_mutation.js           |  3 +
 graph/typeDefs.graphql                     | 14 ++++
 models/comment.js                          | 18 ++++
 services/comments.js                       | 48 +++++++++--
 test/server/graph/mutations/editComment.js | 95 ++++++++++++++++++++++
 test/server/graph/mutations/ignoreUser.js  |  1 -
 7 files changed, 208 insertions(+), 18 deletions(-)
 create mode 100644 test/server/graph/mutations/editComment.js

diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index 5cfc23794..cf5382d4f 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -55,11 +55,11 @@ const createComment = ({user, loaders: {Comments}}, {body, asset_id, parent_id =
 
 /**
  * Filters the comment object and outputs wordlist results.
- * @param  {Object} context graphql context
- * @param  {String} body    body of a comment
+ * @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
  */
-const filterNewComment = (context, {body, asset_id}) => {
+const filterNewComment = ({body, asset_id}) => {
 
   // Create a new instance of the Wordlist.
   const wl = new Wordlist();
@@ -67,20 +67,19 @@ const filterNewComment = (context, {body, asset_id}) => {
   // Load the wordlist and filter the comment content.
   return Promise.all([
     wl.load().then(() => wl.scan('body', body)),
-    AssetsService.rectifySettings(AssetsService.findById(asset_id))
+    asset_id && AssetsService.rectifySettings(AssetsService.findById(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  {String} [asset_id]    asset for the comment
  * @param  {Object} [wordlist={}] the results of the wordlist scan
  * @return {Promise}              resolves to the comment's status
  */
-const resolveNewCommentStatus = (context, {asset_id, body}, wordlist = {}, settings) => {
+const resolveNewCommentStatus = ({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
@@ -92,7 +91,7 @@ const resolveNewCommentStatus = (context, {asset_id, body}, wordlist = {}, setti
     status = Promise.resolve('REJECTED');
   } else if (settings.premodLinksEnable && linkify.test(body)) {
     status = Promise.resolve('PREMOD');
-  } else {
+  } else if (asset_id) {
     status = AssetsService
       .rectifySettings(AssetsService.findById(asset_id).then((asset) => {
         if (!asset) {
@@ -119,6 +118,8 @@ const resolveNewCommentStatus = (context, {asset_id, body}, wordlist = {}, setti
         }
         return moderation === 'PRE' ? 'PREMOD' : 'NONE';
       });
+  } else {
+    status = 'NONE';
   }
 
   return status;
@@ -136,12 +137,12 @@ const createPublicComment = (context, commentInput) => {
 
   // First we filter the comment contents to ensure that we note any validation
   // issues.
-  return filterNewComment(context, commentInput)
+  return filterNewComment(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(context, commentInput, wordlist, settings)
+    .then(([wordlist, settings]) => resolveNewCommentStatus(commentInput, wordlist, settings)
 
       // Then we actually create the comment with the new status.
       .then((status) => createComment(context, commentInput, status))
@@ -213,13 +214,32 @@ const addCommentTag = ({user, loaders: {Comments}}, {id, tag}) => {
 
 /**
  * Removes a tag from a Comment
- * @param {String} id          identifier of the comment  (uuid)
+ * @param {String} id      identifier of the comment  (uuid)
  * @param {String} tag     name of the tag
  */
 const removeCommentTag = ({user, loaders: {Comments}}, {id, tag}) => {
   return CommentsService.removeTag(id, tag);
 };
 
+/**
+ * Edit a Comment
+ * @param {String} id         identifier of the comment  (uuid)
+ * @param {Object} edit       describes how to edit the comment
+ * @param {String} edit.body  the new Comment body
+ */
+const editComment = async ({user, loaders: {Comments}}, {id, edit}) => {
+  const {body} = edit;
+  const comment = await CommentsService.findById(id);
+  const {asset_id} = comment;
+  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});
+  await CommentsService.edit(id, Object.assign({status}, edit));
+};
+
 module.exports = (context) => {
   let mutators = {
     Comment: {
@@ -227,6 +247,7 @@ module.exports = (context) => {
       setCommentStatus: () => Promise.reject(errors.ErrNotAuthorized),
       addCommentTag: () => Promise.reject(errors.ErrNotAuthorized),
       removeCommentTag: () => Promise.reject(errors.ErrNotAuthorized),
+      editComment: () => Promise.reject(errors.ErrNotAuthorized),
     }
   };
 
@@ -246,5 +267,9 @@ module.exports = (context) => {
     mutators.Comment.removeCommentTag = (action) => removeCommentTag(context, action);
   }
 
+  if (context.user) {
+    mutators.Comment.editComment = (action) => editComment(context, action);
+  }
+
   return mutators;
 };
diff --git a/graph/resolvers/root_mutation.js b/graph/resolvers/root_mutation.js
index 661cc9f96..6a91ec3f2 100644
--- a/graph/resolvers/root_mutation.js
+++ b/graph/resolvers/root_mutation.js
@@ -5,6 +5,9 @@ const RootMutation = {
   createComment(_, {comment}, {mutators: {Comment}}) {
     return wrapResponse('comment')(Comment.create(comment));
   },
+  editComment(_, args, {mutators: {Comment}}) {
+    return wrapResponse(null)(Comment.editComment(args));
+  },
   createLike(_, {like: {item_id, item_type}}, {mutators: {Action}}) {
     return wrapResponse('like')(Action.create({item_id, item_type, action_type: 'LIKE'}));
   },
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 32c2c16c2..a88baa2e8 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -780,6 +780,17 @@ type StopIgnoringUserResponse implements Response {
   errors: [UserError]
 }
 
+# Input to editComment mutation
+input EditCommentInput {
+  # Update body of the comment
+  body: String!
+}
+
+type EditCommentResponse implements Response {
+  # An array of errors relating to the mutation that occured.
+  errors: [UserError]  
+}
+
 # All mutations for the application are defined on this object.
 type RootMutation {
 
@@ -798,6 +809,9 @@ type RootMutation {
   # Delete an action based on the action id.
   deleteAction(id: ID!): DeleteActionResponse
 
+  # Edit a comment
+  editComment(id: ID!, edit: EditCommentInput): EditCommentResponse
+
   # Sets User status. Requires the `ADMIN` role.
   setUserStatus(id: ID!, status: USER_STATUS!): SetUserStatusResponse
 
diff --git a/models/comment.js b/models/comment.js
index 0984a0832..68a8f7526 100644
--- a/models/comment.js
+++ b/models/comment.js
@@ -51,6 +51,23 @@ const TagSchema = new Schema({
   _id: false
 });
 
+/**
+ * A record of old body values for a Comment
+ */
+const BodyHistoryItemSchema = new Schema({
+  body: {
+    required: true,
+    type: String,
+  },
+
+  // datetime until the comment body value was this.body
+  created_at: {
+    required: true,
+    type: Date,
+    default: Date,
+  }
+});
+
 /**
  * The Mongo schema for a Comment.
  * @type {Schema}
@@ -66,6 +83,7 @@ const CommentSchema = new Schema({
     required: [true, 'The body is required.'],
     minlength: 2
   },
+  body_history: [BodyHistoryItemSchema],
   asset_id: String,
   author_id: String,
   status_history: [StatusSchema],
diff --git a/services/comments.js b/services/comments.js
index d77118705..e505251a4 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -33,16 +33,52 @@ module.exports = class CommentsService {
       status = 'NONE',
     } = comment;
 
-    comment.status_history = status ? [{
-      type: status,
-      created_at: new Date()
-    }] : [];
-
-    let commentModel = new CommentModel(comment);
+    const commentModel = new CommentModel(Object.assign({
+      status_history: status ? [{
+        type: status,
+        created_at: new Date()
+      }] : [],
+      body_history: [{
+        body: comment.body,
+        created_at: new Date()
+      }]
+    }, comment));
 
     return commentModel.save();
   }
 
+  /**
+   * Edit a Comment
+   * @param {String} body  the new Comment body
+   * @param {String} status  the new Comment status
+   */
+  static async edit(id, {body, status}) {
+    if (status && ! STATUSES.includes(status)) {
+      throw new Error(`status ${status} is not supported`);
+    }
+    const {nModified} = await CommentModel.update({id}, {
+      $set: {
+        body,
+        status,
+      },
+      $push: {
+        body_history: {
+          body,
+          created_at: new Date(),
+        },
+        status_history: {
+          type: status,
+          created_at: new Date(),
+        }
+      },
+    });
+    switch (nModified) {
+    case 0:
+      throw new Error(`Couldn't edit comment. There is no Comment with id "${id}"`);
+    }
+
+  }
+
   /**
    * Adds a tag if it doesn't already exist on the comment.
    * @throws if tag is already added to the comment
diff --git a/test/server/graph/mutations/editComment.js b/test/server/graph/mutations/editComment.js
new file mode 100644
index 000000000..9fdceb1f1
--- /dev/null
+++ b/test/server/graph/mutations/editComment.js
@@ -0,0 +1,95 @@
+const expect = require('chai').expect;
+const {graphql} = require('graphql');
+
+const schema = require('../../../../graph/schema');
+const Context = require('../../../../graph/context');
+const UsersService = require('../../../../services/users');
+const AssetModel = require('../../../../models/asset');
+const SettingsService = require('../../../../services/settings');
+const CommentsService = require('../../../../services/comments');
+
+describe('graph.mutations.editComment', () => {
+  let asset;
+  let user;
+  beforeEach(async () => {
+    await SettingsService.init();
+    asset = await AssetModel.create({});
+    user = await UsersService.createLocalUser(
+      'usernameA@example.com', 'password', 'usernameA');
+  });
+  afterEach(async () => {
+    await asset.remove();
+    await user.remove();
+  });
+
+  const editCommentMutation = `
+    mutation EditComment ($id: ID!, $edit: EditCommentInput) {
+      editComment(id:$id, edit:$edit) {
+        errors {
+          translation_key
+        }
+      }
+    }
+  `;
+
+  // const queryCommentById = `
+  //   query commentQuery($id: ID!) {
+  //     comment(id: $id) {
+  //       body,
+  //       status
+  //     }
+  //   }
+  // `;
+
+  it('a user can edit their own comment', async () => {
+    const context = new Context({user});
+    const testStartedAt = new Date();
+    const comment = await CommentsService.publicCreate({
+      asset_id: asset.id,
+      author_id: user.id,
+      body: `hello there! ${  String(Math.random()).slice(2)}`,
+    });
+
+    // body_history should be there
+    expect(comment.body_history.length).to.equal(1);
+    expect(comment.body_history[0].body).to.equal(comment.body);
+    expect(comment.body_history[0].created_at).to.be.instanceOf(Date);
+    expect(comment.body_history[0].created_at).to.be.at.least(testStartedAt);
+
+    // now edit
+    const newBody = 'I have been edited.';
+    const response = await graphql(schema, editCommentMutation, {}, context, {
+      id: comment.id,
+      edit: {
+        body: newBody
+      }
+    });
+    if (response.errors && response.errors.length) {
+      console.error(response.errors);
+    }
+    expect(response.errors).to.be.empty;
+
+    // assert body has changed
+    const commentAfterEdit = await CommentsService.findById(comment.id);
+    expect(commentAfterEdit.body).to.equal(newBody);
+    expect(commentAfterEdit.body_history).to.be.instanceOf(Array);
+    expect(commentAfterEdit.body_history.length).to.equal(2);
+    expect(commentAfterEdit.body_history[1].body).to.equal(newBody);
+    expect(commentAfterEdit.body_history[1].created_at).to.be.instanceOf(Date);
+    expect(commentAfterEdit.body_history[1].created_at).to.be.at.least(testStartedAt);
+    expect(commentAfterEdit.status).to.equal('NONE');
+  });
+
+  /**
+  Server: When an Edit is sent to the server
+  -- The (old) comment.body and (current) timestamp are pushed onto the comment.body_history array.
+  -- The status is set to the same status as if the comment is posted for the first time.*
+  -- The body of the comment is updated.
+  */
+  // user can't edit outside of edit window
+  // can't edit comment id that doesn't exist
+  // user cant edit comments by others
+
+  // should BANNED users be able to edit their comments?
+
+});
diff --git a/test/server/graph/mutations/ignoreUser.js b/test/server/graph/mutations/ignoreUser.js
index 54d6305a1..c2d9ebdd6 100644
--- a/test/server/graph/mutations/ignoreUser.js
+++ b/test/server/graph/mutations/ignoreUser.js
@@ -30,7 +30,6 @@ describe('graph.mutations.ignoreUser', () => {
     await SettingsService.init();
   });
 
-  // @TODO (bengo) - test a user can't ignore themselves
   it('users can ignoreUser', async () => {
     const user = await UsersService.createLocalUser('usernameA@example.com', 'password', 'usernameA');
     const userToIgnore = await UsersService.createLocalUser('usernameB@example.com', 'password', 'usernameB');

From 860030a57c586f69cbe0d3e342f64ae31793ed85 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Tue, 2 May 2017 15:47:32 -0500
Subject: [PATCH 010/132] Test some editComment state transitions

---
 test/server/graph/mutations/editComment.js | 115 +++++++++++++++++++--
 1 file changed, 105 insertions(+), 10 deletions(-)

diff --git a/test/server/graph/mutations/editComment.js b/test/server/graph/mutations/editComment.js
index 9fdceb1f1..55a386da6 100644
--- a/test/server/graph/mutations/editComment.js
+++ b/test/server/graph/mutations/editComment.js
@@ -11,8 +11,9 @@ const CommentsService = require('../../../../services/comments');
 describe('graph.mutations.editComment', () => {
   let asset;
   let user;
+  let settings;
   beforeEach(async () => {
-    await SettingsService.init();
+    settings = await SettingsService.init();
     asset = await AssetModel.create({});
     user = await UsersService.createLocalUser(
       'usernameA@example.com', 'password', 'usernameA');
@@ -20,6 +21,7 @@ describe('graph.mutations.editComment', () => {
   afterEach(async () => {
     await asset.remove();
     await user.remove();
+    await settings.remove();
   });
 
   const editCommentMutation = `
@@ -32,15 +34,6 @@ describe('graph.mutations.editComment', () => {
     }
   `;
 
-  // const queryCommentById = `
-  //   query commentQuery($id: ID!) {
-  //     comment(id: $id) {
-  //       body,
-  //       status
-  //     }
-  //   }
-  // `;
-
   it('a user can edit their own comment', async () => {
     const context = new Context({user});
     const testStartedAt = new Date();
@@ -80,6 +73,108 @@ describe('graph.mutations.editComment', () => {
     expect(commentAfterEdit.status).to.equal('NONE');
   });
 
+  const bannedWord = 'BANNED_WORD';
+  [
+    {
+      description: 'premod: editing a REJECTED comment sets back to PREMOD',
+      settings: {
+        moderation: 'PRE',
+      },
+      beforeEdit: {
+        body: 'I was offensive and thus REJECTED',
+        status: 'REJECTED',
+      },
+      edit: {
+        body: 'I have been edited to be less offensive',
+      },
+      afterEdit: {
+        status: 'PREMOD',
+      },
+    },
+    {
+      description: 'editing an ACCEPTED comment to add a bad word sets status to REJECTED',
+      settings: {
+        moderation: 'POST',
+        wordlist: {
+          banned: [bannedWord]
+        }
+      },
+      beforeEdit: {
+        body: 'I\'m a perfectly acceptable comment',
+        status: 'ACCEPTED',
+      },
+      edit: {
+        body: `I have been sneakily edited to add a banned word: ${bannedWord}`
+      },
+      afterEdit: {
+        status: 'REJECTED',
+      },
+    },
+    {
+      description: 'postmod: editing a REJECTED comment with banned word to remove banned word sets status to NONE',
+      settings: {
+        moderation: 'POST',
+        wordlist: {
+          banned: [bannedWord]
+        }
+      },
+      beforeEdit: {
+        body: `I'm a rejected comment with bad word ${bannedWord}`,
+        status: 'REJECTED',
+      },
+      edit: {
+        body: 'I have been edited to remove the bad word'
+      },
+      afterEdit: {
+        status: 'NONE',
+      },
+    },
+    {
+      description: 'postmod + premodLinksEnable: editing an ACCEPTED comment to add a link sets status to PREMOD',
+      settings: {
+        moderation: 'POST',
+        premodLinksEnable: true,
+      },
+      beforeEdit: {
+        body: 'I\'m a perfectly acceptable comment',
+        status: 'ACCEPTED',
+      },
+      edit: {
+        body: 'I have been edited to add a link: https://coralproject.net/'
+      },
+      afterEdit: {
+        status: 'PREMOD',
+      },
+    },
+  ].forEach(({description, settings, beforeEdit, edit, afterEdit, only}) => {
+    const test = only ? it.only : it;
+    test(description, async () => {
+      await SettingsService.update(settings);
+      const context = new Context({user});
+      const comment = await CommentsService.publicCreate(Object.assign(
+        {
+          asset_id: asset.id,
+          author_id: user.id,
+        },
+        beforeEdit,
+      ));
+
+      // now edit
+      const newBody = edit.body;
+      const response = await graphql(schema, editCommentMutation, {}, context, {
+        id: comment.id,
+        edit: {
+          body: newBody
+        }
+      });
+      if (response.errors && response.errors.length) {console.error(response.errors);}
+      expect(response.errors).to.be.empty;
+      const commentAfterEdit = await CommentsService.findById(comment.id);
+      expect(commentAfterEdit.body).to.equal(newBody);
+      expect(commentAfterEdit.status).to.equal(afterEdit.status);      
+    });
+  });
+
   /**
   Server: When an Edit is sent to the server
   -- The (old) comment.body and (current) timestamp are pushed onto the comment.body_history array.

From 756b5f8b457da8bb56a145500c4d8f1742684c6d Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Tue, 2 May 2017 16:09:09 -0500
Subject: [PATCH 011/132] editComment only allows editing real comments
 authored by the requesting user

---
 graph/mutators/comment.js                  |  9 ++++
 test/server/graph/mutations/editComment.js | 49 ++++++++++++++++++----
 2 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index cf5382d4f..5c4377435 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -230,6 +230,15 @@ const removeCommentTag = ({user, loaders: {Comments}}, {id, tag}) => {
 const editComment = async ({user, loaders: {Comments}}, {id, edit}) => {
   const {body} = edit;
   const comment = await CommentsService.findById(id);
+  if ( ! comment) {
+    throw new errors.APIError('Comment not found', {
+      status: 404,
+      translation_key: 'NOT_FOUND',
+    });
+  }
+  if ( ! (user && user.id && (user.id === comment.author_id))) {
+    throw errors.ErrNotAuthorized;
+  }
   const {asset_id} = comment;
   const determineStatusForComment = async ({body, asset_id}) => {
     const [wordlist, settings] = await filterNewComment({asset_id, body});
diff --git a/test/server/graph/mutations/editComment.js b/test/server/graph/mutations/editComment.js
index 55a386da6..de2944069 100644
--- a/test/server/graph/mutations/editComment.js
+++ b/test/server/graph/mutations/editComment.js
@@ -73,6 +73,45 @@ describe('graph.mutations.editComment', () => {
     expect(commentAfterEdit.status).to.equal('NONE');
   });
 
+  it('A user can\'t edit someone else\'s comment', async () => {
+    const comment = await CommentsService.publicCreate({
+      asset_id: asset.id,
+      author_id: user.id,
+      body: `hello there! ${  String(Math.random()).slice(2)}`,
+    });
+
+    const userB = await UsersService.createLocalUser(
+      'usernameB@example.com', 'password', 'usernameB');
+    const newBody = 'This body should never be set';
+    const context = new Context({user: userB});
+    const response = await graphql(schema, editCommentMutation, {}, context, {
+      id: comment.id,
+      edit: {
+        body: newBody
+      }
+    });
+    expect(response.errors).to.be.empty;
+    expect(response.data.editComment.errors[0].translation_key).to.equal('NOT_AUTHORIZED');
+    const commentAfterEdit = await CommentsService.findById(comment.id);    
+
+    // it *hasn't* changed from the original
+    expect(commentAfterEdit.body).to.equal(comment.body);
+  });
+
+  it('A user Can\'t edit a comment id that doesn\'t exist', async () => {
+    const fakeCommentId = 'nooooope';
+    const newBody = 'This body should never be set';
+    const context = new Context({user});
+    const response = await graphql(schema, editCommentMutation, {}, context, {
+      id: fakeCommentId,
+      edit: {
+        body: newBody
+      }
+    });
+    expect(response.errors).to.be.empty;
+    expect(response.data.editComment.errors[0].translation_key).to.equal('NOT_FOUND');
+  });
+
   const bannedWord = 'BANNED_WORD';
   [
     {
@@ -175,16 +214,8 @@ describe('graph.mutations.editComment', () => {
     });
   });
 
-  /**
-  Server: When an Edit is sent to the server
-  -- The (old) comment.body and (current) timestamp are pushed onto the comment.body_history array.
-  -- The status is set to the same status as if the comment is posted for the first time.*
-  -- The body of the comment is updated.
-  */
   // user can't edit outside of edit window
-  // can't edit comment id that doesn't exist
-  // user cant edit comments by others
 
   // should BANNED users be able to edit their comments?
-
+  
 });

From aa18a433f8fa493c79886196023b2f1e4b62b4a6 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Tue, 2 May 2017 16:47:00 -0500
Subject: [PATCH 012/132] Can't edit comment outside of edit window

---
 graph/mutators/comment.js                  |  11 +-
 package.json                               |   1 +
 services/comments.js                       |  23 +-
 test/server/graph/mutations/editComment.js |  30 +
 yarn.lock                                  | 681 +++++++++++----------
 5 files changed, 405 insertions(+), 341 deletions(-)

diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index 5c4377435..3f690e95b 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -246,7 +246,16 @@ const editComment = async ({user, loaders: {Comments}}, {id, edit}) => {
     return status;
   };
   const status = await determineStatusForComment({body, asset_id});
-  await CommentsService.edit(id, Object.assign({status}, edit));
+  try {
+    await CommentsService.edit(comment, Object.assign({status}, edit));
+  } catch (error) {
+    switch (error.name) {
+    case 'EditWindowExpired':
+      throw errors.ErrNotAuthorized;
+    default:
+      throw error;
+    }
+  }
 };
 
 module.exports = (context) => {
diff --git a/package.json b/package.json
index 6c725a852..87ab01076 100644
--- a/package.json
+++ b/package.json
@@ -97,6 +97,7 @@
     "resolve": "^1.3.2",
     "semver": "^5.3.0",
     "simplemde": "^1.11.2",
+    "timekeeper": "^1.0.0",
     "uuid": "^2.0.3"
   },
   "devDependencies": {
diff --git a/services/comments.js b/services/comments.js
index e505251a4..93bf9e097 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -15,6 +15,8 @@ const STATUSES = [
   'NONE',
 ];
 
+const EDIT_WINDOW_MS = 5 * 60 * 60; // 5 minutes
+
 module.exports = class CommentsService {
 
   /**
@@ -49,13 +51,32 @@ module.exports = class CommentsService {
 
   /**
    * Edit a Comment
+   * @param {CommentModel|String} comment you want to edit (or its ID)
    * @param {String} body  the new Comment body
    * @param {String} status  the new Comment status
    */
-  static async edit(id, {body, status}) {
+  static async edit(comment, {body, status, ignoreEditWindow}) {
+    if (typeof comment === 'string') {
+
+      // it's an id
+      comment = await this.findById(comment);
+    }
+    const lastEditDate = (comment) => {
+      const {created_at, body_history} = comment;
+      const lastEdit = body_history[body_history.length - 1];
+      return lastEdit.created_at || created_at;
+    };
+    const editWindowExpired = (new Date() - lastEditDate(comment)) > EDIT_WINDOW_MS;
+    if (( ! ignoreEditWindow) && editWindowExpired) {
+      throw Object.assign(new Error('Edit window is over.'), {
+        name: 'EditWindowExpired'
+      });
+    }
     if (status && ! STATUSES.includes(status)) {
       throw new Error(`status ${status} is not supported`);
     }
+
+    const {id} = comment;
     const {nModified} = await CommentModel.update({id}, {
       $set: {
         body,
diff --git a/test/server/graph/mutations/editComment.js b/test/server/graph/mutations/editComment.js
index de2944069..4cf162308 100644
--- a/test/server/graph/mutations/editComment.js
+++ b/test/server/graph/mutations/editComment.js
@@ -1,5 +1,6 @@
 const expect = require('chai').expect;
 const {graphql} = require('graphql');
+const timekeeper = require('timekeeper');
 
 const schema = require('../../../../graph/schema');
 const Context = require('../../../../graph/context');
@@ -13,6 +14,7 @@ describe('graph.mutations.editComment', () => {
   let user;
   let settings;
   beforeEach(async () => {
+    timekeeper.reset();
     settings = await SettingsService.init();
     asset = await AssetModel.create({});
     user = await UsersService.createLocalUser(
@@ -73,6 +75,34 @@ describe('graph.mutations.editComment', () => {
     expect(commentAfterEdit.status).to.equal('NONE');
   });
 
+  it('A user can\'t edit their comment outside of the edit comment time window', async () => {
+    const comment = await CommentsService.publicCreate({
+      asset_id: asset.id,
+      author_id: user.id,
+      body: `hello there! ${  String(Math.random()).slice(2)}`,
+    });
+
+    const now = new Date();
+    const oneHourFromNow = new Date(new Date(now).setHours(now.getHours() + 1));
+    timekeeper.travel(oneHourFromNow);
+
+    const newBody = 'This body should never be set';
+    const context = new Context({user});
+    const response = await graphql(schema, editCommentMutation, {}, context, {
+      id: comment.id,
+      edit: {
+        body: newBody
+      }
+    });
+    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('NOT_AUTHORIZED');
+    const commentAfterEdit = await CommentsService.findById(comment.id);
+
+    // it *hasn't* changed from the original
+    expect(commentAfterEdit.body).to.equal(comment.body);
+  });
+
   it('A user can\'t edit someone else\'s comment', async () => {
     const comment = await CommentsService.publicCreate({
       asset_id: asset.id,
diff --git a/yarn.lock b/yarn.lock
index 378e5a6c0..adb8ea366 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1,7 +1,5 @@
 # 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"
@@ -300,14 +298,14 @@ assert@^1.1.1:
   dependencies:
     util "0.10.3"
 
-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"
 
+assertion-error@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.0.0.tgz#c7f85438fdd466bc7ca16ab90c81513797a5d23b"
+
 ast-traverse@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ast-traverse/-/ast-traverse-0.1.1.tgz#69cf2b8386f19dcda1bb1e05d68fe359d8897de6"
@@ -324,15 +322,11 @@ 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.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.4.2, async@^1.5.2:
+async@^1.4.0, async@^1.4.2, async@^1.5.2, async@1.x:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
-async@2.1.4, async@^2.1.2, async@^2.1.4:
+async@^2.1.2, async@^2.1.4, async@2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/async/-/async-2.1.4.tgz#2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4"
   dependencies:
@@ -342,6 +336,10 @@ 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"
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -1132,10 +1130,6 @@ babylon@^6.13.0, babylon@^6.15.0, babylon@^6.16.1:
   version "6.16.1"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.16.1.tgz#30c5a22f481978a9e7f8cdfdf496b11d94b404d3"
 
-balanced-match@0.1.0, 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"
@@ -1144,6 +1138,10 @@ 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, 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"
@@ -1152,7 +1150,7 @@ base64-url@1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/base64-url/-/base64-url-1.3.3.tgz#f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f"
 
-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"
 
@@ -1198,6 +1196,14 @@ 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.6:
+  version "3.4.6"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.6.tgz#01da8d821d87813d158967e743d5fe6c62cf8c0f"
+
 bluebird@2.10.2:
   version "2.10.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.10.2.tgz#024a5517295308857f14f91f1106fc3b555f446b"
@@ -1210,14 +1216,6 @@ bluebird@3.3.4:
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.3.4.tgz#f780fe43e1a7a6510f67abd7d0d79533a40ddde6"
 
-bluebird@3.4.6, bluebird@^3.4.6:
-  version "3.4.6"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.6.tgz#01da8d821d87813d158967e743d5fe6c62cf8c0f"
-
-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"
@@ -1462,7 +1460,7 @@ chai@^3.5.0:
     deep-eql "^0.1.3"
     type-detect "^1.0.0"
 
-chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
+chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3, chalk@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   dependencies:
@@ -1621,7 +1619,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:
@@ -1715,11 +1713,7 @@ colormin@^1.0.5:
     css-color-names "0.0.4"
     has "^1.0.1"
 
-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:
+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"
 
@@ -1727,6 +1721,10 @@ 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"
@@ -1739,6 +1737,16 @@ 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@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-0.6.1.tgz#fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"
@@ -1757,16 +1765,6 @@ 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"
@@ -1900,7 +1898,7 @@ cookie@0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
 
-cookiejar@2.0.x, cookiejar@^2.0.6:
+cookiejar@^2.0.6, cookiejar@2.0.x:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.0.6.tgz#0abf356ad00d1c5a219d88d44518046dd026acfe"
 
@@ -1925,7 +1923,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.2, core-util-is@~1.0.0:
+core-util-is@~1.0.0, core-util-is@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
@@ -2131,7 +2129,7 @@ csso@~2.3.1:
     clap "^1.0.9"
     source-map "^0.5.3"
 
-cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0", "cssom@>= 0.3.2 < 0.4.0":
+"cssom@>= 0.3.0 < 0.4.0", "cssom@>= 0.3.2 < 0.4.0", cssom@0.3.x:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
 
@@ -2156,16 +2154,16 @@ cz-conventional-changelog@1.1.5:
   dependencies:
     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@^0.1.1, d@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/d/-/d-0.1.1.tgz#da184c535d18d8ee7ba2aa229b914009fae11309"
   dependencies:
     es5-ext "~0.10.2"
 
+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"
@@ -2196,13 +2194,17 @@ 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, debug@2.6.3, debug@^2.1.1, debug@^2.2.0, debug@^2.6.3:
+debug@*, debug@^2.1.1, debug@^2.2.0, debug@^2.6.3, debug@2, debug@2.6.3:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.3.tgz#0f7eb8c30965ec08c72accfa0130c8b79984141d"
   dependencies:
     ms "0.7.2"
 
-debug@2.2.0, debug@~2.2.0:
+debug@^0.7.2, 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:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
   dependencies:
@@ -2220,15 +2222,11 @@ debug@2.6.1:
   dependencies:
     ms "0.7.2"
 
-debug@^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:
@@ -2294,19 +2292,19 @@ del@^2.0.2:
     pinkie-promise "^2.0.0"
     rimraf "^2.2.8"
 
-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"
 
+delayed-stream@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-0.0.5.tgz#d4b1f43a93e8296dfe02694f4680bc37a313c73f"
+
 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"
 
@@ -2358,7 +2356,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.5.0, doctrine@^1.2.2:
+doctrine@^1.2.2, doctrine@1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
   dependencies:
@@ -2369,7 +2367,7 @@ doctypes@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/doctypes/-/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9"
 
-dom-serializer@0, dom-serializer@~0.1.0:
+dom-serializer@~0.1.0, dom-serializer@0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
   dependencies:
@@ -2380,21 +2378,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"
 
-domhandler@2.3, domhandler@^2.3.0:
+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:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.3.0.tgz#2de59a0822d5027fabff6f032c2b25a2a8abe738"
   dependencies:
     domelementtype "1"
 
-domutils@1.5, domutils@1.5.1, domutils@^1.5.1:
+domutils@^1.5.1, domutils@1.5, domutils@1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
   dependencies:
@@ -2478,18 +2476,18 @@ encoding@^0.1.11:
   dependencies:
     iconv-lite "~0.4.13"
 
-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.1.0"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.1.0.tgz#e9353258baa9108965efc41cb0ef8ade2f3cfb07"
   dependencies:
     once "~1.3.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"
+
 enhanced-resolve@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.0.3.tgz#df14c06b5fc5eecade1094c9c5a12b4b3edc0b62"
@@ -2499,14 +2497,14 @@ enhanced-resolve@^3.0.0:
     object-assign "^4.0.1"
     tapable "^0.2.5"
 
-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"
 
+entities@1.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.0.0.tgz#b2987aa3821347fcde642b24fdfc9e4fb712bf26"
+
 env-rewrite@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/env-rewrite/-/env-rewrite-1.0.2.tgz#3e344a95af1bdaab34a559479b8be3abd0804183"
@@ -2580,14 +2578,14 @@ es6-map@^0.1.3:
     es6-symbol "~3.1.0"
     event-emitter "~0.3.4"
 
-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:
   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-set@~0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.4.tgz#9516b6761c2964b92ff479456233a247dc707ce8"
@@ -2602,7 +2600,7 @@ es6-shim@^0.35.3:
   version "0.35.3"
   resolved "https://registry.yarnpkg.com/es6-shim/-/es6-shim-0.35.3.tgz#9bfb7363feffff87a6cdb6cd93e405ec3c4b6f26"
 
-es6-symbol@3, es6-symbol@~3.1, es6-symbol@~3.1.0:
+es6-symbol@~3.1, es6-symbol@~3.1.0, es6-symbol@3:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.0.tgz#94481c655e7a7cad82eba832d97d5433496d7ffa"
   dependencies:
@@ -2626,15 +2624,15 @@ 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:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+
 escape-string-regexp@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz#4dbc2fe674e71949caf3fb2695ce7f2dc1d9a8d1"
 
-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.x.x, escodegen@^1.6.1:
+escodegen@^1.6.1, escodegen@1.x.x:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018"
   dependencies:
@@ -2770,14 +2768,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.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.0, esprima@3.x.x:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+
 esrecurse@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.1.0.tgz#4713b6536adf7f2ac4f327d559e7756bff648220"
@@ -2904,14 +2902,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"
@@ -3007,11 +3005,11 @@ fill-range@^2.1.0:
     repeat-element "^1.1.2"
     repeat-string "^1.5.2"
 
-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.1"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.1.tgz#bcd15d1689c0e5ed729b6f7f541a6df984117db8"
   dependencies:
-    debug "2.6.1"
+    debug "2.6.3"
     encodeurl "~1.0.1"
     escape-html "~1.0.3"
     on-finished "~2.3.0"
@@ -3019,11 +3017,11 @@ finalhandler@1.0.0:
     statuses "~1.3.1"
     unpipe "~1.0.0"
 
-finalhandler@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.1.tgz#bcd15d1689c0e5ed729b6f7f541a6df984117db8"
+finalhandler@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.0.tgz#b5691c2c0912092f18ac23e9416bde5cd7dc6755"
   dependencies:
-    debug "2.6.3"
+    debug "2.6.1"
     encodeurl "~1.0.1"
     escape-html "~1.0.3"
     on-finished "~2.3.0"
@@ -3090,14 +3088,6 @@ 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"
@@ -3114,6 +3104,14 @@ 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"
@@ -3332,6 +3330,37 @@ 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@3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-3.2.3.tgz#e313eeb249c7affaa5c475286b0e115b59839467"
@@ -3361,37 +3390,6 @@ glob@7.0.5, 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.14.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.14.0.tgz#8859936af0038741263053b39d0e76ca241e4034"
@@ -3789,15 +3787,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"
 
-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:
+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"
 
@@ -3855,7 +3853,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1:
+inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@2, inherits@2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -3874,24 +3872,7 @@ inquirer-confirm@0.2.2:
     bluebird "2.9.24"
     inquirer "0.8.2"
 
-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:
+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:
@@ -3909,19 +3890,6 @@ 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"
@@ -3940,6 +3908,36 @@ 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.1"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.1.tgz#d579fb7f693b858004947af39fa0db49f795602c"
@@ -4187,14 +4185,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"
@@ -4356,7 +4354,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.x, js-yaml@^3.4.3, js-yaml@^3.5.1, js-yaml@^3.7.0, js-yaml@~3.7.0:
+js-yaml@^3.4.3, js-yaml@^3.5.1, js-yaml@^3.7.0, js-yaml@~3.7.0, js-yaml@3.x:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
   dependencies:
@@ -4757,7 +4755,7 @@ lodash.cond@^4.3.0:
   version "4.5.2"
   resolved "https://registry.yarnpkg.com/lodash.cond/-/lodash.cond-4.5.2.tgz#f471a1da486be60f6ab955d17115523dd1d255d5"
 
-lodash.create@3.1.1, lodash.create@^3.1.1:
+lodash.create@^3.1.1, lodash.create@3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/lodash.create/-/lodash.create-3.1.1.tgz#d7f2849f0dbda7e04682bb8cd72ab022461debe7"
   dependencies:
@@ -4840,7 +4838,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.6.0, lodash.reduce@^4.4.0:
+lodash.reduce@^4.4.0, lodash.reduce@4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b"
 
@@ -4860,18 +4858,18 @@ lodash.uniq@^4.3.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
 
-lodash@3.10.1, lodash@^3.3.1:
+lodash@^3.3.1, lodash@3.10.1:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
-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"
 
+lodash@3.9.3:
+  version "3.9.3"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.9.3.tgz#0159e86832feffc6d61d852b12a953b99496bd32"
+
 log4js@*:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/log4js/-/log4js-1.1.0.tgz#c7d2b616d91bbf47cc65fb79d6fe04581c8096fa"
@@ -4894,7 +4892,7 @@ lowercase-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
 
-lru-cache@2, lru-cache@^2.5.0:
+lru-cache@^2.5.0, lru-cache@2:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
 
@@ -4982,7 +4980,7 @@ metascraper@^1.0.6:
     popsicle "^6.2.0"
     to-title-case "^1.0.0"
 
-methods@1.x, methods@^1.1.1, methods@^1.1.2, methods@~1.1.2:
+methods@^1.1.1, methods@^1.1.2, methods@~1.1.2, methods@1.x:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
 
@@ -5031,7 +5029,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"
 
@@ -5043,7 +5041,7 @@ minimalistic-assert@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
 
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3:
+minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, "minimatch@2 || 3":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
   dependencies:
@@ -5056,7 +5054,11 @@ minimatch@~0.2.11, minimatch@~0.2.14:
     lru-cache "2"
     sigmund "~1.0.0"
 
-minimist@0.0.8, minimist@~0.0.1:
+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:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
@@ -5064,9 +5066,11 @@ minimist@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.1.0.tgz#cdf225e8898f840a258ded44fc91776770afdc93"
 
-minimist@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+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"
 
 mkdirp@0.3.0:
   version "0.3.0"
@@ -5078,12 +5082,6 @@ 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@>=0.1.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/mkpath/-/mkpath-1.0.0.tgz#ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"
@@ -5128,6 +5126,10 @@ mocha@^3.1.2:
     mkdirp "0.5.1"
     supports-color "3.1.2"
 
+moment@^2.10.3, moment@2.x.x:
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.17.1.tgz#fed9506063f36b10f066c8b59a144d7faebe1d82"
+
 moment@2.12.0:
   version "2.12.0"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.12.0.tgz#dc2560d19838d6c0731b1a6afa04675264d360d6"
@@ -5136,10 +5138,6 @@ 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.17.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.17.1.tgz#fed9506063f36b10f066c8b59a144d7faebe1d82"
-
 mongodb-core@2.1.9:
   version "2.1.9"
   resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-2.1.9.tgz#85aa71ee4fb716196e06b787557bf139f801daf5"
@@ -5199,14 +5197,14 @@ mquery@2.3.0:
     regexp-clone "0.0.1"
     sliced "0.0.5"
 
+ms@^0.7.1, ms@0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
+
 ms@0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
 
-ms@0.7.2, ms@^0.7.1:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
-
 muri@1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/muri/-/muri-1.2.1.tgz#ec7ea5ce6ca6a523eb1ab35bacda5fa816c9aa3c"
@@ -5223,7 +5221,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.5.0, nan@^2.3.0:
+nan@^2.3.0, nan@2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.0.tgz#aa8f1e34531d807e9e27755b234b4a6ec0c152a8"
 
@@ -5334,7 +5332,7 @@ node-libs-browser@^2.0.0:
     util "^0.10.3"
     vm-browserify "0.0.4"
 
-node-pre-gyp@0.6.32, node-pre-gyp@^0.6.29:
+node-pre-gyp@^0.6.29, node-pre-gyp@0.6.32:
   version "0.6.32"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz#fc452b376e7319b3d255f5f34853ef6fd8fe1fd5"
   dependencies:
@@ -5426,18 +5424,18 @@ nodemon@^1.11.0:
     undefsafe "0.0.3"
     update-notifier "0.5.0"
 
-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@~1.0.10:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"
   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"
+  dependencies:
+    abbrev "1"
+
 normalize-package-data@^2.3.2:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.5.tgz#8d924f142960e1777e7ffe170543631cc7cb02df"
@@ -5576,7 +5574,7 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
-optimist@0.6.1, optimist@>=0.3.5, optimist@^0.6.1:
+optimist@^0.6.1, optimist@>=0.3.5, optimist@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
   dependencies:
@@ -5759,16 +5757,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"
@@ -6074,27 +6072,27 @@ postcss-mixins@^2.1.0:
     postcss "^5.0.10"
     postcss-simple-vars "^1.0.1"
 
-postcss-modules-extract-imports@1.0.0, postcss-modules-extract-imports@^1.0.0:
+postcss-modules-extract-imports@^1.0.0, 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.1.1, postcss-modules-local-by-default@^1.0.1:
+postcss-modules-local-by-default@^1.0.1, postcss-modules-local-by-default@1.1.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.2, postcss-modules-scope@^1.0.0:
+postcss-modules-scope@^1.0.0, postcss-modules-scope@1.0.2:
   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.2.2, postcss-modules-values@^1.1.0:
+postcss-modules-values@^1.1.0, postcss-modules-values@1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.2.2.tgz#f0e7d476fe1ed88c5e4c7f97533a3e772ad94ca1"
   dependencies:
@@ -6260,14 +6258,6 @@ 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.8, postcss@^5.1.2, postcss@^5.2.15, postcss@^5.2.4, postcss@^5.2.5:
   version "5.2.16"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.16.tgz#732b3100000f9ff8379a48a53839ed097376ad57"
@@ -6286,6 +6276,14 @@ postcss@^5.0.6, postcss@^5.2.11:
     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.12.0"
   resolved "https://registry.yarnpkg.com/pre-git/-/pre-git-3.12.0.tgz#8291899a15ba86f9cdaa8ca180e47096deff8dc3"
@@ -6350,7 +6348,7 @@ process@^0.11.0:
   version "0.11.9"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.9.tgz#7bd5ad21aa6253e7da8682264f1e11d11c0318c1"
 
-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"
 
@@ -6507,18 +6505,22 @@ 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.1.1"
   resolved "https://registry.yarnpkg.com/pym.js/-/pym.js-1.1.1.tgz#3b5eb9e8499e5c95e5cb8fe29888ea7edf10a507"
 
+q@^1.1.2:
+  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"
@@ -6531,11 +6533,7 @@ q@2.0.3:
     pop-iterate "^1.0.1"
     weak-map "^1.0.5"
 
-q@^1.1.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
-
-qs@6.4.0, qs@^6.1.0, qs@^6.2.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"
 
@@ -6562,14 +6560,14 @@ quote@0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/quote/-/quote-0.4.0.tgz#10839217f6c1362b89194044d29b233fd7f32f01"
 
-ramda@0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.9.1.tgz#cc914dc3a82c608d003090203787c3f6826c1d87"
-
 ramda@^0.22.1:
   version "0.22.1"
   resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.22.1.tgz#031da0c3df417c5b33c96234757eb37033f36a0e"
 
+ramda@0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.9.1.tgz#cc914dc3a82c608d003090203787c3f6826c1d87"
+
 random-bytes@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/random-bytes/-/random-bytes-1.0.0.tgz#4f68a1dc0ae58bd3fb95848c30324db75d64360b"
@@ -6630,7 +6628,7 @@ react-apollo@^1.0.0:
   optionalDependencies:
     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:
+react-dom@^15.3.1, react-dom@^15.4.2, "react-dom@0.14.x || 15.* || ^15.0.0":
   version "15.4.2"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.4.2.tgz#015363f05b0a1fd52ae9efdd3a0060d90695208f"
   dependencies:
@@ -6736,7 +6734,7 @@ read-pkg@^1.0.0:
     normalize-package-data "^2.3.2"
     path-type "^1.0.0"
 
-readable-stream@1.1, readable-stream@1.1.x, readable-stream@^1.1.7:
+readable-stream@^1.1.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:
@@ -6745,7 +6743,7 @@ readable-stream@1.1, readable-stream@1.1.x, readable-stream@^1.1.7:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@2, readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.0, readable-stream@^2.2.2:
+readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.0, readable-stream@^2.2.2, readable-stream@2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"
   dependencies:
@@ -6757,7 +6755,7 @@ readable-stream@2, readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13",
     string_decoder "~0.10.x"
     util-deprecate "~1.0.1"
 
-readable-stream@2.1.5, readable-stream@^2.0.5, readable-stream@~2.1.4:
+readable-stream@^2.0.5, readable-stream@~2.1.4, readable-stream@2.1.5:
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0"
   dependencies:
@@ -6793,15 +6791,6 @@ readline2@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     mute-stream "0.0.5"
 
-recast@0.10.33:
-  version "0.10.33"
-  resolved "https://registry.yarnpkg.com/recast/-/recast-0.10.33.tgz#942808f7aa016f1fa7142c461d7e5704aaa8d697"
-  dependencies:
-    ast-types "0.8.12"
-    esprima-fb "~15001.1001.0-dev-harmony-fb"
-    private "~0.1.5"
-    source-map "~0.5.0"
-
 recast@^0.11.17:
   version "0.11.20"
   resolved "https://registry.yarnpkg.com/recast/-/recast-0.11.20.tgz#2cb9bec269c03b36d0598118a936cd0a293ca3f3"
@@ -6811,6 +6800,15 @@ recast@^0.11.17:
     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"
+  dependencies:
+    ast-types "0.8.12"
+    esprima-fb "~15001.1001.0-dev-harmony-fb"
+    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"
@@ -6982,7 +6980,7 @@ repeating@^2.0.0:
   dependencies:
     is-finite "^1.0.0"
 
-request@2.79.0, request@^2.55.0, request@^2.74.0, request@^2.79.0:
+request@^2.55.0, request@^2.74.0, request@^2.79.0, request@2.79.0:
   version "2.79.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
   dependencies:
@@ -7007,6 +7005,13 @@ request@2.79.0, request@^2.55.0, request@^2.74.0, request@^2.79.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"
@@ -7030,13 +7035,6 @@ 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"
@@ -7075,7 +7073,7 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@~2.5.1, rimraf@~2.5.4:
+rimraf@^2.2.8, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@~2.5.1, rimraf@~2.5.4, rimraf@2:
   version "2.5.4"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04"
   dependencies:
@@ -7117,14 +7115,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@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.1"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a"
 
+sax@0.5.x:
+  version "0.5.8"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
+
 selenium-standalone@^5.11.2:
   version "5.11.2"
   resolved "https://registry.yarnpkg.com/selenium-standalone/-/selenium-standalone-5.11.2.tgz#724ccaa72fb26f3711e0e20989e478c4133df844"
@@ -7151,18 +7149,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@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@~5.3.0:
+semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@~5.3.0, "semver@2 || 3 || 4 || 5":
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
 
-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"
 
+semver@5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.1.0.tgz#85f2cf8550465c4df000cf7d86f6b054106ab9e5"
+
 send@0.15.1:
   version "0.15.1"
   resolved "https://registry.yarnpkg.com/send/-/send-0.15.1.tgz#8a02354c26e6f5cca700065f5f0cdeba90ec7b5f"
@@ -7226,10 +7224,6 @@ 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.6"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.6.tgz#379cccfb56b91c8601e4793356eb5382924de9ad"
@@ -7238,6 +7232,10 @@ 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"
+
 sigmund@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
@@ -7320,7 +7318,7 @@ socks-proxy-agent@2:
     extend "3"
     socks "~1.1.5"
 
-socks@1.1.9, socks@~1.1.5:
+socks@~1.1.5, socks@1.1.9:
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/socks/-/socks-1.1.9.tgz#628d7e4d04912435445ac0b6e459376cb3e6d691"
   dependencies:
@@ -7347,19 +7345,13 @@ source-map-support@^0.4.2:
   dependencies:
     source-map "^0.5.3"
 
-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:
+source-map@^0.4.4, source-map@0.4.x:
   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.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:
+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:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
 
@@ -7369,6 +7361,12 @@ 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"
@@ -7469,6 +7467,10 @@ 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-hash@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string-hash/-/string-hash-1.1.1.tgz#8e85bed291e0763b8f6809d9c3368fea048db3dc"
@@ -7498,10 +7500,6 @@ 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"
-
 stringmap@~0.2.2:
   version "0.2.2"
   resolved "http://registry.npmjs.org/stringmap/-/stringmap-0.2.2.tgz#556c137b258f942b8776f5b2ef582aa069d7d1b1"
@@ -7550,7 +7548,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:
@@ -7589,16 +7587,6 @@ supertest@^2.0.1:
     methods "1.x"
     superagent "^2.0.0"
 
-supports-color@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-1.2.0.tgz#ff1ed1e61169d06b3cf2d588e188b18d8847e17e"
-
-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@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a"
@@ -7607,12 +7595,22 @@ 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:
+  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@^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"
   dependencies:
     has-flag "^1.0.0"
 
+supports-color@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-1.2.0.tgz#ff1ed1e61169d06b3cf2d588e188b18d8847e17e"
+
 svgo@^0.7.0:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
@@ -7633,7 +7631,7 @@ symbol-observable@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
 
-"symbol-tree@>= 3.1.0 < 4.0.0", symbol-tree@^3.2.1:
+symbol-tree@^3.2.1, "symbol-tree@>= 3.1.0 < 4.0.0":
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.1.tgz#8549dd1d01fa9f893c18cc9ab0b106b4d9b168cb"
 
@@ -7700,7 +7698,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, through@^2.3.6, through@~2.3, through@~2.3.1, through@~2.3.8:
+through@^2.3.6, through@~2.3, through@~2.3.1, through@~2.3.8, through@2:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
@@ -7722,6 +7720,10 @@ timed-out@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-2.0.0.tgz#f38b0ae81d3747d628001f41dafc652ace671c0a"
 
+timekeeper:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/timekeeper/-/timekeeper-1.0.0.tgz#2f38aee1e94b11dd66d8580ff1aa9dcc6a2ba0d8"
+
 timers-browserify@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.2.tgz#ab4883cf597dcd50af211349a00fbca56ac86b86"
@@ -7847,14 +7849,14 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
-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-detect@0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-0.1.1.tgz#0ba5ec2a885640e470ea4e8505971900dac58822"
+
 type-is@~1.6.14:
   version "1.6.14"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.14.tgz#e219639c17ded1ca0789092dd54a03826b817cb2"
@@ -7895,7 +7897,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.3, uid-safe@~2.1.3:
+uid-safe@~2.1.3, uid-safe@2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/uid-safe/-/uid-safe-2.1.3.tgz#077e264a00b3187936b270bb7376a26473631071"
   dependencies:
@@ -7928,7 +7930,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"
 
@@ -7969,7 +7971,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:
@@ -8099,7 +8101,7 @@ whatwg-encoding@^1.0.1:
   dependencies:
     iconv-lite "0.4.13"
 
-whatwg-fetch@>=0.10.0, whatwg-fetch@^2.0.0:
+whatwg-fetch@^2.0.0, whatwg-fetch@>=0.10.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.2.tgz#fe294d1d89e36c5be8b3195057f2e4bc74fc980e"
 
@@ -8124,28 +8126,24 @@ 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:
-  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.12"
   resolved "https://registry.yarnpkg.com/which/-/which-1.2.12.tgz#de67b5e450269f194909ef23ece4ebe416fa1192"
   dependencies:
     isexe "^1.1.1"
 
+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"
+
 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"
@@ -8154,6 +8152,10 @@ 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"
@@ -8161,14 +8163,10 @@ with@^5.0.0:
     acorn "^3.1.0"
     acorn-globals "^3.0.0"
 
-word-wrap@1.1.0, word-wrap@^1.0.3:
+word-wrap@^1.0.3, word-wrap@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.1.0.tgz#356153d61d10610d600785c5d701288e0ae764a6"
 
-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"
@@ -8177,6 +8175,10 @@ wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
 
+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"
@@ -8212,7 +8214,7 @@ xdg-basedir@^2.0.0:
   dependencies:
     os-homedir "^1.0.0"
 
-"xml-name-validator@>= 2.0.1 < 3.0.0", xml-name-validator@^2.0.1:
+xml-name-validator@^2.0.1, "xml-name-validator@>= 2.0.1 < 3.0.0":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"
 
@@ -8338,3 +8340,4 @@ yauzl@^2.5.0:
   dependencies:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.0.1"
+

From b9a3466e2e24e512667ddfbb88cba0c4e38358bb Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Tue, 2 May 2017 22:07:23 -0500
Subject: [PATCH 013/132] Edit UI sends editComment mutation, handles errors

---
 client/coral-embed-stream/src/Comment.js      |  6 +++
 .../src/EditableCommentContent.js             | 46 +++++++++++++++++--
 client/coral-embed-stream/src/Embed.js        |  7 ++-
 client/coral-embed-stream/src/Stream.js       |  6 ++-
 .../graphql/mutations/editComment.graphql     |  7 +++
 .../graphql/mutations/index.js                | 22 +++++++++
 client/coral-framework/translations.json      |  2 +
 graph/mutators/comment.js                     |  5 +-
 services/comments.js                          |  2 +-
 test/server/graph/mutations/editComment.js    |  2 +-
 10 files changed, 95 insertions(+), 10 deletions(-)
 create mode 100644 client/coral-framework/graphql/mutations/editComment.graphql

diff --git a/client/coral-embed-stream/src/Comment.js b/client/coral-embed-stream/src/Comment.js
index 442c79bc1..cdbd9c978 100644
--- a/client/coral-embed-stream/src/Comment.js
+++ b/client/coral-embed-stream/src/Comment.js
@@ -106,6 +106,9 @@ class Comment extends React.Component {
 
     // dispatch action to ignore another user
     ignoreUser: React.PropTypes.func,
+
+    // edit a comment, passed (id, { body })
+    editComment: React.PropTypes.func,
   }
 
   onClickEdit (e) {
@@ -215,12 +218,14 @@ class Comment extends React.Component {
           { 
             this.state.isEditing
             ? <EditableCommentContent
+                editComment={this.props.editComment.bind(null, comment.id)}
                 addNotification={addNotification}
                 asset={asset}
                 comment={comment}
                 currentUser={currentUser}
                 maxCharCount={maxCharCount}
                 parentId={parentId}
+                stopEditing={() => this.setState({isEditing: false})}
                 />
             : <Content body={comment.body} />
           }
@@ -303,6 +308,7 @@ class Comment extends React.Component {
                   addNotification={addNotification}
                   parentId={comment.id}
                   postItem={postItem}
+                  editComment={this.props.editComment}
                   depth={depth + 1}
                   asset={asset}
                   highlighted={highlighted}
diff --git a/client/coral-embed-stream/src/EditableCommentContent.js b/client/coral-embed-stream/src/EditableCommentContent.js
index 09c5fae9b..f792985ec 100644
--- a/client/coral-embed-stream/src/EditableCommentContent.js
+++ b/client/coral-embed-stream/src/EditableCommentContent.js
@@ -1,6 +1,10 @@
 import React, {PropTypes} from 'react';
 import {CommentForm} from 'coral-plugin-commentbox/CommentBox';
 
+import I18n from 'coral-framework/modules/i18n/i18n';
+import translations from 'coral-framework/translations';
+const lang = new I18n(translations);
+
 /**
  * Renders a Comment's body in such a way that the end-user can edit it and save changes
  */
@@ -12,7 +16,6 @@ export class EditableCommentContent extends React.Component {
     // show notification to the user (e.g. for errors)
     addNotification: PropTypes.func.isRequired,
     asset: PropTypes.shape({
-      id: PropTypes.string.isRequired,
       settings: PropTypes.shape({
         charCountEnable: PropTypes.bool,
       }),
@@ -29,14 +32,47 @@ export class EditableCommentContent extends React.Component {
     }),
     maxCharCount: PropTypes.number,
 
-    parentId: PropTypes.string,
+    // edit a comment, passed {{ body }}
+    editComment: React.PropTypes.func,
+
+    // called when editing should be stopped
+    stopEditing: React.PropTypes.func,
   }
   constructor(props) {
     super(props);
+    this.editComment = this.editComment.bind(this);
+  }
+  async editComment(edit) {
+    const {editComment, addNotification, stopEditing} = this.props;
+    if (typeof editComment !== 'function') {return;}
+    let response;
+    let successfullyEdited = false;
+    try {
+      response = await editComment(edit);
+      const errors = (response && response.data && response.data.editComment)
+        ? response.data.editComment.errors
+        : null;
+      if (errors && (errors.length === 1)) {
+        throw errors[0];
+      }
+      successfullyEdited = true;
+    } catch (error) {
+      if (error.translation_key) {
+        addNotification('error', lang.t(error.translation_key) || error.translation_key);
+      } else if (error.networkError) {
+        addNotification('error', lang.t('error.networkError'));
+      } else {
+        throw error;
+      }
+    }
+    if (successfullyEdited && typeof stopEditing === 'function') {
+      stopEditing();
+    }
+  }
+  stopEditing() {
+    this.setState({resetCounter: this.state.resetCounter + 1});
   }
   render() {
-    const saveComment = function () {
-    };
     const originalBody = this.props.comment.body;
     return (
       <div style={{marginBottom: '10px'}}>
@@ -50,7 +86,7 @@ export class EditableCommentContent extends React.Component {
             // original comment
             return comment.body !== originalBody;
           }}
-          saveComment={saveComment}
+          saveComment={this.editComment}
           bodyLabel={'Edit this comment' /* @TODO (bengo) i18n */}
           bodyPlaceholder=""
           submitText={'Save changes' /* @TODO (bengo) i18n */}
diff --git a/client/coral-embed-stream/src/Embed.js b/client/coral-embed-stream/src/Embed.js
index fbe24c8c7..ba25b5b87 100644
--- a/client/coral-embed-stream/src/Embed.js
+++ b/client/coral-embed-stream/src/Embed.js
@@ -14,7 +14,7 @@ const {fetchAssetSuccess} = assetActions;
 import {NEW_COMMENT_COUNT_POLL_INTERVAL} from 'coral-framework/constants/comments';
 
 import {queryStream} from 'coral-framework/graphql/queries';
-import {postComment, postFlag, postLike, postDontAgree, deleteAction, addCommentTag, removeCommentTag, ignoreUser} from 'coral-framework/graphql/mutations';
+import {postComment, postFlag, postLike, postDontAgree, deleteAction, addCommentTag, removeCommentTag, ignoreUser, editComment} from 'coral-framework/graphql/mutations';
 import {editName} from 'coral-framework/actions/user';
 import {updateCountCache, viewAllComments} from 'coral-framework/actions/asset';
 import {notificationActions, authActions, assetActions, pym} from 'coral-framework';
@@ -73,6 +73,9 @@ class Embed extends React.Component {
 
     // dispatch action to ignore another user
     ignoreUser: React.PropTypes.func,
+
+    // edit a comment, passed (id, { body })
+    editComment: React.PropTypes.func,
   }
 
   componentDidMount () {
@@ -265,6 +268,7 @@ class Embed extends React.Component {
                     open={openStream}
                     addNotification={this.props.addNotification}
                     postItem={this.props.postItem}
+                    editComment={this.props.editComment}
                     setActiveReplyBox={this.setActiveReplyBox}
                     activeReplyBox={this.state.activeReplyBox}
                     asset={asset}
@@ -344,5 +348,6 @@ export default compose(
   removeCommentTag,
   ignoreUser,
   deleteAction,
+  editComment,
   queryStream,
 )(Embed);
diff --git a/client/coral-embed-stream/src/Stream.js b/client/coral-embed-stream/src/Stream.js
index ab64ee98f..a1b07f5ca 100644
--- a/client/coral-embed-stream/src/Stream.js
+++ b/client/coral-embed-stream/src/Stream.js
@@ -28,7 +28,10 @@ class Stream extends React.Component {
     ignoreUser: React.PropTypes.func,
 
     // list of user ids that should be rendered as ignored
-    ignoredUsers: React.PropTypes.arrayOf(React.PropTypes.string)
+    ignoredUsers: React.PropTypes.arrayOf(React.PropTypes.string),
+
+    // edit a comment, passed (id, { body })
+    editComment: React.PropTypes.func,
   }
 
   constructor(props) {
@@ -74,6 +77,7 @@ class Stream extends React.Component {
                   addNotification={addNotification}
                   depth={0}
                   postItem={postItem}
+                  editComment={this.props.editComment}
                   asset={asset}
                   currentUser={currentUser}
                   postLike={postLike}
diff --git a/client/coral-framework/graphql/mutations/editComment.graphql b/client/coral-framework/graphql/mutations/editComment.graphql
new file mode 100644
index 000000000..7becd6def
--- /dev/null
+++ b/client/coral-framework/graphql/mutations/editComment.graphql
@@ -0,0 +1,7 @@
+mutation EditComment ($id: ID!, $edit: EditCommentInput) {
+  editComment(id:$id, edit:$edit) {
+    errors {
+      translation_key
+    }
+  }
+}
diff --git a/client/coral-framework/graphql/mutations/index.js b/client/coral-framework/graphql/mutations/index.js
index 4a3abb48e..2d57c8aac 100644
--- a/client/coral-framework/graphql/mutations/index.js
+++ b/client/coral-framework/graphql/mutations/index.js
@@ -8,6 +8,7 @@ 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 MY_IGNORED_USERS from '../queries/myIgnoredUsers.graphql';
 import STREAM_QUERY from '../queries/streamQuery.graphql';
@@ -191,3 +192,24 @@ export const stopIgnoringUser = graphql(STOP_IGNORING_USER, {
     };
   }
 });
+
+export const editComment = graphql(EDIT_COMMENT, {
+  props: ({mutate, ownProps}) => {
+    return {
+      editComment: (id, edit) => {
+        return mutate({
+          variables: {
+            id,
+            edit,
+          },
+          refetchQueries: [
+            {
+              query: STREAM_QUERY,
+              variables: variablesForStreamQuery(ownProps),
+            }
+          ]
+        });
+      }
+    };
+  }
+});
diff --git a/client/coral-framework/translations.json b/client/coral-framework/translations.json
index 88ead57af..35317920f 100644
--- a/client/coral-framework/translations.json
+++ b/client/coral-framework/translations.json
@@ -23,8 +23,10 @@
     "comments": "comments",
     "commentIsIgnored": "This comment is hidden because you ignored this user.",
     "error": {
+      "editWindowExpired": "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.",
       "password": "Password must be at least 8 characters",
       "username": "Usernames can contain letters, numbers and _ only",
       "confirmPassword": "Passwords don't match. Please, check again",
diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index 3f690e95b..4bb228adb 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -251,7 +251,10 @@ const editComment = async ({user, loaders: {Comments}}, {id, edit}) => {
   } catch (error) {
     switch (error.name) {
     case 'EditWindowExpired':
-      throw errors.ErrNotAuthorized;
+      throw new errors.APIError('You can no longer edit this comment. The window to do so has expired.', {
+        status: 401,
+        translation_key: 'error.editWindowExpired',
+      });
     default:
       throw error;
     }
diff --git a/services/comments.js b/services/comments.js
index 93bf9e097..40f0ccce0 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -15,7 +15,7 @@ const STATUSES = [
   'NONE',
 ];
 
-const EDIT_WINDOW_MS = 5 * 60 * 60; // 5 minutes
+const EDIT_WINDOW_MS = 5 * 60 * 1000; // 5 minutes
 
 module.exports = class CommentsService {
 
diff --git a/test/server/graph/mutations/editComment.js b/test/server/graph/mutations/editComment.js
index 4cf162308..cd213ac35 100644
--- a/test/server/graph/mutations/editComment.js
+++ b/test/server/graph/mutations/editComment.js
@@ -96,7 +96,7 @@ describe('graph.mutations.editComment', () => {
     });
     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('NOT_AUTHORIZED');
+    expect(response.data.editComment.errors[0].translation_key).to.equal('error.editWindowExpired');
     const commentAfterEdit = await CommentsService.findById(comment.id);
 
     // it *hasn't* changed from the original

From ae3cbe990b09ea49533dacc8fa8ccbf2387129a5 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Wed, 3 May 2017 12:34:22 -0700
Subject: [PATCH 014/132] Edit Comment UI reflects expired edit comment window

---
 client/coral-embed-stream/src/Comment.css     |  9 +++
 client/coral-embed-stream/src/Comment.js      | 74 ++++++++++++++++--
 .../src/EditableCommentContent.js             | 77 ++++++++++++++++++-
 client/coral-embed-stream/style/default.css   |  2 -
 .../graphql/fragments/commentView.graphql     |  4 +
 graph/resolvers/comment.js                    | 10 +++
 graph/typeDefs.graphql                        |  8 ++
 services/comments.js                          | 24 ++++--
 test/server/graph/mutations/editComment.js    |  1 +
 9 files changed, 194 insertions(+), 15 deletions(-)

diff --git a/client/coral-embed-stream/src/Comment.css b/client/coral-embed-stream/src/Comment.css
index 24124f9ae..0429b18b3 100644
--- a/client/coral-embed-stream/src/Comment.css
+++ b/client/coral-embed-stream/src/Comment.css
@@ -13,6 +13,15 @@
   pointer-events: none;
 }
 
+.bylineSecondary {
+  color: #696969;
+  font-size: 12px;
+}
+
+.editedMarker {
+  font-style: italic;
+}
+
 /* element in the top right of the Comment */
 .topRight {
   float: right;
diff --git a/client/coral-embed-stream/src/Comment.js b/client/coral-embed-stream/src/Comment.js
index cdbd9c978..ef40c2a64 100644
--- a/client/coral-embed-stream/src/Comment.js
+++ b/client/coral-embed-stream/src/Comment.js
@@ -39,6 +39,9 @@ class Comment extends React.Component {
 
   constructor(props) {
     super(props);
+
+    // timeout to keep track of Comment edit window expiration
+    this.editWindowExpiryTimeout = null;
     this.onClickEdit = this.onClickEdit.bind(this);
     this.state = {
 
@@ -92,7 +95,13 @@ class Comment extends React.Component {
       user: PropTypes.shape({
         id: PropTypes.string.isRequired,
         name: PropTypes.string.isRequired
-      }).isRequired
+      }).isRequired,
+      editing: PropTypes.shape({
+        edited: PropTypes.bool,
+
+        // ISO8601
+        editableUntil: PropTypes.string,
+      })
     }).isRequired,
 
     // given a comment, return whether it should be rendered as ignored
@@ -116,6 +125,26 @@ class Comment extends React.Component {
     this.setState({isEditing: true});
   }
 
+  componentDidMount() {
+    if (this.editWindowExpiryTimeout) {
+      this.editWindowExpiryTimeout = clearTimeout(this.editWindowExpiryTimeout);
+    }
+
+    // if still in the edit window, set a timeout to re-render once it expires
+    const msLeftToEdit = editWindowRemainingMs(this.props.comment);
+    if (msLeftToEdit > 0) {
+      this.editWindowExpiryTimeout = setTimeout(() => {
+
+        // re-render
+        this.setState(this.state);
+      }, msLeftToEdit);      
+    }
+  }
+  componentWillUnmount() {
+    if (this.editWindowExpiryTimeout) {
+      this.editWindowExpiryTimeout = clearTimeout(this.editWindowExpiryTimeout);
+    }    
+  }
   render () {
     const {
       comment,
@@ -193,7 +222,14 @@ class Comment extends React.Component {
           { commentIsBest(comment)
             ? <TagLabel><BestIndicator /></TagLabel>
           : null }
-          <PubDate created_at={comment.created_at} />
+          <span className={styles.bylineSecondary}>
+            <PubDate created_at={comment.created_at} />
+            {
+              (comment.editing && comment.editing.edited)
+              ? <span>&nbsp;<span className={styles.editedMarker}>(Edited)</span></span>
+              : null
+            }
+          </span>
           <Slot fill="commentInfoBar" comment={comment} commentId={comment.id} inline/>
 
           { (currentUser &&
@@ -201,9 +237,12 @@ class Comment extends React.Component {
 
               /* User can edit/delete their own comment for a short window after posting */
               ? <span className={classnames(styles.topRight)}>
-                  <a
-                    className={classnames(styles.link, {[styles.active]: this.state.isEditing})}
-                    onClick={this.onClickEdit}>Edit</a>
+                  {
+                    commentIsStillEditable(comment) &&
+                    <a
+                      className={classnames(styles.link, {[styles.active]: this.state.isEditing})}
+                      onClick={this.onClickEdit}>Edit</a>
+                  }
                 </span>
 
               /* TopRightMenu allows currentUser to ignore other users' comments */
@@ -346,3 +385,28 @@ class Comment extends React.Component {
 }
 
 export default Comment;
+
+// return a Date instance representing end of edit window for comment
+const getEditableUntilDate = (comment) => {
+  const editing = comment && comment.editing;
+  const editableUntil = editing && editing.editableUntil && new Date(Date.parse(editing.editableUntil));
+  return editableUntil;  
+};
+
+// return whether the comment is editable
+function commentIsStillEditable (comment) {
+  const editing = comment && comment.editing;
+  if ( ! editing) {return false;}
+  const editableUntil = getEditableUntilDate(comment);
+  const editWindowExpired = (editableUntil - new Date) < 0;
+  return ! editWindowExpired;  
+}
+
+// return number of milliseconds before edit window expires
+function editWindowRemainingMs (comment) {
+  const editableUntil = getEditableUntilDate(comment);
+  if ( ! editableUntil) {return;}
+  const now = new Date();
+  const editWindowRemainingMs = (editableUntil - now);
+  return editWindowRemainingMs;
+}
diff --git a/client/coral-embed-stream/src/EditableCommentContent.js b/client/coral-embed-stream/src/EditableCommentContent.js
index f792985ec..6ac223844 100644
--- a/client/coral-embed-stream/src/EditableCommentContent.js
+++ b/client/coral-embed-stream/src/EditableCommentContent.js
@@ -5,6 +5,12 @@ import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from 'coral-framework/translations';
 const lang = new I18n(translations);
 
+const getEditableUntilDate = (comment) => {
+  const editing = comment && comment.editing;
+  const editableUntil = editing && editing.editableUntil && new Date(Date.parse(editing.editableUntil));
+  return editableUntil;  
+};
+
 /**
  * Renders a Comment's body in such a way that the end-user can edit it and save changes
  */
@@ -23,7 +29,13 @@ export class EditableCommentContent extends React.Component {
 
     // comment that is being edited
     comment: PropTypes.shape({
-      body: PropTypes.string
+      body: PropTypes.string,
+      editing: PropTypes.shape({
+        edited: PropTypes.bool,
+
+        // ISO8601
+        editableUntil: PropTypes.string,
+      })
     }).isRequired,
 
     // logged in user
@@ -41,6 +53,22 @@ export class EditableCommentContent extends React.Component {
   constructor(props) {
     super(props);
     this.editComment = this.editComment.bind(this);
+    this.editWindowExpiryTimeout = null;
+  }
+  componentDidMount() {
+    const editableUntil = getEditableUntilDate(this.props.comment);
+    const now = new Date();
+    const editWindowRemainingMs = editableUntil && (editableUntil - now);
+    if (editWindowRemainingMs > 0) {
+      this.editWindowExpiryTimeout = setTimeout(() => {
+        this.forceUpdate();
+      }, editWindowRemainingMs);
+    }
+  }
+  componentWillUnmount() {
+    if (this.editWindowExpiryTimeout) {
+      this.editWindowExpiryTimeout = clearTimeout(this.editWindowExpiryTimeout);
+    }    
   }
   async editComment(edit) {
     const {editComment, addNotification, stopEditing} = this.props;
@@ -74,6 +102,8 @@ export class EditableCommentContent extends React.Component {
   }
   render() {
     const originalBody = this.props.comment.body;
+    const editableUntil = getEditableUntilDate(this.props.comment);
+    const editWindowExpired = (editableUntil - new Date()) < 0;
     return (
       <div style={{marginBottom: '10px'}}>
         <CommentForm
@@ -84,7 +114,7 @@ export class EditableCommentContent extends React.Component {
 
             // should be disabled if user hasn't actually changed their
             // original comment
-            return comment.body !== originalBody;
+            return (comment.body !== originalBody) && ! editWindowExpired;
           }}
           saveComment={this.editComment}
           bodyLabel={'Edit this comment' /* @TODO (bengo) i18n */}
@@ -92,7 +122,50 @@ export class EditableCommentContent extends React.Component {
           submitText={'Save changes' /* @TODO (bengo) i18n */}
           saveButtonCStyle="green"
         />
+        {
+          editWindowExpired
+          ? <p>You can no longer edit this comment. The time window to do so has expired. Why not post another one?</p>
+          : <p>You have <CountdownSeconds until={editableUntil} /> to save this Edit. You may save this edit now to reset the clock.</p>
+        }
       </div>
     );
   }
 }
+
+/**
+ * Countdown the number of seconds until a given Date
+ */
+class CountdownSeconds extends React.Component {
+  static propTypes = {
+    until: PropTypes.instanceOf(Date).isRequired
+  }
+  constructor(props) {
+    super(props);
+    this.countdownInterval = null;
+  }
+  componentDidMount() {
+    const {until} = this.props;
+    const now = new Date();
+    if (until - now > 0) {
+      this.countdownInterval = setInterval(() => {
+
+        // re-render
+        this.forceUpdate();
+      }, 1000);
+    }
+  }
+  componentWillUnmount() {
+    if (this.countdownInterval) {
+      this.countdownInterval = clearInterval(this.countdownInterval);
+    }    
+  }
+  render() {
+    const now = new Date();
+    const {until} = this.props;
+    const msRemaining = until - now;
+    const secRemaining = msRemaining / 1000;
+    const wholeSecRemaining = Math.floor(secRemaining);
+    const plural = secRemaining !== 1;
+    return <span>{`${wholeSecRemaining} second${plural ? 's' : ''}`}</span>;
+  }
+}
diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css
index 087859e89..76993725f 100644
--- a/client/coral-embed-stream/style/default.css
+++ b/client/coral-embed-stream/style/default.css
@@ -317,9 +317,7 @@ button.comment__action-button[disabled],
 }
 
 .coral-plugin-pubdate-text {
-  color: #696969;
   display: inline-block;
-  font-size: .75rem;
   margin-left: 5px;
 }
 
diff --git a/client/coral-framework/graphql/fragments/commentView.graphql b/client/coral-framework/graphql/fragments/commentView.graphql
index 0ed5e00b8..76f4c8caa 100644
--- a/client/coral-framework/graphql/fragments/commentView.graphql
+++ b/client/coral-framework/graphql/fragments/commentView.graphql
@@ -15,4 +15,8 @@ fragment commentView on Comment {
     action_summaries {
       ...actionSummaryView
     }
+    editing {
+        edited
+        editableUntil
+    }
 }
diff --git a/graph/resolvers/comment.js b/graph/resolvers/comment.js
index 19ea11efe..b52361f40 100644
--- a/graph/resolvers/comment.js
+++ b/graph/resolvers/comment.js
@@ -1,3 +1,5 @@
+const CommentsService = require('../../services/comments');
+
 const Comment = {
   parent({parent_id}, _, {loaders: {Comments}}) {
     if (parent_id == null) {
@@ -45,6 +47,14 @@ const Comment = {
   },
   asset({asset_id}, _, {loaders: {Assets}}) {
     return Assets.getByID.load(asset_id);
+  },
+  editing(comment) {
+    const editableUntil = CommentsService.getEditableUntilDate(comment);
+    const edited = comment.body_history.length > 1;
+    return {
+      edited,
+      editableUntil,
+    };
   }
 };
 
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index a88baa2e8..c28e38d00 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -166,6 +166,11 @@ input CommentCountQuery {
   tag: [String]
 }
 
+type EditInfo {
+  edited: Boolean!
+  editableUntil: Date
+}
+
 # Comment is the base representation of user interaction in Talk.
 type Comment {
 
@@ -207,6 +212,9 @@ type Comment {
 
   # The time when the comment was created
   created_at: Date!
+
+  # describes how the comment can be edited
+  editing: EditInfo
 }
 
 ################################################################################
diff --git a/services/comments.js b/services/comments.js
index 40f0ccce0..c87fc313a 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -61,13 +61,12 @@ module.exports = class CommentsService {
       // it's an id
       comment = await this.findById(comment);
     }
-    const lastEditDate = (comment) => {
-      const {created_at, body_history} = comment;
-      const lastEdit = body_history[body_history.length - 1];
-      return lastEdit.created_at || created_at;
+    const editWindowExpired = (comment) => {
+      const now = new Date;
+      const editableUntil = this.getEditableUntilDate(comment);
+      return now > editableUntil;
     };
-    const editWindowExpired = (new Date() - lastEditDate(comment)) > EDIT_WINDOW_MS;
-    if (( ! ignoreEditWindow) && editWindowExpired) {
+    if (( ! ignoreEditWindow) && editWindowExpired(comment)) {
       throw Object.assign(new Error('Edit window is over.'), {
         name: 'EditWindowExpired'
       });
@@ -97,7 +96,20 @@ module.exports = class CommentsService {
     case 0:
       throw new Error(`Couldn't edit comment. There is no Comment with id "${id}"`);
     }
+  }
 
+  /**
+   * 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 mostRecentEditDate = (comment) => {
+      const {created_at, body_history} = comment;
+      const lastEdit = body_history[body_history.length - 1];
+      return (lastEdit && lastEdit.created_at) || created_at;
+    };
+    return new Date(Number(mostRecentEditDate(comment)) + EDIT_WINDOW_MS);
   }
 
   /**
diff --git a/test/server/graph/mutations/editComment.js b/test/server/graph/mutations/editComment.js
index cd213ac35..39256d17b 100644
--- a/test/server/graph/mutations/editComment.js
+++ b/test/server/graph/mutations/editComment.js
@@ -63,6 +63,7 @@ describe('graph.mutations.editComment', () => {
       console.error(response.errors);
     }
     expect(response.errors).to.be.empty;
+    expect(response.data.editComment.errors).to.be.null;
 
     // assert body has changed
     const commentAfterEdit = await CommentsService.findById(comment.id);

From c8e7ec6cbfb814c911e4587c7dc24530569a7bd0 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Wed, 3 May 2017 13:25:54 -0700
Subject: [PATCH 015/132] streamQuery reduces editComment mutations to reflect
 edits without contacting server

---
 .../graphql/mutations/editComment.graphql     |  2 +-
 .../coral-framework/graphql/queries/index.js  | 61 ++++++++++++++++++-
 package.json                                  |  1 +
 yarn.lock                                     |  6 ++
 4 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/client/coral-framework/graphql/mutations/editComment.graphql b/client/coral-framework/graphql/mutations/editComment.graphql
index 7becd6def..e143af064 100644
--- a/client/coral-framework/graphql/mutations/editComment.graphql
+++ b/client/coral-framework/graphql/mutations/editComment.graphql
@@ -1,4 +1,4 @@
-mutation EditComment ($id: ID!, $edit: EditCommentInput) {
+mutation editComment ($id: ID!, $edit: EditCommentInput) {
   editComment(id:$id, edit:$edit) {
     errors {
       translation_key
diff --git a/client/coral-framework/graphql/queries/index.js b/client/coral-framework/graphql/queries/index.js
index 5dbea5822..1cab53e2a 100644
--- a/client/coral-framework/graphql/queries/index.js
+++ b/client/coral-framework/graphql/queries/index.js
@@ -1,4 +1,5 @@
 import {graphql} from 'react-apollo';
+import update from 'immutability-helper';
 import STREAM_QUERY from './streamQuery.graphql';
 import LOAD_MORE from './loadMore.graphql';
 import GET_COUNTS from './getCounts.graphql';
@@ -139,7 +140,10 @@ export const variablesForStreamQuery = ({auth}) => {
 export const queryStream = graphql(STREAM_QUERY, {
   options: (props) => {
     return {
-      variables: variablesForStreamQuery(props)
+      variables: variablesForStreamQuery(props),
+      reducer: (previousResult, action, variables) => {
+        return reduceEditCommentActionsToUpdateStreamQuery(previousResult, action, variables);
+      },
     };
   },
   props: ({data}) => ({
@@ -149,6 +153,61 @@ export const queryStream = graphql(STREAM_QUERY, {
   })
 });
 
+/**
+ * Reduce editComment mutation actions
+ * producing a new queryStream result where asset.comments reflects the edit
+ */
+function reduceEditCommentActionsToUpdateStreamQuery(previousResult, action) {
+  if ( ! (action.type === 'APOLLO_MUTATION_RESULT' && action.operationName === 'editComment')) {
+    return previousResult;
+  }
+  const resultHasErrors = (result) => {
+    try {
+      return result.data.editComment.errors.length > 0;
+    } catch (error) {
+
+      // expected if no errors;
+      return false;
+    }
+  };
+  if (resultHasErrors(action.result)) {
+    return previousResult;
+  }
+  const {variables: {id, edit}} = action;
+  const updateCommentWithEdit = (comment, edit) => {
+    const {body} = edit;
+    const editedComment = update(comment, {
+      $merge: {
+        body
+      },
+      editing: {$merge:{edited:true}}
+    });
+    return editedComment;
+  };
+  const resultReflectingEdit = update(previousResult, {
+    asset: {
+      comments: {
+        $apply: comments => comments.map(comment => {
+          if (comment.id === id) {
+            return updateCommentWithEdit(comment, edit);
+          }
+          return update(comment, {
+            replies: {
+              $apply: (comments) => comments.map(comment => {
+                if (comment.id === id) {
+                  return updateCommentWithEdit(comment, edit);                          
+                }
+                return comment;
+              })
+            },
+          });
+        })
+      }
+    }
+  });
+  return resultReflectingEdit;
+}
+
 export const myCommentHistory = graphql(MY_COMMENT_HISTORY, {});
 
 export const myIgnoredUsers = graphql(MY_IGNORED_USERS, {
diff --git a/package.json b/package.json
index 87ab01076..9db7fa033 100644
--- a/package.json
+++ b/package.json
@@ -73,6 +73,7 @@
     "graphql-server-express": "^0.5.0",
     "graphql-tools": "^0.9.0",
     "helmet": "^3.5.0",
+    "immutability-helper": "^2.2.0",
     "inquirer": "^3.0.6",
     "joi": "^10.4.1",
     "jsonwebtoken": "^7.3.0",
diff --git a/yarn.lock b/yarn.lock
index adb8ea366..3acfb232b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3819,6 +3819,12 @@ ignore@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.2.tgz#1c51e1ef53bab6ddc15db4d9ac4ec139eceb3410"
 
+immutability-helper:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/immutability-helper/-/immutability-helper-2.2.0.tgz#c4385ad4f68315843efaf0cff3575ee82ffa405f"
+  dependencies:
+    invariant "^2.2.0"
+
 immutable@^3.8.1:
   version "3.8.1"
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.1.tgz#200807f11ab0f72710ea485542de088075f68cd2"

From 818c09a9b849bfaf29add57d8580f85995f1f285 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Wed, 3 May 2017 14:06:07 -0700
Subject: [PATCH 016/132] Edit window is now 30s instead of 5min

---
 services/comments.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/comments.js b/services/comments.js
index c87fc313a..0c379aa75 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -15,7 +15,7 @@ const STATUSES = [
   'NONE',
 ];
 
-const EDIT_WINDOW_MS = 5 * 60 * 1000; // 5 minutes
+const EDIT_WINDOW_MS = 30 * 1000; // 30 seconds
 
 module.exports = class CommentsService {
 

From 3cb84222b24590ed221f8a9b00f33140fb87a45d Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Wed, 3 May 2017 14:14:23 -0700
Subject: [PATCH 017/132] Add new padding, color, border-color to CommentBox
 textarea

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

diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css
index 76993725f..5c47437ec 100644
--- a/client/coral-embed-stream/style/default.css
+++ b/client/coral-embed-stream/style/default.css
@@ -191,12 +191,13 @@ hr {
 }
 
 .coral-plugin-commentbox-textarea {
+  color: #262626;
   flex: 1;
-  padding: 5px;
+  padding: 1em;
   min-height: 100px;
   margin-top: 10px;
   font-size: 16px;
-  border: 1px solid #ccc;
+  border: 1px solid #9E9E9E;
 }
 
 .coral-plugin-commentbox-button-container {

From c3f3ed8a50e76b6364b65d537842feece99aa4a3 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Wed, 3 May 2017 14:17:36 -0700
Subject: [PATCH 018/132] Comment edit is no longer extended one ach edit

---
 services/comments.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/services/comments.js b/services/comments.js
index 0c379aa75..28216381f 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -104,12 +104,8 @@ module.exports = class CommentsService {
    * @returns {Date} last date at which comment can be edited
    */
   static getEditableUntilDate(comment) {
-    const mostRecentEditDate = (comment) => {
-      const {created_at, body_history} = comment;
-      const lastEdit = body_history[body_history.length - 1];
-      return (lastEdit && lastEdit.created_at) || created_at;
-    };
-    return new Date(Number(mostRecentEditDate(comment)) + EDIT_WINDOW_MS);
+    const {created_at} = comment;
+    return new Date(Number(created_at) + EDIT_WINDOW_MS);
   }
 
   /**

From 92fd146a8c6098f81a45680995c78aaf15c3e528 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Wed, 3 May 2017 14:22:15 -0700
Subject: [PATCH 019/132] Add cancel button to editing CommentForm

---
 client/coral-embed-stream/src/EditableCommentContent.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/client/coral-embed-stream/src/EditableCommentContent.js b/client/coral-embed-stream/src/EditableCommentContent.js
index 6ac223844..0b9dda93a 100644
--- a/client/coral-embed-stream/src/EditableCommentContent.js
+++ b/client/coral-embed-stream/src/EditableCommentContent.js
@@ -97,9 +97,6 @@ export class EditableCommentContent extends React.Component {
       stopEditing();
     }
   }
-  stopEditing() {
-    this.setState({resetCounter: this.state.resetCounter + 1});
-  }
   render() {
     const originalBody = this.props.comment.body;
     const editableUntil = getEditableUntilDate(this.props.comment);
@@ -121,6 +118,7 @@ export class EditableCommentContent extends React.Component {
           bodyPlaceholder=""
           submitText={'Save changes' /* @TODO (bengo) i18n */}
           saveButtonCStyle="green"
+          cancelButtonClicked={this.props.stopEditing}
         />
         {
           editWindowExpired

From b83381719c6be88c855702b96e2c19b4300d1e04 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Wed, 3 May 2017 15:37:02 -0700
Subject: [PATCH 020/132] Style editCommentWindow messages and i18n

---
 client/coral-embed-stream/src/Comment.css     | 19 ++++++++++
 .../src/EditableCommentContent.js             | 37 ++++++++++++++-----
 client/coral-framework/translations.json      | 18 +++++++++
 client/coral-plugin-commentbox/CommentBox.js  | 10 +++--
 4 files changed, 72 insertions(+), 12 deletions(-)

diff --git a/client/coral-embed-stream/src/Comment.css b/client/coral-embed-stream/src/Comment.css
index 0429b18b3..85143e32c 100644
--- a/client/coral-embed-stream/src/Comment.css
+++ b/client/coral-embed-stream/src/Comment.css
@@ -49,6 +49,25 @@
   margin-top: 5px;
 }
 
+.editCommentForm {
+  margin-bottom: 10px;
+}
+
+.editCommentForm .buttonContainerLeft {
+  margin-right: auto;
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+}
+
+.editCommentForm .buttonContainerLeft .editWindowRemaining {
+  margin-right: 1em;
+}
+
+.editCommentForm .button {
+  flex-shrink: 0;
+}
+
 .link {
   color: #2376D8;
   cursor: pointer;
diff --git a/client/coral-embed-stream/src/EditableCommentContent.js b/client/coral-embed-stream/src/EditableCommentContent.js
index 0b9dda93a..676eb2bff 100644
--- a/client/coral-embed-stream/src/EditableCommentContent.js
+++ b/client/coral-embed-stream/src/EditableCommentContent.js
@@ -1,6 +1,8 @@
 import React, {PropTypes} from 'react';
 import {CommentForm} from 'coral-plugin-commentbox/CommentBox';
+import styles from './Comment.css';
 
+import {Icon} from 'coral-ui';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from 'coral-framework/translations';
 const lang = new I18n(translations);
@@ -102,7 +104,7 @@ export class EditableCommentContent extends React.Component {
     const editableUntil = getEditableUntilDate(this.props.comment);
     const editWindowExpired = (editableUntil - new Date()) < 0;
     return (
-      <div style={{marginBottom: '10px'}}>
+      <div className={styles.editCommentForm}>
         <CommentForm
           defaultValue={this.props.comment.body}
           charCountEnable={this.props.asset.settings.charCountEnable}
@@ -114,17 +116,33 @@ export class EditableCommentContent extends React.Component {
             return (comment.body !== originalBody) && ! editWindowExpired;
           }}
           saveComment={this.editComment}
-          bodyLabel={'Edit this comment' /* @TODO (bengo) i18n */}
+          bodyLabel={lang.t('editComment.bodyInputLabel')}
           bodyPlaceholder=""
-          submitText={'Save changes' /* @TODO (bengo) i18n */}
+          submitText={<span>{lang.t('editComment.saveButton')}</span>}
           saveButtonCStyle="green"
           cancelButtonClicked={this.props.stopEditing}
+          buttonClass={styles.button}
+          buttonContainerStart={
+            <div className={styles.buttonContainerLeft}>
+              <span className={styles.editWindowRemaining}>
+                {
+                  editWindowExpired
+                  ? <span>
+                      {lang.t('editComment.editWindowExpired')}
+                      {
+                        typeof this.props.stopEditing === 'function'
+                        ? <span>&nbsp;<a className={styles.link} onClick={this.props.stopEditing}>{lang.t('editComment.editWindowExpiredClose')}</a></span>
+                        : null
+                      }
+                    </span>
+                  : <span>
+                      <Icon name="timer"/> {lang.t('editComment.editWindowTimerPrefix')}<CountdownSeconds until={editableUntil} />
+                    </span>
+                }
+              </span>
+            </div>
+          }
         />
-        {
-          editWindowExpired
-          ? <p>You can no longer edit this comment. The time window to do so has expired. Why not post another one?</p>
-          : <p>You have <CountdownSeconds until={editableUntil} /> to save this Edit. You may save this edit now to reset the clock.</p>
-        }
       </div>
     );
   }
@@ -164,6 +182,7 @@ class CountdownSeconds extends React.Component {
     const secRemaining = msRemaining / 1000;
     const wholeSecRemaining = Math.floor(secRemaining);
     const plural = secRemaining !== 1;
-    return <span>{`${wholeSecRemaining} second${plural ? 's' : ''}`}</span>;
+    const units = lang.t(plural ? 'editComment.secondsPlural' : 'editComment.second');
+    return <span>{`${wholeSecRemaining} ${units}`}</span>;
   }
 }
diff --git a/client/coral-framework/translations.json b/client/coral-framework/translations.json
index 35317920f..6298afa2f 100644
--- a/client/coral-framework/translations.json
+++ b/client/coral-framework/translations.json
@@ -22,6 +22,15 @@
     "comment": "comment",
     "comments": "comments",
     "commentIsIgnored": "This comment is hidden because you ignored this user.",
+    "editComment": {
+      "bodyInputLabel": "Edit this comment",
+      "saveButton": "Save changes",
+      "editWindowExpired": "You can no longer edit this comment. The time window to do so has expired. Why not post another one?",
+      "editWindowExpiredClose": "Close",
+      "editWindowTimerPrefix": "Edit Window: ",
+      "second": "second",
+      "secondsPlural": "seconds"
+    },
     "error": {
       "editWindowExpired": "You can no longer edit this comment. The time window to do so has expired.",
       "emailNotVerified": "Email address {0} not verified.",
@@ -63,6 +72,15 @@
     "comments": "commentarios",
     "commentIsIgnored": "Este comentario está escondido porque has ignorado al usuario.",
     "showAllComments": "Mostrar todos los comentarios",
+    "editComment": {
+      "bodyInputLabel": "Editar este comentario",
+      "saveButton": "Guardar cambios",
+      "editWindowExpired": "Ya no puedes editar este comentario. La ventana de tiempo para hacerlo ha caducado. ¿Por qué no publicar otro?",
+      "editWindowExpiredClose": "Cerca",
+      "editWindowTimerPrefix": "Ventana de edición: ",
+      "second": "segundo",
+      "secondsPlural": "segundos"
+    },
     "error": {
       "emailNotVerified": "E-mail {0} no verificado.",
       "email": "No es un e-mail válido",
diff --git a/client/coral-plugin-commentbox/CommentBox.js b/client/coral-plugin-commentbox/CommentBox.js
index ee3b9722c..7b20e9b99 100644
--- a/client/coral-plugin-commentbox/CommentBox.js
+++ b/client/coral-plugin-commentbox/CommentBox.js
@@ -4,6 +4,7 @@ import translations from './translations.json';
 import {Button} from 'coral-ui';
 import Slot from 'coral-framework/components/Slot';
 import {connect} from 'react-redux';
+import classnames from 'classnames';
 
 const name = 'coral-plugin-commentbox';
 
@@ -48,6 +49,9 @@ export class CommentForm extends Component {
     // return whether the save button should be enabled for the provided
     // comment ({ body }) (for reasons other than charCount)
     saveCommentEnabled: PropTypes.func,
+
+    // className to add to buttons
+    buttonClass: PropTypes.string,
   }
   static get defaultProps() {
     return {
@@ -76,7 +80,7 @@ export class CommentForm extends Component {
     saveComment({body});
   }
   render() {
-    const {maxCharCount, styles, saveCommentEnabled} = this.props;
+    const {maxCharCount, styles, saveCommentEnabled, buttonClass} = this.props;
 
     const body = this.state.body;
     const length = body.length;
@@ -112,7 +116,7 @@ export class CommentForm extends Component {
           typeof this.props.cancelButtonClicked === 'function' && (
             <Button
               cStyle='darkGrey'
-              className={`${name}-cancel-button`}
+              className={classnames(`${name}-cancel-button`, buttonClass)}
               onClick={this.props.cancelButtonClicked}>
               {lang.t('cancel')}
             </Button>
@@ -120,7 +124,7 @@ export class CommentForm extends Component {
         }
         <Button
           cStyle={disablePostComment ? 'lightGrey' : this.props.saveButtonCStyle}
-          className={`${name}-button`}
+          className={classnames(`${name}-button`, buttonClass)}
           onClick={this.onClickSubmit}
           disabled={disablePostComment ? 'disabled' : ''}>
           {this.props.submitText}

From e31961716e63bb16f8db8e295de14f1d4c61b300 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Wed, 3 May 2017 17:14:36 -0700
Subject: [PATCH 021/132] Remove done todo comments

---
 client/coral-embed-stream/src/EditableCommentContent.js | 2 --
 test/server/services/users.js                           | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/client/coral-embed-stream/src/EditableCommentContent.js b/client/coral-embed-stream/src/EditableCommentContent.js
index 676eb2bff..36b0fd029 100644
--- a/client/coral-embed-stream/src/EditableCommentContent.js
+++ b/client/coral-embed-stream/src/EditableCommentContent.js
@@ -17,8 +17,6 @@ const getEditableUntilDate = (comment) => {
  * Renders a Comment's body in such a way that the end-user can edit it and save changes
  */
 export class EditableCommentContent extends React.Component {
-
-  // @TODO (bengo) make sure these are accurate wrt isRequired
   static propTypes = {
 
     // show notification to the user (e.g. for errors)
diff --git a/test/server/services/users.js b/test/server/services/users.js
index 04c5c457e..2f8e0adc3 100644
--- a/test/server/services/users.js
+++ b/test/server/services/users.js
@@ -170,9 +170,6 @@ describe('services.UsersService', () => {
   });
 
   describe('#ignoreUser', () => {
-
-    // @TODO: assert cannot ignore yourself
-    
     it('should add user id to ignoredUsers set', async () => {
       const user = mockUsers[0];
       const usersToIgnore = [mockUsers[1], mockUsers[2]];

From ab9c2a89b7d539f83046cddd684a3fcca8adef09 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Wed, 3 May 2017 17:27:36 -0700
Subject: [PATCH 022/132] Edit Window countdown is bold when < 10 seconds left

---
 client/coral-embed-stream/src/Comment.css     |  4 ++++
 .../src/EditableCommentContent.js             | 21 +++++++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/client/coral-embed-stream/src/Comment.css b/client/coral-embed-stream/src/Comment.css
index 85143e32c..5fab57d95 100644
--- a/client/coral-embed-stream/src/Comment.css
+++ b/client/coral-embed-stream/src/Comment.css
@@ -68,6 +68,10 @@
   flex-shrink: 0;
 }
 
+.editWindowAlmostOver {
+  font-weight: bold;
+}
+
 .link {
   color: #2376D8;
   cursor: pointer;
diff --git a/client/coral-embed-stream/src/EditableCommentContent.js b/client/coral-embed-stream/src/EditableCommentContent.js
index 36b0fd029..26a04b31a 100644
--- a/client/coral-embed-stream/src/EditableCommentContent.js
+++ b/client/coral-embed-stream/src/EditableCommentContent.js
@@ -134,7 +134,11 @@ export class EditableCommentContent extends React.Component {
                       }
                     </span>
                   : <span>
-                      <Icon name="timer"/> {lang.t('editComment.editWindowTimerPrefix')}<CountdownSeconds until={editableUntil} />
+                      <Icon name="timer"/> {lang.t('editComment.editWindowTimerPrefix')}
+                      <CountdownSeconds
+                        until={editableUntil}
+                        classNameForMsRemaining={(remainingMs) => (remainingMs <= 10 * 1000) ? styles.editWindowAlmostOver : '' }
+                      />
                     </span>
                 }
               </span>
@@ -151,7 +155,8 @@ export class EditableCommentContent extends React.Component {
  */
 class CountdownSeconds extends React.Component {
   static propTypes = {
-    until: PropTypes.instanceOf(Date).isRequired
+    until: PropTypes.instanceOf(Date).isRequired,
+    classNameForMsRemaining: PropTypes.func,
   }
   constructor(props) {
     super(props);
@@ -175,12 +180,20 @@ class CountdownSeconds extends React.Component {
   }
   render() {
     const now = new Date();
-    const {until} = this.props;
+    const {until, classNameForMsRemaining} = this.props;
     const msRemaining = until - now;
     const secRemaining = msRemaining / 1000;
     const wholeSecRemaining = Math.floor(secRemaining);
     const plural = secRemaining !== 1;
     const units = lang.t(plural ? 'editComment.secondsPlural' : 'editComment.second');
-    return <span>{`${wholeSecRemaining} ${units}`}</span>;
+    let classFromProp;
+    if (typeof classNameForMsRemaining === 'function') {
+      classFromProp = classNameForMsRemaining(msRemaining);
+    }
+    return (
+      <span className={classFromProp}>
+        {`${wholeSecRemaining} ${units}`}
+      </span>
+    );
   }
 }

From 3ac8f09619f01852c0e1ddffaad0d0b4e937ec6c Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Wed, 3 May 2017 17:31:36 -0700
Subject: [PATCH 023/132] Notify on unexpected error when saving edit changes

---
 client/coral-embed-stream/src/EditableCommentContent.js | 1 +
 client/coral-framework/translations.json                | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/client/coral-embed-stream/src/EditableCommentContent.js b/client/coral-embed-stream/src/EditableCommentContent.js
index 26a04b31a..6a22b958a 100644
--- a/client/coral-embed-stream/src/EditableCommentContent.js
+++ b/client/coral-embed-stream/src/EditableCommentContent.js
@@ -90,6 +90,7 @@ export class EditableCommentContent extends React.Component {
       } else if (error.networkError) {
         addNotification('error', lang.t('error.networkError'));
       } else {
+        addNotification('error', lang.t('editComment.unexpectedError'));
         throw error;
       }
     }
diff --git a/client/coral-framework/translations.json b/client/coral-framework/translations.json
index 6298afa2f..a2d1c9219 100644
--- a/client/coral-framework/translations.json
+++ b/client/coral-framework/translations.json
@@ -29,7 +29,8 @@
       "editWindowExpiredClose": "Close",
       "editWindowTimerPrefix": "Edit Window: ",
       "second": "second",
-      "secondsPlural": "seconds"
+      "secondsPlural": "seconds",
+      "unexpectedError": "Unexpected error while saving changes. Sorry!"
     },
     "error": {
       "editWindowExpired": "You can no longer edit this comment. The time window to do so has expired.",
@@ -79,7 +80,8 @@
       "editWindowExpiredClose": "Cerca",
       "editWindowTimerPrefix": "Ventana de edición: ",
       "second": "segundo",
-      "secondsPlural": "segundos"
+      "secondsPlural": "segundos",
+      "unexpectedError": "Unexpected error while saving changes. Sorry!"
     },
     "error": {
       "emailNotVerified": "E-mail {0} no verificado.",

From 0ba973fb4417d2fc47cadc91c65ff4e43e08357f Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Wed, 3 May 2017 18:05:06 -0700
Subject: [PATCH 024/132] editComment returns status of comment after edit. UI
 shows appropriate notifications if PREMOD or REJECTED

---
 .../src/EditableCommentContent.js                  |  6 +++++-
 .../graphql/mutations/editComment.graphql          |  3 +++
 client/coral-plugin-commentbox/CommentBox.js       | 14 ++++++++++++--
 graph/mutators/comment.js                          |  1 +
 graph/resolvers/root_mutation.js                   |  2 +-
 graph/typeDefs.graphql                             |  6 ++++++
 6 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/client/coral-embed-stream/src/EditableCommentContent.js b/client/coral-embed-stream/src/EditableCommentContent.js
index 6a22b958a..3116ec96b 100644
--- a/client/coral-embed-stream/src/EditableCommentContent.js
+++ b/client/coral-embed-stream/src/EditableCommentContent.js
@@ -1,5 +1,5 @@
 import React, {PropTypes} from 'react';
-import {CommentForm} from 'coral-plugin-commentbox/CommentBox';
+import {notifyForNewCommentStatus, CommentForm} from 'coral-plugin-commentbox/CommentBox';
 import styles from './Comment.css';
 
 import {Icon} from 'coral-ui';
@@ -94,6 +94,10 @@ export class EditableCommentContent extends React.Component {
         throw error;
       }
     }
+    if (successfullyEdited) {
+      const status = response.data.editComment.comment.status;
+      notifyForNewCommentStatus(this.props.addNotification, status);
+    }
     if (successfullyEdited && typeof stopEditing === 'function') {
       stopEditing();
     }
diff --git a/client/coral-framework/graphql/mutations/editComment.graphql b/client/coral-framework/graphql/mutations/editComment.graphql
index e143af064..05e532002 100644
--- a/client/coral-framework/graphql/mutations/editComment.graphql
+++ b/client/coral-framework/graphql/mutations/editComment.graphql
@@ -1,5 +1,8 @@
 mutation editComment ($id: ID!, $edit: EditCommentInput) {
   editComment(id:$id, edit:$edit) {
+    comment {
+      status
+    }
     errors {
       translation_key
     }
diff --git a/client/coral-plugin-commentbox/CommentBox.js b/client/coral-plugin-commentbox/CommentBox.js
index 7b20e9b99..5b60fac2e 100644
--- a/client/coral-plugin-commentbox/CommentBox.js
+++ b/client/coral-plugin-commentbox/CommentBox.js
@@ -8,6 +8,16 @@ import classnames from 'classnames';
 
 const name = 'coral-plugin-commentbox';
 
+// Given a newly posted comment's status, show a notification to the user
+// if needed
+export const notifyForNewCommentStatus = (addNotification, status) => {
+  if (status === 'REJECTED') {
+    addNotification('error', lang.t('comment-post-banned-word'));
+  } else if (status === 'PREMOD') {
+    addNotification('success', lang.t('comment-post-notif-premod'));
+  }
+};
+
 /**
  * Common UI for Creating or Editing a Comment
  */
@@ -189,11 +199,11 @@ class CommentBox extends Component {
         // Execute postSubmit Hooks
         this.state.hooks.postSubmit.forEach(hook => hook(data));
 
+        notifyForNewCommentStatus(addNotification, postedComment.status);
+
         if (postedComment.status === 'REJECTED') {
-          addNotification('error', lang.t('comment-post-banned-word'));
           !isReply && updateCountCache(assetId, countCache);
         } else if (postedComment.status === 'PREMOD') {
-          addNotification('success', lang.t('comment-post-notif-premod'));
           !isReply && updateCountCache(assetId, countCache);
         }
 
diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index 4bb228adb..c813ac112 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -259,6 +259,7 @@ const editComment = async ({user, loaders: {Comments}}, {id, edit}) => {
       throw error;
     }
   }
+  return {status};
 };
 
 module.exports = (context) => {
diff --git a/graph/resolvers/root_mutation.js b/graph/resolvers/root_mutation.js
index 6a91ec3f2..6305ee140 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(null)(Comment.editComment(args));
+    return wrapResponse('comment')(Comment.editComment(args));
   },
   createLike(_, {like: {item_id, item_type}}, {mutators: {Action}}) {
     return wrapResponse('like')(Action.create({item_id, item_type, action_type: 'LIKE'}));
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index c28e38d00..c7ce02ff1 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -794,7 +794,13 @@ input EditCommentInput {
   body: String!
 }
 
+type CommentInfoAfterEdit {
+  # New status of the edited comment
+  status: COMMENT_STATUS!
+}
+
 type EditCommentResponse implements Response {
+  comment: CommentInfoAfterEdit!
   # An array of errors relating to the mutation that occured.
   errors: [UserError]  
 }

From 9b659b024ed142fbc985fe0370f340bfda42b527 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Wed, 3 May 2017 19:27:32 -0700
Subject: [PATCH 025/132] Add spanish translations for 2 new error strings

---
 client/coral-framework/translations.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/coral-framework/translations.json b/client/coral-framework/translations.json
index a2d1c9219..40860fc3a 100644
--- a/client/coral-framework/translations.json
+++ b/client/coral-framework/translations.json
@@ -84,8 +84,10 @@
       "unexpectedError": "Unexpected error while saving changes. Sorry!"
     },
     "error": {
+      "editWindowExpired": "Ya no puedes editar este comentario. La ventana de tiempo para hacerlo ha caducado.",
       "emailNotVerified": "E-mail {0} no verificado.",
       "email": "No es un e-mail válido",
+      "networkError": "Error al conectar con el servidor. Compruebe su conexión a Internet y vuelva a intentarlo.",
       "password": "La contraseña debe tener por lo menos 8 caracteres",
       "username": "Los nombres pueden contener letras, números y _",
       "organizationName": "El nombre de la organización debe contener letras y/o números.",

From 9b944067630bb8d55d939b109653f49290fad00c Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Wed, 3 May 2017 19:32:42 -0700
Subject: [PATCH 026/132] Remove old comments

---
 test/server/graph/mutations/editComment.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/test/server/graph/mutations/editComment.js b/test/server/graph/mutations/editComment.js
index 39256d17b..1375157ad 100644
--- a/test/server/graph/mutations/editComment.js
+++ b/test/server/graph/mutations/editComment.js
@@ -243,10 +243,5 @@ describe('graph.mutations.editComment', () => {
       expect(commentAfterEdit.body).to.equal(newBody);
       expect(commentAfterEdit.status).to.equal(afterEdit.status);      
     });
-  });
-
-  // user can't edit outside of edit window
-
-  // should BANNED users be able to edit their comments?
-  
+  });  
 });

From 636d29af9f216167d5493176fe545f048f35deac Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Wed, 3 May 2017 19:41:29 -0700
Subject: [PATCH 027/132] When max char count is disabled, allow posting long
 comments in CommentBox

---
 client/coral-plugin-commentbox/CommentBox.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-plugin-commentbox/CommentBox.js b/client/coral-plugin-commentbox/CommentBox.js
index cd38aba1a..57ff7cf49 100644
--- a/client/coral-plugin-commentbox/CommentBox.js
+++ b/client/coral-plugin-commentbox/CommentBox.js
@@ -90,12 +90,12 @@ export class CommentForm extends React.Component {
     saveComment({body});
   }
   render() {
-    const {maxCharCount, styles, saveCommentEnabled, buttonClass} = this.props;
+    const {maxCharCount, styles, saveCommentEnabled, buttonClass, charCountEnable} = this.props;
 
     const body = this.state.body;
     const length = body.length;
     const isNotValidLength = (length) => !length || (maxCharCount && length > maxCharCount);
-    const disablePostComment = isNotValidLength(length) || ! saveCommentEnabled({body});
+    const disablePostComment = (charCountEnable && isNotValidLength(length)) || ! saveCommentEnabled({body});
 
     return <div>
       <div className={`${name}-container`}>

From 67b17160cb54b7fb1b02cedc6f68aaf2c03396bc Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Thu, 4 May 2017 14:42:43 -0600
Subject: [PATCH 028/132] don't accept/reject when a comment is already
 accepted/rejected respectively

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

diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
index e5afd9726..8c4b6f174 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
@@ -74,8 +74,8 @@ const Comment = ({actions = [], comment, ...props}) => {
                   user={comment.user}
                   status={comment.status}
                   active={active}
-                  acceptComment={() => props.acceptComment({commentId: comment.id})}
-                  rejectComment={() => props.rejectComment({commentId: comment.id})} />;
+                  acceptComment={() => comment.status === 'ACCEPTED' ? null : props.acceptComment({commentId: comment.id})}
+                  rejectComment={() => comment.status === 'REJECTED' ? null : props.rejectComment({commentId: comment.id})} />;
               })}
             </div>
           </div>

From 4507059a04f5f0f7b63a98de382f8309097a22f7 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Thu, 4 May 2017 15:43:23 -0600
Subject: [PATCH 029/132] same thing for BanUserDialog and the keyboard
 shortcuts

---
 client/coral-admin/src/actions/moderation.js           |  2 +-
 client/coral-admin/src/components/BanUserDialog.js     |  8 ++++----
 .../coral-admin/src/containers/Dashboard/Dashboard.js  |  8 +-------
 .../containers/ModerationQueue/ModerationContainer.js  | 10 ++++++----
 .../containers/ModerationQueue/components/Comment.js   |  2 +-
 client/coral-admin/src/reducers/moderation.js          |  5 ++++-
 6 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/client/coral-admin/src/actions/moderation.js b/client/coral-admin/src/actions/moderation.js
index b7117181e..c93dc0c76 100644
--- a/client/coral-admin/src/actions/moderation.js
+++ b/client/coral-admin/src/actions/moderation.js
@@ -4,7 +4,7 @@ export const toggleModal = open => ({type: actions.TOGGLE_MODAL, open});
 export const singleView = () => ({type: actions.SINGLE_VIEW});
 
 // Ban User Dialog
-export const showBanUserDialog = (user, commentId, showRejectedNote) => ({type: actions.SHOW_BANUSER_DIALOG, user, commentId, showRejectedNote});
+export const showBanUserDialog = (user, commentId, commentStatus, showRejectedNote) => ({type: actions.SHOW_BANUSER_DIALOG, user, commentId, commentStatus, showRejectedNote});
 export const hideBanUserDialog = (showDialog) => ({type: actions.HIDE_BANUSER_DIALOG, showDialog});
 
 // hide shortcuts note
diff --git a/client/coral-admin/src/components/BanUserDialog.js b/client/coral-admin/src/components/BanUserDialog.js
index ee5830249..b259012f3 100644
--- a/client/coral-admin/src/components/BanUserDialog.js
+++ b/client/coral-admin/src/components/BanUserDialog.js
@@ -8,14 +8,14 @@ import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../translations';
 const lang = new I18n(translations);
 
-const onBanClick = (userId, commentId, handleBanUser, rejectComment, handleClose) => (e) => {
+const onBanClick = (userId, commentId, commentStatus, handleBanUser, rejectComment, handleClose) => (e) => {
   e.preventDefault();
   handleBanUser({userId})
   .then(handleClose)
-  .then(() => rejectComment({commentId}));
+  .then(() => commentStatus === 'REJECTED' ? null : rejectComment({commentId}));
 };
 
-const BanUserDialog = ({open, handleClose, handleBanUser, rejectComment, user, commentId, showRejectedNote}) => (
+const BanUserDialog = ({open, handleClose, handleBanUser, rejectComment, user, commentId, commentStatus, showRejectedNote}) => (
   <Dialog
     className={styles.dialog}
     id="banuserDialog"
@@ -36,7 +36,7 @@ const BanUserDialog = ({open, handleClose, handleBanUser, rejectComment, user, c
         <Button cStyle="cancel" className={styles.cancel} onClick={handleClose} raised>
           {lang.t('bandialog.cancel')}
         </Button>
-        <Button cStyle="black" className={styles.ban} onClick={onBanClick(user.id, commentId, handleBanUser, rejectComment, handleClose)} raised>
+        <Button cStyle="black" className={styles.ban} onClick={onBanClick(user.id, commentId, commentStatus, handleBanUser, rejectComment, handleClose)} raised>
           {lang.t('bandialog.yes_ban_user')}
         </Button>
       </div>
diff --git a/client/coral-admin/src/containers/Dashboard/Dashboard.js b/client/coral-admin/src/containers/Dashboard/Dashboard.js
index f5d0aa39b..e6cfa27cd 100644
--- a/client/coral-admin/src/containers/Dashboard/Dashboard.js
+++ b/client/coral-admin/src/containers/Dashboard/Dashboard.js
@@ -6,7 +6,6 @@ import {getMetrics} from 'coral-admin/src/graphql/queries';
 import FlagWidget from './FlagWidget';
 import ActivityWidget from './ActivityWidget';
 import CountdownTimer from 'coral-admin/src/components/CountdownTimer';
-import {showBanUserDialog, hideBanUserDialog} from 'coral-admin/src/actions/moderation';
 
 import {Spinner} from 'coral-ui';
 
@@ -43,12 +42,7 @@ const mapStateToProps = state => {
   };
 };
 
-const mapDispatchToProps = dispatch => ({
-  showBanUserDialog: (user, commentId) => dispatch(showBanUserDialog(user, commentId)),
-  hideBanUserDialog: () => dispatch(hideBanUserDialog(false))
-});
-
 export default compose(
-  connect(mapStateToProps, mapDispatchToProps),
+  connect(mapStateToProps),
   getMetrics
 )(Dashboard);
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
index 7a3aab909..9606be543 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
@@ -43,12 +43,13 @@ class ModerationContainer extends Component {
     const {acceptComment, rejectComment} = this.props;
     const {selectedIndex} = this.state;
     const comments = this.getComments();
-    const commentId = {commentId: comments[selectedIndex].id};
+    const comment = comments[selectedIndex];
+    const commentId = {commentId: comment.id};
 
     if (accept) {
-      acceptComment(commentId);
+      comment.status !== 'ACCEPTED' && acceptComment(commentId);
     } else {
-      rejectComment(commentId);
+      comment.status !== 'REJECTED' && rejectComment(commentId);
     }
   }
 
@@ -185,6 +186,7 @@ class ModerationContainer extends Component {
           open={moderation.banDialog}
           user={moderation.user}
           commentId={moderation.commentId}
+          commentStatus={moderation.commentStatus}
           handleClose={props.hideBanUserDialog}
           handleBanUser={props.banUser}
           showRejectedNote={moderation.showRejectedNote}
@@ -212,7 +214,7 @@ const mapDispatchToProps = dispatch => ({
   singleView: () => dispatch(singleView()),
   updateAssets: assets => dispatch(updateAssets(assets)),
   fetchSettings: () => dispatch(fetchSettings()),
-  showBanUserDialog: (user, commentId, showRejectedNote) => dispatch(showBanUserDialog(user, commentId, showRejectedNote)),
+  showBanUserDialog: (user, commentId, commentStatus, showRejectedNote) => dispatch(showBanUserDialog(user, commentId, commentStatus, showRejectedNote)),
   hideBanUserDialog: () => dispatch(hideBanUserDialog(false)),
   hideShortcutsNote: () => dispatch(hideShortcutsNote()),
 });
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
index 8c4b6f174..d8982e4dc 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
@@ -41,7 +41,7 @@ const Comment = ({actions = [], comment, ...props}) => {
             <span className={styles.created}>
               {timeago().format(comment.created_at || (Date.now() - props.index * 60 * 1000), lang.getLocale().replace('-', '_'))}
             </span>
-            <BanUserButton user={comment.user} onClick={() => props.showBanUserDialog(comment.user, comment.id, comment.status !== 'REJECTED')} />
+            <BanUserButton user={comment.user} onClick={() => props.showBanUserDialog(comment.user, comment.id, comment.status, comment.status !== 'REJECTED')} />
             <CommentType type={commentType} />
           </div>
           {comment.user.status === 'banned' ?
diff --git a/client/coral-admin/src/reducers/moderation.js b/client/coral-admin/src/reducers/moderation.js
index a40ac865f..8f51cea6b 100644
--- a/client/coral-admin/src/reducers/moderation.js
+++ b/client/coral-admin/src/reducers/moderation.js
@@ -6,6 +6,7 @@ const initialState = Map({
   modalOpen: false,
   user: Map({}),
   commentId: null,
+  commentStatus: null,
   banDialog: false,
   shortcutsNoteVisible: window.localStorage.getItem('coral:shortcutsNote') || 'show'
 });
@@ -14,12 +15,14 @@ export default function moderation (state = initialState, action) {
   switch (action.type) {
   case actions.HIDE_BANUSER_DIALOG:
     return state
-      .set('banDialog', false);
+      .set('banDialog', false)
+      .set('commentStatus', null);
   case actions.SHOW_BANUSER_DIALOG:
     return state
       .merge({
         user: Map(action.user),
         commentId: action.commentId,
+        commentStatus: action.commentStatus,
         showRejectedNote: action.showRejectedNote,
         banDialog: true
       });

From f3f0b9c858f5e262ac0ebf7c6b6844ae226cb8ca Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Thu, 4 May 2017 15:55:46 -0600
Subject: [PATCH 030/132] change mouse cursor for disabled buttons

---
 client/coral-admin/src/components/ModerationList.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/coral-admin/src/components/ModerationList.css b/client/coral-admin/src/components/ModerationList.css
index 1e871f97c..4d4f37c9a 100644
--- a/client/coral-admin/src/components/ModerationList.css
+++ b/client/coral-admin/src/components/ModerationList.css
@@ -193,10 +193,12 @@
   box-shadow: none;
   color: white;
   background-color: #519954;
+  cursor: not-allowed;
 }
 
 .reject__active, .rejected__active {
   color: white;
   background-color: #D03235;
   box-shadow: none;
+  cursor: not-allowed;
 }

From 5f9240f201d2ff298cfb7fa44466df2cdb68d393 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Thu, 4 May 2017 16:32:07 -0600
Subject: [PATCH 031/132] open the comment in context when clicked

---
 .../src/containers/ModerationQueue/components/Comment.js  | 5 +++--
 .../src/containers/ModerationQueue/components/styles.css  | 8 ++++++++
 .../coral-admin/src/graphql/fragments/commentView.graphql | 1 +
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
index e5afd9726..ac16082d2 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
@@ -57,7 +57,7 @@ const Comment = ({actions = [], comment, ...props}) => {
             <Link to={`/admin/moderate/${comment.asset.id}`}>Moderate →</Link>
           )}
         </div>
-        <div className={styles.itemBody}>
+        <a className={styles.itemBody} href={`${comment.asset.url}#${comment.id}`} target="_blank">
           <p className={styles.body}>
             <Highlighter
               searchWords={[...props.suspectWords, ...props.bannedWords, ...linkText]}
@@ -79,7 +79,7 @@ const Comment = ({actions = [], comment, ...props}) => {
               })}
             </div>
           </div>
-        </div>
+        </a>
       </div>
       {
         flagActions && flagActions.length
@@ -106,6 +106,7 @@ Comment.propTypes = {
     }),
     asset: PropTypes.shape({
       title: PropTypes.string,
+      url: PropTypes.string,
       id: PropTypes.string
     })
   })
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/styles.css b/client/coral-admin/src/containers/ModerationQueue/components/styles.css
index a22fbbc64..074bc34f1 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/styles.css
+++ b/client/coral-admin/src/containers/ModerationQueue/components/styles.css
@@ -231,6 +231,14 @@ span {
     font-size: 14px;
     line-height: 1.5;
     font-weight: 300;
+    cursor: pointer;
+    text-decoration: none;
+    background-color: white;
+    transition: background-color .3s;
+
+    &:hover {
+      background-color: #eee;
+    }
   }
 
   .avatar {
diff --git a/client/coral-admin/src/graphql/fragments/commentView.graphql b/client/coral-admin/src/graphql/fragments/commentView.graphql
index 51b0a3f44..1f3b8b1d3 100644
--- a/client/coral-admin/src/graphql/fragments/commentView.graphql
+++ b/client/coral-admin/src/graphql/fragments/commentView.graphql
@@ -11,6 +11,7 @@ fragment commentView on Comment {
     asset {
       id
       title
+      url
     }
     action_summaries {
       count

From 8b3f69d964580f8ce1e1af8d7434ef056f2b92d7 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 5 May 2017 22:40:54 +0700
Subject: [PATCH 032/132] Use getDisplayName from recompose

---
 client/coral-framework/hocs/withFragments.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/client/coral-framework/hocs/withFragments.js b/client/coral-framework/hocs/withFragments.js
index a2686d94b..bcc362ca3 100644
--- a/client/coral-framework/hocs/withFragments.js
+++ b/client/coral-framework/hocs/withFragments.js
@@ -1,11 +1,8 @@
 import React from 'react';
+import {getDisplayName} from 'recompose';
 
 // TODO: revisit `filtering` after https://github.com/apollographql/graphql-anywhere/issues/38.
 
-function getDisplayName(WrappedComponent) {
-  return WrappedComponent.displayName || WrappedComponent.name || 'Component';
-}
-
 export default fragments => WrappedComponent => {
   class WithFragments extends React.Component {
     render() {

From 1b7eedfd8d3228d44209703ec0edd3c9cb6a5add Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 5 May 2017 22:51:19 +0700
Subject: [PATCH 033/132] Implement extendable GraphQL framework

---
 .../src/components/Comment.js                 |   8 +-
 .../src/components/Stream.js                  |  10 +-
 .../src/containers/Comment.js                 |   2 +-
 .../src/containers/Embed.js                   |  10 +-
 .../src/containers/Stream.js                  |   6 +-
 .../coral-embed-stream/src/graphql/index.js   | 105 +++++++++++
 client/coral-embed-stream/src/index.js        |   1 +
 .../graphql/fragments/index.js                |   2 +
 .../graphql/mutations/index.js                |  95 +++-------
 .../graphql/mutations/postComment.graphql     |  16 --
 client/coral-framework/helpers/plugins.js     |  23 ++-
 client/coral-framework/hocs/index.js          |   3 +
 client/coral-framework/hocs/withMutation.js   |  74 ++++++++
 client/coral-framework/hocs/withQuery.js      |  34 ++++
 client/coral-framework/services/registry.js   | 171 ++++++++++++++++++
 client/coral-plugin-commentbox/CommentBox.js  |   6 +-
 client/coral-plugin-replies/ReplyBox.js       |   6 +-
 .../client/containers/RespectButton.js        |  18 +-
 18 files changed, 463 insertions(+), 127 deletions(-)
 create mode 100644 client/coral-embed-stream/src/graphql/index.js
 create mode 100644 client/coral-framework/graphql/fragments/index.js
 delete mode 100644 client/coral-framework/graphql/mutations/postComment.graphql
 create mode 100644 client/coral-framework/hocs/index.js
 create mode 100644 client/coral-framework/hocs/withMutation.js
 create mode 100644 client/coral-framework/hocs/withQuery.js
 create mode 100644 client/coral-framework/services/registry.js

diff --git a/client/coral-embed-stream/src/components/Comment.js b/client/coral-embed-stream/src/components/Comment.js
index 7ce143c55..87412c0a6 100644
--- a/client/coral-embed-stream/src/components/Comment.js
+++ b/client/coral-embed-stream/src/components/Comment.js
@@ -54,7 +54,7 @@ class Comment extends React.Component {
     parentId: PropTypes.string,
     highlighted: PropTypes.string,
     addNotification: PropTypes.func.isRequired,
-    postItem: PropTypes.func.isRequired,
+    postComment: PropTypes.func.isRequired,
     depth: PropTypes.number.isRequired,
     asset: PropTypes.shape({
       id: PropTypes.string,
@@ -107,7 +107,7 @@ class Comment extends React.Component {
       currentUser,
       asset,
       depth,
-      postItem,
+      postComment,
       addNotification,
       showSignInDialog,
       postLike,
@@ -268,7 +268,7 @@ class Comment extends React.Component {
               parentId={parentId || comment.id}
               addNotification={addNotification}
               authorId={currentUser.id}
-              postItem={postItem}
+              postComment={postComment}
               assetId={asset.id} />
           : null
         }
@@ -285,7 +285,7 @@ class Comment extends React.Component {
                   activeReplyBox={activeReplyBox}
                   addNotification={addNotification}
                   parentId={comment.id}
-                  postItem={postItem}
+                  postComment={postComment}
                   depth={depth + 1}
                   asset={asset}
                   highlighted={highlighted}
diff --git a/client/coral-embed-stream/src/components/Stream.js b/client/coral-embed-stream/src/components/Stream.js
index eb30dc16c..96e571a01 100644
--- a/client/coral-embed-stream/src/components/Stream.js
+++ b/client/coral-embed-stream/src/components/Stream.js
@@ -26,7 +26,7 @@ class Stream extends React.Component {
   render() {
     const {
       root: {asset, asset: {comments}, comment, myIgnoredUsers},
-      postItem,
+      postComment,
       addNotification,
       postFlag,
       postLike,
@@ -85,7 +85,7 @@ class Stream extends React.Component {
                 {user
                   ? <CommentBox
                       addNotification={this.props.addNotification}
-                      postItem={this.props.postItem}
+                      postComment={this.props.postComment}
                       appendItemArray={this.props.appendItemArray}
                       updateItem={this.props.updateItem}
                       setCommentCountCache={this.props.setCommentCountCache}
@@ -123,7 +123,7 @@ class Stream extends React.Component {
               activeReplyBox={this.props.activeReplyBox}
               addNotification={addNotification}
               depth={0}
-              postItem={this.props.postItem}
+              postComment={this.props.postComment}
               asset={asset}
               currentUser={user}
               highlighted={comment.id}
@@ -162,7 +162,7 @@ class Stream extends React.Component {
                           activeReplyBox={this.props.activeReplyBox}
                           addNotification={addNotification}
                           depth={0}
-                          postItem={postItem}
+                          postComment={postComment}
                           asset={asset}
                           currentUser={user}
                           postLike={postLike}
@@ -199,7 +199,7 @@ class Stream extends React.Component {
 
 Stream.propTypes = {
   addNotification: PropTypes.func.isRequired,
-  postItem: PropTypes.func.isRequired,
+  postComment: PropTypes.func.isRequired,
 
   // dispatch action to add a tag to a comment
   addCommentTag: PropTypes.func,
diff --git a/client/coral-embed-stream/src/containers/Comment.js b/client/coral-embed-stream/src/containers/Comment.js
index 9b48e0809..6650f8161 100644
--- a/client/coral-embed-stream/src/containers/Comment.js
+++ b/client/coral-embed-stream/src/containers/Comment.js
@@ -1,6 +1,6 @@
 import {gql} from 'react-apollo';
 import Comment from '../components/Comment';
-import withFragments from 'coral-framework/hocs/withFragments';
+import {withFragments} from 'coral-framework/hocs';
 import {getSlotsFragments} from 'coral-framework/helpers/plugins';
 
 const pluginFragments = getSlotsFragments([
diff --git a/client/coral-embed-stream/src/containers/Embed.js b/client/coral-embed-stream/src/containers/Embed.js
index d5399fc60..9477ecfb7 100644
--- a/client/coral-embed-stream/src/containers/Embed.js
+++ b/client/coral-embed-stream/src/containers/Embed.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import {compose, gql, graphql} from 'react-apollo';
+import {compose, gql} from 'react-apollo';
 import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
 import isEqual from 'lodash/isEqual';
@@ -8,7 +8,8 @@ import renderComponent from 'recompose/renderComponent';
 
 import {Spinner} from 'coral-ui';
 import {authActions, assetActions, pym} from 'coral-framework';
-import {getDefinitionName, separateDataAndRoot} from 'coral-framework/utils';
+import {getDefinitionName} from 'coral-framework/utils';
+import {withQuery} from 'coral-framework/hocs';
 import Embed from '../components/Embed';
 import {setCommentCountCache, viewAllComments} from '../actions/stream';
 import {setActiveTab} from '../actions/embed';
@@ -75,7 +76,7 @@ const EMBED_QUERY = gql`
   ${Stream.fragments.root}
 `;
 
-export const withQuery = graphql(EMBED_QUERY, {
+export const withEmbedQuery = withQuery(EMBED_QUERY, {
   options: ({auth, commentId, assetId, assetUrl}) => ({
     variables: {
       assetId,
@@ -85,7 +86,6 @@ export const withQuery = graphql(EMBED_QUERY, {
       excludeIgnored: Boolean(auth && auth.user && auth.user.id),
     },
   }),
-  props: ({data}) => separateDataAndRoot(data),
 });
 
 const mapStateToProps = state => ({
@@ -113,6 +113,6 @@ export default compose(
     props => !props.auth.checkedInitialLogin,
     renderComponent(Spinner),
   ),
-  withQuery,
+  withEmbedQuery,
 )(EmbedContainer);
 
diff --git a/client/coral-embed-stream/src/containers/Stream.js b/client/coral-embed-stream/src/containers/Stream.js
index 49f234dab..2253a6a82 100644
--- a/client/coral-embed-stream/src/containers/Stream.js
+++ b/client/coral-embed-stream/src/containers/Stream.js
@@ -6,13 +6,13 @@ import uniqBy from 'lodash/uniqBy';
 import sortBy from 'lodash/sortBy';
 import isNil from 'lodash/isNil';
 import {NEW_COMMENT_COUNT_POLL_INTERVAL} from '../constants/stream';
-import {postComment, postFlag, postLike, postDontAgree, deleteAction, addCommentTag, removeCommentTag, ignoreUser} from 'coral-framework/graphql/mutations';
+import {withPostComment, postFlag, postLike, postDontAgree, deleteAction, addCommentTag, removeCommentTag, ignoreUser} from 'coral-framework/graphql/mutations';
 import {notificationActions, authActions} from 'coral-framework';
 import {editName} from 'coral-framework/actions/user';
 import {setCommentCountCache, setActiveReplyBox} from '../actions/stream';
 import Stream from '../components/Stream';
 import Comment from './Comment';
-import withFragments from 'coral-framework/hocs/withFragments';
+import {withFragments} from 'coral-framework/hocs';
 import {getDefinitionName} from 'coral-framework/utils';
 
 const {showSignInDialog} = authActions;
@@ -237,7 +237,7 @@ const mapDispatchToProps = dispatch =>
 export default compose(
   withFragments(fragments),
   connect(mapStateToProps, mapDispatchToProps),
-  postComment,
+  withPostComment,
   postFlag,
   postLike,
   postDontAgree,
diff --git a/client/coral-embed-stream/src/graphql/index.js b/client/coral-embed-stream/src/graphql/index.js
new file mode 100644
index 000000000..2d6f943a2
--- /dev/null
+++ b/client/coral-embed-stream/src/graphql/index.js
@@ -0,0 +1,105 @@
+import {gql} from 'react-apollo';
+import {registerConfig} from 'coral-framework/services/registry';
+
+const config = {
+  fragments: {
+    CreateCommentResponse: gql`
+      fragment Coral_CreateCommentResponse on CreateCommentResponse {
+        comment {
+          ...Coral_CreateCommentResponse_Comment
+          replies {
+            ...Coral_CreateCommentResponse_Comment
+          }
+        }
+        errors {
+          translation_key
+        }
+      }
+
+      fragment Coral_CreateCommentResponse_Comment on Comment {
+        id
+        body
+        created_at
+        status
+        replyCount
+        tags {
+          name
+        }
+        user {
+          id
+          name: username
+        }
+        action_summaries {
+          count
+          current_user {
+            id
+            created_at
+          }
+        }
+      }`,
+  },
+  mutations: {
+    PostComment: ({
+      variables: {comment: {asset_id, body, parent_id, tags = []}},
+      state: {auth},
+    }) => ({
+      optimisticResponse: {
+        createComment: {
+          comment: {
+            user: {
+              id: auth.toJS().user.id,
+              name: auth.toJS().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;
+        }
+      }
+    })
+  },
+};
+
+registerConfig(config);
diff --git a/client/coral-embed-stream/src/index.js b/client/coral-embed-stream/src/index.js
index 2fd1e2731..bd63ba267 100644
--- a/client/coral-embed-stream/src/index.js
+++ b/client/coral-embed-stream/src/index.js
@@ -4,6 +4,7 @@ import {ApolloProvider} from 'react-apollo';
 
 import {client} from 'coral-framework/services/client';
 import {checkLogin} from 'coral-framework/actions/auth';
+import './graphql';
 
 import reducers from './reducers';
 import localStore, {injectReducers} from 'coral-framework/services/store';
diff --git a/client/coral-framework/graphql/fragments/index.js b/client/coral-framework/graphql/fragments/index.js
new file mode 100644
index 000000000..f4948ed05
--- /dev/null
+++ b/client/coral-framework/graphql/fragments/index.js
@@ -0,0 +1,2 @@
+// fragments defined here are automatically registered.
+export default {};
diff --git a/client/coral-framework/graphql/mutations/index.js b/client/coral-framework/graphql/mutations/index.js
index b1ea57ae1..56f63b372 100644
--- a/client/coral-framework/graphql/mutations/index.js
+++ b/client/coral-framework/graphql/mutations/index.js
@@ -1,5 +1,4 @@
-import {graphql} from 'react-apollo';
-import POST_COMMENT from './postComment.graphql';
+import {graphql, gql} from 'react-apollo';
 import POST_FLAG from './postFlag.graphql';
 import POST_LIKE from './postLike.graphql';
 import POST_DONT_AGREE from './postDontAgree.graphql';
@@ -8,80 +7,28 @@ 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 withMutation from '../../hocs/withMutation';
+import {getFragmentDocument} from '../../services/registry';
 
-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 withPostComment = withMutation(
+  gql`
+    mutation PostComment($comment: CreateCommentInput!) {
+      createComment(comment: $comment) {
+        ...CreateCommentResponse
+      }
     }
-  }),
-});
+    ${getFragmentDocument('CreateCommentResponse')}
+  `, {
+    props: ({mutate}) => ({
+      postComment: comment => {
+        return mutate({
+          variables: {
+            comment
+          },
+        });
+      }
+    }),
+  });
 
 export const postLike = graphql(POST_LIKE, {
   props: ({mutate}) => ({
diff --git a/client/coral-framework/graphql/mutations/postComment.graphql b/client/coral-framework/graphql/mutations/postComment.graphql
deleted file mode 100644
index f98558804..000000000
--- a/client/coral-framework/graphql/mutations/postComment.graphql
+++ /dev/null
@@ -1,16 +0,0 @@
-#import "../fragments/commentView.graphql"
-
-mutation CreateComment ($comment: CreateCommentInput!) {
-    createComment(comment: $comment) {
-        comment {
-          ...commentView
-          replyCount
-          replies {
-              ...commentView
-          }
-        }
-        errors {
-          translation_key
-        }
-    }
-}
diff --git a/client/coral-framework/helpers/plugins.js b/client/coral-framework/helpers/plugins.js
index 20aee7abb..76995c204 100644
--- a/client/coral-framework/helpers/plugins.js
+++ b/client/coral-framework/helpers/plugins.js
@@ -3,6 +3,7 @@ import merge from 'lodash/merge';
 import flatten from 'lodash/flatten';
 import flattenDeep from 'lodash/flattenDeep';
 import uniq from 'lodash/uniq';
+import pick from 'lodash/pick';
 import plugins from 'pluginsConfig';
 import {gql} from 'react-apollo';
 import {getDefinitionName} from 'coral-framework/utils';
@@ -25,19 +26,27 @@ export function getSlotElements(slot, props = {}) {
 }
 
 function getComponentFragments(components) {
-  return components
+  const res = components
     .map(c => c.fragments)
     .filter(fragments => fragments)
     .reduce((res, fragments) => {
       Object.keys(fragments).forEach(key => {
         if (!(key in res)) {
-          res[key] = {spreads: '', definitions: ''};
+          res[key] = {spreads: [], definitions: []};
         }
-        res[key].spreads += `...${getDefinitionName(fragments[key])}\n`;
-        res[key].definitions = gql`${res[key].definitions}${fragments[key]}`;
+        res[key].spreads.push(getDefinitionName(fragments[key]));
+        res[key].definitions.push(fragments[key]);
       });
       return res;
     }, {});
+
+  Object.keys(res).forEach(key => {
+    res[key].spreads = `...${res[key].spreads.join('\n...')}\n`;
+    const literals = ['', ...res[key].definitions.map(() => '\n')];
+    res[key].definitions = gql.apply(null, [literals, ...res[key].definitions]);
+  });
+
+  return res;
 }
 
 /**
@@ -73,3 +82,9 @@ export function getSlotsFragments(slots) {
   };
 }
 
+export function getGraphQLConfigs() {
+  return plugins
+    .map(o => o.module.mutations && pick(o.module, ['mutations', 'queries', 'fragments']))
+    .filter(o => o);
+}
+
diff --git a/client/coral-framework/hocs/index.js b/client/coral-framework/hocs/index.js
new file mode 100644
index 000000000..d624a3308
--- /dev/null
+++ b/client/coral-framework/hocs/index.js
@@ -0,0 +1,3 @@
+export {default as withFragments} from './withFragments';
+export {default as withMutation} from './withMutation';
+export {default as withQuery} from './withQuery';
diff --git a/client/coral-framework/hocs/withMutation.js b/client/coral-framework/hocs/withMutation.js
new file mode 100644
index 000000000..423ab9793
--- /dev/null
+++ b/client/coral-framework/hocs/withMutation.js
@@ -0,0 +1,74 @@
+import {graphql} from 'react-apollo';
+import merge from 'lodash/merge';
+import uniq from 'lodash/uniq';
+import {getMutationOptions} from 'coral-framework/services/registry';
+import {store} from 'coral-framework/services/store';
+import {getDefinitionName} from '../utils';
+
+export default (definitions, config) => WrappedComponent => {
+  config = {
+    ...config,
+    options: config.options || {},
+    props: config.props || (data => ({mutate: data.mutate()})),
+  };
+  const wrappedProps = (data) => {
+    const name = getDefinitionName(definitions);
+    const callbacks = getMutationOptions(name);
+    const mutate = (base) => {
+      const variables = base.variables || config.options.variables;
+      const configs = callbacks.map(cb => cb({variables, state: store.getState()}));
+
+      const optimisticResponse = merge(
+        base.optimisticResponse || config.options.optimisticResponse,
+        ...configs.map(cfg => cfg.optimisticResponse),
+      );
+
+      const refetchQueries = uniq(
+        base.refetchQueries || config.options.refetchQueries,
+        ...configs.map(cfg => cfg.refetchQueries),
+      );
+
+      const updateCallbacks =
+        [base.update || config.options.update]
+        .concat(...configs.map(cfg => cfg.update))
+        .filter(i => i);
+
+      const update = (proxy, result) => {
+        updateCallbacks.forEach(cb => cb(proxy, result));
+      };
+
+      const updateQueries =
+        [
+          base.updateQueries || config.options.updateQueries,
+          ...configs.map(cfg => cfg.updateQueries)
+        ]
+        .filter(i => i)
+        .reduce((res, map) => {
+          Object.keys(map).forEach(key => {
+            if (!(key in res)) {
+              res[key] = map[key];
+            } else {
+              const existing = res[key];
+              res[key] = (prev, result) => {
+                const next = existing(prev, result);
+                return map[key](next, result);
+              };
+            }
+          });
+          return res;
+        }, {});
+
+      const wrappedConfig = {
+        variables,
+        optimisticResponse,
+        refetchQueries,
+        updateQueries,
+        update,
+      };
+      return data.mutate(wrappedConfig);
+    };
+    return config.props({...data, mutate});
+  };
+  const wrapped = graphql(definitions, {...config, props: wrappedProps})(WrappedComponent);
+  return wrapped;
+};
diff --git a/client/coral-framework/hocs/withQuery.js b/client/coral-framework/hocs/withQuery.js
new file mode 100644
index 000000000..9677c223e
--- /dev/null
+++ b/client/coral-framework/hocs/withQuery.js
@@ -0,0 +1,34 @@
+import {graphql} from 'react-apollo';
+import {getQueryOptions} from 'coral-framework/services/registry';
+import {getDefinitionName, separateDataAndRoot} from '../utils';
+
+export default (definitions, config) => WrappedComponent => {
+  config = {
+    ...config,
+    options: config.options || {},
+    props: config.props || (({data}) => separateDataAndRoot(data)),
+  };
+
+  const wrappedOptions = (data) => {
+    const base = (typeof config.options === 'function') ? config.options(data) : config.options;
+    const name = getDefinitionName(definitions);
+    const configs = getQueryOptions(name);
+    const reducerCallbacks =
+      [base.reducer || (i => i)]
+      .concat(...configs.map(cfg => cfg.reducer))
+      .filter(i => i);
+
+    const reducer = reducerCallbacks.reduce(
+      (a, b) => (prev, ...rest) =>
+        b(a(prev, ...rest), ...rest),
+    );
+
+    return {
+      ...base,
+      reducer,
+    };
+  };
+
+  const wrapped = graphql(definitions, {...config, options: wrappedOptions})(WrappedComponent);
+  return wrapped;
+};
diff --git a/client/coral-framework/services/registry.js b/client/coral-framework/services/registry.js
new file mode 100644
index 000000000..2e889de94
--- /dev/null
+++ b/client/coral-framework/services/registry.js
@@ -0,0 +1,171 @@
+import {gql} from 'react-apollo';
+import {getDefinitionName} from 'coral-framework/utils';
+import {getGraphQLConfigs} from 'coral-framework/helpers/plugins';
+import globalFragments from 'coral-framework/graphql/fragments';
+
+const fragments = {};
+const mutationOptions = {};
+const queryOptions = {};
+
+const getTypeName = (ast) => ast.definitions[0].typeCondition.name.value;
+
+/**
+ * Register fragment
+ *
+ * Example:
+ * registerFragment('MyFragment', gql`
+ *   fragment Plugin_MyFragment on Comment {
+ *     body
+ *   }
+ * `);
+ */
+export function registerFragment(key, document) {
+  const type = getTypeName(document);
+  const name = getDefinitionName(document);
+  if (!(key in fragments)) {
+    fragments[key] = {type, names: [name], documents: [document]};
+  } else {
+    if (type !== fragments[key].type) {
+      console.error(`Type mismatch ${type} !== ${fragments[key].type}`);
+    }
+    fragments[key].names.push(name);
+    fragments[key].documents.push(document);
+  }
+}
+
+/**
+ * Register mutation options.
+ *
+ * Example:
+ * registerMutationOptions('PostComment', ({variables, state}) => ({
+ *   optimisticResponse: {
+ *     CreateComment: {
+ *       extra: '',
+ *     },
+ *   },
+ *   refetchQueries: [],
+ *   updateQueries: {
+ *     EmbedQuery: (previous, data) => {
+ *       return previous;
+ *     },
+ *   },
+ *   update: (proxy, result) => {
+ *   },
+ * })
+ */
+export function registerMutationOptions(key, config) {
+  if (!(key in mutationOptions)) {
+    mutationOptions[key] = [config];
+  } else {
+    mutationOptions[key].push(config);
+  }
+}
+
+/**
+ * Register query options.
+ *
+ * Example:
+ * registerQueryOptions('EmbedQuery', {
+ *   reducer: (previousResult, action, variables) => previousResult,
+ * });
+ */
+export function registerQueryOptions(key, config) {
+  if (!(key in queryOptions)) {
+    queryOptions[key] = [config];
+  } else {
+    queryOptions[key].push(config);
+  }
+}
+
+/**
+ * Register all fragments, mutation options, and query options defined in the object.
+ *
+ * Example:
+ * registerConfig({
+ *   fragments: {
+ *     CreateCommentResponse: gql`
+ *       fragment CoralRandomEmoji_CreateCommentResponse on CreateCommentResponse {
+ *         [...]
+ *       }`,
+ *   },
+ *   mutations: {
+ *     PostComment: ({variables, state}) => ({
+ *       optimisticResponse: {
+ *         [...]
+ *       },
+ *       refetchQueries: [],
+ *       updateQueries: {
+ *         EmbedQuery: (previous, data) => {
+ *           return previous;
+ *         },
+ *       },
+ *       update: (proxy, result) => {
+ *       },
+ *     })
+ *   },
+ *   queries: {
+ *     EmbedQuery: {
+ *       reducer: (previousResult, action, variables)  => {
+ *         return previousResult;
+ *       },
+ *     },
+ *   },
+ * });
+ */
+export function registerConfig(cfg) {
+  Object.keys(cfg.fragments || []).forEach(key => registerFragment(key, cfg.fragments[key]));
+  Object.keys(cfg.mutations || []).forEach(key => registerMutationOptions(key, cfg.mutations[key]));
+  Object.keys(cfg.queries || []).forEach(key => registerQueryOptions(key, cfg.queries[key]));
+}
+
+/**
+ * Get a list of mutation options.
+ */
+export function getMutationOptions(key) {
+  init();
+  return mutationOptions[key] || [];
+}
+
+/**
+ * Get a list of query options.
+ */
+export function getQueryOptions(key) {
+  init();
+  return queryOptions[key] || [];
+}
+
+/**
+ * Get a document with a fragment named `key`, which contains
+ * all fragments registered under this key.
+ */
+export function getFragmentDocument(key) {
+  init();
+  let documents = fragments[key] ? fragments[key].documents : [];
+  let fields =  fragments[key] ? `...${fragments[key].names.join('\n...')}\n` : ' __typename';
+
+  const main = `
+    fragment ${key} on ${fragments[key].type} {
+      ${fields}
+    }
+  `;
+  const literals = [main, ...documents.map(() => '\n')];
+  return gql.apply(null, [literals, ...documents]);
+}
+
+// The fragments and configs are lazily loaded to allow circular dependencies to work.
+// TODO: We might want to change this to an explicit register after we have lazy Queries and Mutations.
+let initialized = false;
+
+function init() {
+  if (initialized) { return; }
+  initialized = true;
+
+  // Register fragments from framework.
+  [globalFragments].forEach(map =>
+    Object.keys(map).forEach(key => registerFragment(key, map[key]))
+  );
+
+  // Register configs from plugins.
+  getGraphQLConfigs().forEach(cfg => registerConfig(cfg));
+}
+
diff --git a/client/coral-plugin-commentbox/CommentBox.js b/client/coral-plugin-commentbox/CommentBox.js
index 5d0906b6e..e19224179 100644
--- a/client/coral-plugin-commentbox/CommentBox.js
+++ b/client/coral-plugin-commentbox/CommentBox.js
@@ -25,7 +25,7 @@ class CommentBox extends React.Component {
   postComment = () => {
     const {
       commentPostedHandler,
-      postItem,
+      postComment,
       setCommentCountCache,
       commentCountCache,
       isReply,
@@ -46,7 +46,7 @@ class CommentBox extends React.Component {
     // Execute preSubmit Hooks
     this.state.hooks.preSubmit.forEach(hook => hook());
 
-    postItem(comment, 'comments')
+    postComment(comment, 'comments')
       .then(({data}) => {
         const postedComment = data.createComment.comment;
 
@@ -192,7 +192,7 @@ CommentBox.propTypes = {
   charCountEnable: PropTypes.bool.isRequired,
   maxCharCount: PropTypes.number,
   commentPostedHandler: PropTypes.func,
-  postItem: PropTypes.func.isRequired,
+  postComment: PropTypes.func.isRequired,
   cancelButtonClicked: PropTypes.func,
   assetId: PropTypes.string.isRequired,
   parentId: PropTypes.string,
diff --git a/client/coral-plugin-replies/ReplyBox.js b/client/coral-plugin-replies/ReplyBox.js
index d6e2b5631..97667f932 100644
--- a/client/coral-plugin-replies/ReplyBox.js
+++ b/client/coral-plugin-replies/ReplyBox.js
@@ -12,7 +12,7 @@ class ReplyBox extends Component {
   render() {
     const {
       styles,
-      postItem,
+      postComment,
       assetId,
       authorId,
       addNotification,
@@ -32,7 +32,7 @@ class ReplyBox extends Component {
         addNotification={addNotification}
         authorId={authorId}
         assetId={assetId}
-        postItem={postItem}
+        postComment={postComment}
         isReply={true} />
     </div>;
   }
@@ -46,7 +46,7 @@ ReplyBox.propTypes = {
   parentId: PropTypes.string,
   addNotification: PropTypes.func.isRequired,
   authorId: PropTypes.string.isRequired,
-  postItem: PropTypes.func.isRequired,
+  postComment: PropTypes.func.isRequired,
   assetId: PropTypes.string.isRequired
 };
 
diff --git a/plugins/coral-plugin-respect/client/containers/RespectButton.js b/plugins/coral-plugin-respect/client/containers/RespectButton.js
index 38be8a978..fcb7b2a57 100644
--- a/plugins/coral-plugin-respect/client/containers/RespectButton.js
+++ b/plugins/coral-plugin-respect/client/containers/RespectButton.js
@@ -1,15 +1,15 @@
-import {compose, gql, graphql} from 'react-apollo';
+import {compose, gql} from 'react-apollo';
 import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
 import get from 'lodash/get';
-import withFragments from 'coral-framework/hocs/withFragments';
+import {withFragments, withMutation} from 'coral-framework/hocs';
 import {showSignInDialog} from 'coral-framework/actions/auth';
 import RespectButton from '../components/RespectButton';
 
 const isRespectAction = (a) => a.__typename === 'RespectActionSummary';
 
 const COMMENT_FRAGMENT = gql`
-  fragment RespectButton_updateFragment on Comment {
+  fragment CoralRespect_UpdateFragment on Comment {
     action_summaries {
       ... on RespectActionSummary {
         count
@@ -21,8 +21,8 @@ const COMMENT_FRAGMENT = gql`
   }
 `;
 
-const withDeleteAction = graphql(gql`
-  mutation deleteAction($id: ID!) {
+const withDeleteAction = withMutation(gql`
+  mutation CoralRespect_DeleteAction($id: ID!) {
       deleteAction(id:$id) {
         errors {
           translation_key
@@ -66,8 +66,8 @@ const withDeleteAction = graphql(gql`
   }),
 });
 
-const withPostRespect = graphql(gql`
-  mutation createRespect($respect: CreateRespectInput!) {
+const withPostRespect = withMutation(gql`
+  mutation CoralRespect_CreateRespect($respect: CreateRespectInput!) {
     createRespect(respect: $respect) {
       respect {
         id
@@ -137,14 +137,14 @@ const mapDispatchToProps = dispatch =>
 const enhance = compose(
   withFragments({
     root: gql`
-      fragment RespectButton_root on RootQuery {
+      fragment CoralRespect_RespectButton_root on RootQuery {
         me {
           status
         }
       }
     `,
     comment: gql`
-      fragment RespectButton_comment on Comment {
+      fragment CoralRespect_RespectButton_comment on Comment {
         action_summaries {
           ... on RespectActionSummary {
             count

From 5db48e8c0f96ba2b73fde2c111e132ae47e1efa3 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Fri, 5 May 2017 11:35:18 -0600
Subject: [PATCH 034/132] make it a blue link instead of the whole thing

---
 .../ModerationQueue/components/Comment.js     |  6 +++---
 .../ModerationQueue/components/styles.css     | 21 +++++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
index ac16082d2..b3813bbc8 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
@@ -57,11 +57,11 @@ const Comment = ({actions = [], comment, ...props}) => {
             <Link to={`/admin/moderate/${comment.asset.id}`}>Moderate →</Link>
           )}
         </div>
-        <a className={styles.itemBody} href={`${comment.asset.url}#${comment.id}`} target="_blank">
+        <div className={styles.itemBody}>
           <p className={styles.body}>
             <Highlighter
               searchWords={[...props.suspectWords, ...props.bannedWords, ...linkText]}
-              textToHighlight={comment.body} />
+              textToHighlight={comment.body} /> <a className={styles.external} href={`${comment.asset.url}#${comment.id}`} target="_blank"><Icon name='open_in_new' /> View context</a>
           </p>
           <div className={styles.sideActions}>
             {links ? <span className={styles.hasLinks}><Icon name='error_outline'/> Contains Link</span> : null}
@@ -79,7 +79,7 @@ const Comment = ({actions = [], comment, ...props}) => {
               })}
             </div>
           </div>
-        </a>
+        </div>
       </div>
       {
         flagActions && flagActions.length
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/styles.css b/client/coral-admin/src/containers/ModerationQueue/components/styles.css
index 074bc34f1..6d09b2d36 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/styles.css
+++ b/client/coral-admin/src/containers/ModerationQueue/components/styles.css
@@ -431,3 +431,24 @@ span {
   position: relative;
   top: 7px;
 }
+
+.external {
+  font-size: .7em;
+  text-decoration: none;
+  color: #063b9a;
+  cursor: pointer;
+  font-weight: normal;
+  margin-left: 10px;
+  white-space: nowrap;
+
+  &:hover {
+    text-decoration: underline;
+    opacity: .9;
+  }
+
+  i {
+    font-size: 12px;
+    top: 2px;
+    position: relative;
+  }
+}

From 519ca7beb51fa6f66b3ab59b3db58e1ee76e354a Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Fri, 5 May 2017 11:55:28 -0600
Subject: [PATCH 035/132] =?UTF-8?q?en=20espa=C3=B1ol?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/containers/ModerationQueue/components/Comment.js        | 2 +-
 client/coral-admin/src/translations.json                        | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
index b3813bbc8..afe0c967f 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
@@ -61,7 +61,7 @@ const Comment = ({actions = [], comment, ...props}) => {
           <p className={styles.body}>
             <Highlighter
               searchWords={[...props.suspectWords, ...props.bannedWords, ...linkText]}
-              textToHighlight={comment.body} /> <a className={styles.external} href={`${comment.asset.url}#${comment.id}`} target="_blank"><Icon name='open_in_new' /> View context</a>
+              textToHighlight={comment.body} /> <a className={styles.external} href={`${comment.asset.url}#${comment.id}`} target="_blank"><Icon name='open_in_new' /> {lang.t('comment.view_context')}</a>
           </p>
           <div className={styles.sideActions}>
             {links ? <span className={styles.hasLinks}><Icon name='error_outline'/> Contains Link</span> : null}
diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json
index 3f9392656..68a3b93d5 100644
--- a/client/coral-admin/src/translations.json
+++ b/client/coral-admin/src/translations.json
@@ -72,6 +72,7 @@
       "flagged": "flagged",
       "anon": "Anonymous",
       "ban_user": "Ban User",
+      "view_context": "View context",
       "banned_user": "Banned User"
     },
     "user": {
@@ -259,6 +260,7 @@
     "comment": {
       "flagged": "marcado",
       "anon": "Anónimo",
+      "view_context": "Ver contexto",
       "ban_user": "Suspender Usuario",
       "banned_user": "Usuario Suspendido"
     },

From 13e2382cd79b87937660db02c61f2bb66b2faef8 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Sat, 6 May 2017 02:33:23 +0700
Subject: [PATCH 036/132] More code comments

---
 client/coral-framework/helpers/plugins.js   | 2 ++
 client/coral-framework/hocs/withMutation.js | 4 ++++
 client/coral-framework/hocs/withQuery.js    | 4 ++++
 client/coral-framework/services/registry.js | 5 +++++
 4 files changed, 15 insertions(+)

diff --git a/client/coral-framework/helpers/plugins.js b/client/coral-framework/helpers/plugins.js
index 76995c204..a21eaba4b 100644
--- a/client/coral-framework/helpers/plugins.js
+++ b/client/coral-framework/helpers/plugins.js
@@ -41,6 +41,8 @@ function getComponentFragments(components) {
     }, {});
 
   Object.keys(res).forEach(key => {
+
+    // Assemble arguments for `gql` to call it directly without using template literals.
     res[key].spreads = `...${res[key].spreads.join('\n...')}\n`;
     const literals = ['', ...res[key].definitions.map(() => '\n')];
     res[key].definitions = gql.apply(null, [literals, ...res[key].definitions]);
diff --git a/client/coral-framework/hocs/withMutation.js b/client/coral-framework/hocs/withMutation.js
index 423ab9793..81529faea 100644
--- a/client/coral-framework/hocs/withMutation.js
+++ b/client/coral-framework/hocs/withMutation.js
@@ -5,6 +5,10 @@ import {getMutationOptions} from 'coral-framework/services/registry';
 import {store} from 'coral-framework/services/store';
 import {getDefinitionName} from '../utils';
 
+/**
+ * Exports a HOC with the same signature as `graphql`, that will
+ * apply mutation options registered in the registry.
+ */
 export default (definitions, config) => WrappedComponent => {
   config = {
     ...config,
diff --git a/client/coral-framework/hocs/withQuery.js b/client/coral-framework/hocs/withQuery.js
index 9677c223e..575a4484f 100644
--- a/client/coral-framework/hocs/withQuery.js
+++ b/client/coral-framework/hocs/withQuery.js
@@ -2,6 +2,10 @@ import {graphql} from 'react-apollo';
 import {getQueryOptions} from 'coral-framework/services/registry';
 import {getDefinitionName, separateDataAndRoot} from '../utils';
 
+/**
+ * Exports a HOC with the same signature as `graphql`, that will
+ * apply query options registered in the registry.
+ */
 export default (definitions, config) => WrappedComponent => {
   config = {
     ...config,
diff --git a/client/coral-framework/services/registry.js b/client/coral-framework/services/registry.js
index 2e889de94..d35861663 100644
--- a/client/coral-framework/services/registry.js
+++ b/client/coral-framework/services/registry.js
@@ -37,6 +37,8 @@ export function registerFragment(key, document) {
  * Register mutation options.
  *
  * Example:
+ * // state is the current redux state, which is sometimes
+ * // necessary to fill the optimistic response.
  * registerMutationOptions('PostComment', ({variables, state}) => ({
  *   optimisticResponse: {
  *     CreateComment: {
@@ -89,6 +91,8 @@ export function registerQueryOptions(key, config) {
  *       }`,
  *   },
  *   mutations: {
+ *     // state is the current redux state, which is sometimes
+ *     // necessary to fill the optimistic response.
  *     PostComment: ({variables, state}) => ({
  *       optimisticResponse: {
  *         [...]
@@ -143,6 +147,7 @@ export function getFragmentDocument(key) {
   let documents = fragments[key] ? fragments[key].documents : [];
   let fields =  fragments[key] ? `...${fragments[key].names.join('\n...')}\n` : ' __typename';
 
+  // Assemble arguments for `gql` to call it directly without using template literals.
   const main = `
     fragment ${key} on ${fragments[key].type} {
       ${fields}

From dc81a59908029cd3825595bea7176dc05936490d Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Fri, 5 May 2017 16:40:17 -0400
Subject: [PATCH 037/132] Supported Browsers

---
 README.md | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ef621b59c..3d8b3bf3a 100644
--- a/README.md
+++ b/README.md
@@ -42,9 +42,43 @@ available in the format: `<scheme>://<host>` without the path.
 Refer to the wiki page on [Configuration Loading](https://github.com/coralproject/talk/wiki/Configuration-Loading) for
 alternative methods of loading configuration during development.
 
+## Supported Browsers
+
+### Web
+
+- Chrome: latest 2 versions
+- Firefox: latest 2 versions, and most recent extended support version, if any
+- Safari: latest 2 versions
+- Internet Explorer: IE Edge, 11
+
+### iOS Devices
+
+- iPad
+- iPad Pro
+- iPhone 6 Plus
+- iPhone 6
+- iPhone 5
+
+### iOS Browsers
+
+- Chrome for iOS: latest version
+- Firefox for iOS: latest version
+- Safari for iOS: latest version
+
+### Android Devices
+
+- Galaxy S5
+- Nexus 5X
+- Nexus 6P
+
+### Android Browsers
+
+- Chrome for Android: latest version
+- Firefox for Android: latest version
+
 ### License
 
-    Copyright 2016 Mozilla Foundation
+    Copyright 2017 Mozilla Foundation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

From 4ff42385e330db5a242b11c69336a1c24162ad13 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Fri, 5 May 2017 14:41:19 -0600
Subject: [PATCH 038/132] remove dead code

---
 .../src/containers/ModerationQueue/components/styles.css  | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/client/coral-admin/src/containers/ModerationQueue/components/styles.css b/client/coral-admin/src/containers/ModerationQueue/components/styles.css
index 6d09b2d36..966a37526 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/styles.css
+++ b/client/coral-admin/src/containers/ModerationQueue/components/styles.css
@@ -231,14 +231,6 @@ span {
     font-size: 14px;
     line-height: 1.5;
     font-weight: 300;
-    cursor: pointer;
-    text-decoration: none;
-    background-color: white;
-    transition: background-color .3s;
-
-    &:hover {
-      background-color: #eee;
-    }
   }
 
   .avatar {

From b15a2af38c68b24290a5845b623659c29426cdc5 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Fri, 5 May 2017 16:45:15 -0400
Subject: [PATCH 039/132] Update formatting of License info

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

diff --git a/README.md b/README.md
index 3d8b3bf3a..74097d48c 100644
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@ alternative methods of loading configuration during development.
 - Chrome for Android: latest version
 - Firefox for Android: latest version
 
-### License
+## License
 
     Copyright 2017 Mozilla Foundation
 

From 95f9bac2548cb0fd93f66122b63ade0e8c3c2d42 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 5 May 2017 15:42:34 -0600
Subject: [PATCH 040/132] Initial migration to JWT

---
 app.js                                        |  37 +-----
 middleware/authentication.js                  |  19 +++
 package.json                                  |  21 ++-
 .../server/router.js                          |   2 +-
 routes/api/auth/index.js                      |  14 +-
 services/passport.js                          | 122 ++++++++++++------
 services/session.js                           |  36 ------
 services/subscriptions.js                     |  10 +-
 views/admin.ejs                               |   1 -
 views/auth-callback.ejs                       |   5 +-
 views/embed/stream.ejs                        |   1 -
 yarn.lock                                     |  82 ++----------
 12 files changed, 138 insertions(+), 212 deletions(-)
 create mode 100644 middleware/authentication.js
 delete mode 100644 services/session.js

diff --git a/app.js b/app.js
index a0a5b7789..f5243f81a 100644
--- a/app.js
+++ b/app.js
@@ -3,12 +3,11 @@ const bodyParser = require('body-parser');
 const morgan = require('morgan');
 const path = require('path');
 const helmet = require('helmet');
+const authentication = require('./middleware/authentication');
 const {passport} = require('./services/passport');
 const plugins = require('./services/plugins');
 const enabled = require('debug').enabled;
-const csrf = require('csurf');
 const errors = require('./errors');
-const session = require('./services/session');
 const {createGraphOptions} = require('./graph');
 const apollo = require('graphql-server-express');
 
@@ -37,12 +36,6 @@ app.use('/public', express.static(path.join(__dirname, 'public')));
 app.set('views', path.join(__dirname, 'views'));
 app.set('view engine', 'ejs');
 
-//==============================================================================
-// SESSION MIDDLEWARE
-//==============================================================================
-
-app.use(session);
-
 //==============================================================================
 // PASSPORT MIDDLEWARE
 //==============================================================================
@@ -60,7 +53,10 @@ plugins.get('server', 'passport').forEach((plugin) => {
 
 // Setup the PassportJS Middleware.
 app.use(passport.initialize());
-app.use(passport.session());
+
+// Attach the authentication middleware, this will be responsible for decoding
+// (if present) the JWT on the request.
+app.use('/api', authentication);
 
 //==============================================================================
 // GraphQL Router
@@ -84,29 +80,6 @@ if (app.get('env') !== 'production') {
 
 }
 
-//==============================================================================
-// CSRF MIDDLEWARE
-//==============================================================================
-
-if (process.env.TEST_MODE === 'unit') {
-
-  // Add this fake test token in the event we are in unit test mode, and don't
-  // include the CSRF protection.
-  app.locals.csrfToken = 'UNIT_TESTS';
-
-} else {
-
-  // Setup route middlewares for CSRF protection.
-  // Default ignore methods are GET, HEAD, OPTIONS
-  app.use(csrf({}));
-  app.use((req, res, next) => {
-    res.locals.csrfToken = req.csrfToken();
-
-    next();
-  });
-
-}
-
 //==============================================================================
 // ROUTES
 //==============================================================================
diff --git a/middleware/authentication.js b/middleware/authentication.js
new file mode 100644
index 000000000..ca6949a5c
--- /dev/null
+++ b/middleware/authentication.js
@@ -0,0 +1,19 @@
+const {passport} = require('../services/passport');
+
+const authentication = (req, res, next) => passport.authenticate('jwt', {
+  session: false
+}, (err, user) => {
+  if (err) {
+    return next(err);
+  }
+
+  if (user) {
+
+    // Attach the user to the request object, now that we know it exists.
+    req.user = user;
+  }
+
+  next();
+})(req, res, next);
+
+module.exports = authentication;
diff --git a/package.json b/package.json
index bfca21643..f5ab201ef 100644
--- a/package.json
+++ b/package.json
@@ -58,14 +58,12 @@
     "commander": "^2.9.0",
     "connect-redis": "^3.1.0",
     "cross-spawn": "^5.1.0",
-    "csurf": "^1.9.0",
     "dataloader": "^1.3.0",
     "debug": "^2.6.3",
     "dotenv": "^4.0.0",
     "ejs": "^2.5.6",
     "env-rewrite": "^1.0.2",
     "express": "^4.15.2",
-    "express-session": "^1.15.1",
     "form-data": "^2.1.2",
     "gql-merge": "^0.0.4",
     "graphql": "^0.9.1",
@@ -77,11 +75,10 @@
     "helmet": "^3.5.0",
     "inquirer": "^3.0.6",
     "joi": "^10.4.1",
-    "jsonwebtoken": "^7.3.0",
+    "jsonwebtoken": "^7.4.0",
     "kue": "^0.11.5",
     "linkify-it": "^2.0.3",
     "lodash": "^4.16.6",
-    "marked": "^0.3.6",
     "metascraper": "^1.0.6",
     "minimist": "^1.2.0",
     "mongoose": "^4.9.1",
@@ -92,18 +89,12 @@
     "nodemailer": "^2.6.4",
     "parse-duration": "^0.1.1",
     "passport": "^0.3.2",
+    "passport-jwt": "^2.2.1",
     "passport-local": "^1.0.0",
-    "prop-types": "^15.5.8",
-    "react-apollo": "^1.1.0",
-    "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",
     "uuid": "^3.0.1"
   },
   "devDependencies": {
@@ -157,6 +148,7 @@
     "keymaster": "^1.6.2",
     "license-webpack-plugin": "^0.4.2",
     "material-design-lite": "^1.2.1",
+    "marked": "^0.3.6",
     "mocha": "^3.1.2",
     "mocha-junit-reporter": "^1.12.1",
     "nightwatch": "^0.9.11",
@@ -178,11 +170,16 @@
     "react-redux": "^4.4.5",
     "react-router": "^3.0.0",
     "react-tagsinput": "^3.14.0",
+    "prop-types": "^15.5.8",
+    "react-apollo": "^1.1.0",
+    "react-recaptcha": "^2.2.6",
+    "recompose": "^0.23.1",
     "redux": "^3.6.0",
     "redux-mock-store": "^1.2.1",
     "redux-thunk": "^2.1.0",
     "regenerator": "^0.8.46",
     "selenium-standalone": "^5.11.2",
+    "simplemde": "^1.11.2",
     "style-loader": "^0.16.0",
     "subscriptions-transport-ws": "^0.5.5-alpha.0",
     "supertest": "^2.0.1",
diff --git a/plugins/coral-plugin-facebook-auth/server/router.js b/plugins/coral-plugin-facebook-auth/server/router.js
index 7ef7b0ed2..56fcd2ab2 100644
--- a/plugins/coral-plugin-facebook-auth/server/router.js
+++ b/plugins/coral-plugin-facebook-auth/server/router.js
@@ -15,6 +15,6 @@ module.exports = (router) => {
   router.get('/api/v1/auth/facebook/callback', (req, res, next) => {
 
     // Perform the facebook login flow and pass the data back through the opener.
-    passport.authenticate('facebook', HandleAuthPopupCallback(req, res, next))(req, res, next);
+    passport.authenticate('facebook', {session: false}, HandleAuthPopupCallback(req, res, next))(req, res, next);
   });
 };
diff --git a/routes/api/auth/index.js b/routes/api/auth/index.js
index 4926192de..54932ac03 100644
--- a/routes/api/auth/index.js
+++ b/routes/api/auth/index.js
@@ -1,6 +1,5 @@
 const express = require('express');
-const {passport, HandleAuthCallback} = require('../../../services/passport');
-const authorization = require('../../../middleware/authorization');
+const {passport, HandleGenerateCredentials} = require('../../../services/passport');
 
 const router = express.Router();
 
@@ -20,15 +19,6 @@ router.get('/', (req, res, next) => {
   res.json({user: req.user});
 });
 
-/**
- * This destroys the session of a user, if they have one.
- */
-router.delete('/', authorization.needed(), (req, res) => {
-  delete req.session.passport;
-
-  res.status(204).end();
-});
-
 //==============================================================================
 // PASSPORT ROUTES
 //==============================================================================
@@ -39,7 +29,7 @@ router.delete('/', authorization.needed(), (req, res) => {
 router.post('/local', (req, res, next) => {
 
   // Perform the local authentication.
-  passport.authenticate('local', HandleAuthCallback(req, res, next))(req, res, next);
+  passport.authenticate('local', {session: false}, HandleGenerateCredentials(req, res, next))(req, res, next);
 });
 
 module.exports = router;
diff --git a/services/passport.js b/services/passport.js
index 682d86ce1..a455fa745 100644
--- a/services/passport.js
+++ b/services/passport.js
@@ -3,33 +3,43 @@ const UsersService = require('./users');
 const SettingsService = require('./settings');
 const fetch = require('node-fetch');
 const FormData = require('form-data');
+const JWT = require('jsonwebtoken');
 const LocalStrategy = require('passport-local').Strategy;
 const errors = require('../errors');
+const uuid = require('uuid');
 const debug = require('debug')('talk:passport');
 
-//==============================================================================
-// SESSION SERIALIZATION
-//==============================================================================
+// JWT_SECRET is the secret used to sign and verify tokens issued by this
+// application.
+const JWT_SECRET = process.env.JWT_SECRET;
 
-passport.serializeUser((user, done) => {
-  done(null, user.id);
+// JWT_EXPIRY is the time for which a given token is valid for.
+const JWT_EXPIRY = process.env.JWT_EXPIRY || '1 day';
+
+// JWT_ISSUER is the value for the issuer for the tokens that will be verified
+// when decoding. If `JWT_ISSUER` is not in the environment, then it will try
+// `TALK_ROOT_URL`, otherwise, it will be undefined.
+const JWT_ISSUER = process.env.JWT_ISSUER || process.env.TALK_ROOT_URL || undefined;
+
+// JWT_AUDIENCE is the value for the audience claim for the tokens that will be
+// verified when decoding. If `JWT_AUDIENCE` is not in the environment, then it
+// will default to `talk`.
+const JWT_AUDIENCE = process.env.JWT_AUDIENCE || 'talk';
+
+// GenerateToken will sign a token to include all the authorization information
+// needed for the front end.
+const GenerateToken = (user) => JWT.sign({}, JWT_SECRET, {
+  jwtid: uuid.v4(),
+  expiresIn: JWT_EXPIRY,
+  issuer: JWT_ISSUER,
+  subject: user.id,
+  audience: JWT_AUDIENCE
 });
 
-passport.deserializeUser((id, done) => {
-  UsersService
-    .findById(id)
-    .then((user) => {
-      done(null, user);
-    })
-    .catch((err) => {
-      done(err);
-    });
-});
-
-/**
- * This sends back the user data as JSON.
- */
-const HandleAuthCallback = (req, res, next) => (err, user) => {
+// HandleGenerateCredentials validates that an authentication scheme did indeed
+// return a user, if it did, then sign and return the user and token to be used
+// by the frontend to display and update the UI.
+const HandleGenerateCredentials = (req, res, next) => (err, user) => {
   if (err) {
     return next(err);
   }
@@ -38,15 +48,11 @@ const HandleAuthCallback = (req, res, next) => (err, user) => {
     return next(errors.ErrNotAuthorized);
   }
 
-  // Perform the login of the user!
-  req.logIn(user, (err) => {
-    if (err) {
-      return next(err);
-    }
+  // Generate the token to re-issue to the frontend.
+  const token = GenerateToken(user);
 
-    // We logged in the user! Let's send back the user data and the CSRF token.
-    res.json({user});
-  });
+  // Send back the details!
+  res.json({user, token});
 };
 
 /**
@@ -54,22 +60,18 @@ const HandleAuthCallback = (req, res, next) => (err, user) => {
  */
 const HandleAuthPopupCallback = (req, res, next) => (err, user) => {
   if (err) {
-    return res.render('auth-callback', {err: JSON.stringify(err), data: null});
+    return res.render('auth-callback', {auth: JSON.stringify({err, data: null})});
   }
 
   if (!user) {
-    return res.render('auth-callback', {err: JSON.stringify(errors.ErrNotAuthorized), data: null});
+    return res.render('auth-callback', {auth: JSON.stringify({err, data: null})});
   }
 
-  // Perform the login of the user!
-  req.logIn(user, (err) => {
-    if (err) {
-      return res.render('auth-callback', {err: JSON.stringify(err), data: null});
-    }
+  // Generate the token to re-issue to the frontend.
+  const token = GenerateToken(user);
 
-    // We logged in the user! Let's send back the user data.
-    res.render('auth-callback', {err: null, data: JSON.stringify(user)});
-  });
+  // We logged in the user! Let's send back the user data.
+  res.render('auth-callback', {auth: JSON.stringify({err: null, data: {user, token}})});
 };
 
 /**
@@ -119,7 +121,45 @@ function ValidateUserLogin(loginProfile, user, done) {
 }
 
 //==============================================================================
-// STRATEGIES
+// JWT STRATEGY
+//==============================================================================
+
+const JwtStrategy = require('passport-jwt').Strategy;
+const ExtractJwt = require('passport-jwt').ExtractJwt;
+
+// Extract the JWT from the 'Authorization' header with the 'Bearer' scheme.
+passport.use(new JwtStrategy({
+
+  // Prepare the extractor from the header.
+  jwtFromRequest: ExtractJwt.fromAuthHeaderWithScheme('Bearer'),
+
+  // Use the secret passed in which is loaded from the environment. This can be
+  // a certificate (loaded) or a HMAC key.
+  secretOrKey: JWT_SECRET,
+
+  // Verify the issuer.
+  issuer: JWT_ISSUER,
+
+  // Verify the audience.
+  audience: JWT_AUDIENCE,
+
+  // Enable only the HS256 algorithm.
+  algorithms: ['HS256']
+}, async (jwt, done) => {
+
+  // Load the user from the environment, because we just got a user from the
+  // header.
+  try {
+    let user = await UsersService.findById(jwt.sub);
+
+    return done(null, user);
+  } catch(e) {
+    return done(e);
+  }
+}));
+
+//==============================================================================
+// LOCAL STRATEGY
 //==============================================================================
 
 /**
@@ -356,6 +396,6 @@ module.exports = {
   passport,
   ValidateUserLogin,
   HandleFailedAttempt,
-  HandleAuthCallback,
-  HandleAuthPopupCallback
+  HandleAuthPopupCallback,
+  HandleGenerateCredentials
 };
diff --git a/services/session.js b/services/session.js
deleted file mode 100644
index 505dfdf4a..000000000
--- a/services/session.js
+++ /dev/null
@@ -1,36 +0,0 @@
-const session = require('express-session');
-const RedisStore = require('connect-redis')(session);
-const redis = require('./redis');
-
-//==============================================================================
-// SESSION MIDDLEWARE
-//==============================================================================
-
-const session_opts = {
-  secret: process.env.TALK_SESSION_SECRET,
-  httpOnly: true,
-  rolling: true,
-  saveUninitialized: true,
-  resave: true,
-  unset: 'destroy',
-  name: 'talk.sid',
-  cookie: {
-    secure: false,
-    maxAge: 8.64e+7, // 24 hours for session token expiry
-  },
-  store: new RedisStore({
-    client: redis.createClient(),
-  })
-};
-
-if (process.env.NODE_ENV === 'production') {
-
-  // Enable the secure cookie when we are in production mode.
-  session_opts.cookie.secure = true;
-} else if (process.env.NODE_ENV === 'test') {
-
-  // Add in the secret during tests.
-  session_opts.secret = 'keyboard cat';
-}
-
-module.exports = session(session_opts);
diff --git a/services/subscriptions.js b/services/subscriptions.js
index 8c34507f2..c4cd2378a 100644
--- a/services/subscriptions.js
+++ b/services/subscriptions.js
@@ -1,12 +1,18 @@
-const session = require('./session');
 const passport = require('./passport');
+const authentication = require('../middleware/authentication');
 
 // Session data does not automatically attach to websocket req objects.
 // This middleware code looks for a user in the session and, if it exists,
 // attaches it to the graph req.
 const deserializeUser = (req) => {
   return new Promise((resolve, reject) => {
-    session(req, {}, () => {
+
+    // This uses the authentication connect middleware to establish the session
+    // user details from the headers.
+    authentication(req, null, (err) => {
+      if (err) {
+        return reject(err);
+      }
 
       if ('session' in req && 'passport' in req.session && 'user' in req.session.passport) {
         passport.deserializeUser(req.session.passport.user, (err, user) => {
diff --git a/views/admin.ejs b/views/admin.ejs
index 947f15425..946284622 100644
--- a/views/admin.ejs
+++ b/views/admin.ejs
@@ -3,7 +3,6 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="initial-scale=1, maximum-scale=1">
-    <meta property="csrf" content="<%= csrfToken %>">
     <title>Talk - Coral Admin</title>
     <link rel="apple-touch-icon" sizes="57x57" href="/public/img/apple-icon-57x57.png">
     <link rel="apple-touch-icon" sizes="60x60" href="/public/img/apple-icon-60x60.png">
diff --git a/views/auth-callback.ejs b/views/auth-callback.ejs
index d38d759ee..a97884ae2 100644
--- a/views/auth-callback.ejs
+++ b/views/auth-callback.ejs
@@ -2,7 +2,10 @@
 <html>
   <body>
     <script type="text/javascript">
-      window.opener.authCallback(<% if (err) { %>'<%- err %>'<% } else { %>null<% } %>, '<%- data %>');
+      <%/* set the auth data in localStorage, this will ensure that only
+           javascript on the same domain can access the data, they can listen
+           for updates by attaching to localStorage event changes */%>
+      localStorage.setItem('auth', <%- auth %>);
       setTimeout(function() { window.close(); }, 50);
     </script>
   </body>
diff --git a/views/embed/stream.ejs b/views/embed/stream.ejs
index d99d4bce1..03897d85f 100644
--- a/views/embed/stream.ejs
+++ b/views/embed/stream.ejs
@@ -3,7 +3,6 @@
   <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, user-scalable=no">
-    <meta property="csrf" content="<%= csrfToken %>">
     <link rel="stylesheet" type="text/css" href="/client/embed/stream/default.css">
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
     <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
diff --git a/yarn.lock b/yarn.lock
index 99703bdf3..4663f70fe 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1957,10 +1957,6 @@ cosmiconfig@^2.1.0, cosmiconfig@^2.1.1:
     os-homedir "^1.0.1"
     require-from-string "^1.1.0"
 
-crc@3.4.4:
-  version "3.4.4"
-  resolved "https://registry.yarnpkg.com/crc/-/crc-3.4.4.tgz#9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"
-
 create-ecdh@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.0.tgz#888c723596cdf7612f6498233eebd7a35301737d"
@@ -2024,14 +2020,6 @@ crypto-browserify@^3.11.0:
     public-encrypt "^4.0.0"
     randombytes "^2.0.0"
 
-csrf@~3.0.3:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/csrf/-/csrf-3.0.6.tgz#b61120ddceeafc91e76ed5313bb5c0b2667b710a"
-  dependencies:
-    rndm "1.2.0"
-    tsscmp "1.0.5"
-    uid-safe "2.1.4"
-
 css-color-function@^1.2.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/css-color-function/-/css-color-function-1.3.0.tgz#72c767baf978f01b8a8a94f42f17ba5d22a776fc"
@@ -2164,15 +2152,6 @@ cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0", "cssom@>= 0.3.2 < 0.4.0":
   dependencies:
     cssom "0.3.x"
 
-csurf@^1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/csurf/-/csurf-1.9.0.tgz#49d2c6925ffcec7b7de559597c153fa533364133"
-  dependencies:
-    cookie "0.3.1"
-    cookie-signature "1.0.6"
-    csrf "~3.0.3"
-    http-errors "~1.5.0"
-
 cz-conventional-changelog@1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/cz-conventional-changelog/-/cz-conventional-changelog-1.1.5.tgz#0a4d1550c4e2fb6a3aed8f6cd858c21760e119b8"
@@ -2256,12 +2235,6 @@ debug@2.6.1:
   dependencies:
     ms "0.7.2"
 
-debug@2.6.3:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.3.tgz#0f7eb8c30965ec08c72accfa0130c8b79984141d"
-  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"
@@ -2919,20 +2892,6 @@ exports-loader@^0.6.4:
     loader-utils "^1.0.2"
     source-map "0.5.x"
 
-express-session@^1.15.1:
-  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.15.2.tgz#d98516443a4ccb8688e1725ae584c02daa4093d4"
-  dependencies:
-    cookie "0.3.1"
-    cookie-signature "1.0.6"
-    crc "3.4.4"
-    debug "2.6.3"
-    depd "~1.1.0"
-    on-headers "~1.0.1"
-    parseurl "~1.3.1"
-    uid-safe "~2.1.4"
-    utils-merge "1.0.0"
-
 express@^4.12.2, express@^4.15.2:
   version "4.15.2"
   resolved "https://registry.yarnpkg.com/express/-/express-4.15.2.tgz#af107fc148504457f2dca9a6f2571d7129b97b35"
@@ -3807,14 +3766,6 @@ htmlparser2@~3.8.1:
     entities "1.0"
     readable-stream "1.1"
 
-http-errors@~1.5.0:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.5.1.tgz#788c0d2c1de2c81b9e6e8c01843b6b97eb920750"
-  dependencies:
-    inherits "2.0.3"
-    setprototypeof "1.0.2"
-    statuses ">= 1.3.1 < 2"
-
 http-errors@~1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.1.tgz#5f8b8ed98aca545656bf572997387f904a722257"
@@ -4547,7 +4498,7 @@ jsonpointer@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
 
-jsonwebtoken@^7.3.0:
+jsonwebtoken@^7.0.0, jsonwebtoken@^7.4.0:
   version "7.4.0"
   resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-7.4.0.tgz#515bf2bba070ec615bad97fd2e945027eb476946"
   dependencies:
@@ -5817,13 +5768,20 @@ parseurl@~1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.1.tgz#c8ab8c9223ba34888aa64a297b28853bec18da56"
 
+passport-jwt@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/passport-jwt/-/passport-jwt-2.2.1.tgz#0e004c94071319d673d9d9bcfd1574a868011527"
+  dependencies:
+    jsonwebtoken "^7.0.0"
+    passport-strategy "^1.0.0"
+
 passport-local@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/passport-local/-/passport-local-1.0.0.tgz#1fe63268c92e75606626437e3b906662c15ba6ee"
   dependencies:
     passport-strategy "1.x.x"
 
-passport-strategy@1.x.x:
+passport-strategy@1.x.x, passport-strategy@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/passport-strategy/-/passport-strategy-1.0.0.tgz#b5539aa8fc225a3d1ad179476ddf236b440f52e4"
 
@@ -6678,10 +6636,6 @@ 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"
-
 randomatic@^1.1.3:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.6.tgz#110dcabff397e9dcff7c0789ccc0a49adf1ec5bb"
@@ -7247,10 +7201,6 @@ ripemd160@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-1.0.1.tgz#93a4bbd4942bc574b69a8fa57c71de10ecca7d6e"
 
-rndm@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/rndm/-/rndm-1.2.0.tgz#f33fe9cfb52bbfd520aa18323bc65db110a1b76c"
-
 run-async@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389"
@@ -7364,10 +7314,6 @@ setimmediate@^1.0.4, setimmediate@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
 
-setprototypeof@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.2.tgz#81a552141ec104b88e89ce383103ad5c66564d08"
-
 setprototypeof@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
@@ -7987,10 +7933,6 @@ tryor@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/tryor/-/tryor-0.1.2.tgz#8145e4ca7caff40acde3ccf946e8b8bb75b4172b"
 
-tsscmp@1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.5.tgz#7dc4a33af71581ab4337da91d85ca5427ebd9a97"
-
 tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
@@ -8063,12 +8005,6 @@ 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:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/uid-safe/-/uid-safe-2.1.4.tgz#3ad6f38368c6d4c8c75ec17623fb79aa1d071d81"
-  dependencies:
-    random-bytes "~1.0.0"
-
 ultron@1.0.x:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa"

From 3d8c521928ba2e3931c7e3bfde772add2e4434f5 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Sun, 7 May 2017 23:44:41 -0700
Subject: [PATCH 041/132] CommentForm component is in its own file

---
 .../src/components/EditableCommentContent.js  |   3 +-
 client/coral-plugin-commentbox/CommentBox.js  | 132 +----------------
 client/coral-plugin-commentbox/CommentForm.js | 137 ++++++++++++++++++
 3 files changed, 141 insertions(+), 131 deletions(-)
 create mode 100644 client/coral-plugin-commentbox/CommentForm.js

diff --git a/client/coral-embed-stream/src/components/EditableCommentContent.js b/client/coral-embed-stream/src/components/EditableCommentContent.js
index 3116ec96b..b408c1b1a 100644
--- a/client/coral-embed-stream/src/components/EditableCommentContent.js
+++ b/client/coral-embed-stream/src/components/EditableCommentContent.js
@@ -1,5 +1,6 @@
 import React, {PropTypes} from 'react';
-import {notifyForNewCommentStatus, CommentForm} from 'coral-plugin-commentbox/CommentBox';
+import {notifyForNewCommentStatus} from 'coral-plugin-commentbox/CommentBox';
+import {CommentForm} from 'coral-plugin-commentbox/CommentForm';
 import styles from './Comment.css';
 
 import {Icon} from 'coral-ui';
diff --git a/client/coral-plugin-commentbox/CommentBox.js b/client/coral-plugin-commentbox/CommentBox.js
index 57ff7cf49..da5f8c5cd 100644
--- a/client/coral-plugin-commentbox/CommentBox.js
+++ b/client/coral-plugin-commentbox/CommentBox.js
@@ -1,12 +1,11 @@
 import React, {PropTypes} from 'react';
-import {Button} from 'coral-ui';
 import {I18n} from '../coral-framework';
 import translations from './translations.json';
 import Slot from 'coral-framework/components/Slot';
 import {connect} from 'react-redux';
-import classnames from 'classnames';
+import {CommentForm} from './CommentForm';
 
-const name = 'coral-plugin-commentbox';
+export const name = 'coral-plugin-commentbox';
 
 // Given a newly posted comment's status, show a notification to the user
 // if needed
@@ -18,133 +17,6 @@ export const notifyForNewCommentStatus = (addNotification, status) => {
   }
 };
 
-/**
- * Common UI for Creating or Editing a Comment
- */
-export class CommentForm extends React.Component {
-  static propTypes = {
-
-    // Initial value for underlying comment body textarea
-    defaultValue: PropTypes.string,
-    charCountEnable: PropTypes.bool.isRequired,
-    maxCharCount: PropTypes.number,
-    cancelButtonClicked: PropTypes.func,
-
-    // Save the comment in the form.
-    // Will be passed { body: String }
-    saveComment: PropTypes.func.isRequired,
-
-    // DOM ID for form input that edits comment body
-    bodyInputId: PropTypes.string,
-
-    // screen reader label for input that edits comment body
-    bodyLabel: PropTypes.string,
-
-    // Placeholder for input that edits comment body
-    bodyPlaceholder: PropTypes.string,
-
-    // render at start of button container (useful for extra buttons)
-    buttonContainerStart: PropTypes.node,
-
-    // render inside submit button
-    submitText: PropTypes.node,
-
-    styles: PropTypes.shape({
-      textarea: PropTypes.string
-    }),
-
-    // cStyle for enabled save <coral-ui/Button>
-    saveButtonCStyle: PropTypes.string,
-
-    // return whether the save button should be enabled for the provided
-    // comment ({ body }) (for reasons other than charCount)
-    saveCommentEnabled: PropTypes.func,
-
-    // className to add to buttons
-    buttonClass: PropTypes.string,
-  }
-  static get defaultProps() {
-    return {
-      bodyLabel: lang.t('comment'),
-      bodyPlaceholder: lang.t('comment'),
-      submitText: lang.t('post'),
-      saveButtonCStyle: 'darkGrey',
-      saveCommentEnabled: () => true,
-    };
-  }
-  constructor(props) {
-    super(props);
-    this.onBodyChange = this.onBodyChange.bind(this);
-    this.onClickSubmit = this.onClickSubmit.bind(this);
-    this.state = {
-      body: props.defaultValue || ''
-    };
-  }
-  onBodyChange(e) {
-    this.setState({body: e.target.value});
-  }
-  onClickSubmit(e) {
-    e.preventDefault();
-    const {saveComment} = this.props;
-    const {body} = this.state;
-    saveComment({body});
-  }
-  render() {
-    const {maxCharCount, styles, saveCommentEnabled, buttonClass, charCountEnable} = this.props;
-
-    const body = this.state.body;
-    const length = body.length;
-    const isNotValidLength = (length) => !length || (maxCharCount && length > maxCharCount);
-    const disablePostComment = (charCountEnable && isNotValidLength(length)) || ! saveCommentEnabled({body});
-
-    return <div>
-      <div className={`${name}-container`}>
-        <label
-          htmlFor={this.props.bodyInputId}
-          className="screen-reader-text"
-          aria-hidden={true}>
-          {this.props.bodyLabel}
-        </label>
-        <textarea
-          style={styles && styles.textarea}
-          className={`${name}-textarea`}
-          value={this.state.body}
-          placeholder={this.props.bodyPlaceholder}
-          id={this.props.bodyInputId}
-          onChange={this.onBodyChange}
-          rows={3}/>
-        <Slot fill='commentInputArea' />
-      </div>
-      { 
-        this.props.charCountEnable && 
-        <div className={`${name}-char-count ${length > maxCharCount ? `${name}-char-max` : ''}`}>
-          {maxCharCount && `${maxCharCount - length} ${lang.t('characters-remaining')}`}
-        </div>
-      }
-      <div className={`${name}-button-container`}>
-        { this.props.buttonContainerStart }
-        {
-          typeof this.props.cancelButtonClicked === 'function' && (
-            <Button
-              cStyle='darkGrey'
-              className={classnames(`${name}-cancel-button`, buttonClass)}
-              onClick={this.props.cancelButtonClicked}>
-              {lang.t('cancel')}
-            </Button>
-          )
-        }
-        <Button
-          cStyle={disablePostComment ? 'lightGrey' : this.props.saveButtonCStyle}
-          className={classnames(`${name}-button`, buttonClass)}
-          onClick={this.onClickSubmit}
-          disabled={disablePostComment ? 'disabled' : ''}>
-          {this.props.submitText}
-        </Button>
-      </div>
-    </div>;
-  }
-}
-
 /**
  * Container for posting a new Comment
  */
diff --git a/client/coral-plugin-commentbox/CommentForm.js b/client/coral-plugin-commentbox/CommentForm.js
new file mode 100644
index 000000000..dc27a1906
--- /dev/null
+++ b/client/coral-plugin-commentbox/CommentForm.js
@@ -0,0 +1,137 @@
+import React, {PropTypes} from 'react';
+import {Button} from 'coral-ui';
+import classnames from 'classnames';
+import {I18n} from '../coral-framework';
+import translations from './translations.json';
+import Slot from 'coral-framework/components/Slot';
+
+import {name} from './CommentBox';
+
+const lang = new I18n(translations);
+
+/**
+ * Common UI for Creating or Editing a Comment
+ */
+export class CommentForm extends React.Component {
+  static propTypes = {
+
+    // Initial value for underlying comment body textarea
+    defaultValue: PropTypes.string,
+    charCountEnable: PropTypes.bool.isRequired,
+    maxCharCount: PropTypes.number,
+    cancelButtonClicked: PropTypes.func,
+
+    // Save the comment in the form.
+    // Will be passed { body: String }
+    saveComment: PropTypes.func.isRequired,
+
+    // DOM ID for form input that edits comment body
+    bodyInputId: PropTypes.string,
+
+    // screen reader label for input that edits comment body
+    bodyLabel: PropTypes.string,
+
+    // Placeholder for input that edits comment body
+    bodyPlaceholder: PropTypes.string,
+
+    // render at start of button container (useful for extra buttons)
+    buttonContainerStart: PropTypes.node,
+
+    // render inside submit button
+    submitText: PropTypes.node,
+
+    styles: PropTypes.shape({
+      textarea: PropTypes.string
+    }),
+
+    // cStyle for enabled save <coral-ui/Button>
+    saveButtonCStyle: PropTypes.string,
+
+    // return whether the save button should be enabled for the provided
+    // comment ({ body }) (for reasons other than charCount)
+    saveCommentEnabled: PropTypes.func,
+
+    // className to add to buttons
+    buttonClass: PropTypes.string,
+  }
+  static get defaultProps() {
+    return {
+      bodyLabel: lang.t('comment'),
+      bodyPlaceholder: lang.t('comment'),
+      submitText: lang.t('post'),
+      saveButtonCStyle: 'darkGrey',
+      saveCommentEnabled: () => true,
+    };
+  }
+  constructor(props) {
+    super(props);
+    this.onBodyChange = this.onBodyChange.bind(this);
+    this.onClickSubmit = this.onClickSubmit.bind(this);
+    this.state = {
+      body: props.defaultValue || ''
+    };
+  }
+  onBodyChange(e) {
+    this.setState({body: e.target.value});
+  }
+  onClickSubmit(e) {
+    e.preventDefault();
+    const {saveComment} = this.props;
+    const {body} = this.state;
+    saveComment({body});
+  }
+  render() {
+    const {maxCharCount, styles, saveCommentEnabled, buttonClass, charCountEnable} = this.props;
+
+    const body = this.state.body;
+    const length = body.length;
+    const isNotValidLength = (length) => !length || (maxCharCount && length > maxCharCount);
+    const disablePostComment = (charCountEnable && isNotValidLength(length)) || ! saveCommentEnabled({body});
+
+    return <div>
+      <div className={`${name}-container`}>
+        <label
+          htmlFor={this.props.bodyInputId}
+          className="screen-reader-text"
+          aria-hidden={true}>
+          {this.props.bodyLabel}
+        </label>
+        <textarea
+          style={styles && styles.textarea}
+          className={`${name}-textarea`}
+          value={this.state.body}
+          placeholder={this.props.bodyPlaceholder}
+          id={this.props.bodyInputId}
+          onChange={this.onBodyChange}
+          rows={3}/>
+        <Slot fill='commentInputArea' />
+      </div>
+      { 
+        this.props.charCountEnable && 
+        <div className={`${name}-char-count ${length > maxCharCount ? `${name}-char-max` : ''}`}>
+          {maxCharCount && `${maxCharCount - length} ${lang.t('characters-remaining')}`}
+        </div>
+      }
+      <div className={`${name}-button-container`}>
+        { this.props.buttonContainerStart }
+        {
+          typeof this.props.cancelButtonClicked === 'function' && (
+            <Button
+              cStyle='darkGrey'
+              className={classnames(`${name}-cancel-button`, buttonClass)}
+              onClick={this.props.cancelButtonClicked}>
+              {lang.t('cancel')}
+            </Button>
+          )
+        }
+        <Button
+          cStyle={disablePostComment ? 'lightGrey' : this.props.saveButtonCStyle}
+          className={classnames(`${name}-button`, buttonClass)}
+          onClick={this.onClickSubmit}
+          disabled={disablePostComment ? 'disabled' : ''}>
+          {this.props.submitText}
+        </Button>
+      </div>
+    </div>;
+  }
+}

From a7099295d63df27bc391a74a024935c73f04b7ca Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Sun, 7 May 2017 23:47:59 -0700
Subject: [PATCH 042/132] CountdownSeconds component has its own file

---
 .../src/components/CountdownSeconds.js        | 53 +++++++++++++++++++
 .../src/components/EditableCommentContent.js  | 49 +----------------
 2 files changed, 54 insertions(+), 48 deletions(-)
 create mode 100644 client/coral-embed-stream/src/components/CountdownSeconds.js

diff --git a/client/coral-embed-stream/src/components/CountdownSeconds.js b/client/coral-embed-stream/src/components/CountdownSeconds.js
new file mode 100644
index 000000000..1b9fca5d5
--- /dev/null
+++ b/client/coral-embed-stream/src/components/CountdownSeconds.js
@@ -0,0 +1,53 @@
+import React, {PropTypes} from 'react';
+import I18n from 'coral-framework/modules/i18n/i18n';
+import translations from 'coral-framework/translations';
+
+const lang = new I18n(translations);
+
+/**
+ * Countdown the number of seconds until a given Date
+ */
+export class CountdownSeconds extends React.Component {
+  static propTypes = {
+    until: PropTypes.instanceOf(Date).isRequired,
+    classNameForMsRemaining: PropTypes.func,
+  }
+  constructor(props) {
+    super(props);
+    this.countdownInterval = null;
+  }
+  componentDidMount() {
+    const {until} = this.props;
+    const now = new Date();
+    if (until - now > 0) {
+      this.countdownInterval = setInterval(() => {
+
+        // re-render
+        this.forceUpdate();
+      }, 1000);
+    }
+  }
+  componentWillUnmount() {
+    if (this.countdownInterval) {
+      this.countdownInterval = clearInterval(this.countdownInterval);
+    }    
+  }
+  render() {
+    const now = new Date();
+    const {until, classNameForMsRemaining} = this.props;
+    const msRemaining = until - now;
+    const secRemaining = msRemaining / 1000;
+    const wholeSecRemaining = Math.floor(secRemaining);
+    const plural = secRemaining !== 1;
+    const units = lang.t(plural ? 'editComment.secondsPlural' : 'editComment.second');
+    let classFromProp;
+    if (typeof classNameForMsRemaining === 'function') {
+      classFromProp = classNameForMsRemaining(msRemaining);
+    }
+    return (
+      <span className={classFromProp}>
+        {`${wholeSecRemaining} ${units}`}
+      </span>
+    );
+  }
+}
diff --git a/client/coral-embed-stream/src/components/EditableCommentContent.js b/client/coral-embed-stream/src/components/EditableCommentContent.js
index b408c1b1a..1f14613c0 100644
--- a/client/coral-embed-stream/src/components/EditableCommentContent.js
+++ b/client/coral-embed-stream/src/components/EditableCommentContent.js
@@ -2,6 +2,7 @@ import React, {PropTypes} from 'react';
 import {notifyForNewCommentStatus} from 'coral-plugin-commentbox/CommentBox';
 import {CommentForm} from 'coral-plugin-commentbox/CommentForm';
 import styles from './Comment.css';
+import {CountdownSeconds} from './CountdownSeconds';
 
 import {Icon} from 'coral-ui';
 import I18n from 'coral-framework/modules/i18n/i18n';
@@ -155,51 +156,3 @@ export class EditableCommentContent extends React.Component {
     );
   }
 }
-
-/**
- * Countdown the number of seconds until a given Date
- */
-class CountdownSeconds extends React.Component {
-  static propTypes = {
-    until: PropTypes.instanceOf(Date).isRequired,
-    classNameForMsRemaining: PropTypes.func,
-  }
-  constructor(props) {
-    super(props);
-    this.countdownInterval = null;
-  }
-  componentDidMount() {
-    const {until} = this.props;
-    const now = new Date();
-    if (until - now > 0) {
-      this.countdownInterval = setInterval(() => {
-
-        // re-render
-        this.forceUpdate();
-      }, 1000);
-    }
-  }
-  componentWillUnmount() {
-    if (this.countdownInterval) {
-      this.countdownInterval = clearInterval(this.countdownInterval);
-    }    
-  }
-  render() {
-    const now = new Date();
-    const {until, classNameForMsRemaining} = this.props;
-    const msRemaining = until - now;
-    const secRemaining = msRemaining / 1000;
-    const wholeSecRemaining = Math.floor(secRemaining);
-    const plural = secRemaining !== 1;
-    const units = lang.t(plural ? 'editComment.secondsPlural' : 'editComment.second');
-    let classFromProp;
-    if (typeof classNameForMsRemaining === 'function') {
-      classFromProp = classNameForMsRemaining(msRemaining);
-    }
-    return (
-      <span className={classFromProp}>
-        {`${wholeSecRemaining} ${units}`}
-      </span>
-    );
-  }
-}

From 9fb76d35c8d52c7261e8c5631548eaa51051270b Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Sun, 7 May 2017 23:54:51 -0700
Subject: [PATCH 043/132] shorten some syntax that could be shorter

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

diff --git a/client/coral-plugin-commentbox/CommentBox.js b/client/coral-plugin-commentbox/CommentBox.js
index da5f8c5cd..f7f76161c 100644
--- a/client/coral-plugin-commentbox/CommentBox.js
+++ b/client/coral-plugin-commentbox/CommentBox.js
@@ -55,7 +55,7 @@ class CommentBox extends React.Component {
     let comment = {
       asset_id: assetId,
       parent_id: parentId,
-      body: body,
+      body,
       ...this.props.commentBox
     };
 

From 81879c9bb97bf392321745069c35fff52937b25d Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Mon, 8 May 2017 00:05:14 -0700
Subject: [PATCH 044/132] Move getEditableUntilDate into util file

---
 client/coral-embed-stream/src/components/Comment.js    |  9 +--------
 .../src/components/EditableCommentContent.js           |  7 +------
 client/coral-embed-stream/src/components/util.js       | 10 ++++++++++
 3 files changed, 12 insertions(+), 14 deletions(-)
 create mode 100644 client/coral-embed-stream/src/components/util.js

diff --git a/client/coral-embed-stream/src/components/Comment.js b/client/coral-embed-stream/src/components/Comment.js
index cda85f49d..b80a62b28 100644
--- a/client/coral-embed-stream/src/components/Comment.js
+++ b/client/coral-embed-stream/src/components/Comment.js
@@ -22,7 +22,7 @@ import {TopRightMenu} from './TopRightMenu';
 import classnames from 'classnames';
 import {EditableCommentContent} from './EditableCommentContent';
 import {getActionSummary, iPerformedThisAction} from 'coral-framework/utils';
-
+import {getEditableUntilDate} from './util';
 import styles from './Comment.css';
 
 const isStaff = tags => !tags.every(t => t.name !== 'STAFF');
@@ -415,13 +415,6 @@ class Comment extends React.Component {
 
 export default Comment;
 
-// return a Date instance representing end of edit window for comment
-const getEditableUntilDate = (comment) => {
-  const editing = comment && comment.editing;
-  const editableUntil = editing && editing.editableUntil && new Date(Date.parse(editing.editableUntil));
-  return editableUntil;  
-};
-
 // return whether the comment is editable
 function commentIsStillEditable (comment) {
   const editing = comment && comment.editing;
diff --git a/client/coral-embed-stream/src/components/EditableCommentContent.js b/client/coral-embed-stream/src/components/EditableCommentContent.js
index 1f14613c0..03b61edce 100644
--- a/client/coral-embed-stream/src/components/EditableCommentContent.js
+++ b/client/coral-embed-stream/src/components/EditableCommentContent.js
@@ -3,18 +3,13 @@ import {notifyForNewCommentStatus} from 'coral-plugin-commentbox/CommentBox';
 import {CommentForm} from 'coral-plugin-commentbox/CommentForm';
 import styles from './Comment.css';
 import {CountdownSeconds} from './CountdownSeconds';
+import {getEditableUntilDate} from './util';
 
 import {Icon} from 'coral-ui';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from 'coral-framework/translations';
 const lang = new I18n(translations);
 
-const getEditableUntilDate = (comment) => {
-  const editing = comment && comment.editing;
-  const editableUntil = editing && editing.editableUntil && new Date(Date.parse(editing.editableUntil));
-  return editableUntil;  
-};
-
 /**
  * Renders a Comment's body in such a way that the end-user can edit it and save changes
  */
diff --git a/client/coral-embed-stream/src/components/util.js b/client/coral-embed-stream/src/components/util.js
new file mode 100644
index 000000000..fe5258853
--- /dev/null
+++ b/client/coral-embed-stream/src/components/util.js
@@ -0,0 +1,10 @@
+/**
+ * Given a comment, return when the comment can no longer be edited
+ * @param {Object} comment
+ * @returns {Date} when the comment can no longer be edited.
+ */
+export const getEditableUntilDate = (comment) => {
+  const editing = comment && comment.editing;
+  const editableUntil = editing && editing.editableUntil && new Date(Date.parse(editing.editableUntil));
+  return editableUntil;  
+};

From ce38b9da6483a780aa369b59ead6eb69b4d3aef3 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Mon, 8 May 2017 19:41:14 +0700
Subject: [PATCH 045/132] Rename argument name

---
 client/coral-framework/hocs/withMutation.js | 6 +++---
 client/coral-framework/hocs/withQuery.js    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/coral-framework/hocs/withMutation.js b/client/coral-framework/hocs/withMutation.js
index 81529faea..9c5bad8fd 100644
--- a/client/coral-framework/hocs/withMutation.js
+++ b/client/coral-framework/hocs/withMutation.js
@@ -9,14 +9,14 @@ import {getDefinitionName} from '../utils';
  * Exports a HOC with the same signature as `graphql`, that will
  * apply mutation options registered in the registry.
  */
-export default (definitions, config) => WrappedComponent => {
+export default (document, config) => WrappedComponent => {
   config = {
     ...config,
     options: config.options || {},
     props: config.props || (data => ({mutate: data.mutate()})),
   };
   const wrappedProps = (data) => {
-    const name = getDefinitionName(definitions);
+    const name = getDefinitionName(document);
     const callbacks = getMutationOptions(name);
     const mutate = (base) => {
       const variables = base.variables || config.options.variables;
@@ -73,6 +73,6 @@ export default (definitions, config) => WrappedComponent => {
     };
     return config.props({...data, mutate});
   };
-  const wrapped = graphql(definitions, {...config, props: wrappedProps})(WrappedComponent);
+  const wrapped = graphql(document, {...config, props: wrappedProps})(WrappedComponent);
   return wrapped;
 };
diff --git a/client/coral-framework/hocs/withQuery.js b/client/coral-framework/hocs/withQuery.js
index 575a4484f..42dfe7b35 100644
--- a/client/coral-framework/hocs/withQuery.js
+++ b/client/coral-framework/hocs/withQuery.js
@@ -6,7 +6,7 @@ import {getDefinitionName, separateDataAndRoot} from '../utils';
  * Exports a HOC with the same signature as `graphql`, that will
  * apply query options registered in the registry.
  */
-export default (definitions, config) => WrappedComponent => {
+export default (document, config) => WrappedComponent => {
   config = {
     ...config,
     options: config.options || {},
@@ -15,7 +15,7 @@ export default (definitions, config) => WrappedComponent => {
 
   const wrappedOptions = (data) => {
     const base = (typeof config.options === 'function') ? config.options(data) : config.options;
-    const name = getDefinitionName(definitions);
+    const name = getDefinitionName(document);
     const configs = getQueryOptions(name);
     const reducerCallbacks =
       [base.reducer || (i => i)]
@@ -33,6 +33,6 @@ export default (definitions, config) => WrappedComponent => {
     };
   };
 
-  const wrapped = graphql(definitions, {...config, options: wrappedOptions})(WrappedComponent);
+  const wrapped = graphql(document, {...config, options: wrappedOptions})(WrappedComponent);
   return wrapped;
 };

From 4c17cec4fd43cb83b38bd7ba750316333796a75e Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Mon, 8 May 2017 21:30:25 +0700
Subject: [PATCH 046/132] Lazily resolve fragments in  queries and mutations

---
 .../graphql/mutations/index.js                |  2 --
 client/coral-framework/helpers/plugins.js     |  8 ++---
 client/coral-framework/hocs/withMutation.js   | 19 ++++++++++--
 client/coral-framework/hocs/withQuery.js      | 17 +++++++++--
 client/coral-framework/services/registry.js   | 30 ++++++++++++++++---
 client/coral-framework/utils/index.js         | 10 +++++++
 6 files changed, 69 insertions(+), 17 deletions(-)

diff --git a/client/coral-framework/graphql/mutations/index.js b/client/coral-framework/graphql/mutations/index.js
index 56f63b372..c9152e904 100644
--- a/client/coral-framework/graphql/mutations/index.js
+++ b/client/coral-framework/graphql/mutations/index.js
@@ -8,7 +8,6 @@ import REMOVE_COMMENT_TAG from './removeCommentTag.graphql';
 import IGNORE_USER from './ignoreUser.graphql';
 import STOP_IGNORING_USER from './stopIgnoringUser.graphql';
 import withMutation from '../../hocs/withMutation';
-import {getFragmentDocument} from '../../services/registry';
 
 export const withPostComment = withMutation(
   gql`
@@ -17,7 +16,6 @@ export const withPostComment = withMutation(
         ...CreateCommentResponse
       }
     }
-    ${getFragmentDocument('CreateCommentResponse')}
   `, {
     props: ({mutate}) => ({
       postComment: comment => {
diff --git a/client/coral-framework/helpers/plugins.js b/client/coral-framework/helpers/plugins.js
index a21eaba4b..bcf6e4c50 100644
--- a/client/coral-framework/helpers/plugins.js
+++ b/client/coral-framework/helpers/plugins.js
@@ -5,8 +5,7 @@ import flattenDeep from 'lodash/flattenDeep';
 import uniq from 'lodash/uniq';
 import pick from 'lodash/pick';
 import plugins from 'pluginsConfig';
-import {gql} from 'react-apollo';
-import {getDefinitionName} from 'coral-framework/utils';
+import {getDefinitionName, mergeDocuments} from 'coral-framework/utils';
 
 export const pluginReducers = merge(
   ...plugins
@@ -44,8 +43,7 @@ function getComponentFragments(components) {
 
     // Assemble arguments for `gql` to call it directly without using template literals.
     res[key].spreads = `...${res[key].spreads.join('\n...')}\n`;
-    const literals = ['', ...res[key].definitions.map(() => '\n')];
-    res[key].definitions = gql.apply(null, [literals, ...res[key].definitions]);
+    res[key].definitions = mergeDocuments(res[key].definitions);
   });
 
   return res;
@@ -86,7 +84,7 @@ export function getSlotsFragments(slots) {
 
 export function getGraphQLConfigs() {
   return plugins
-    .map(o => o.module.mutations && pick(o.module, ['mutations', 'queries', 'fragments']))
+    .map(o => pick(o.module, ['mutations', 'queries', 'fragments']))
     .filter(o => o);
 }
 
diff --git a/client/coral-framework/hocs/withMutation.js b/client/coral-framework/hocs/withMutation.js
index 9c5bad8fd..f3f092187 100644
--- a/client/coral-framework/hocs/withMutation.js
+++ b/client/coral-framework/hocs/withMutation.js
@@ -1,7 +1,8 @@
+import * as React from 'react';
 import {graphql} from 'react-apollo';
 import merge from 'lodash/merge';
 import uniq from 'lodash/uniq';
-import {getMutationOptions} from 'coral-framework/services/registry';
+import {getMutationOptions, resolveFragments} from 'coral-framework/services/registry';
 import {store} from 'coral-framework/services/store';
 import {getDefinitionName} from '../utils';
 
@@ -73,6 +74,18 @@ export default (document, config) => WrappedComponent => {
     };
     return config.props({...data, mutate});
   };
-  const wrapped = graphql(document, {...config, props: wrappedProps})(WrappedComponent);
-  return wrapped;
+
+  // Lazily resolve fragments from registry to support circular dependencies.
+  let memoized = null;
+  const getWrapped = () => {
+    if (!memoized) {
+      memoized = graphql(resolveFragments(document), {...config, props: wrappedProps})(WrappedComponent);
+    }
+    return memoized;
+  };
+
+  return (props) => {
+    const Wrapped = getWrapped();
+    return <Wrapped {...props} />;
+  };
 };
diff --git a/client/coral-framework/hocs/withQuery.js b/client/coral-framework/hocs/withQuery.js
index 42dfe7b35..6a5fa7c14 100644
--- a/client/coral-framework/hocs/withQuery.js
+++ b/client/coral-framework/hocs/withQuery.js
@@ -1,5 +1,6 @@
+import * as React from 'react';
 import {graphql} from 'react-apollo';
-import {getQueryOptions} from 'coral-framework/services/registry';
+import {getQueryOptions, resolveFragments} from 'coral-framework/services/registry';
 import {getDefinitionName, separateDataAndRoot} from '../utils';
 
 /**
@@ -33,6 +34,16 @@ export default (document, config) => WrappedComponent => {
     };
   };
 
-  const wrapped = graphql(document, {...config, options: wrappedOptions})(WrappedComponent);
-  return wrapped;
+  let memoized = null;
+  const getWrapped = () => {
+    if (!memoized) {
+      memoized = graphql(resolveFragments(document), {...config, options: wrappedOptions})(WrappedComponent);
+    }
+    return memoized;
+  };
+
+  return (props) => {
+    const Wrapped = getWrapped();
+    return <Wrapped {...props} />;
+  };
 };
diff --git a/client/coral-framework/services/registry.js b/client/coral-framework/services/registry.js
index d35861663..8fe934730 100644
--- a/client/coral-framework/services/registry.js
+++ b/client/coral-framework/services/registry.js
@@ -1,7 +1,7 @@
-import {gql} from 'react-apollo';
-import {getDefinitionName} from 'coral-framework/utils';
+import {getDefinitionName, mergeDocuments} from 'coral-framework/utils';
 import {getGraphQLConfigs} from 'coral-framework/helpers/plugins';
 import globalFragments from 'coral-framework/graphql/fragments';
+import uniq from 'lodash/uniq';
 
 const fragments = {};
 const mutationOptions = {};
@@ -144,6 +144,11 @@ export function getQueryOptions(key) {
  */
 export function getFragmentDocument(key) {
   init();
+
+  if (!(key in fragments)) {
+    return '';
+  }
+
   let documents = fragments[key] ? fragments[key].documents : [];
   let fields =  fragments[key] ? `...${fragments[key].names.join('\n...')}\n` : ' __typename';
 
@@ -153,8 +158,7 @@ export function getFragmentDocument(key) {
       ${fields}
     }
   `;
-  const literals = [main, ...documents.map(() => '\n')];
-  return gql.apply(null, [literals, ...documents]);
+  return mergeDocuments([main, ...documents]);
 }
 
 // The fragments and configs are lazily loaded to allow circular dependencies to work.
@@ -174,3 +178,21 @@ function init() {
   getGraphQLConfigs().forEach(cfg => registerConfig(cfg));
 }
 
+export function resolveFragments(document) {
+  if (document.loc.source) {
+
+    // resolve fragments from registry
+    const matchedSubFragments = document.loc.source.body.match(/\.\.\.(.*)/g) || [];
+    const subFragments =
+      uniq(matchedSubFragments.map(f => f.replace('...', '')))
+      .map(key => getFragmentDocument(key))
+      .filter(i => i);
+
+    if (subFragments.length > 0) {
+      return mergeDocuments([document, ...subFragments]);
+    }
+  } else {
+    console.warn('Can only resolve fragments from documents definied using the gql tag.');
+  }
+  return document;
+}
diff --git a/client/coral-framework/utils/index.js b/client/coral-framework/utils/index.js
index 598fb59ab..70ce89bf7 100644
--- a/client/coral-framework/utils/index.js
+++ b/client/coral-framework/utils/index.js
@@ -1,3 +1,5 @@
+import {gql} from 'react-apollo';
+
 export const getTotalActionCount = (type, comment) => {
   return comment.action_summaries
     .filter(s => s.__typename === type)
@@ -61,3 +63,11 @@ export function separateDataAndRoot(
     root,
   };
 }
+
+export function mergeDocuments(documents) {
+  const main = typeof documents[0] === 'string' ? documents[0] : documents[0].loc.source.body;
+  const substitutions = documents.slice(1);
+  const literals = [main, ...substitutions.map(() => '\n')];
+  return gql.apply(null, [literals, ...substitutions]);
+}
+

From a5f6e1f343061cd0246052a479ed9f046c419253 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 8 May 2017 11:32:46 -0300
Subject: [PATCH 047/132] Adding coral-reaction

---
 client/coral-reaction/actions.js              |   0
 .../components/CoralReaction.js               |  98 +++++++++
 client/coral-reaction/components/style.css    |  30 +++
 client/coral-reaction/constants.js            |   0
 .../containers/CoralReaction.js               | 188 ++++++++++++++++++
 client/coral-reaction/helpers.js              |   4 +
 client/coral-reaction/index.js                |   3 +
 client/coral-reaction/reducer.js              |   0
 client/coral-reaction/typeDefGenerator.js     |  80 ++++++++
 9 files changed, 403 insertions(+)
 create mode 100644 client/coral-reaction/actions.js
 create mode 100644 client/coral-reaction/components/CoralReaction.js
 create mode 100644 client/coral-reaction/components/style.css
 create mode 100644 client/coral-reaction/constants.js
 create mode 100644 client/coral-reaction/containers/CoralReaction.js
 create mode 100644 client/coral-reaction/helpers.js
 create mode 100644 client/coral-reaction/index.js
 create mode 100644 client/coral-reaction/reducer.js
 create mode 100644 client/coral-reaction/typeDefGenerator.js

diff --git a/client/coral-reaction/actions.js b/client/coral-reaction/actions.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/client/coral-reaction/components/CoralReaction.js b/client/coral-reaction/components/CoralReaction.js
new file mode 100644
index 000000000..f691e2bb7
--- /dev/null
+++ b/client/coral-reaction/components/CoralReaction.js
@@ -0,0 +1,98 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import cn from 'classnames';
+import styles from './style.css';
+
+import {capitalize} from '../helpers';
+import {getMyActionSummary, getTotalActionCount} from 'coral-framework/utils';
+
+class CoralReaction extends React.Component {
+  handleClick = () => {
+    const name = this.props.children;
+    const {postReaction, deleteReaction, showSignInDialog} = this.props;
+
+    const {root: {me}, comment} = this.props;
+
+    const myActionSummary = getMyActionSummary(
+      `${capitalize(name)}ActionSummary`,
+      comment
+    );
+
+    // If the current user does not exist, trigger sign in dialog.
+    if (!me) {
+      showSignInDialog();
+      return;
+    }
+
+    // If the current user is banned, do nothing.
+    if (me.status === 'BANNED') {
+      return;
+    }
+
+    if (myActionSummary) {
+      deleteReaction(myActionSummary.current_user.id, comment.id);
+    } else {
+      postReaction({
+        item_id: comment.id,
+        item_type: 'COMMENTS'
+      });
+    }
+  };
+
+  render() {
+    const name = this.props.children;
+    const {comment} = this.props;
+
+    console.log(this.props)
+
+    if (!comment) {
+      return null;
+    }
+
+    const myReaction = getMyActionSummary(`${capitalize(name)}ActionSummary`, comment);
+    let count = getTotalActionCount(`${capitalize(name)}ActionSummary`, comment);
+
+    return (
+      <div className={cn(styles.like, `${name}-container`)}>
+        <button
+          className={cn(
+            styles.button,
+            {[styles.liked]: myReaction},
+            `${name}-button`
+          )}
+          onClick={this.handleClick}
+        >
+          <span className={`${name}-button-text`}>
+            {this.props.children} {(myReaction ? 'd' : '')}
+          </span>
+          <i
+            className={cn(
+              styles.icon,
+              'material-icons',
+              {[styles.liked]: myReaction},
+              `${name}-icon`
+            )}
+            aria-hidden={true}
+          >
+            thumb_up
+          </i>
+          <span className={`${name}-count`}>{count > 0 && count}</span>
+        </button>
+      </div>
+    );
+  }
+}
+
+CoralReaction.propTypes = {
+  children: PropTypes.string.isRequired,
+  icon: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
+  tag: PropTypes.string,
+  translations: PropTypes.object
+};
+
+export default CoralReaction;
+
+/**
+ *
+ * icon: Could be a string or a component https://material.io/icons/
+ **/
diff --git a/client/coral-reaction/components/style.css b/client/coral-reaction/components/style.css
new file mode 100644
index 000000000..a82f20ff6
--- /dev/null
+++ b/client/coral-reaction/components/style.css
@@ -0,0 +1,30 @@
+.like {
+    display: inline-block;
+}
+
+.button {
+    color: #2a2a2a;
+    margin: 5px 10px 5px 0px;
+    background: none;
+    padding: 0px;
+    border: none;
+    font-size: inherit;
+
+    &:hover {
+         color: #767676;
+         cursor: pointer;
+     }
+
+    &.liked {
+         color: rgb(0,134,227);
+
+        &:hover {
+         color: rgb(0,134,227);
+         cursor: pointer;
+        }
+    }
+}
+
+.icon {
+    padding: 0 5px;
+}
diff --git a/client/coral-reaction/constants.js b/client/coral-reaction/constants.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/client/coral-reaction/containers/CoralReaction.js b/client/coral-reaction/containers/CoralReaction.js
new file mode 100644
index 000000000..f8880a935
--- /dev/null
+++ b/client/coral-reaction/containers/CoralReaction.js
@@ -0,0 +1,188 @@
+import get from 'lodash/get';
+import {connect} from 'react-redux';
+import {bindActionCreators} from 'redux';
+import {compose, gql, graphql} from 'react-apollo';
+import CoralReaction from '../components/CoralReaction';
+import withFragments from 'coral-framework/hocs/withFragments';
+import {showSignInDialog} from 'coral-framework/actions/auth';
+import {capitalize} from '../helpers';
+
+const name = 'love';
+
+const isReaction = a => a.__typename === `${capitalize(name)}ActionSummary`;
+
+const COMMENT_FRAGMENT = gql`
+    fragment ${capitalize(name)}Button_updateFragment on Comment {
+        action_summaries {
+            ... on ${capitalize(name)}ActionSummary {
+                count
+                current_user {
+                    id
+                }
+            }
+        }
+    }
+`;
+
+const withDeleteReaction = graphql(
+  gql`
+      mutation deleteReaction($id: ID!) {
+          deleteAction(id:$id) {
+              errors {
+                  translation_key
+              }
+          }
+      }
+  `,
+  {
+    props: ({mutate}) => ({
+      deleteReaction: (id, commentId) => {
+        return mutate({
+          variables: {id},
+          optimisticResponse: {
+            deleteAction: {
+              __typename: 'DeleteActionResponse',
+              errors: null
+            }
+          },
+          update: proxy => {
+            const fragmentId = `Comment_${commentId}`;
+
+            // Read the data from our cache for this query.
+            const data = proxy.readFragment({
+              fragment: COMMENT_FRAGMENT,
+              id: fragmentId
+            });
+
+            // Check whether we liked this comment.
+            const idx = data.action_summaries.findIndex(isReaction);
+            if (
+              idx < 0 ||
+              get(data.action_summaries[idx], 'current_user.id') !== id
+            ) {
+              return;
+            }
+
+            data.action_summaries[idx] = {
+              ...data.action_summaries[idx],
+              count: data.action_summaries[idx].count - 1,
+              current_user: null
+            };
+
+            // Write our data back to the cache.
+            proxy.writeFragment({
+              fragment: COMMENT_FRAGMENT,
+              id: fragmentId,
+              data
+            });
+          }
+        });
+      }
+    })
+  }
+);
+
+const withPostReaction = graphql(
+  gql`
+      mutation create${capitalize(name)}($${name}: Create${capitalize(name)}Input!) {
+          create${capitalize(name)}(${name}: $${capitalize(name)}) {
+              ${name} {
+                  id
+              }
+              errors {
+                  translation_key
+              }
+          }
+      }
+  `,
+  {
+    props: ({mutate}) => ({
+      postReaction: reaction => {
+        return mutate({
+          variables: {reaction},
+          optimisticResponse: {
+            [`create${capitalize(name)}`]: {
+              __typename: `Create${capitalize(name)}Response`,
+              errors: null,
+              [name]: {
+                __typename: `${capitalize(name)}Action`,
+                id: 'pending'
+              }
+            }
+          },
+          update: (proxy, mutationResult) => {
+            const fragmentId = `Comment_${reaction.item_id}`;
+
+            // Read the data from our cache for this query.
+            const data = proxy.readFragment({
+              fragment: COMMENT_FRAGMENT,
+              id: fragmentId
+            });
+
+            // Add our comment from the mutation to the end.
+            let idx = data.action_summaries.findIndex(isReaction);
+
+            // Check whether we already reactioned this comment.
+            if (idx >= 0 && data.action_summaries[idx].current_user) {
+              return;
+            }
+
+            if (idx < 0) {
+              // Add initial action when it doesn't exist.
+              data.action_summaries.push({
+                __typename: `${capitalize(name)}ActionSummary`,
+                count: 0,
+                current_user: null
+              });
+              idx = data.action_summaries.length - 1;
+            }
+
+            data.action_summaries[idx] = {
+              ...data.action_summaries[idx],
+              count: data.action_summaries[idx].count + 1,
+              current_user: mutationResult.data[`create${capitalize(name)}`][name]
+            };
+
+            // Write our data back to the cache.
+            proxy.writeFragment({
+              fragment: COMMENT_FRAGMENT,
+              id: fragmentId,
+              data
+            });
+          }
+        });
+      }
+    })
+  }
+);
+
+const mapDispatchToProps = dispatch =>
+  bindActionCreators({showSignInDialog}, dispatch);
+
+const enhance = compose(
+  withFragments({
+    root: gql`
+        fragment ${capitalize(name)}Button_root on RootQuery {
+            me {
+                status
+            }
+        }
+    `,
+    comment: gql`
+        fragment ${capitalize(name)}Button_comment on Comment {
+            action_summaries {
+                ... on ${capitalize(name)}ActionSummary {
+                    count
+                    current_user {
+                        id
+                    }
+                }
+            }
+        }`
+  }),
+  connect(null, mapDispatchToProps),
+  withDeleteReaction,
+  withPostReaction
+);
+
+export default enhance(CoralReaction);
diff --git a/client/coral-reaction/helpers.js b/client/coral-reaction/helpers.js
new file mode 100644
index 000000000..0a267da59
--- /dev/null
+++ b/client/coral-reaction/helpers.js
@@ -0,0 +1,4 @@
+export function capitalize(str) {
+  const newString = new String(str);
+  return newString.charAt(0).toUpperCase() + newString.slice(1);
+}
diff --git a/client/coral-reaction/index.js b/client/coral-reaction/index.js
new file mode 100644
index 000000000..d8527b9fd
--- /dev/null
+++ b/client/coral-reaction/index.js
@@ -0,0 +1,3 @@
+import CoralReaction from './containers/CoralReaction';
+
+export default CoralReaction;
\ No newline at end of file
diff --git a/client/coral-reaction/reducer.js b/client/coral-reaction/reducer.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/client/coral-reaction/typeDefGenerator.js b/client/coral-reaction/typeDefGenerator.js
new file mode 100644
index 000000000..63c20684e
--- /dev/null
+++ b/client/coral-reaction/typeDefGenerator.js
@@ -0,0 +1,80 @@
+export function typeDefGenerator(type = '') {
+  function capitalize(str) {
+    const newString = String.new(str);
+    return newString.charAt(0).toUpperCase() + newString.slice(1);
+  }
+
+  return `
+enum ACTION_TYPE {
+
+  # Represents a Like.
+  LIKE
+}
+
+enum ASSET_METRICS_SORT {
+
+  # Represents a LikeAction.
+  LIKE
+}
+
+input CreateLikeInput {
+
+  # The item's id for which we are to create a like.
+  item_id: ID!
+
+  # The type of the item for which we are to create the like.
+  item_type: ACTION_ITEM_TYPE!
+}
+
+# LikeAction is used by users who "like" a specific entity.
+type LikeAction implements Action {
+
+  # The ID of the action.
+  id: ID!
+
+  # The author of the action.
+  user: User
+
+  # The time when the Action was updated.
+  updated_at: Date
+
+  # The time when the Action was created.
+  created_at: Date
+}
+
+type LikeActionSummary implements ActionSummary {
+
+  # The count of actions with this group.
+  count: Int
+
+  # The current user's action.
+  current_user: LikeAction
+}
+
+# A summary of counts related to all the Likes on an Asset.
+type LikeAssetActionSummary implements AssetActionSummary {
+
+  # Number of likes associated with actionable types on this this Asset.
+  actionCount: Int
+
+  # Number of unique actionable types that are referenced by the likes.
+  actionableItemCount: Int
+}
+
+type CreateLikeResponse implements Response {
+
+  # The like that was created.
+  like: LikeAction
+
+  # An array of errors relating to the mutation that occurred.
+  errors: [UserError]
+}
+
+type RootMutation {
+
+  # Creates a like on an entity.
+  createLike(like: CreateLikeInput!): CreateLikeResponse
+}
+
+`;
+}
\ No newline at end of file

From b019c5e180baf8b01b3c55b8b997542728eabc5b Mon Sep 17 00:00:00 2001
From: David Erwin <davidjerwin@gmail.com>
Date: Mon, 8 May 2017 10:36:36 -0400
Subject: [PATCH 048/132] Separate supported and experimental plugin guildes

---
 docs/frontend/PLUGINS-experimental.md | 102 +++++++++++++++++++
 docs/frontend/PLUGINS.md              | 136 +++++---------------------
 2 files changed, 126 insertions(+), 112 deletions(-)
 create mode 100644 docs/frontend/PLUGINS-experimental.md

diff --git a/docs/frontend/PLUGINS-experimental.md b/docs/frontend/PLUGINS-experimental.md
new file mode 100644
index 000000000..895be5900
--- /dev/null
+++ b/docs/frontend/PLUGINS-experimental.md
@@ -0,0 +1,102 @@
+# Experimental plugins
+
+Talk plugins are, in essence, small programs that hook into the core application in a variety of ways. Ultimately, this code can do anything that javascript is capable of. In addition, plugins can import any core code to hook into talk at any level.
+
+If you want to write plugins that integrate with core code beyond the api described in [PLUGINS.md](PLUGINS.md), please keep the following things in mind:
+
+* core code may change and break your plugin
+* you may introduce inefficiencies with your plugin that could hurt performance/crash Talk
+* you may cause bugs in other areas of Talk
+
+If you'd like to build a supported plugin but don't have the hooks you need, please file an issue on this repo and we can discuss deepening the supported plugin api!
+
+With that said, here's some of the prime experimental integration points:
+
+## Reducers and Actions : Redux
+
+Talk is powered by Redux and our plugins can too! Our plugins can have their own reducers and actions.
+
+```js
+import MyButton from './MyButton';
+import reducer from './reducer';
+
+export default {
+  slots: {
+    commentDetail: [MyButton],
+  },
+	reducer
+};
+```
+
+## Import Actions from Talk
+We can easily trigger `Talk` actions in our plugin Components.
+
+```js
+import React, {Component} from 'react';
+import {connect} from 'react-redux';
+import {bindActionCreators} from 'redux';
+import {addTag, removeTag} from 'coral-plugin-commentbox/actions';
+
+class MyButton extends Component {
+  render() {
+    return <button onClick={this.props.addTag('MY_TAG')}>My Button</button>;
+  }
+}
+
+const mapStateToProps = ({commentBox}) => ({commentBox});
+
+const mapDispatchToProps = dispatch =>
+  bindActionCreators({addTag, removeTag}, dispatch);
+
+export default connect(mapStateToProps, mapDispatchToProps)(OffTopicCheckbox);
+```
+
+## ESlint and Babel
+In talk we use `eslint:recommended` and Babel with the latest ECMAScript Features. But you can use your own!
+While building your plugin you need to specify a `.eslintrc.json` file and a`.babelrc` file.
+
+#### `.eslintrc.json`
+```json
+{
+  "env": {
+    "browser": true,
+    "es6": true,
+    "mocha": true
+  },
+  "parserOptions": {
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "experimentalObjectRestSpread": true,
+      "jsx": true
+    }
+  },
+  "parser": "babel-eslint",
+  "plugins": [
+    "react"
+  ],
+  "rules": {
+    "react/jsx-uses-react": "error",
+    "react/jsx-uses-vars": "error",
+    "no-console": ["warn", { "allow": ["warn", "error"] }]
+  }
+}
+````
+
+
+#### `. babelrc `
+```json
+{
+  "presets": [
+    "es2015"
+  ],
+  "plugins": [
+    "add-module-exports",
+    "transform-class-properties",
+    "transform-decorators-legacy",
+    "transform-object-assign",
+    "transform-object-rest-spread",
+    "transform-async-to-generator",
+    "transform-react-jsx"
+  ]
+}
+````
diff --git a/docs/frontend/PLUGINS.md b/docs/frontend/PLUGINS.md
index 94c7b49e9..5a2530523 100644
--- a/docs/frontend/PLUGINS.md
+++ b/docs/frontend/PLUGINS.md
@@ -1,28 +1,32 @@
 # Plugins
-We can build plugins to extend the functionality of Talk.  Our plugins are powered by *React*, *Redux* and *GraphQL*. We can also build them with simple vanilla javascript. 
+We can build plugins to extend the functionality of Talk.  
+
+This guide is a walkthrough of our plugin architecture and components that we provide that allow you to build on top of Core coral components without having to understand the concepts there in. It is organized into three sections:
+
+* Plugin architecture
+* Using our building block components
+* Styling
+
+Advanced users will quickly realize that our plugins have complete access to core code. If you would like to write advanced plugins that reach outside of our published API as described in this document, please see [our notes on experimental pluginss](PLUGINS-experimental.md).
+
+Under the hood our plugins are powered by *React*, *Redux* and *GraphQL*. We can also build them with simple vanilla javascript.
+
+## Plugin Architecture
+
 The plugins live in the `/plugins` folder. Each plugin must have an `index.js` file and two folders `client` and `server`.
 
-Our plugin folder structure should look like this:
-```
-my-plugin/
-  ├── client/
-  ├── server/
-  └── index.js
-```
-
-
 ### The Client Folder
 The frontend of our plugin lives inside the `client` folder. The `client`  folder must have an `index.js` file that exports the configuration of our plugin.
 
 ```
 my-plugin/
   ├── client/
-  │   └── index.js
+  │   └── index.js <-- index for client side functionality
   ├── server/
-  └── index.js
+  └── index.js <-- base plugin index
 ```
 
-For now our `index.js` file should look like this:
+For now our base plugin `index.js` file should look like this:
 
 ```js
 export default {
@@ -30,9 +34,8 @@ export default {
 };
 ```
 
-
 ###  Components
-We can add our components within the `client` folder.
+We can add our components (or any other javascript code) within the `client` folder.
 
 ```
 my-plugin/
@@ -44,7 +47,7 @@ my-plugin/
 ```
 
 ####  Creating a Component
-Our component could look like this: 
+Our component could look like this:
 
 ```js
 import React, {Component} from 'react';
@@ -56,20 +59,19 @@ class MyButton extends Component {
 }
 
 export default MyButton;
-````
+```
 
 We are just creating a component that creates a `button`. Now that we created our component we need to specify where it should get injected within Talk!
-To tell Talk where that Component should get injected we need to specify our *Slots*.
 
-Also, our Component can be a Stateless Component.
+To tell Talk where that Component should get injected we need to specify which *Slots* to insert it into.
 
 ```js
 import React from 'react';
 export default = () => <button>My Button</button>;
-````
+```
 
 ### Slots
-In Talk we have defined specific *Slots* where we can inject components. 
+In Talk we have defined specific *Slots* where we can inject components.
 
 Here is how we specify our slots config in `my-plugin/index.js`
 
@@ -89,49 +91,10 @@ Here I’m specifying that the MyComponent Component will take place within the
 
 Slots properties take an`Array` so we can add as many components as we want.
 
-#### Reducers and Actions : Redux
-
-Talk is powered by Redux and our plugins can too! Our plugins can have their own reducers and actions.
-
-```js
-import MyButton from './MyButton';
-import reducer from './reducer';
-
-export default {
-  slots: {
-    commentDetail: [MyButton],
-  },
-	reducer
-};
-```
-
-### Import Actions from Talk
-We can easily trigger `Talk` actions in our plugin Components.
-
-```js
-import React, {Component} from 'react';
-import {connect} from 'react-redux';
-import {bindActionCreators} from 'redux';
-import {addTag, removeTag} from 'coral-plugin-commentbox/actions';
-
-class MyButton extends Component {
-  render() {
-    return <button onClick={this.props.addTag('MY_TAG')}>My Button</button>;
-  }
-}
-
-const mapStateToProps = ({commentBox}) => ({commentBox});
-
-const mapDispatchToProps = dispatch =>
-  bindActionCreators({addTag, removeTag}, dispatch);
-
-export default connect(mapStateToProps, mapDispatchToProps)(OffTopicCheckbox);
-```
-
 ### Styling our Plugin
 Talk uses CSS Modules. This basically means that you can also add your CSS Module to your plugin without colliding with the rest of Talk!
 
-##### My Component 
+##### My Component
 ```js
 import styles from './style.css';
 
@@ -151,58 +114,7 @@ Our `style.css` should could look like this.
 }
 ```
 
-## ESlint and Babel
-In talk we use `eslint:recommended` and Babel with the latest ECMAScript Features. But you can use your own! 
-While building your plugin you need to specify a `.eslintrc.json` file and a`.babelrc` file.
-
-#### `.eslintrc.json`
-```json
-{
-  "env": {
-    "browser": true,
-    "es6": true,
-    "mocha": true
-  },
-  "parserOptions": {
-    "sourceType": "module",
-    "ecmaFeatures": {
-      "experimentalObjectRestSpread": true,
-      "jsx": true
-    }
-  },
-  "parser": "babel-eslint",
-  "plugins": [
-    "react"
-  ],
-  "rules": {
-    "react/jsx-uses-react": "error",
-    "react/jsx-uses-vars": "error",
-    "no-console": ["warn", { "allow": ["warn", "error"] }]
-  }
-}
-````
-
-
-#### `. babelrc `
-```json
-{
-  "presets": [
-    "es2015"
-  ],
-  "plugins": [
-    "add-module-exports",
-    "transform-class-properties",
-    "transform-decorators-legacy",
-    "transform-object-assign",
-    "transform-object-rest-spread",
-    "transform-async-to-generator",
-    "transform-react-jsx"
-  ]
-}
-````
 
 ### The server folder and the index file
 Read more about the `/server` and how to extend Talk here.
 [talk/PLUGINS.md at master · coralproject/talk · GitHub](https://github.com/coralproject/talk/blob/master/PLUGINS.md)
-
-

From 10796ed4b337f1f0754eb0b328d6d7b7f660590f Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Mon, 8 May 2017 22:35:00 +0700
Subject: [PATCH 049/132] Port PostFlag mutation

---
 .../src/containers/Stream.js                  |  4 +--
 .../coral-embed-stream/src/graphql/index.js   | 13 +++++++--
 .../graphql/mutations/index.js                | 28 +++++++++++--------
 .../graphql/mutations/postFlag.graphql        | 10 -------
 4 files changed, 30 insertions(+), 25 deletions(-)
 delete mode 100644 client/coral-framework/graphql/mutations/postFlag.graphql

diff --git a/client/coral-embed-stream/src/containers/Stream.js b/client/coral-embed-stream/src/containers/Stream.js
index 08adbd930..880098388 100644
--- a/client/coral-embed-stream/src/containers/Stream.js
+++ b/client/coral-embed-stream/src/containers/Stream.js
@@ -6,7 +6,7 @@ import uniqBy from 'lodash/uniqBy';
 import sortBy from 'lodash/sortBy';
 import isNil from 'lodash/isNil';
 import {NEW_COMMENT_COUNT_POLL_INTERVAL} from '../constants/stream';
-import {withPostComment, postFlag, postDontAgree, deleteAction, addCommentTag, removeCommentTag, ignoreUser} from 'coral-framework/graphql/mutations';
+import {withPostComment, withPostFlag, postDontAgree, deleteAction, addCommentTag, removeCommentTag, ignoreUser} from 'coral-framework/graphql/mutations';
 import {notificationActions, authActions} from 'coral-framework';
 import {editName} from 'coral-framework/actions/user';
 import {setCommentCountCache, setActiveReplyBox} from '../actions/stream';
@@ -237,7 +237,7 @@ export default compose(
   withFragments(fragments),
   connect(mapStateToProps, mapDispatchToProps),
   withPostComment,
-  postFlag,
+  withPostFlag,
   postDontAgree,
   addCommentTag,
   removeCommentTag,
diff --git a/client/coral-embed-stream/src/graphql/index.js b/client/coral-embed-stream/src/graphql/index.js
index 2d6f943a2..5add9eb30 100644
--- a/client/coral-embed-stream/src/graphql/index.js
+++ b/client/coral-embed-stream/src/graphql/index.js
@@ -3,8 +3,17 @@ import {registerConfig} from 'coral-framework/services/registry';
 
 const config = {
   fragments: {
+    CreateFlagResponse: gql`
+      fragment CoralEmbedStream_CreateFlagResponse on CreateFlagResponse {
+        flag {
+          id
+        }
+        errors {
+          translation_key
+        }
+      }`,
     CreateCommentResponse: gql`
-      fragment Coral_CreateCommentResponse on CreateCommentResponse {
+      fragment CoralEmbedStream_CreateCommentResponse on CreateCommentResponse {
         comment {
           ...Coral_CreateCommentResponse_Comment
           replies {
@@ -16,7 +25,7 @@ const config = {
         }
       }
 
-      fragment Coral_CreateCommentResponse_Comment on Comment {
+      fragment CoralEmbedStream_CreateCommentResponse_Comment on Comment {
         id
         body
         created_at
diff --git a/client/coral-framework/graphql/mutations/index.js b/client/coral-framework/graphql/mutations/index.js
index dbc8f100e..430145122 100644
--- a/client/coral-framework/graphql/mutations/index.js
+++ b/client/coral-framework/graphql/mutations/index.js
@@ -1,5 +1,4 @@
 import {graphql, gql} from 'react-apollo';
-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';
@@ -27,16 +26,23 @@ export const withPostComment = withMutation(
     }),
   });
 
-export const postFlag = graphql(POST_FLAG, {
-  props: ({mutate}) => ({
-    postFlag: (flag) => {
-      return mutate({
-        variables: {
-          flag
-        }
-      });
-    }}),
-});
+export const withPostFlag = withMutation(
+  gql`
+    mutation CreateFlag($flag: CreateFlagInput!) {
+      createFlag(flag: $flag) {
+        ...CreateFlagResponse
+      }
+    }
+  `, {
+    props: ({mutate}) => ({
+      postFlag: (flag) => {
+        return mutate({
+          variables: {
+            flag
+          }
+        });
+      }}),
+  });
 
 export const postDontAgree = graphql(POST_DONT_AGREE, {
   props: ({mutate}) => ({
diff --git a/client/coral-framework/graphql/mutations/postFlag.graphql b/client/coral-framework/graphql/mutations/postFlag.graphql
deleted file mode 100644
index cabc2feef..000000000
--- a/client/coral-framework/graphql/mutations/postFlag.graphql
+++ /dev/null
@@ -1,10 +0,0 @@
-mutation CreateFlag($flag: CreateFlagInput!) {
-  createFlag(flag:$flag) {
-    flag {
-      id
-    }
-    errors {
-      translation_key
-    }
-  }
-}

From 83ef41000c1b6581280600c90b50103317c3d11f Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Mon, 8 May 2017 22:56:01 +0700
Subject: [PATCH 050/132] Port PostDontAgree mutation

---
 .../src/containers/Stream.js                  |  4 +--
 .../coral-embed-stream/src/graphql/index.js   | 16 ++++++++--
 .../graphql/mutations/index.js                | 30 +++++++++++--------
 .../graphql/mutations/postDontAgree.graphql   | 10 -------
 4 files changed, 34 insertions(+), 26 deletions(-)
 delete mode 100644 client/coral-framework/graphql/mutations/postDontAgree.graphql

diff --git a/client/coral-embed-stream/src/containers/Stream.js b/client/coral-embed-stream/src/containers/Stream.js
index 880098388..9b01ee439 100644
--- a/client/coral-embed-stream/src/containers/Stream.js
+++ b/client/coral-embed-stream/src/containers/Stream.js
@@ -6,7 +6,7 @@ import uniqBy from 'lodash/uniqBy';
 import sortBy from 'lodash/sortBy';
 import isNil from 'lodash/isNil';
 import {NEW_COMMENT_COUNT_POLL_INTERVAL} from '../constants/stream';
-import {withPostComment, withPostFlag, postDontAgree, deleteAction, addCommentTag, removeCommentTag, ignoreUser} from 'coral-framework/graphql/mutations';
+import {withPostComment, withPostFlag, withPostDontAgree, deleteAction, addCommentTag, removeCommentTag, ignoreUser} from 'coral-framework/graphql/mutations';
 import {notificationActions, authActions} from 'coral-framework';
 import {editName} from 'coral-framework/actions/user';
 import {setCommentCountCache, setActiveReplyBox} from '../actions/stream';
@@ -238,7 +238,7 @@ export default compose(
   connect(mapStateToProps, mapDispatchToProps),
   withPostComment,
   withPostFlag,
-  postDontAgree,
+  withPostDontAgree,
   addCommentTag,
   removeCommentTag,
   ignoreUser,
diff --git a/client/coral-embed-stream/src/graphql/index.js b/client/coral-embed-stream/src/graphql/index.js
index 5add9eb30..e71eef1cb 100644
--- a/client/coral-embed-stream/src/graphql/index.js
+++ b/client/coral-embed-stream/src/graphql/index.js
@@ -11,7 +11,18 @@ const config = {
         errors {
           translation_key
         }
-      }`,
+      }
+    `,
+    CreateDontAgreeResponse : gql`
+      fragment CoralEmbedStream_CreateDontAgreeResponse on CreateDontAgreeResponse {
+        dontagree {
+          id
+        }
+        errors {
+          translation_key
+        }
+      }
+    `,
     CreateCommentResponse: gql`
       fragment CoralEmbedStream_CreateCommentResponse on CreateCommentResponse {
         comment {
@@ -45,7 +56,8 @@ const config = {
             created_at
           }
         }
-      }`,
+      }
+    `,
   },
   mutations: {
     PostComment: ({
diff --git a/client/coral-framework/graphql/mutations/index.js b/client/coral-framework/graphql/mutations/index.js
index 430145122..e758d2dfa 100644
--- a/client/coral-framework/graphql/mutations/index.js
+++ b/client/coral-framework/graphql/mutations/index.js
@@ -1,5 +1,4 @@
 import {graphql, gql} from 'react-apollo';
-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';
@@ -28,7 +27,7 @@ export const withPostComment = withMutation(
 
 export const withPostFlag = withMutation(
   gql`
-    mutation CreateFlag($flag: CreateFlagInput!) {
+    mutation PostFlag($flag: CreateFlagInput!) {
       createFlag(flag: $flag) {
         ...CreateFlagResponse
       }
@@ -44,16 +43,23 @@ export const withPostFlag = withMutation(
       }}),
   });
 
-export const postDontAgree = graphql(POST_DONT_AGREE, {
-  props: ({mutate}) => ({
-    postDontAgree: (dontagree) => {
-      return mutate({
-        variables: {
-          dontagree
-        }
-      });
-    }}),
-});
+export const withPostDontAgree = withMutation(
+  gql`
+    mutation CreateDontAgree($dontagree: CreateDontAgreeInput!) {
+      createDontAgree(dontagree: $dontagree) {
+        ...CreateDontAgreeResponse
+      }
+    }
+  `, {
+    props: ({mutate}) => ({
+      postDontAgree: (dontagree) => {
+        return mutate({
+          variables: {
+            dontagree
+          }
+        });
+      }}),
+  });
 
 export const deleteAction = graphql(DELETE_ACTION, {
   props: ({mutate}) => ({
diff --git a/client/coral-framework/graphql/mutations/postDontAgree.graphql b/client/coral-framework/graphql/mutations/postDontAgree.graphql
deleted file mode 100644
index 6e36d48b8..000000000
--- a/client/coral-framework/graphql/mutations/postDontAgree.graphql
+++ /dev/null
@@ -1,10 +0,0 @@
-mutation CreateDontAgree($dontagree: CreateDontAgreeInput!) {
-  createDontAgree(dontagree:$dontagree) {
-    dontagree {
-      id
-    }
-    errors {
-      translation_key
-    }
-  }
-}

From e2ed21e113592d972a0f22f2d434e05369e265f0 Mon Sep 17 00:00:00 2001
From: David Erwin <davidjerwin@gmail.com>
Date: Mon, 8 May 2017 12:00:22 -0400
Subject: [PATCH 051/132] Adding building block documentation

---
 docs/frontend/PLUGINS.md | 74 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 70 insertions(+), 4 deletions(-)

diff --git a/docs/frontend/PLUGINS.md b/docs/frontend/PLUGINS.md
index 5a2530523..fa582877c 100644
--- a/docs/frontend/PLUGINS.md
+++ b/docs/frontend/PLUGINS.md
@@ -34,7 +34,8 @@ export default {
 };
 ```
 
-###  Components
+###  Creating a Component
+
 We can add our components (or any other javascript code) within the `client` folder.
 
 ```
@@ -46,7 +47,6 @@ my-plugin/
   └── index.js
 ```
 
-####  Creating a Component
 Our component could look like this:
 
 ```js
@@ -61,7 +61,7 @@ class MyButton extends Component {
 export default MyButton;
 ```
 
-We are just creating a component that creates a `button`. Now that we created our component we need to specify where it should get injected within Talk!
+Here we create a component that renders a `button`. Now that we created our component we need to specify where it should get injected within Talk!
 
 To tell Talk where that Component should get injected we need to specify which *Slots* to insert it into.
 
@@ -91,7 +91,73 @@ Here I’m specifying that the MyComponent Component will take place within the
 
 Slots properties take an`Array` so we can add as many components as we want.
 
-### Styling our Plugin
+## Building Blocks (TBD)
+
+`Note: the concepts in this section are still to be implemented. Code samples are for discussion and may change.`
+
+In order to allow you to build more complex plugins, we have wrapped some of our functionality in higher order componenets that expose a simple api.
+
+### Reactions
+
+Reactions provide users the ability to 'like', 'respect', etc... comments.
+
+```
+<Reaction name="love">
+	<img class="coralsrc="" />
+</Reaction>
+```
+
+Note: some server side work will need to accompany this client side component. See the like and respect plugins as examples.
+
+### Comment Stream
+
+Comment streams may be created with filtering and ordering in place:
+
+* filter by user
+* filter by tag
+* sort by date ascending / descrnding
+
+```
+<CommentStream userFilter="[userId]" tagFilter="[tag]" sort="[ascending|descending]"></CommentStream>
+```
+
+### Comment Commit hooks
+
+// docs for the pre/post comment submit commit hooks
+
+### Mod Queues
+
+Moderation queues can be added via configuration objects passed in through plugins.
+
+Basic mod queues will resemble the current moderation queues but can be generated from different lists of comments.
+
+* filter by user tag
+* filter by comment tag
+* filter by comment status
+* Custom queries (paired with back end plugins that provide queries to get the data)
+
+#### Advanced mod queues
+
+Advanced mod queues can be created giving plugin authors the power to create the cards that appear in the queue, create actions and custom buttons, etc...
+
+### Custom Configuration
+
+Plugins may rely on configuration options that admins/moderators can set in the Configuration section.
+
+Basic settings can be added via json configuration in a plugin.
+
+* Setting headline
+* Setting description
+* Setting input type
+* Default value
+* Variable name
+
+#### Advanced Custom Configuration (low prioritiy)
+
+Users can inject configuration interfaces that they create into the configuration allowing for more advanced configuration.
+
+
+## Styling Plugins
 Talk uses CSS Modules. This basically means that you can also add your CSS Module to your plugin without colliding with the rest of Talk!
 
 ##### My Component

From 096025b72a285d3382151ff90e744f26fe362a0e Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Mon, 8 May 2017 09:57:52 -0700
Subject: [PATCH 052/132] Add asset_id to editComment mutation to allow mongo
 query happy path to be atomic

---
 .../src/components/Comment.js                 |   4 +-
 .../src/components/Stream.js                  |   2 +-
 .../graphql/mutations/editComment.graphql     |   4 +-
 .../graphql/mutations/index.js                |   3 +-
 graph/mutators/comment.js                     |  22 ++--
 graph/typeDefs.graphql                        |   2 +-
 services/comments.js                          | 100 +++++++++++-------
 test/server/graph/mutations/editComment.js    |  10 +-
 8 files changed, 88 insertions(+), 59 deletions(-)

diff --git a/client/coral-embed-stream/src/components/Comment.js b/client/coral-embed-stream/src/components/Comment.js
index b80a62b28..000e0caad 100644
--- a/client/coral-embed-stream/src/components/Comment.js
+++ b/client/coral-embed-stream/src/components/Comment.js
@@ -116,7 +116,7 @@ class Comment extends React.Component {
     // dispatch action to ignore another user
     ignoreUser: React.PropTypes.func,
 
-    // edit a comment, passed (id, { body })
+    // edit a comment, passed (id, asset_id, { body })
     editComment: React.PropTypes.func,
   }
 
@@ -280,7 +280,7 @@ class Comment extends React.Component {
           { 
             this.state.isEditing
             ? <EditableCommentContent
-                editComment={this.props.editComment.bind(null, comment.id)}
+                editComment={this.props.editComment.bind(null, comment.id, asset.id)}
                 addNotification={addNotification}
                 asset={asset}
                 comment={comment}
diff --git a/client/coral-embed-stream/src/components/Stream.js b/client/coral-embed-stream/src/components/Stream.js
index 5c7f98ea6..121aa7993 100644
--- a/client/coral-embed-stream/src/components/Stream.js
+++ b/client/coral-embed-stream/src/components/Stream.js
@@ -209,7 +209,7 @@ Stream.propTypes = {
   // dispatch action to ignore another user
   ignoreUser: React.PropTypes.func,
 
-  // edit a comment, passed (id, { body })
+  // edit a comment, passed (id, asset_id, { body })
   editComment: React.PropTypes.func,
 };
 
diff --git a/client/coral-framework/graphql/mutations/editComment.graphql b/client/coral-framework/graphql/mutations/editComment.graphql
index 05e532002..3cd1ec323 100644
--- a/client/coral-framework/graphql/mutations/editComment.graphql
+++ b/client/coral-framework/graphql/mutations/editComment.graphql
@@ -1,5 +1,5 @@
-mutation editComment ($id: ID!, $edit: EditCommentInput) {
-  editComment(id:$id, edit:$edit) {
+mutation editComment ($id: ID!, $asset_id: ID!, $edit: EditCommentInput) {
+  editComment(id:$id, asset_id:$asset_id, edit:$edit) {
     comment {
       status
     }
diff --git a/client/coral-framework/graphql/mutations/index.js b/client/coral-framework/graphql/mutations/index.js
index be0a0624a..df3e58ed0 100644
--- a/client/coral-framework/graphql/mutations/index.js
+++ b/client/coral-framework/graphql/mutations/index.js
@@ -176,10 +176,11 @@ export const stopIgnoringUser = graphql(STOP_IGNORING_USER, {
 export const editComment = graphql(EDIT_COMMENT, {
   props: ({mutate}) => {
     return {
-      editComment: (id, edit) => {
+      editComment: (id, asset_id, edit) => {
         return mutate({
           variables: {
             id,
+            asset_id,
             edit,
           },
           refetchQueries: [
diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index 283d66738..17c75a94b 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -233,19 +233,8 @@ 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, edit}) => {
+const editComment = async ({user, loaders: {Comments}}, {id, asset_id, edit}) => {
   const {body} = edit;
-  const comment = await CommentsService.findById(id);
-  if ( ! comment) {
-    throw new errors.APIError('Comment not found', {
-      status: 404,
-      translation_key: 'NOT_FOUND',
-    });
-  }
-  if ( ! (user && user.id && (user.id === comment.author_id))) {
-    throw errors.ErrNotAuthorized;
-  }
-  const {asset_id} = comment;
   const determineStatusForComment = async ({body, asset_id}) => {
     const [wordlist, settings] = await filterNewComment({asset_id, body});
     const status = await resolveNewCommentStatus({asset_id, body}, wordlist, settings);    
@@ -253,14 +242,21 @@ const editComment = async ({user, loaders: {Comments}}, {id, edit}) => {
   };
   const status = await determineStatusForComment({body, asset_id});
   try {
-    await CommentsService.edit(comment, Object.assign({status}, edit));
+    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 'EditWindowExpired':
       throw new errors.APIError('You can no longer edit this comment. The window to do so has expired.', {
         status: 401,
         translation_key: 'error.editWindowExpired',
       });
+    case 'NotAuthorizedToEdit':
+      throw errors.ErrNotAuthorized;
     default:
       throw error;
     }
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index a16f4bc1c..26e7349ec 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -762,7 +762,7 @@ type RootMutation {
   deleteAction(id: ID!): DeleteActionResponse
 
   # Edit a comment
-  editComment(id: ID!, edit: EditCommentInput): EditCommentResponse
+  editComment(id: ID!, asset_id: ID!, edit: EditCommentInput): EditCommentResponse
 
   # Sets User status. Requires the `ADMIN` role.
   setUserStatus(id: ID!, status: USER_STATUS!): SetUserStatusResponse
diff --git a/services/comments.js b/services/comments.js
index 28216381f..6e3d79edd 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -51,50 +51,76 @@ module.exports = class CommentsService {
 
   /**
    * Edit a Comment
-   * @param {CommentModel|String} comment you want to edit (or its ID)
-   * @param {String} body  the new Comment body
-   * @param {String} status  the new Comment status
+   * @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} body       the new Comment body
+   * @param {String} status     the new Comment status
    */
-  static async edit(comment, {body, status, ignoreEditWindow}) {
-    if (typeof comment === 'string') {
-
-      // it's an id
-      comment = await this.findById(comment);
-    }
-    const editWindowExpired = (comment) => {
-      const now = new Date;
-      const editableUntil = this.getEditableUntilDate(comment);
-      return now > editableUntil;
-    };
-    if (( ! ignoreEditWindow) && editWindowExpired(comment)) {
-      throw Object.assign(new Error('Edit window is over.'), {
-        name: 'EditWindowExpired'
-      });
-    }
+  static async edit(id, asset_id, editor, {body, status, ignoreEditWindow}) {
     if (status && ! STATUSES.includes(status)) {
       throw new Error(`status ${status} is not supported`);
     }
-
-    const {id} = comment;
-    const {nModified} = await CommentModel.update({id}, {
-      $set: {
-        body,
-        status,
+    const lastEditableCommentCreatedAt = new Date((new Date()).getTime() - EDIT_WINDOW_MS);
+    const filter = Object.assign(
+      {
+        id,
+        asset_id,
+        author_id: editor,
       },
-      $push: {
-        body_history: {
-          body,
-          created_at: new Date(),
+      ignoreEditWindow ? {} : {
+        created_at: {
+          $gt: lastEditableCommentCreatedAt,
         },
-        status_history: {
-          type: status,
-          created_at: new Date(),
-        }
-      },
-    });
+      }
+    );
+    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:
-      throw new Error(`Couldn't edit comment. There is no Comment with id "${id}"`);
+    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 ( ! 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 Object.assign(new Error('Edit window is over.'), {
+          name: 'EditWindowExpired'
+        });
+      }
+      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.');
+    }
     }
   }
 
diff --git a/test/server/graph/mutations/editComment.js b/test/server/graph/mutations/editComment.js
index 1375157ad..f449e37a8 100644
--- a/test/server/graph/mutations/editComment.js
+++ b/test/server/graph/mutations/editComment.js
@@ -27,8 +27,8 @@ describe('graph.mutations.editComment', () => {
   });
 
   const editCommentMutation = `
-    mutation EditComment ($id: ID!, $edit: EditCommentInput) {
-      editComment(id:$id, edit:$edit) {
+    mutation EditComment ($id: ID!, $asset_id: ID!, $edit: EditCommentInput) {
+      editComment(id:$id, asset_id:$asset_id, edit:$edit) {
         errors {
           translation_key
         }
@@ -55,6 +55,7 @@ describe('graph.mutations.editComment', () => {
     const newBody = 'I have been edited.';
     const response = await graphql(schema, editCommentMutation, {}, context, {
       id: comment.id,
+      asset_id: asset.id,
       edit: {
         body: newBody
       }
@@ -91,6 +92,7 @@ describe('graph.mutations.editComment', () => {
     const context = new Context({user});
     const response = await graphql(schema, editCommentMutation, {}, context, {
       id: comment.id,
+      asset_id: asset.id,
       edit: {
         body: newBody
       }
@@ -117,11 +119,13 @@ describe('graph.mutations.editComment', () => {
     const context = new Context({user: userB});
     const response = await graphql(schema, editCommentMutation, {}, context, {
       id: comment.id,
+      asset_id: asset.id,
       edit: {
         body: newBody
       }
     });
     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('NOT_AUTHORIZED');
     const commentAfterEdit = await CommentsService.findById(comment.id);    
 
@@ -135,6 +139,7 @@ describe('graph.mutations.editComment', () => {
     const context = new Context({user});
     const response = await graphql(schema, editCommentMutation, {}, context, {
       id: fakeCommentId,
+      asset_id: asset.id,
       edit: {
         body: newBody
       }
@@ -233,6 +238,7 @@ describe('graph.mutations.editComment', () => {
       const newBody = edit.body;
       const response = await graphql(schema, editCommentMutation, {}, context, {
         id: comment.id,
+        asset_id: asset.id,
         edit: {
           body: newBody
         }

From 0e931d023dc93989170eb9b852b9bea7a1af1184 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 9 May 2017 01:15:07 +0700
Subject: [PATCH 053/132] Port DeleteAction Mutation

---
 .../src/containers/Stream.js                  |  7 +++--
 .../coral-embed-stream/src/graphql/index.js   |  7 +++++
 .../graphql/mutations/deleteAction.graphql    |  7 -----
 .../graphql/mutations/index.js                | 28 +++++++++++--------
 4 files changed, 29 insertions(+), 20 deletions(-)
 delete mode 100644 client/coral-framework/graphql/mutations/deleteAction.graphql

diff --git a/client/coral-embed-stream/src/containers/Stream.js b/client/coral-embed-stream/src/containers/Stream.js
index 9b01ee439..913d894f3 100644
--- a/client/coral-embed-stream/src/containers/Stream.js
+++ b/client/coral-embed-stream/src/containers/Stream.js
@@ -6,7 +6,10 @@ import uniqBy from 'lodash/uniqBy';
 import sortBy from 'lodash/sortBy';
 import isNil from 'lodash/isNil';
 import {NEW_COMMENT_COUNT_POLL_INTERVAL} from '../constants/stream';
-import {withPostComment, withPostFlag, withPostDontAgree, deleteAction, addCommentTag, removeCommentTag, ignoreUser} from 'coral-framework/graphql/mutations';
+import {
+  withPostComment, withPostFlag, withPostDontAgree, withDeleteAction,
+  addCommentTag, removeCommentTag, ignoreUser,
+} from 'coral-framework/graphql/mutations';
 import {notificationActions, authActions} from 'coral-framework';
 import {editName} from 'coral-framework/actions/user';
 import {setCommentCountCache, setActiveReplyBox} from '../actions/stream';
@@ -242,6 +245,6 @@ export default compose(
   addCommentTag,
   removeCommentTag,
   ignoreUser,
-  deleteAction,
+  withDeleteAction,
 )(StreamContainer);
 
diff --git a/client/coral-embed-stream/src/graphql/index.js b/client/coral-embed-stream/src/graphql/index.js
index e71eef1cb..001c953f9 100644
--- a/client/coral-embed-stream/src/graphql/index.js
+++ b/client/coral-embed-stream/src/graphql/index.js
@@ -3,6 +3,13 @@ import {registerConfig} from 'coral-framework/services/registry';
 
 const config = {
   fragments: {
+    DeleteActionResponse: gql`
+      fragment CoralEmbedStream_DeleteActionResponse on DeleteActionResponse {
+        errors {
+          translation_key
+        }
+      }
+    `,
     CreateFlagResponse: gql`
       fragment CoralEmbedStream_CreateFlagResponse on CreateFlagResponse {
         flag {
diff --git a/client/coral-framework/graphql/mutations/deleteAction.graphql b/client/coral-framework/graphql/mutations/deleteAction.graphql
deleted file mode 100644
index f8adf371c..000000000
--- a/client/coral-framework/graphql/mutations/deleteAction.graphql
+++ /dev/null
@@ -1,7 +0,0 @@
-mutation deleteAction ($id: ID!) {
-    deleteAction(id:$id) {
-      errors {
-        translation_key
-      }
-    }
-}
diff --git a/client/coral-framework/graphql/mutations/index.js b/client/coral-framework/graphql/mutations/index.js
index e758d2dfa..1d8e3a081 100644
--- a/client/coral-framework/graphql/mutations/index.js
+++ b/client/coral-framework/graphql/mutations/index.js
@@ -1,5 +1,4 @@
 import {graphql, gql} from 'react-apollo';
-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';
@@ -61,16 +60,23 @@ export const withPostDontAgree = withMutation(
       }}),
   });
 
-export const deleteAction = graphql(DELETE_ACTION, {
-  props: ({mutate}) => ({
-    deleteAction: (id) => {
-      return mutate({
-        variables: {
-          id
-        }
-      });
-    }}),
-});
+export const withDeleteAction = withMutation(
+  gql`
+    mutation DeleteAction($id: ID!) {
+      deleteAction(id:$id) {
+        ...DeleteActionResponse
+      }
+    }
+  `, {
+    props: ({mutate}) => ({
+      deleteAction: (id) => {
+        return mutate({
+          variables: {
+            id
+          }
+        });
+      }}),
+  });
 
 export const addCommentTag = graphql(ADD_COMMENT_TAG, {
   props: ({mutate}) => ({

From 011e5da26f9a0b8d82d17628f112cda8e67ea7f3 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 8 May 2017 15:44:11 -0300
Subject: [PATCH 054/132] Almost fully working

---
 client/coral-framework/helpers/plugins.js     |   2 +-
 .../helpers/strings.js}                       |   0
 client/coral-framework/hocs/withReaction.js   | 220 ++++++++++++++++++
 client/coral-reaction/actions.js              |   0
 .../components/CoralReaction.js               |  98 --------
 client/coral-reaction/components/style.css    |  30 ---
 client/coral-reaction/constants.js            |   0
 .../containers/CoralReaction.js               | 188 ---------------
 client/coral-reaction/index.js                |   3 -
 client/coral-reaction/reducer.js              |   0
 client/coral-reaction/typeDefGenerator.js     |  80 -------
 11 files changed, 221 insertions(+), 400 deletions(-)
 rename client/{coral-reaction/helpers.js => coral-framework/helpers/strings.js} (100%)
 create mode 100644 client/coral-framework/hocs/withReaction.js
 delete mode 100644 client/coral-reaction/actions.js
 delete mode 100644 client/coral-reaction/components/CoralReaction.js
 delete mode 100644 client/coral-reaction/components/style.css
 delete mode 100644 client/coral-reaction/constants.js
 delete mode 100644 client/coral-reaction/containers/CoralReaction.js
 delete mode 100644 client/coral-reaction/index.js
 delete mode 100644 client/coral-reaction/reducer.js
 delete mode 100644 client/coral-reaction/typeDefGenerator.js

diff --git a/client/coral-framework/helpers/plugins.js b/client/coral-framework/helpers/plugins.js
index 20aee7abb..d701b933f 100644
--- a/client/coral-framework/helpers/plugins.js
+++ b/client/coral-framework/helpers/plugins.js
@@ -21,7 +21,7 @@ export function getSlotElements(slot, props = {}) {
     .filter(o => o.module.slots[slot])
     .map(o => o.module.slots[slot]));
   return components
-    .map((component, i) => React.createElement(component, {...props, key: i}));
+    .map((component, i) => React.createElement(component, {key: i, ...props}));
 }
 
 function getComponentFragments(components) {
diff --git a/client/coral-reaction/helpers.js b/client/coral-framework/helpers/strings.js
similarity index 100%
rename from client/coral-reaction/helpers.js
rename to client/coral-framework/helpers/strings.js
diff --git a/client/coral-framework/hocs/withReaction.js b/client/coral-framework/hocs/withReaction.js
new file mode 100644
index 000000000..b838941ad
--- /dev/null
+++ b/client/coral-framework/hocs/withReaction.js
@@ -0,0 +1,220 @@
+import React from 'react';
+import get from 'lodash/get';
+import {connect} from 'react-redux';
+import {bindActionCreators} from 'redux';
+import {compose, gql, graphql} from 'react-apollo';
+import withFragments from 'coral-framework/hocs/withFragments';
+import {showSignInDialog} from 'coral-framework/actions/auth';
+import {capitalize} from 'coral-framework/helpers/strings';
+import {getMyActionSummary, getTotalActionCount} from 'coral-framework/utils';
+
+export default reaction => WrappedComponent => {
+  if (typeof reaction !== 'string') {
+    console.error('Reaction must be a valid string');
+    return null;
+  }
+
+  reaction = reaction.toLowerCase();
+
+  class WithReactions extends React.Component {
+    render() {
+      const {comment} = this.props;
+
+      const reactionSummary = getMyActionSummary(
+        `${capitalize(reaction)}ActionSummary`,
+        comment
+      );
+      const count = getTotalActionCount(
+        `${capitalize(reaction)}ActionSummary`,
+        comment
+      );
+
+      const withReactionProps = {reactionSummary, count};
+
+      return <WrappedComponent {...this.props} {...withReactionProps} />;
+    }
+  }
+
+  const isReaction = a =>
+    a.__typereaction === `${capitalize(reaction)}ActionSummary`;
+
+  const COMMENT_FRAGMENT = gql`
+      fragment ${capitalize(reaction)}Button_updateFragment on Comment {
+          action_summaries {
+          ... on ${capitalize(reaction)}ActionSummary {
+              count
+              current_user {
+                  id
+              }
+          }
+        }
+      }
+  `;
+
+  const withDeleteReaction = graphql(
+    gql`
+        mutation deleteReaction($id: ID!) {
+            deleteAction(id:$id) {
+                errors {
+                    translation_key
+                }
+            }
+        }
+    `,
+    {
+      props: ({mutate}) => ({
+        deleteReaction: (id, commentId) => {
+          return mutate({
+            variables: {id},
+            optimisticResponse: {
+              deleteAction: {
+                __typereaction: 'DeleteActionResponse',
+                errors: null
+              }
+            },
+            update: proxy => {
+              const fragmentId = `Comment_${commentId}`;
+
+              // Read the data from our cache for this query.
+              const data = proxy.readFragment({
+                fragment: COMMENT_FRAGMENT,
+                id: fragmentId
+              });
+
+              // Check whether we liked this comment.
+              const idx = data.action_summaries.findIndex(isReaction);
+              if (
+                idx < 0 ||
+                get(data.action_summaries[idx], 'current_user.id') !== id
+              ) {
+                return;
+              }
+
+              data.action_summaries[idx] = {
+                ...data.action_summaries[idx],
+                count: data.action_summaries[idx].count - 1,
+                current_user: null
+              };
+
+              // Write our data back to the cache.
+              proxy.writeFragment({
+                fragment: COMMENT_FRAGMENT,
+                id: fragmentId,
+                data
+              });
+            }
+          });
+        }
+      })
+    }
+  );
+
+  const withPostReaction = graphql(
+    gql`
+        mutation create${capitalize(reaction)}($${reaction}: Create${capitalize(reaction)}Input!) {
+            create${capitalize(reaction)}(${reaction}: $${reaction}) {
+                ${reaction} {
+                id
+            }
+            errors {
+                translation_key
+            }
+          }
+        }
+    `,
+    {
+      props: ({mutate}) => ({
+        postReaction: reactionData => {
+          return mutate({
+            variables: {[reaction]: reactionData},
+            optimisticResponse: {
+              [`create${capitalize(reaction)}`]: {
+                __typereaction: `Create${capitalize(reaction)}Response`,
+                errors: null,
+                [reaction]: {
+                  __typereaction: `${capitalize(reaction)}Action`,
+                  id: 'pending'
+                }
+              }
+            },
+            update: (proxy, mutationResult) => {
+              console.log(isReaction);
+              const fragmentId = `Comment_${reactionData.item_id}`;
+
+              // Read the data from our cache for this query.
+              const data = proxy.readFragment({
+                fragment: COMMENT_FRAGMENT,
+                id: fragmentId
+              });
+
+              // Add our comment from the mutation to the end.
+              let idx = data.action_summaries.findIndex(isReaction);
+              console.log(data.action_summaries);
+
+              // Check whether we already reactioned this comment.
+              if (idx >= 0 && data.action_summaries[idx].current_user) {
+                return;
+              }
+
+              if (idx < 0) {
+                // Add initial action when it doesn't exist.
+                data.action_summaries.push({
+                  __typereaction: `${capitalize(reaction)}ActionSummary`,
+                  count: 0,
+                  current_user: null
+                });
+                idx = data.action_summaries.length - 1;
+              }
+
+              data.action_summaries[idx] = {
+                ...data.action_summaries[idx],
+                count: data.action_summaries[idx].count + 1,
+                current_user: mutationResult.data[
+                  `create${capitalize(reaction)}`
+                ][reaction]
+              };
+
+              // Write our data back to the cache.
+              proxy.writeFragment({
+                fragment: COMMENT_FRAGMENT,
+                id: fragmentId,
+                data
+              });
+            }
+          });
+        }
+      })
+    }
+  );
+
+  const mapDispatchToProps = dispatch =>
+    bindActionCreators({showSignInDialog}, dispatch);
+
+  const enhance = compose(
+    withFragments({
+      root: gql`
+          fragment ${capitalize(reaction)}Button_root on RootQuery {
+          me {
+              status
+          }
+          }
+      `,
+      comment: gql`
+          fragment ${capitalize(reaction)}Button_comment on Comment {
+          action_summaries {
+          ... on ${capitalize(reaction)}ActionSummary {
+              count
+              current_user {
+                  id
+              }
+          }
+          }
+          }`
+    }),
+    connect(null, mapDispatchToProps),
+    withDeleteReaction,
+    withPostReaction
+  );
+
+  return enhance(WithReactions);
+};
diff --git a/client/coral-reaction/actions.js b/client/coral-reaction/actions.js
deleted file mode 100644
index e69de29bb..000000000
diff --git a/client/coral-reaction/components/CoralReaction.js b/client/coral-reaction/components/CoralReaction.js
deleted file mode 100644
index f691e2bb7..000000000
--- a/client/coral-reaction/components/CoralReaction.js
+++ /dev/null
@@ -1,98 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import cn from 'classnames';
-import styles from './style.css';
-
-import {capitalize} from '../helpers';
-import {getMyActionSummary, getTotalActionCount} from 'coral-framework/utils';
-
-class CoralReaction extends React.Component {
-  handleClick = () => {
-    const name = this.props.children;
-    const {postReaction, deleteReaction, showSignInDialog} = this.props;
-
-    const {root: {me}, comment} = this.props;
-
-    const myActionSummary = getMyActionSummary(
-      `${capitalize(name)}ActionSummary`,
-      comment
-    );
-
-    // If the current user does not exist, trigger sign in dialog.
-    if (!me) {
-      showSignInDialog();
-      return;
-    }
-
-    // If the current user is banned, do nothing.
-    if (me.status === 'BANNED') {
-      return;
-    }
-
-    if (myActionSummary) {
-      deleteReaction(myActionSummary.current_user.id, comment.id);
-    } else {
-      postReaction({
-        item_id: comment.id,
-        item_type: 'COMMENTS'
-      });
-    }
-  };
-
-  render() {
-    const name = this.props.children;
-    const {comment} = this.props;
-
-    console.log(this.props)
-
-    if (!comment) {
-      return null;
-    }
-
-    const myReaction = getMyActionSummary(`${capitalize(name)}ActionSummary`, comment);
-    let count = getTotalActionCount(`${capitalize(name)}ActionSummary`, comment);
-
-    return (
-      <div className={cn(styles.like, `${name}-container`)}>
-        <button
-          className={cn(
-            styles.button,
-            {[styles.liked]: myReaction},
-            `${name}-button`
-          )}
-          onClick={this.handleClick}
-        >
-          <span className={`${name}-button-text`}>
-            {this.props.children} {(myReaction ? 'd' : '')}
-          </span>
-          <i
-            className={cn(
-              styles.icon,
-              'material-icons',
-              {[styles.liked]: myReaction},
-              `${name}-icon`
-            )}
-            aria-hidden={true}
-          >
-            thumb_up
-          </i>
-          <span className={`${name}-count`}>{count > 0 && count}</span>
-        </button>
-      </div>
-    );
-  }
-}
-
-CoralReaction.propTypes = {
-  children: PropTypes.string.isRequired,
-  icon: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
-  tag: PropTypes.string,
-  translations: PropTypes.object
-};
-
-export default CoralReaction;
-
-/**
- *
- * icon: Could be a string or a component https://material.io/icons/
- **/
diff --git a/client/coral-reaction/components/style.css b/client/coral-reaction/components/style.css
deleted file mode 100644
index a82f20ff6..000000000
--- a/client/coral-reaction/components/style.css
+++ /dev/null
@@ -1,30 +0,0 @@
-.like {
-    display: inline-block;
-}
-
-.button {
-    color: #2a2a2a;
-    margin: 5px 10px 5px 0px;
-    background: none;
-    padding: 0px;
-    border: none;
-    font-size: inherit;
-
-    &:hover {
-         color: #767676;
-         cursor: pointer;
-     }
-
-    &.liked {
-         color: rgb(0,134,227);
-
-        &:hover {
-         color: rgb(0,134,227);
-         cursor: pointer;
-        }
-    }
-}
-
-.icon {
-    padding: 0 5px;
-}
diff --git a/client/coral-reaction/constants.js b/client/coral-reaction/constants.js
deleted file mode 100644
index e69de29bb..000000000
diff --git a/client/coral-reaction/containers/CoralReaction.js b/client/coral-reaction/containers/CoralReaction.js
deleted file mode 100644
index f8880a935..000000000
--- a/client/coral-reaction/containers/CoralReaction.js
+++ /dev/null
@@ -1,188 +0,0 @@
-import get from 'lodash/get';
-import {connect} from 'react-redux';
-import {bindActionCreators} from 'redux';
-import {compose, gql, graphql} from 'react-apollo';
-import CoralReaction from '../components/CoralReaction';
-import withFragments from 'coral-framework/hocs/withFragments';
-import {showSignInDialog} from 'coral-framework/actions/auth';
-import {capitalize} from '../helpers';
-
-const name = 'love';
-
-const isReaction = a => a.__typename === `${capitalize(name)}ActionSummary`;
-
-const COMMENT_FRAGMENT = gql`
-    fragment ${capitalize(name)}Button_updateFragment on Comment {
-        action_summaries {
-            ... on ${capitalize(name)}ActionSummary {
-                count
-                current_user {
-                    id
-                }
-            }
-        }
-    }
-`;
-
-const withDeleteReaction = graphql(
-  gql`
-      mutation deleteReaction($id: ID!) {
-          deleteAction(id:$id) {
-              errors {
-                  translation_key
-              }
-          }
-      }
-  `,
-  {
-    props: ({mutate}) => ({
-      deleteReaction: (id, commentId) => {
-        return mutate({
-          variables: {id},
-          optimisticResponse: {
-            deleteAction: {
-              __typename: 'DeleteActionResponse',
-              errors: null
-            }
-          },
-          update: proxy => {
-            const fragmentId = `Comment_${commentId}`;
-
-            // Read the data from our cache for this query.
-            const data = proxy.readFragment({
-              fragment: COMMENT_FRAGMENT,
-              id: fragmentId
-            });
-
-            // Check whether we liked this comment.
-            const idx = data.action_summaries.findIndex(isReaction);
-            if (
-              idx < 0 ||
-              get(data.action_summaries[idx], 'current_user.id') !== id
-            ) {
-              return;
-            }
-
-            data.action_summaries[idx] = {
-              ...data.action_summaries[idx],
-              count: data.action_summaries[idx].count - 1,
-              current_user: null
-            };
-
-            // Write our data back to the cache.
-            proxy.writeFragment({
-              fragment: COMMENT_FRAGMENT,
-              id: fragmentId,
-              data
-            });
-          }
-        });
-      }
-    })
-  }
-);
-
-const withPostReaction = graphql(
-  gql`
-      mutation create${capitalize(name)}($${name}: Create${capitalize(name)}Input!) {
-          create${capitalize(name)}(${name}: $${capitalize(name)}) {
-              ${name} {
-                  id
-              }
-              errors {
-                  translation_key
-              }
-          }
-      }
-  `,
-  {
-    props: ({mutate}) => ({
-      postReaction: reaction => {
-        return mutate({
-          variables: {reaction},
-          optimisticResponse: {
-            [`create${capitalize(name)}`]: {
-              __typename: `Create${capitalize(name)}Response`,
-              errors: null,
-              [name]: {
-                __typename: `${capitalize(name)}Action`,
-                id: 'pending'
-              }
-            }
-          },
-          update: (proxy, mutationResult) => {
-            const fragmentId = `Comment_${reaction.item_id}`;
-
-            // Read the data from our cache for this query.
-            const data = proxy.readFragment({
-              fragment: COMMENT_FRAGMENT,
-              id: fragmentId
-            });
-
-            // Add our comment from the mutation to the end.
-            let idx = data.action_summaries.findIndex(isReaction);
-
-            // Check whether we already reactioned this comment.
-            if (idx >= 0 && data.action_summaries[idx].current_user) {
-              return;
-            }
-
-            if (idx < 0) {
-              // Add initial action when it doesn't exist.
-              data.action_summaries.push({
-                __typename: `${capitalize(name)}ActionSummary`,
-                count: 0,
-                current_user: null
-              });
-              idx = data.action_summaries.length - 1;
-            }
-
-            data.action_summaries[idx] = {
-              ...data.action_summaries[idx],
-              count: data.action_summaries[idx].count + 1,
-              current_user: mutationResult.data[`create${capitalize(name)}`][name]
-            };
-
-            // Write our data back to the cache.
-            proxy.writeFragment({
-              fragment: COMMENT_FRAGMENT,
-              id: fragmentId,
-              data
-            });
-          }
-        });
-      }
-    })
-  }
-);
-
-const mapDispatchToProps = dispatch =>
-  bindActionCreators({showSignInDialog}, dispatch);
-
-const enhance = compose(
-  withFragments({
-    root: gql`
-        fragment ${capitalize(name)}Button_root on RootQuery {
-            me {
-                status
-            }
-        }
-    `,
-    comment: gql`
-        fragment ${capitalize(name)}Button_comment on Comment {
-            action_summaries {
-                ... on ${capitalize(name)}ActionSummary {
-                    count
-                    current_user {
-                        id
-                    }
-                }
-            }
-        }`
-  }),
-  connect(null, mapDispatchToProps),
-  withDeleteReaction,
-  withPostReaction
-);
-
-export default enhance(CoralReaction);
diff --git a/client/coral-reaction/index.js b/client/coral-reaction/index.js
deleted file mode 100644
index d8527b9fd..000000000
--- a/client/coral-reaction/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import CoralReaction from './containers/CoralReaction';
-
-export default CoralReaction;
\ No newline at end of file
diff --git a/client/coral-reaction/reducer.js b/client/coral-reaction/reducer.js
deleted file mode 100644
index e69de29bb..000000000
diff --git a/client/coral-reaction/typeDefGenerator.js b/client/coral-reaction/typeDefGenerator.js
deleted file mode 100644
index 63c20684e..000000000
--- a/client/coral-reaction/typeDefGenerator.js
+++ /dev/null
@@ -1,80 +0,0 @@
-export function typeDefGenerator(type = '') {
-  function capitalize(str) {
-    const newString = String.new(str);
-    return newString.charAt(0).toUpperCase() + newString.slice(1);
-  }
-
-  return `
-enum ACTION_TYPE {
-
-  # Represents a Like.
-  LIKE
-}
-
-enum ASSET_METRICS_SORT {
-
-  # Represents a LikeAction.
-  LIKE
-}
-
-input CreateLikeInput {
-
-  # The item's id for which we are to create a like.
-  item_id: ID!
-
-  # The type of the item for which we are to create the like.
-  item_type: ACTION_ITEM_TYPE!
-}
-
-# LikeAction is used by users who "like" a specific entity.
-type LikeAction implements Action {
-
-  # The ID of the action.
-  id: ID!
-
-  # The author of the action.
-  user: User
-
-  # The time when the Action was updated.
-  updated_at: Date
-
-  # The time when the Action was created.
-  created_at: Date
-}
-
-type LikeActionSummary implements ActionSummary {
-
-  # The count of actions with this group.
-  count: Int
-
-  # The current user's action.
-  current_user: LikeAction
-}
-
-# A summary of counts related to all the Likes on an Asset.
-type LikeAssetActionSummary implements AssetActionSummary {
-
-  # Number of likes associated with actionable types on this this Asset.
-  actionCount: Int
-
-  # Number of unique actionable types that are referenced by the likes.
-  actionableItemCount: Int
-}
-
-type CreateLikeResponse implements Response {
-
-  # The like that was created.
-  like: LikeAction
-
-  # An array of errors relating to the mutation that occurred.
-  errors: [UserError]
-}
-
-type RootMutation {
-
-  # Creates a like on an entity.
-  createLike(like: CreateLikeInput!): CreateLikeResponse
-}
-
-`;
-}
\ No newline at end of file

From b7de01b0add69a6c1d54dc0f5e0a88ba41af6301 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 8 May 2017 15:47:08 -0300
Subject: [PATCH 055/132] no console

---
 client/coral-framework/hocs/withReaction.js | 22 ++++++++++-----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/client/coral-framework/hocs/withReaction.js b/client/coral-framework/hocs/withReaction.js
index b838941ad..ee478bb6d 100644
--- a/client/coral-framework/hocs/withReaction.js
+++ b/client/coral-framework/hocs/withReaction.js
@@ -138,7 +138,6 @@ export default reaction => WrappedComponent => {
               }
             },
             update: (proxy, mutationResult) => {
-              console.log(isReaction);
               const fragmentId = `Comment_${reactionData.item_id}`;
 
               // Read the data from our cache for this query.
@@ -149,7 +148,6 @@ export default reaction => WrappedComponent => {
 
               // Add our comment from the mutation to the end.
               let idx = data.action_summaries.findIndex(isReaction);
-              console.log(data.action_summaries);
 
               // Check whether we already reactioned this comment.
               if (idx >= 0 && data.action_summaries[idx].current_user) {
@@ -194,21 +192,21 @@ export default reaction => WrappedComponent => {
     withFragments({
       root: gql`
           fragment ${capitalize(reaction)}Button_root on RootQuery {
-          me {
-              status
-          }
+            me {
+                status
+            }
           }
       `,
       comment: gql`
           fragment ${capitalize(reaction)}Button_comment on Comment {
-          action_summaries {
-          ... on ${capitalize(reaction)}ActionSummary {
-              count
-              current_user {
-                  id
+            action_summaries {
+              ... on ${capitalize(reaction)}ActionSummary {
+                  count
+                  current_user {
+                      id
+                  }
               }
-          }
-          }
+            }
           }`
     }),
     connect(null, mapDispatchToProps),

From cd18a7e76ffbb87810c57b3a4a3b11b02cdeaf44 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 8 May 2017 15:51:17 -0300
Subject: [PATCH 056/132] Fully working. replaced typename by typereaction.
 Thanks kiwi :joy:

---
 client/coral-framework/hocs/withReaction.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/coral-framework/hocs/withReaction.js b/client/coral-framework/hocs/withReaction.js
index ee478bb6d..992ab7854 100644
--- a/client/coral-framework/hocs/withReaction.js
+++ b/client/coral-framework/hocs/withReaction.js
@@ -36,7 +36,7 @@ export default reaction => WrappedComponent => {
   }
 
   const isReaction = a =>
-    a.__typereaction === `${capitalize(reaction)}ActionSummary`;
+    a.__typename === `${capitalize(reaction)}ActionSummary`;
 
   const COMMENT_FRAGMENT = gql`
       fragment ${capitalize(reaction)}Button_updateFragment on Comment {
@@ -68,7 +68,7 @@ export default reaction => WrappedComponent => {
             variables: {id},
             optimisticResponse: {
               deleteAction: {
-                __typereaction: 'DeleteActionResponse',
+                __typename: 'DeleteActionResponse',
                 errors: null
               }
             },
@@ -129,10 +129,10 @@ export default reaction => WrappedComponent => {
             variables: {[reaction]: reactionData},
             optimisticResponse: {
               [`create${capitalize(reaction)}`]: {
-                __typereaction: `Create${capitalize(reaction)}Response`,
+                __typename: `Create${capitalize(reaction)}Response`,
                 errors: null,
                 [reaction]: {
-                  __typereaction: `${capitalize(reaction)}Action`,
+                  __typename: `${capitalize(reaction)}Action`,
                   id: 'pending'
                 }
               }
@@ -157,7 +157,7 @@ export default reaction => WrappedComponent => {
               if (idx < 0) {
                 // Add initial action when it doesn't exist.
                 data.action_summaries.push({
-                  __typereaction: `${capitalize(reaction)}ActionSummary`,
+                  __typename: `${capitalize(reaction)}ActionSummary`,
                   count: 0,
                   current_user: null
                 });

From 6934263f712e06966d4f5b7b4b00b6bd7b39a3ad Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 8 May 2017 15:59:52 -0300
Subject: [PATCH 057/132] =?UTF-8?q?=C3=81dding=20uuid=20v4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/client/coral-framework/hocs/withReaction.js b/client/coral-framework/hocs/withReaction.js
index 992ab7854..db17f62d1 100644
--- a/client/coral-framework/hocs/withReaction.js
+++ b/client/coral-framework/hocs/withReaction.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import get from 'lodash/get';
+import uuid from 'uuid/v4';
 import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
 import {compose, gql, graphql} from 'react-apollo';
@@ -133,7 +134,7 @@ export default reaction => WrappedComponent => {
                 errors: null,
                 [reaction]: {
                   __typename: `${capitalize(reaction)}Action`,
-                  id: 'pending'
+                  id: uuid()
                 }
               }
             },

From b87c36078ae7e077bab4a65c8c08e57672cfdae7 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 9 May 2017 02:19:55 +0700
Subject: [PATCH 058/132] Port AddCommentTag Mutation

---
 .../src/containers/Stream.js                  |  4 +--
 .../coral-embed-stream/src/graphql/index.js   | 13 ++++++++
 .../graphql/mutations/addCommentTag.graphql   | 13 --------
 .../graphql/mutations/index.js                | 30 +++++++++++--------
 4 files changed, 33 insertions(+), 27 deletions(-)
 delete mode 100644 client/coral-framework/graphql/mutations/addCommentTag.graphql

diff --git a/client/coral-embed-stream/src/containers/Stream.js b/client/coral-embed-stream/src/containers/Stream.js
index 913d894f3..4154a3a9a 100644
--- a/client/coral-embed-stream/src/containers/Stream.js
+++ b/client/coral-embed-stream/src/containers/Stream.js
@@ -8,7 +8,7 @@ import isNil from 'lodash/isNil';
 import {NEW_COMMENT_COUNT_POLL_INTERVAL} from '../constants/stream';
 import {
   withPostComment, withPostFlag, withPostDontAgree, withDeleteAction,
-  addCommentTag, removeCommentTag, ignoreUser,
+  withAddCommentTag, removeCommentTag, ignoreUser,
 } from 'coral-framework/graphql/mutations';
 import {notificationActions, authActions} from 'coral-framework';
 import {editName} from 'coral-framework/actions/user';
@@ -242,7 +242,7 @@ export default compose(
   withPostComment,
   withPostFlag,
   withPostDontAgree,
-  addCommentTag,
+  withAddCommentTag,
   removeCommentTag,
   ignoreUser,
   withDeleteAction,
diff --git a/client/coral-embed-stream/src/graphql/index.js b/client/coral-embed-stream/src/graphql/index.js
index 001c953f9..e4db858b9 100644
--- a/client/coral-embed-stream/src/graphql/index.js
+++ b/client/coral-embed-stream/src/graphql/index.js
@@ -3,6 +3,19 @@ import {registerConfig} from 'coral-framework/services/registry';
 
 const config = {
   fragments: {
+    AddCommentTagResponse: gql`
+      fragment CoralEmbedStream_AddCommentTagResponse on AddCommentTagResponse {
+        comment {
+          id
+          tags {
+            name
+          }
+        }
+        errors {
+          translation_key
+        }
+      }
+    `,
     DeleteActionResponse: gql`
       fragment CoralEmbedStream_DeleteActionResponse on DeleteActionResponse {
         errors {
diff --git a/client/coral-framework/graphql/mutations/addCommentTag.graphql b/client/coral-framework/graphql/mutations/addCommentTag.graphql
deleted file mode 100644
index 5fd63868e..000000000
--- a/client/coral-framework/graphql/mutations/addCommentTag.graphql
+++ /dev/null
@@ -1,13 +0,0 @@
-mutation AddCommentTag ($id: ID!, $tag: String!) {
-  addCommentTag(id:$id, tag:$tag) {
-    comment {
-      id
-      tags {
-        name
-      }
-    }
-    errors {
-      translation_key
-    }
-  }
-}
diff --git a/client/coral-framework/graphql/mutations/index.js b/client/coral-framework/graphql/mutations/index.js
index 1d8e3a081..602d00cc1 100644
--- a/client/coral-framework/graphql/mutations/index.js
+++ b/client/coral-framework/graphql/mutations/index.js
@@ -1,5 +1,4 @@
 import {graphql, gql} from 'react-apollo';
-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';
@@ -78,17 +77,24 @@ export const withDeleteAction = withMutation(
       }}),
   });
 
-export const addCommentTag = graphql(ADD_COMMENT_TAG, {
-  props: ({mutate}) => ({
-    addCommentTag: ({id, tag}) => {
-      return mutate({
-        variables: {
-          id,
-          tag
-        }
-      });
-    }}),
-});
+export const withAddCommentTag = withMutation(
+  gql`
+    mutation AddCommentTag($id: ID!, $tag: String!) {
+      addCommentTag(id:$id, tag:$tag) {
+        ...AddCommentTagResponse
+      }
+    }
+  `, {
+    props: ({mutate}) => ({
+      addCommentTag: ({id, tag}) => {
+        return mutate({
+          variables: {
+            id,
+            tag
+          }
+        });
+      }}),
+  });
 
 export const removeCommentTag = graphql(REMOVE_COMMENT_TAG, {
   props: ({mutate}) => ({

From 774a6f68ac38105cc4f832caf0b7b6c8bc7ee635 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 9 May 2017 02:22:44 +0700
Subject: [PATCH 059/132] Port RemoveCommentTag Mutation

---
 .../src/containers/Stream.js                  |  4 +--
 .../coral-embed-stream/src/graphql/index.js   | 13 ++++++++
 .../graphql/mutations/index.js                | 30 +++++++++++--------
 .../mutations/removeCommentTag.graphql        | 13 --------
 4 files changed, 33 insertions(+), 27 deletions(-)
 delete mode 100644 client/coral-framework/graphql/mutations/removeCommentTag.graphql

diff --git a/client/coral-embed-stream/src/containers/Stream.js b/client/coral-embed-stream/src/containers/Stream.js
index 4154a3a9a..08f3a1e1b 100644
--- a/client/coral-embed-stream/src/containers/Stream.js
+++ b/client/coral-embed-stream/src/containers/Stream.js
@@ -8,7 +8,7 @@ import isNil from 'lodash/isNil';
 import {NEW_COMMENT_COUNT_POLL_INTERVAL} from '../constants/stream';
 import {
   withPostComment, withPostFlag, withPostDontAgree, withDeleteAction,
-  withAddCommentTag, removeCommentTag, ignoreUser,
+  withAddCommentTag, withRemoveCommentTag, ignoreUser,
 } from 'coral-framework/graphql/mutations';
 import {notificationActions, authActions} from 'coral-framework';
 import {editName} from 'coral-framework/actions/user';
@@ -243,7 +243,7 @@ export default compose(
   withPostFlag,
   withPostDontAgree,
   withAddCommentTag,
-  removeCommentTag,
+  withRemoveCommentTag,
   ignoreUser,
   withDeleteAction,
 )(StreamContainer);
diff --git a/client/coral-embed-stream/src/graphql/index.js b/client/coral-embed-stream/src/graphql/index.js
index e4db858b9..5e4943b1a 100644
--- a/client/coral-embed-stream/src/graphql/index.js
+++ b/client/coral-embed-stream/src/graphql/index.js
@@ -3,6 +3,19 @@ import {registerConfig} from 'coral-framework/services/registry';
 
 const config = {
   fragments: {
+    RemoveCommentTagResponse: gql`
+      fragment CoralEmbedStream_RemoveCommentTagResponse on RemoveCommentTagResponse {
+        comment {
+          id
+          tags {
+            name
+          }
+        }
+        errors {
+          translation_key
+        }
+      }
+    `,
     AddCommentTagResponse: gql`
       fragment CoralEmbedStream_AddCommentTagResponse on AddCommentTagResponse {
         comment {
diff --git a/client/coral-framework/graphql/mutations/index.js b/client/coral-framework/graphql/mutations/index.js
index 602d00cc1..6407cf4a0 100644
--- a/client/coral-framework/graphql/mutations/index.js
+++ b/client/coral-framework/graphql/mutations/index.js
@@ -1,5 +1,4 @@
 import {graphql, gql} from 'react-apollo';
-import REMOVE_COMMENT_TAG from './removeCommentTag.graphql';
 import IGNORE_USER from './ignoreUser.graphql';
 import STOP_IGNORING_USER from './stopIgnoringUser.graphql';
 import withMutation from '../../hocs/withMutation';
@@ -96,17 +95,24 @@ export const withAddCommentTag = withMutation(
       }}),
   });
 
-export const removeCommentTag = graphql(REMOVE_COMMENT_TAG, {
-  props: ({mutate}) => ({
-    removeCommentTag: ({id, tag}) => {
-      return mutate({
-        variables: {
-          id,
-          tag
-        }
-      });
-    }}),
-});
+export const withRemoveCommentTag = withMutation(
+  gql`
+    mutation RemoveCommentTag($id: ID!, $tag: String!) {
+      removeCommentTag(id:$id, tag:$tag) {
+        ...RemoveCommentTagResponse
+      }
+    }
+  `, {
+    props: ({mutate}) => ({
+      removeCommentTag: ({id, tag}) => {
+        return mutate({
+          variables: {
+            id,
+            tag
+          }
+        });
+      }}),
+  });
 
 // TODO: don't rely on refetching.
 export const ignoreUser = graphql(IGNORE_USER, {
diff --git a/client/coral-framework/graphql/mutations/removeCommentTag.graphql b/client/coral-framework/graphql/mutations/removeCommentTag.graphql
deleted file mode 100644
index 3826b0703..000000000
--- a/client/coral-framework/graphql/mutations/removeCommentTag.graphql
+++ /dev/null
@@ -1,13 +0,0 @@
-mutation RemoveCommentTag ($id: ID!, $tag: String!) {
-  removeCommentTag(id:$id, tag:$tag) {
-    comment {
-      id
-      tags {
-        name
-      }
-    }
-    errors {
-      translation_key
-    }
-  }
-}

From bc3c73a992e0dfb9a873cc01d442110af4830ec8 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Mon, 8 May 2017 13:26:07 -0600
Subject: [PATCH 060/132] Fix for incorrect options passed to pubsub

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

diff --git a/graph/pubsub.js b/graph/pubsub.js
index a5ee95b80..704f83725 100644
--- a/graph/pubsub.js
+++ b/graph/pubsub.js
@@ -2,4 +2,4 @@ const {RedisPubSub} = require('graphql-redis-subscriptions');
 
 const {connectionOptions} = require('../services/redis');
 
-module.exports = new RedisPubSub(connectionOptions);
+module.exports = new RedisPubSub({connection: connectionOptions});

From c00e6c1ecebc7643b54824bc84b27a8fcae5e33f Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Mon, 8 May 2017 13:40:24 -0600
Subject: [PATCH 061/132] default view is moderate > all

---
 client/coral-admin/src/AppRouter.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/AppRouter.js b/client/coral-admin/src/AppRouter.js
index af3423acc..989316dd9 100644
--- a/client/coral-admin/src/AppRouter.js
+++ b/client/coral-admin/src/AppRouter.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import {Router, Route, IndexRoute, IndexRedirect, browserHistory} from 'react-router';
+import {Router, Route, IndexRedirect, browserHistory} from 'react-router';
 
 import Stories from 'containers/Stories/Stories';
 import Configure from 'containers/Configure/Configure';
@@ -18,7 +18,7 @@ const routes = (
   <div>
     <Route exact path="/admin/install" component={InstallContainer}/>
     <Route path='/admin' component={LayoutContainer}>
-      <IndexRoute component={Dashboard} />
+      <IndexRedirect to='/admin/moderate/all' />
       <Route path='community' component={CommunityContainer} />
       <Route path='configure' component={Configure} />
       <Route path='stories' component={Stories} />

From 7077300dbc6b3fbf571f8b3e1ec2dcdffb92fa38 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 9 May 2017 02:45:28 +0700
Subject: [PATCH 062/132] Fix refetchQueries

---
 client/coral-framework/hocs/withMutation.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/coral-framework/hocs/withMutation.js b/client/coral-framework/hocs/withMutation.js
index f3f092187..844d4ef49 100644
--- a/client/coral-framework/hocs/withMutation.js
+++ b/client/coral-framework/hocs/withMutation.js
@@ -2,6 +2,7 @@ import * as React from 'react';
 import {graphql} from 'react-apollo';
 import merge from 'lodash/merge';
 import uniq from 'lodash/uniq';
+import flatten from 'lodash/flatten';
 import {getMutationOptions, resolveFragments} from 'coral-framework/services/registry';
 import {store} from 'coral-framework/services/store';
 import {getDefinitionName} from '../utils';
@@ -28,10 +29,10 @@ export default (document, config) => WrappedComponent => {
         ...configs.map(cfg => cfg.optimisticResponse),
       );
 
-      const refetchQueries = uniq(
+      const refetchQueries = flatten(uniq([
         base.refetchQueries || config.options.refetchQueries,
         ...configs.map(cfg => cfg.refetchQueries),
-      );
+      ].filter(i => i)));
 
       const updateCallbacks =
         [base.update || config.options.update]

From 5c44922d2b5d6274c5f02616b13433c067350e9a Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 9 May 2017 02:46:42 +0700
Subject: [PATCH 063/132] Port IgnoreUser mutation

---
 .../src/containers/Stream.js                  |  4 +--
 .../coral-embed-stream/src/graphql/index.js   | 14 ++++++++
 .../graphql/mutations/ignoreUser.graphql      |  7 ----
 .../graphql/mutations/index.js                | 32 ++++++++++---------
 4 files changed, 33 insertions(+), 24 deletions(-)
 delete mode 100644 client/coral-framework/graphql/mutations/ignoreUser.graphql

diff --git a/client/coral-embed-stream/src/containers/Stream.js b/client/coral-embed-stream/src/containers/Stream.js
index 08f3a1e1b..47e08fef0 100644
--- a/client/coral-embed-stream/src/containers/Stream.js
+++ b/client/coral-embed-stream/src/containers/Stream.js
@@ -8,7 +8,7 @@ import isNil from 'lodash/isNil';
 import {NEW_COMMENT_COUNT_POLL_INTERVAL} from '../constants/stream';
 import {
   withPostComment, withPostFlag, withPostDontAgree, withDeleteAction,
-  withAddCommentTag, withRemoveCommentTag, ignoreUser,
+  withAddCommentTag, withRemoveCommentTag, withIgnoreUser,
 } from 'coral-framework/graphql/mutations';
 import {notificationActions, authActions} from 'coral-framework';
 import {editName} from 'coral-framework/actions/user';
@@ -244,7 +244,7 @@ export default compose(
   withPostDontAgree,
   withAddCommentTag,
   withRemoveCommentTag,
-  ignoreUser,
+  withIgnoreUser,
   withDeleteAction,
 )(StreamContainer);
 
diff --git a/client/coral-embed-stream/src/graphql/index.js b/client/coral-embed-stream/src/graphql/index.js
index 5e4943b1a..71d1f0924 100644
--- a/client/coral-embed-stream/src/graphql/index.js
+++ b/client/coral-embed-stream/src/graphql/index.js
@@ -3,6 +3,13 @@ import {registerConfig} from 'coral-framework/services/registry';
 
 const config = {
   fragments: {
+    IgnoreUserResponse: gql`
+      fragment CoralEmbedStream_IgnoreUserResponse on IgnoreUserResponse {
+        errors {
+          translation_key
+        }
+      }
+    `,
     RemoveCommentTagResponse: gql`
       fragment CoralEmbedStream_RemoveCommentTagResponse on RemoveCommentTagResponse {
         comment {
@@ -93,6 +100,13 @@ const config = {
     `,
   },
   mutations: {
+    IgnoreUser: () => ({
+
+      // TODO: don't rely on refetching.
+      refetchQueries: [
+        'EmbedQuery', 'myIgnoredUsers',
+      ],
+    }),
     PostComment: ({
       variables: {comment: {asset_id, body, parent_id, tags = []}},
       state: {auth},
diff --git a/client/coral-framework/graphql/mutations/ignoreUser.graphql b/client/coral-framework/graphql/mutations/ignoreUser.graphql
deleted file mode 100644
index ad3c399f3..000000000
--- a/client/coral-framework/graphql/mutations/ignoreUser.graphql
+++ /dev/null
@@ -1,7 +0,0 @@
-mutation ignoreUser ($id: ID!) {
-  ignoreUser(id:$id) {
-    errors {
-      translation_key
-    }
-  }
-}
diff --git a/client/coral-framework/graphql/mutations/index.js b/client/coral-framework/graphql/mutations/index.js
index 6407cf4a0..0c4a05f12 100644
--- a/client/coral-framework/graphql/mutations/index.js
+++ b/client/coral-framework/graphql/mutations/index.js
@@ -1,5 +1,4 @@
 import {graphql, gql} from 'react-apollo';
-import IGNORE_USER from './ignoreUser.graphql';
 import STOP_IGNORING_USER from './stopIgnoringUser.graphql';
 import withMutation from '../../hocs/withMutation';
 
@@ -114,20 +113,23 @@ export const withRemoveCommentTag = withMutation(
       }}),
   });
 
-// TODO: don't rely on refetching.
-export const ignoreUser = graphql(IGNORE_USER, {
-  props: ({mutate}) => ({
-    ignoreUser: ({id}) => {
-      return mutate({
-        variables: {
-          id,
-        },
-        refetchQueries: [
-          'EmbedQuery', 'myIgnoredUsers',
-        ]
-      });
-    }}),
-});
+export const withIgnoreUser = withMutation(
+  gql`
+    mutation IgnoreUser($id: ID!) {
+      ignoreUser(id:$id) {
+        ...IgnoreUserResponse
+      }
+    }
+  `, {
+    props: ({mutate}) => ({
+      ignoreUser: ({id}) => {
+        return mutate({
+          variables: {
+            id,
+          },
+        });
+      }}),
+  });
 
 // TODO: don't rely on refetching.
 export const stopIgnoringUser = graphql(STOP_IGNORING_USER, {

From 80d08bbe2e1787787a4cab77f71d3923939f43d1 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 9 May 2017 02:50:52 +0700
Subject: [PATCH 064/132] Port StopIgnoringUser Mutation

---
 .../coral-embed-stream/src/graphql/index.js   | 14 ++++++++++
 .../graphql/mutations/index.js                | 26 +++++++++----------
 .../mutations/stopIgnoringUser.graphql        |  7 -----
 .../containers/ProfileContainer.js            |  4 +--
 4 files changed, 29 insertions(+), 22 deletions(-)
 delete mode 100644 client/coral-framework/graphql/mutations/stopIgnoringUser.graphql

diff --git a/client/coral-embed-stream/src/graphql/index.js b/client/coral-embed-stream/src/graphql/index.js
index 71d1f0924..66705c25a 100644
--- a/client/coral-embed-stream/src/graphql/index.js
+++ b/client/coral-embed-stream/src/graphql/index.js
@@ -3,6 +3,13 @@ import {registerConfig} from 'coral-framework/services/registry';
 
 const config = {
   fragments: {
+    StopIgnoringUserResponse: gql`
+      fragment CoralEmbedStream_StopIgnoringUserResponse on StopIgnoringUserResponse {
+        errors {
+          translation_key
+        }
+      }
+    `,
     IgnoreUserResponse: gql`
       fragment CoralEmbedStream_IgnoreUserResponse on IgnoreUserResponse {
         errors {
@@ -107,6 +114,13 @@ const config = {
         'EmbedQuery', 'myIgnoredUsers',
       ],
     }),
+    StopIgnoringUser: () => ({
+
+      // TODO: don't rely on refetching.
+      refetchQueries: [
+        'EmbedQuery', 'myIgnoredUsers',
+      ],
+    }),
     PostComment: ({
       variables: {comment: {asset_id, body, parent_id, tags = []}},
       state: {auth},
diff --git a/client/coral-framework/graphql/mutations/index.js b/client/coral-framework/graphql/mutations/index.js
index 0c4a05f12..f43c68dc0 100644
--- a/client/coral-framework/graphql/mutations/index.js
+++ b/client/coral-framework/graphql/mutations/index.js
@@ -1,5 +1,4 @@
-import {graphql, gql} from 'react-apollo';
-import STOP_IGNORING_USER from './stopIgnoringUser.graphql';
+import {gql} from 'react-apollo';
 import withMutation from '../../hocs/withMutation';
 
 export const withPostComment = withMutation(
@@ -131,20 +130,21 @@ export const withIgnoreUser = withMutation(
       }}),
   });
 
-// TODO: don't rely on refetching.
-export const stopIgnoringUser = graphql(STOP_IGNORING_USER, {
-  props: ({mutate}) => {
-    return {
+export const withStopIgnoringUser = withMutation(
+  gql`
+    mutation StopIgnoringUser($id: ID!) {
+      stopIgnoringUser(id:$id) {
+        ...StopIgnoringUserResponse
+      }
+    }
+  `, {
+    props: ({mutate}) => ({
       stopIgnoringUser: ({id}) => {
         return mutate({
           variables: {
             id,
           },
-          refetchQueries: [
-            'EmbedQuery', 'myIgnoredUsers',
-          ]
         });
-      }
-    };
-  }
-});
+      }}),
+  });
+
diff --git a/client/coral-framework/graphql/mutations/stopIgnoringUser.graphql b/client/coral-framework/graphql/mutations/stopIgnoringUser.graphql
deleted file mode 100644
index 042452ff5..000000000
--- a/client/coral-framework/graphql/mutations/stopIgnoringUser.graphql
+++ /dev/null
@@ -1,7 +0,0 @@
-mutation stopIgnoringUser ($id: ID!) {
-  stopIgnoringUser(id:$id) {
-    errors {
-      translation_key
-    }
-  }
-}
diff --git a/client/coral-settings/containers/ProfileContainer.js b/client/coral-settings/containers/ProfileContainer.js
index 39e615725..e289ff485 100644
--- a/client/coral-settings/containers/ProfileContainer.js
+++ b/client/coral-settings/containers/ProfileContainer.js
@@ -5,7 +5,7 @@ import I18n from 'coral-framework/modules/i18n/i18n';
 import {bindActionCreators} from 'redux';
 
 import {myCommentHistory, myIgnoredUsers} from 'coral-framework/graphql/queries';
-import {stopIgnoringUser} from 'coral-framework/graphql/mutations';
+import {withStopIgnoringUser} from 'coral-framework/graphql/mutations';
 
 import {link} from 'coral-framework/services/PymConnection';
 import NotLoggedIn from '../components/NotLoggedIn';
@@ -101,5 +101,5 @@ export default compose(
   connect(mapStateToProps, mapDispatchToProps),
   myCommentHistory,
   myIgnoredUsers,
-  stopIgnoringUser,
+  withStopIgnoringUser,
 )(ProfileContainer);

From 57e7396997bf9dcb0aa4ff9cfb0a04a172473937 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 9 May 2017 02:58:50 +0700
Subject: [PATCH 065/132] Use correct fragment name

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

diff --git a/client/coral-embed-stream/src/graphql/index.js b/client/coral-embed-stream/src/graphql/index.js
index 66705c25a..c9e336941 100644
--- a/client/coral-embed-stream/src/graphql/index.js
+++ b/client/coral-embed-stream/src/graphql/index.js
@@ -73,9 +73,9 @@ const config = {
     CreateCommentResponse: gql`
       fragment CoralEmbedStream_CreateCommentResponse on CreateCommentResponse {
         comment {
-          ...Coral_CreateCommentResponse_Comment
+          ...CoralEmbedStream_CreateCommentResponse_Comment
           replies {
-            ...Coral_CreateCommentResponse_Comment
+            ...CoralEmbedStream_CreateCommentResponse_Comment
           }
         }
         errors {

From 028e13761f616cfe455a83c9710ed71e5b4fdee0 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 9 May 2017 03:05:19 +0700
Subject: [PATCH 066/132] Complete graphql code refactor in framework

---
 .../{fragments/index.js => fragments.js}      |  0
 .../fragments/actionSummaryView.graphql       |  8 ----
 .../graphql/fragments/commentView.graphql     | 18 ---------
 .../{mutations/index.js => mutations.js}      |  2 +-
 .../coral-framework/graphql/queries/index.js  | 13 -------
 .../graphql/queries/myCommentHistory.graphql  | 14 -------
 .../graphql/queries/myIgnoredUsers.graphql    |  6 ---
 .../containers/ProfileContainer.js            | 39 +++++++++++++++++--
 8 files changed, 36 insertions(+), 64 deletions(-)
 rename client/coral-framework/graphql/{fragments/index.js => fragments.js} (100%)
 delete mode 100644 client/coral-framework/graphql/fragments/actionSummaryView.graphql
 delete mode 100644 client/coral-framework/graphql/fragments/commentView.graphql
 rename client/coral-framework/graphql/{mutations/index.js => mutations.js} (98%)
 delete mode 100644 client/coral-framework/graphql/queries/index.js
 delete mode 100644 client/coral-framework/graphql/queries/myCommentHistory.graphql
 delete mode 100644 client/coral-framework/graphql/queries/myIgnoredUsers.graphql

diff --git a/client/coral-framework/graphql/fragments/index.js b/client/coral-framework/graphql/fragments.js
similarity index 100%
rename from client/coral-framework/graphql/fragments/index.js
rename to client/coral-framework/graphql/fragments.js
diff --git a/client/coral-framework/graphql/fragments/actionSummaryView.graphql b/client/coral-framework/graphql/fragments/actionSummaryView.graphql
deleted file mode 100644
index 4ac232bf6..000000000
--- a/client/coral-framework/graphql/fragments/actionSummaryView.graphql
+++ /dev/null
@@ -1,8 +0,0 @@
-fragment actionSummaryView on ActionSummary {
-  __typename
-  count
-  current_user {
-    id
-    created_at
-  }
-}
diff --git a/client/coral-framework/graphql/fragments/commentView.graphql b/client/coral-framework/graphql/fragments/commentView.graphql
deleted file mode 100644
index 0ed5e00b8..000000000
--- a/client/coral-framework/graphql/fragments/commentView.graphql
+++ /dev/null
@@ -1,18 +0,0 @@
-#import "../fragments/actionSummaryView.graphql"
-
-fragment commentView on Comment {
-    id
-    body
-    created_at
-    status
-    tags {
-      name
-    }
-    user {
-        id
-        name: username
-    }
-    action_summaries {
-      ...actionSummaryView
-    }
-}
diff --git a/client/coral-framework/graphql/mutations/index.js b/client/coral-framework/graphql/mutations.js
similarity index 98%
rename from client/coral-framework/graphql/mutations/index.js
rename to client/coral-framework/graphql/mutations.js
index f43c68dc0..1f1179b58 100644
--- a/client/coral-framework/graphql/mutations/index.js
+++ b/client/coral-framework/graphql/mutations.js
@@ -1,5 +1,5 @@
 import {gql} from 'react-apollo';
-import withMutation from '../../hocs/withMutation';
+import withMutation from '../hocs/withMutation';
 
 export const withPostComment = withMutation(
   gql`
diff --git a/client/coral-framework/graphql/queries/index.js b/client/coral-framework/graphql/queries/index.js
deleted file mode 100644
index d76614a68..000000000
--- a/client/coral-framework/graphql/queries/index.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import {graphql} from 'react-apollo';
-import MY_COMMENT_HISTORY from './myCommentHistory.graphql';
-import MY_IGNORED_USERS from './myIgnoredUsers.graphql';
-
-export const myCommentHistory = graphql(MY_COMMENT_HISTORY, {});
-
-export const myIgnoredUsers = graphql(MY_IGNORED_USERS, {
-  props: ({data}) => {
-    return ({
-      myIgnoredUsersData: data
-    });
-  }
-});
diff --git a/client/coral-framework/graphql/queries/myCommentHistory.graphql b/client/coral-framework/graphql/queries/myCommentHistory.graphql
deleted file mode 100644
index 0b37b192a..000000000
--- a/client/coral-framework/graphql/queries/myCommentHistory.graphql
+++ /dev/null
@@ -1,14 +0,0 @@
-query myCommentHistory {
-    me {
-        comments {
-            id
-            body
-            asset {
-              id
-              title
-              url
-            }
-            created_at
-        }
-    }
-}
diff --git a/client/coral-framework/graphql/queries/myIgnoredUsers.graphql b/client/coral-framework/graphql/queries/myIgnoredUsers.graphql
deleted file mode 100644
index d81531e37..000000000
--- a/client/coral-framework/graphql/queries/myIgnoredUsers.graphql
+++ /dev/null
@@ -1,6 +0,0 @@
-query myIgnoredUsers {
-  myIgnoredUsers {
-    id,
-    username,
-  }
-}
diff --git a/client/coral-settings/containers/ProfileContainer.js b/client/coral-settings/containers/ProfileContainer.js
index e289ff485..f9c8d892f 100644
--- a/client/coral-settings/containers/ProfileContainer.js
+++ b/client/coral-settings/containers/ProfileContainer.js
@@ -1,10 +1,9 @@
 import {connect} from 'react-redux';
-import {compose} from 'react-apollo';
+import {compose, graphql, gql} from 'react-apollo';
 import React, {Component} from 'react';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import {bindActionCreators} from 'redux';
 
-import {myCommentHistory, myIgnoredUsers} from 'coral-framework/graphql/queries';
 import {withStopIgnoringUser} from 'coral-framework/graphql/mutations';
 
 import {link} from 'coral-framework/services/PymConnection';
@@ -88,6 +87,38 @@ class ProfileContainer extends Component {
   }
 }
 
+// TODO: These currently relies on refetching (see ignoreUser and stopIgnoringUser mutations).
+//
+const withMyIgnoredUsersQuery = graphql(gql`
+  query myIgnoredUsers {
+    myIgnoredUsers {
+      id,
+      username,
+    }
+  }`, {
+    props: ({data}) => {
+      return ({
+        myIgnoredUsersData: data
+      });
+    }
+  });
+
+const withMyCommentHistoryQuery = graphql(gql`
+  query myCommentHistory {
+    me {
+      comments {
+          id
+          body
+          asset {
+            id
+            title
+            url
+          }
+          created_at
+      }
+    }
+  }`);
+
 const mapStateToProps = state => ({
   user: state.user.toJS(),
   asset: state.asset.toJS(),
@@ -99,7 +130,7 @@ const mapDispatchToProps = dispatch =>
 
 export default compose(
   connect(mapStateToProps, mapDispatchToProps),
-  myCommentHistory,
-  myIgnoredUsers,
+  withMyCommentHistoryQuery,
+  withMyIgnoredUsersQuery,
   withStopIgnoringUser,
 )(ProfileContainer);

From 50d832c2f89d979234aaa85a44eca654beef7094 Mon Sep 17 00:00:00 2001
From: David Erwin <davidjerwin@gmail.com>
Date: Mon, 8 May 2017 16:21:24 -0400
Subject: [PATCH 067/132] Remove pseudocode

---
 docs/frontend/PLUGINS.md | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/docs/frontend/PLUGINS.md b/docs/frontend/PLUGINS.md
index fa582877c..2ca36a4f1 100644
--- a/docs/frontend/PLUGINS.md
+++ b/docs/frontend/PLUGINS.md
@@ -95,18 +95,12 @@ Slots properties take an`Array` so we can add as many components as we want.
 
 `Note: the concepts in this section are still to be implemented. Code samples are for discussion and may change.`
 
-In order to allow you to build more complex plugins, we have wrapped some of our functionality in higher order componenets that expose a simple api.
+In order to allow you to build more complex plugins, we have wrapped some of our functionality in higher order components that expose a simple api.
 
 ### Reactions
 
 Reactions provide users the ability to 'like', 'respect', etc... comments.
 
-```
-<Reaction name="love">
-	<img class="coralsrc="" />
-</Reaction>
-```
-
 Note: some server side work will need to accompany this client side component. See the like and respect plugins as examples.
 
 ### Comment Stream
@@ -117,10 +111,6 @@ Comment streams may be created with filtering and ordering in place:
 * filter by tag
 * sort by date ascending / descrnding
 
-```
-<CommentStream userFilter="[userId]" tagFilter="[tag]" sort="[ascending|descending]"></CommentStream>
-```
-
 ### Comment Commit hooks
 
 // docs for the pre/post comment submit commit hooks

From b547ad44f1267a22cc3db69f6ed09a35fda0ac07 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 8 May 2017 17:46:56 -0300
Subject: [PATCH 068/132] Better and more friendly API

---
 client/coral-framework/hocs/withReaction.js   | 32 +++++++++++++++----
 .../client/components/LikeButton.js           |  5 +--
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/client/coral-framework/hocs/withReaction.js b/client/coral-framework/hocs/withReaction.js
index db17f62d1..5714a5a97 100644
--- a/client/coral-framework/hocs/withReaction.js
+++ b/client/coral-framework/hocs/withReaction.js
@@ -25,6 +25,7 @@ export default reaction => WrappedComponent => {
         `${capitalize(reaction)}ActionSummary`,
         comment
       );
+
       const count = getTotalActionCount(
         `${capitalize(reaction)}ActionSummary`,
         comment
@@ -63,10 +64,21 @@ export default reaction => WrappedComponent => {
         }
     `,
     {
-      props: ({mutate}) => ({
-        deleteReaction: (id, commentId) => {
+      props: ({mutate, ownProps}) => ({
+        deleteReaction: () => {
+
+          const reactionSummary = getMyActionSummary(
+            `${capitalize(reaction)}ActionSummary`,
+            ownProps.comment
+          );
+
+          const reactionData = {
+            id: reactionSummary.current_user.id,
+            commentId: ownProps.comment.id
+          };
+
           return mutate({
-            variables: {id},
+            variables: {id: reactionData.id},
             optimisticResponse: {
               deleteAction: {
                 __typename: 'DeleteActionResponse',
@@ -74,7 +86,7 @@ export default reaction => WrappedComponent => {
               }
             },
             update: proxy => {
-              const fragmentId = `Comment_${commentId}`;
+              const fragmentId = `Comment_${reactionData.commentId}`;
 
               // Read the data from our cache for this query.
               const data = proxy.readFragment({
@@ -86,7 +98,7 @@ export default reaction => WrappedComponent => {
               const idx = data.action_summaries.findIndex(isReaction);
               if (
                 idx < 0 ||
-                get(data.action_summaries[idx], 'current_user.id') !== id
+                get(data.action_summaries[idx], 'current_user.id') !== reactionData.id
               ) {
                 return;
               }
@@ -124,8 +136,14 @@ export default reaction => WrappedComponent => {
         }
     `,
     {
-      props: ({mutate}) => ({
-        postReaction: reactionData => {
+      props: ({mutate, ownProps}) => ({
+        postReaction: () => {
+
+          const reactionData = {
+            item_id: ownProps.comment.id,
+            item_type: 'COMMENTS'
+          };
+
           return mutate({
             variables: {[reaction]: reactionData},
             optimisticResponse: {
diff --git a/plugins/coral-plugin-like/client/components/LikeButton.js b/plugins/coral-plugin-like/client/components/LikeButton.js
index b91ffd42a..8e653825c 100644
--- a/plugins/coral-plugin-like/client/components/LikeButton.js
+++ b/plugins/coral-plugin-like/client/components/LikeButton.js
@@ -34,10 +34,7 @@ class LikeButton extends Component {
     if (myLikeActionSummary) {
       deleteAction(myLikeActionSummary.current_user.id, comment.id);
     } else {
-      postLike({
-        item_id: comment.id,
-        item_type: 'COMMENTS'
-      });
+      postLike();
     }
   };
 

From b82cab06555cf8cf6ccc0e3730cf83d1af3cf903 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 8 May 2017 17:50:15 -0300
Subject: [PATCH 069/132] Lint

---
 client/coral-framework/hocs/withReaction.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/coral-framework/hocs/withReaction.js b/client/coral-framework/hocs/withReaction.js
index 5714a5a97..bd641a885 100644
--- a/client/coral-framework/hocs/withReaction.js
+++ b/client/coral-framework/hocs/withReaction.js
@@ -174,6 +174,7 @@ export default reaction => WrappedComponent => {
               }
 
               if (idx < 0) {
+
                 // Add initial action when it doesn't exist.
                 data.action_summaries.push({
                   __typename: `${capitalize(reaction)}ActionSummary`,

From 3e258b17873c0d56799cbea7bdef1614ba2591fe Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Mon, 8 May 2017 14:59:23 -0600
Subject: [PATCH 070/132] move approved tab

---
 .../ModerationQueue/components/ModerationMenu.js     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js
index 39594274e..7a50e6270 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js
@@ -28,12 +28,6 @@ const ModerationMenu = (
             activeClassName={styles.active}>
             <Icon name='question_answer' className={styles.tabIcon} /> {lang.t('modqueue.all')} <CommentCount count={allCount} />
           </Link>
-          <Link
-            to={getPath('accepted')}
-            className={`mdl-tabs__tab ${styles.tab}`}
-            activeClassName={styles.active}>
-            <Icon name='check' className={styles.tabIcon} /> {lang.t('modqueue.approved')} <CommentCount count={acceptedCount} />
-          </Link>
           <Link
             to={getPath('premod')}
             className={`mdl-tabs__tab ${styles.tab}`}
@@ -46,6 +40,12 @@ const ModerationMenu = (
             activeClassName={styles.active}>
             <Icon name='flag' className={styles.tabIcon} /> {lang.t('modqueue.flagged')} <CommentCount count={flaggedCount} />
           </Link>
+          <Link
+            to={getPath('accepted')}
+            className={`mdl-tabs__tab ${styles.tab}`}
+            activeClassName={styles.active}>
+            <Icon name='check' className={styles.tabIcon} /> {lang.t('modqueue.approved')} <CommentCount count={acceptedCount} />
+          </Link>
           <Link
             to={getPath('rejected')}
             className={`mdl-tabs__tab ${styles.tab}`}

From fe58a5076ed83ce45f8d2cb1911037ed5fe26a7f Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 8 May 2017 18:05:39 -0300
Subject: [PATCH 071/132] Adding coral-plugin-love

---
 .gitignore                                    |  1 +
 plugins/coral-plugin-love/client/.babelrc     | 14 ++++
 .../coral-plugin-love/client/.eslintrc.json   | 23 ++++++
 .../coral-plugin-love/client/LoveButton.js    | 41 +++++++++++
 plugins/coral-plugin-love/client/index.js     |  7 ++
 plugins/coral-plugin-love/client/styles.css   | 26 +++++++
 .../client/translations.json                  | 10 +++
 plugins/coral-plugin-love/index.js            | 37 ++++++++++
 .../coral-plugin-love/server/typeDefs.graphql | 70 +++++++++++++++++++
 9 files changed, 229 insertions(+)
 create mode 100644 plugins/coral-plugin-love/client/.babelrc
 create mode 100644 plugins/coral-plugin-love/client/.eslintrc.json
 create mode 100644 plugins/coral-plugin-love/client/LoveButton.js
 create mode 100644 plugins/coral-plugin-love/client/index.js
 create mode 100644 plugins/coral-plugin-love/client/styles.css
 create mode 100644 plugins/coral-plugin-love/client/translations.json
 create mode 100644 plugins/coral-plugin-love/index.js
 create mode 100644 plugins/coral-plugin-love/server/typeDefs.graphql

diff --git a/.gitignore b/.gitignore
index a619f0988..e3ae90b9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,5 +20,6 @@ plugins/*
 !plugins/coral-plugin-respect
 !plugins/coral-plugin-offtopic
 !plugins/coral-plugin-like
+!plugins/coral-plugin-love
 
 **/node_modules/*
diff --git a/plugins/coral-plugin-love/client/.babelrc b/plugins/coral-plugin-love/client/.babelrc
new file mode 100644
index 000000000..60be246eb
--- /dev/null
+++ b/plugins/coral-plugin-love/client/.babelrc
@@ -0,0 +1,14 @@
+{
+  "presets": [
+    "es2015"
+  ],
+  "plugins": [
+    "add-module-exports",
+    "transform-class-properties",
+    "transform-decorators-legacy",
+    "transform-object-assign",
+    "transform-object-rest-spread",
+    "transform-async-to-generator",
+    "transform-react-jsx"
+  ]
+}
\ No newline at end of file
diff --git a/plugins/coral-plugin-love/client/.eslintrc.json b/plugins/coral-plugin-love/client/.eslintrc.json
new file mode 100644
index 000000000..9fe56bd14
--- /dev/null
+++ b/plugins/coral-plugin-love/client/.eslintrc.json
@@ -0,0 +1,23 @@
+{
+  "env": {
+    "browser": true,
+    "es6": true,
+    "mocha": true
+  },
+  "parserOptions": {
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "experimentalObjectRestSpread": true,
+      "jsx": true
+    }
+  },
+  "parser": "babel-eslint",
+  "plugins": [
+    "react"
+  ],
+  "rules": {
+    "react/jsx-uses-react": "error",
+    "react/jsx-uses-vars": "error",
+    "no-console": ["warn", { "allow": ["warn", "error"] }]
+  }
+}
diff --git a/plugins/coral-plugin-love/client/LoveButton.js b/plugins/coral-plugin-love/client/LoveButton.js
new file mode 100644
index 000000000..667c32a79
--- /dev/null
+++ b/plugins/coral-plugin-love/client/LoveButton.js
@@ -0,0 +1,41 @@
+import React from 'react';
+import withReaction from 'coral-framework/hocs/withReaction';
+import styles from './styles.css';
+import {Icon} from 'coral-ui';
+
+class LoveButton extends React.Component {
+  handleClick = () => {
+    const { postReaction, deleteReaction, showSignInDialog, reactionSummary} = this.props;
+    const { root: { me }, comment } = this.props;
+
+    // If the current user does not exist, trigger sign in dialog.
+    if (!me) {
+      showSignInDialog();
+      return;
+    }
+
+    // If the current user is banned, do nothing.
+    if (me.status === 'BANNED') {
+      return;
+    }
+
+    if (reactionSummary) {
+      deleteReaction();
+    } else {
+      postReaction();
+    }
+  };
+
+  render() {
+    const {count, reactionSummary} = this.props;
+    return (
+      <button className={`${styles.button} ${reactionSummary? styles.loved : ''}`} onClick={this.handleClick}>
+        <span>Love</span>
+        <Icon name="favorite"/>
+        <span>{count > 0 && count}</span>
+      </button>
+    );
+  }
+}
+
+export default withReaction('love')(LoveButton);
\ No newline at end of file
diff --git a/plugins/coral-plugin-love/client/index.js b/plugins/coral-plugin-love/client/index.js
new file mode 100644
index 000000000..f048963b4
--- /dev/null
+++ b/plugins/coral-plugin-love/client/index.js
@@ -0,0 +1,7 @@
+import LoveButton from './LoveButton';
+
+export default {
+  slots: {
+    commentReactions: [LoveButton]
+  }
+};
diff --git a/plugins/coral-plugin-love/client/styles.css b/plugins/coral-plugin-love/client/styles.css
new file mode 100644
index 000000000..d48e7e28c
--- /dev/null
+++ b/plugins/coral-plugin-love/client/styles.css
@@ -0,0 +1,26 @@
+.respect {
+    display: inline-block;
+}
+
+.button {
+    color: #2a2a2a;
+    margin: 5px 10px 5px 0px;
+    background: none;
+    padding: 0px;
+    border: none;
+    font-size: inherit;
+
+    &:hover {
+         color: #767676;
+         cursor: pointer;
+     }
+
+    &.loved {
+         color: #e52338;
+
+        &:hover {
+             color: #e52839;
+             cursor: pointer;
+         }
+    }
+}
diff --git a/plugins/coral-plugin-love/client/translations.json b/plugins/coral-plugin-love/client/translations.json
new file mode 100644
index 000000000..93d73d3a2
--- /dev/null
+++ b/plugins/coral-plugin-love/client/translations.json
@@ -0,0 +1,10 @@
+{
+  "en": {
+    "like": "Like",
+    "liked": "Liked"
+  },
+  "es": {
+    "like": "Me Gusta",
+    "liked": "Me Gustó"
+  }
+}
diff --git a/plugins/coral-plugin-love/index.js b/plugins/coral-plugin-love/index.js
new file mode 100644
index 000000000..48b4d16c0
--- /dev/null
+++ b/plugins/coral-plugin-love/index.js
@@ -0,0 +1,37 @@
+const {readFileSync} = require('fs');
+const path = require('path');
+const wrapResponse = require('../../graph/helpers/response');
+
+module.exports = {
+  typeDefs: readFileSync(path.join(__dirname, 'server/typeDefs.graphql'), 'utf8'),
+  resolvers: {
+    RootMutation: {
+      createLove(_, {love: {item_id, item_type}}, {mutators: {Action}}) {
+        return wrapResponse('love')(Action.create({item_id, item_type, action_type: 'LOVE'}));
+      }
+    }
+  },
+  hooks: {
+    Action: {
+      __resolveType: {
+        post({action_type}) {
+          switch (action_type) {
+            case 'LOVE':
+              return 'LoveAction';
+          }
+        }
+      }
+    },
+    ActionSummary: {
+      __resolveType: {
+        post({action_type}) {
+          switch (action_type) {
+            case 'LOVE':
+              return 'LoveActionSummary';
+          }
+        }
+      }
+    }
+  }
+};
+
diff --git a/plugins/coral-plugin-love/server/typeDefs.graphql b/plugins/coral-plugin-love/server/typeDefs.graphql
new file mode 100644
index 000000000..e22b91a2d
--- /dev/null
+++ b/plugins/coral-plugin-love/server/typeDefs.graphql
@@ -0,0 +1,70 @@
+enum ACTION_TYPE {
+
+    # Represents a Love.
+    LOVE
+}
+
+enum ASSET_METRICS_SORT {
+
+    # Represents a LoveAction.
+    LOVE
+}
+
+input CreateLoveInput {
+
+    # The item's id for which we are to create a love.
+    item_id: ID!
+
+    # The type of the item for which we are to create the love.
+    item_type: ACTION_ITEM_TYPE!
+}
+
+# LoveAction is used by users who "love" a specific entity.
+type LoveAction implements Action {
+
+    # The ID of the action.
+    id: ID!
+
+    # The author of the action.
+    user: User
+
+    # The time when the Action was updated.
+    updated_at: Date
+
+    # The time when the Action was created.
+    created_at: Date
+}
+
+type LoveActionSummary implements ActionSummary {
+
+    # The count of actions with this group.
+    count: Int
+
+    # The current user's action.
+    current_user: LoveAction
+}
+
+# A summary of counts related to all the Loves on an Asset.
+type LoveAssetActionSummary implements AssetActionSummary {
+
+    # Number of loves associated with actionable types on this this Asset.
+    actionCount: Int
+
+    # Number of unique actionable types that are referenced by the loves.
+    actionableItemCount: Int
+}
+
+type CreateLoveResponse implements Response {
+
+    # The love that was created.
+    love: LoveAction
+
+    # An array of errors relating to the mutation that occurred.
+    errors: [UserError]
+}
+
+type RootMutation {
+
+    # Creates a love on an entity.
+    createLove(love: CreateLoveInput!): CreateLoveResponse
+}

From 88861754f175f20404f1a10dc5c6b6286d088186 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 8 May 2017 18:05:54 -0300
Subject: [PATCH 072/132] Adding full example with translations

---
 .../coral-plugin-love/client/LoveButton.js    | 27 +++++++++++++------
 .../client/translations.json                  |  8 +++---
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/plugins/coral-plugin-love/client/LoveButton.js b/plugins/coral-plugin-love/client/LoveButton.js
index 667c32a79..260c5fc99 100644
--- a/plugins/coral-plugin-love/client/LoveButton.js
+++ b/plugins/coral-plugin-love/client/LoveButton.js
@@ -1,12 +1,20 @@
 import React from 'react';
-import withReaction from 'coral-framework/hocs/withReaction';
-import styles from './styles.css';
 import {Icon} from 'coral-ui';
+import styles from './styles.css';
+import {I18n} from 'coral-framework';
+import translations from './translations.json';
+import withReaction from 'coral-framework/hocs/withReaction';
+const lang = new I18n(translations);
 
 class LoveButton extends React.Component {
   handleClick = () => {
-    const { postReaction, deleteReaction, showSignInDialog, reactionSummary} = this.props;
-    const { root: { me }, comment } = this.props;
+    const {
+      postReaction,
+      deleteReaction,
+      showSignInDialog,
+      reactionSummary
+    } = this.props;
+    const {root: {me}, comment} = this.props;
 
     // If the current user does not exist, trigger sign in dialog.
     if (!me) {
@@ -29,13 +37,16 @@ class LoveButton extends React.Component {
   render() {
     const {count, reactionSummary} = this.props;
     return (
-      <button className={`${styles.button} ${reactionSummary? styles.loved : ''}`} onClick={this.handleClick}>
-        <span>Love</span>
-        <Icon name="favorite"/>
+      <button
+        className={`${styles.button} ${reactionSummary ? styles.loved : ''}`}
+        onClick={this.handleClick}
+      >
+        <span>{lang.t(reactionSummary ? 'loved' : 'love')}</span>
+        <Icon name="favorite" />
         <span>{count > 0 && count}</span>
       </button>
     );
   }
 }
 
-export default withReaction('love')(LoveButton);
\ No newline at end of file
+export default withReaction('love')(LoveButton);
diff --git a/plugins/coral-plugin-love/client/translations.json b/plugins/coral-plugin-love/client/translations.json
index 93d73d3a2..a015efa77 100644
--- a/plugins/coral-plugin-love/client/translations.json
+++ b/plugins/coral-plugin-love/client/translations.json
@@ -1,10 +1,10 @@
 {
   "en": {
-    "like": "Like",
-    "liked": "Liked"
+    "love": "Love",
+    "loved": "Loved"
   },
   "es": {
-    "like": "Me Gusta",
-    "liked": "Me Gustó"
+    "love": "Amo",
+    "loved": "Amé"
   }
 }

From 242f3ea5ea5c59ec4e49c9152d5febe7d5bbfe89 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Mon, 8 May 2017 17:01:36 -0600
Subject: [PATCH 073/132] do not highlight partial word matches in admin since
 this is not how the backend works

---
 .../containers/ModerationQueue/components/Comment.js  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
index e5afd9726..fedb72d45 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
@@ -18,7 +18,7 @@ import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from 'coral-admin/src/translations.json';
 const lang = new I18n(translations);
 
-const Comment = ({actions = [], comment, ...props}) => {
+const Comment = ({actions = [], comment, suspectWords, bannedWords, ...props}) => {
   const links = linkify.getMatches(comment.body);
   const linkText = links ? links.map(link => link.raw) : [];
   const flagActionSummaries = getActionSummary('FlagActionSummary', comment);
@@ -30,6 +30,13 @@ const Comment = ({actions = [], comment, ...props}) => {
     commentType = 'flagged';
   }
 
+  // since words are checked against word boundaries on the backend,
+  // 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 => {
+    return new RegExp(`(^|\\s)${w}(\\s|$)`).test(comment.body);
+  }).concat(linkText);
+
   return (
     <li tabIndex={props.index} className={`mdl-card ${props.selected ?  'mdl-shadow--16dp' : 'mdl-shadow--2dp'} ${styles.Comment} ${styles.listItem} ${props.selected ? styles.selected : ''}`}>
       <div className={styles.container}>
@@ -60,7 +67,7 @@ const Comment = ({actions = [], comment, ...props}) => {
         <div className={styles.itemBody}>
           <p className={styles.body}>
             <Highlighter
-              searchWords={[...props.suspectWords, ...props.bannedWords, ...linkText]}
+              searchWords={searchWords}
               textToHighlight={comment.body} />
           </p>
           <div className={styles.sideActions}>

From 2490e6598162df2ed422bc45b1f6d0255c7f6e94 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Mon, 8 May 2017 17:09:23 -0600
Subject: [PATCH 074/132] merge master

---
 client/coral-admin/src/AppRouter.js           |  4 ++--
 .../ModerationQueue/components/Comment.js     |  3 ++-
 .../components/ModerationMenu.js              | 12 +++++------
 .../ModerationQueue/components/styles.css     | 21 +++++++++++++++++++
 .../src/graphql/fragments/commentView.graphql |  1 +
 client/coral-admin/src/translations.json      |  2 ++
 graph/pubsub.js                               |  2 +-
 7 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/client/coral-admin/src/AppRouter.js b/client/coral-admin/src/AppRouter.js
index af3423acc..989316dd9 100644
--- a/client/coral-admin/src/AppRouter.js
+++ b/client/coral-admin/src/AppRouter.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import {Router, Route, IndexRoute, IndexRedirect, browserHistory} from 'react-router';
+import {Router, Route, IndexRedirect, browserHistory} from 'react-router';
 
 import Stories from 'containers/Stories/Stories';
 import Configure from 'containers/Configure/Configure';
@@ -18,7 +18,7 @@ const routes = (
   <div>
     <Route exact path="/admin/install" component={InstallContainer}/>
     <Route path='/admin' component={LayoutContainer}>
-      <IndexRoute component={Dashboard} />
+      <IndexRedirect to='/admin/moderate/all' />
       <Route path='community' component={CommunityContainer} />
       <Route path='configure' component={Configure} />
       <Route path='stories' component={Stories} />
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
index fedb72d45..a5647fd92 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
@@ -68,7 +68,7 @@ const Comment = ({actions = [], comment, suspectWords, bannedWords, ...props}) =
           <p className={styles.body}>
             <Highlighter
               searchWords={searchWords}
-              textToHighlight={comment.body} />
+              textToHighlight={comment.body} /> <a className={styles.external} href={`${comment.asset.url}#${comment.id}`} target="_blank"><Icon name='open_in_new' /> {lang.t('comment.view_context')}</a>
           </p>
           <div className={styles.sideActions}>
             {links ? <span className={styles.hasLinks}><Icon name='error_outline'/> Contains Link</span> : null}
@@ -113,6 +113,7 @@ Comment.propTypes = {
     }),
     asset: PropTypes.shape({
       title: PropTypes.string,
+      url: PropTypes.string,
       id: PropTypes.string
     })
   })
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js
index 39594274e..7a50e6270 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js
@@ -28,12 +28,6 @@ const ModerationMenu = (
             activeClassName={styles.active}>
             <Icon name='question_answer' className={styles.tabIcon} /> {lang.t('modqueue.all')} <CommentCount count={allCount} />
           </Link>
-          <Link
-            to={getPath('accepted')}
-            className={`mdl-tabs__tab ${styles.tab}`}
-            activeClassName={styles.active}>
-            <Icon name='check' className={styles.tabIcon} /> {lang.t('modqueue.approved')} <CommentCount count={acceptedCount} />
-          </Link>
           <Link
             to={getPath('premod')}
             className={`mdl-tabs__tab ${styles.tab}`}
@@ -46,6 +40,12 @@ const ModerationMenu = (
             activeClassName={styles.active}>
             <Icon name='flag' className={styles.tabIcon} /> {lang.t('modqueue.flagged')} <CommentCount count={flaggedCount} />
           </Link>
+          <Link
+            to={getPath('accepted')}
+            className={`mdl-tabs__tab ${styles.tab}`}
+            activeClassName={styles.active}>
+            <Icon name='check' className={styles.tabIcon} /> {lang.t('modqueue.approved')} <CommentCount count={acceptedCount} />
+          </Link>
           <Link
             to={getPath('rejected')}
             className={`mdl-tabs__tab ${styles.tab}`}
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/styles.css b/client/coral-admin/src/containers/ModerationQueue/components/styles.css
index a22fbbc64..966a37526 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/styles.css
+++ b/client/coral-admin/src/containers/ModerationQueue/components/styles.css
@@ -423,3 +423,24 @@ span {
   position: relative;
   top: 7px;
 }
+
+.external {
+  font-size: .7em;
+  text-decoration: none;
+  color: #063b9a;
+  cursor: pointer;
+  font-weight: normal;
+  margin-left: 10px;
+  white-space: nowrap;
+
+  &:hover {
+    text-decoration: underline;
+    opacity: .9;
+  }
+
+  i {
+    font-size: 12px;
+    top: 2px;
+    position: relative;
+  }
+}
diff --git a/client/coral-admin/src/graphql/fragments/commentView.graphql b/client/coral-admin/src/graphql/fragments/commentView.graphql
index 51b0a3f44..1f3b8b1d3 100644
--- a/client/coral-admin/src/graphql/fragments/commentView.graphql
+++ b/client/coral-admin/src/graphql/fragments/commentView.graphql
@@ -11,6 +11,7 @@ fragment commentView on Comment {
     asset {
       id
       title
+      url
     }
     action_summaries {
       count
diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json
index 3f9392656..68a3b93d5 100644
--- a/client/coral-admin/src/translations.json
+++ b/client/coral-admin/src/translations.json
@@ -72,6 +72,7 @@
       "flagged": "flagged",
       "anon": "Anonymous",
       "ban_user": "Ban User",
+      "view_context": "View context",
       "banned_user": "Banned User"
     },
     "user": {
@@ -259,6 +260,7 @@
     "comment": {
       "flagged": "marcado",
       "anon": "Anónimo",
+      "view_context": "Ver contexto",
       "ban_user": "Suspender Usuario",
       "banned_user": "Usuario Suspendido"
     },
diff --git a/graph/pubsub.js b/graph/pubsub.js
index a5ee95b80..704f83725 100644
--- a/graph/pubsub.js
+++ b/graph/pubsub.js
@@ -2,4 +2,4 @@ const {RedisPubSub} = require('graphql-redis-subscriptions');
 
 const {connectionOptions} = require('../services/redis');
 
-module.exports = new RedisPubSub(connectionOptions);
+module.exports = new RedisPubSub({connection: connectionOptions});

From 788610a5f6f82f2f866006cc6f0334a3bd746aec Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Tue, 9 May 2017 09:02:04 -0300
Subject: [PATCH 075/132] Like button params

---
 plugins/coral-plugin-like/client/components/LikeButton.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/coral-plugin-like/client/components/LikeButton.js b/plugins/coral-plugin-like/client/components/LikeButton.js
index 8e653825c..b91ffd42a 100644
--- a/plugins/coral-plugin-like/client/components/LikeButton.js
+++ b/plugins/coral-plugin-like/client/components/LikeButton.js
@@ -34,7 +34,10 @@ class LikeButton extends Component {
     if (myLikeActionSummary) {
       deleteAction(myLikeActionSummary.current_user.id, comment.id);
     } else {
-      postLike();
+      postLike({
+        item_id: comment.id,
+        item_type: 'COMMENTS'
+      });
     }
   };
 

From c0b526e98d79c1c7f806ebfa55c75bab2cfb6437 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Tue, 9 May 2017 08:03:18 -0400
Subject: [PATCH 076/132] Fix typo

---
 docs/frontend/PLUGINS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/frontend/PLUGINS.md b/docs/frontend/PLUGINS.md
index 2ca36a4f1..8377d0359 100644
--- a/docs/frontend/PLUGINS.md
+++ b/docs/frontend/PLUGINS.md
@@ -109,7 +109,7 @@ Comment streams may be created with filtering and ordering in place:
 
 * filter by user
 * filter by tag
-* sort by date ascending / descrnding
+* sort by date ascending / descending
 
 ### Comment Commit hooks
 

From 3c06ee9360f6595319454c7a9f555ee65ec4fc16 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Tue, 9 May 2017 12:21:21 -0300
Subject: [PATCH 077/132] Adds slots to admin stream

---
 .../ModerationQueue/components/Comment.js     | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
index e5afd9726..8726cc75c 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
@@ -1,16 +1,17 @@
 import React, {PropTypes} from 'react';
 import timeago from 'timeago.js';
+import {Link} from 'react-router';
 import Linkify from 'react-linkify';
 import Highlighter from 'react-highlight-words';
-import {Link} from 'react-router';
 
 import styles from './styles.css';
 import {Icon} from 'coral-ui';
 import FlagBox from './FlagBox';
 import CommentType from './CommentType';
+import Slot from 'coral-framework/components/Slot';
+import {getActionSummary} from 'coral-framework/utils';
 import ActionButton from 'coral-admin/src/components/ActionButton';
 import BanUserButton from 'coral-admin/src/components/BanUserButton';
-import {getActionSummary} from 'coral-framework/utils';
 
 const linkify = new Linkify();
 
@@ -50,6 +51,10 @@ const Comment = ({actions = [], comment, ...props}) => {
               {lang.t('comment.banned_user')}
             </span>
             : null}
+          <Slot
+            fill="adminCommentInfoBar"
+            comment={comment}
+          />
         </div>
         <div className={styles.moderateArticle}>
           Story: {comment.asset.title}
@@ -62,6 +67,10 @@ const Comment = ({actions = [], comment, ...props}) => {
             <Highlighter
               searchWords={[...props.suspectWords, ...props.bannedWords, ...linkText]}
               textToHighlight={comment.body} />
+            <Slot
+              fill="adminCommentContent"
+              comment={comment}
+            />
           </p>
           <div className={styles.sideActions}>
             {links ? <span className={styles.hasLinks}><Icon name='error_outline'/> Contains Link</span> : null}
@@ -78,9 +87,19 @@ const Comment = ({actions = [], comment, ...props}) => {
                   rejectComment={() => props.rejectComment({commentId: comment.id})} />;
               })}
             </div>
+            <Slot
+              fill="adminSideActions"
+              comment={comment}
+            />
           </div>
         </div>
       </div>
+      <div>
+        <Slot
+          fill="adminCommentDetailArea"
+          comment={comment}
+        />
+      </div>
       {
         flagActions && flagActions.length
         ? <FlagBox actions={flagActions} actionSummaries={flagActionSummaries} />

From 52b0819e7874802182dfa317efb761927a26c81c Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Tue, 9 May 2017 14:02:35 -0300
Subject: [PATCH 078/132] Adding example for plugins within the Admin Comment
 Queue

---
 .gitignore                                    |  1 +
 plugins/coral-plugin-mod/client/.babelrc      | 14 ++++++++
 .../coral-plugin-mod/client/.eslintrc.json    | 23 +++++++++++++
 .../coral-plugin-mod/client/components/Box.js |  8 +++++
 .../client/components/Container.js            | 32 +++++++++++++++++++
 .../client/components/styles.css              |  8 +++++
 plugins/coral-plugin-mod/client/index.js      |  7 ++++
 plugins/coral-plugin-mod/index.js             |  4 +++
 8 files changed, 97 insertions(+)
 create mode 100644 plugins/coral-plugin-mod/client/.babelrc
 create mode 100644 plugins/coral-plugin-mod/client/.eslintrc.json
 create mode 100644 plugins/coral-plugin-mod/client/components/Box.js
 create mode 100644 plugins/coral-plugin-mod/client/components/Container.js
 create mode 100644 plugins/coral-plugin-mod/client/components/styles.css
 create mode 100644 plugins/coral-plugin-mod/client/index.js
 create mode 100644 plugins/coral-plugin-mod/index.js

diff --git a/.gitignore b/.gitignore
index a619f0988..9f04eb4b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,5 +20,6 @@ plugins/*
 !plugins/coral-plugin-respect
 !plugins/coral-plugin-offtopic
 !plugins/coral-plugin-like
+!plugins/coral-plugin-mod
 
 **/node_modules/*
diff --git a/plugins/coral-plugin-mod/client/.babelrc b/plugins/coral-plugin-mod/client/.babelrc
new file mode 100644
index 000000000..60be246eb
--- /dev/null
+++ b/plugins/coral-plugin-mod/client/.babelrc
@@ -0,0 +1,14 @@
+{
+  "presets": [
+    "es2015"
+  ],
+  "plugins": [
+    "add-module-exports",
+    "transform-class-properties",
+    "transform-decorators-legacy",
+    "transform-object-assign",
+    "transform-object-rest-spread",
+    "transform-async-to-generator",
+    "transform-react-jsx"
+  ]
+}
\ No newline at end of file
diff --git a/plugins/coral-plugin-mod/client/.eslintrc.json b/plugins/coral-plugin-mod/client/.eslintrc.json
new file mode 100644
index 000000000..9fe56bd14
--- /dev/null
+++ b/plugins/coral-plugin-mod/client/.eslintrc.json
@@ -0,0 +1,23 @@
+{
+  "env": {
+    "browser": true,
+    "es6": true,
+    "mocha": true
+  },
+  "parserOptions": {
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "experimentalObjectRestSpread": true,
+      "jsx": true
+    }
+  },
+  "parser": "babel-eslint",
+  "plugins": [
+    "react"
+  ],
+  "rules": {
+    "react/jsx-uses-react": "error",
+    "react/jsx-uses-vars": "error",
+    "no-console": ["warn", { "allow": ["warn", "error"] }]
+  }
+}
diff --git a/plugins/coral-plugin-mod/client/components/Box.js b/plugins/coral-plugin-mod/client/components/Box.js
new file mode 100644
index 000000000..15f5320b1
--- /dev/null
+++ b/plugins/coral-plugin-mod/client/components/Box.js
@@ -0,0 +1,8 @@
+import React from 'react';
+import styles from './styles.css'
+
+export default (props) => (
+  <div className={styles.box}>
+    Comment Status: {props.comment.status}
+  </div>
+)
\ No newline at end of file
diff --git a/plugins/coral-plugin-mod/client/components/Container.js b/plugins/coral-plugin-mod/client/components/Container.js
new file mode 100644
index 000000000..712031fdf
--- /dev/null
+++ b/plugins/coral-plugin-mod/client/components/Container.js
@@ -0,0 +1,32 @@
+import React from 'react';
+import Box from './Box';
+import {Button} from 'coral-ui'
+import styles from './styles.css';
+
+export default class Footer extends React.Component {
+  constructor() {
+    super();
+
+    this.state = {
+      show: false
+    };
+  }
+
+  handleClick = () => {
+    this.setState(state => ({
+      show: !state.show
+    }))
+  }
+
+  render() {
+    const {show} = this.state;
+    return (
+      <div className={styles.container}>
+        <Button cStyle="darkGrey" onClick={this.handleClick}>
+          Show Comment Status
+        </Button>
+        {show ? <Box comment={this.props.comment} /> : null}
+      </div>
+    );
+  }
+}
diff --git a/plugins/coral-plugin-mod/client/components/styles.css b/plugins/coral-plugin-mod/client/components/styles.css
new file mode 100644
index 000000000..59bb63c3d
--- /dev/null
+++ b/plugins/coral-plugin-mod/client/components/styles.css
@@ -0,0 +1,8 @@
+.container {
+    padding: 0 14px 10px;
+}
+
+.box {
+    font-size: 12px;
+    padding: 10px 14px;
+}
\ No newline at end of file
diff --git a/plugins/coral-plugin-mod/client/index.js b/plugins/coral-plugin-mod/client/index.js
new file mode 100644
index 000000000..b0ea304f4
--- /dev/null
+++ b/plugins/coral-plugin-mod/client/index.js
@@ -0,0 +1,7 @@
+import Container from './components/Container';
+
+export default {
+  slots: {
+    adminCommentDetailArea: [Container],
+  }
+};
diff --git a/plugins/coral-plugin-mod/index.js b/plugins/coral-plugin-mod/index.js
new file mode 100644
index 000000000..42d90e144
--- /dev/null
+++ b/plugins/coral-plugin-mod/index.js
@@ -0,0 +1,4 @@
+const {readFileSync} = require('fs');
+const path = require('path');
+
+module.exports = {};

From 8c219c1c4d8b3ba9d87778968fe69fb917b6d435 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Tue, 9 May 2017 15:53:57 -0300
Subject: [PATCH 079/132] Adding config with initial

---
 .../src}/actions/config.js                    |  0
 .../coral-embed-stream/src/actions/embed.js   |  4 +++
 .../src/constants/config.js                   |  1 +
 .../src/containers/Embed.js                   | 15 +-------
 client/coral-embed-stream/src/index.js        |  8 +++++
 .../src}/reducers/config.js                   |  0
 .../coral-embed-stream/src/reducers/index.js  |  6 ++--
 client/coral-embed/src/index.js               | 36 +++----------------
 client/coral-framework/components/Slot.js     |  4 +--
 client/coral-framework/constants/config.js    | 13 -------
 client/coral-framework/reducers/index.js      |  2 --
 11 files changed, 25 insertions(+), 64 deletions(-)
 rename client/{coral-framework => coral-embed-stream/src}/actions/config.js (100%)
 create mode 100644 client/coral-embed-stream/src/constants/config.js
 rename client/{coral-framework => coral-embed-stream/src}/reducers/config.js (100%)
 delete mode 100644 client/coral-framework/constants/config.js

diff --git a/client/coral-framework/actions/config.js b/client/coral-embed-stream/src/actions/config.js
similarity index 100%
rename from client/coral-framework/actions/config.js
rename to client/coral-embed-stream/src/actions/config.js
diff --git a/client/coral-embed-stream/src/actions/embed.js b/client/coral-embed-stream/src/actions/embed.js
index 863494c68..c0eb7d844 100644
--- a/client/coral-embed-stream/src/actions/embed.js
+++ b/client/coral-embed-stream/src/actions/embed.js
@@ -8,3 +8,7 @@ export const setActiveTab = (tab) => (dispatch, getState) => {
   }
 };
 
+export const addExternalConfig = externalConfig => ({
+  type: 'ADD_EXTERNAL_CONFIG',
+  externalConfig
+});
diff --git a/client/coral-embed-stream/src/constants/config.js b/client/coral-embed-stream/src/constants/config.js
new file mode 100644
index 000000000..5821316c5
--- /dev/null
+++ b/client/coral-embed-stream/src/constants/config.js
@@ -0,0 +1 @@
+export const ADD_EXTERNAL_CONFIG = 'ADD_EXTERNAL_CONFIG';
diff --git a/client/coral-embed-stream/src/containers/Embed.js b/client/coral-embed-stream/src/containers/Embed.js
index 5b324b35b..75d5dcbaf 100644
--- a/client/coral-embed-stream/src/containers/Embed.js
+++ b/client/coral-embed-stream/src/containers/Embed.js
@@ -13,7 +13,6 @@ import Stream from './Stream';
 import Embed from '../components/Embed';
 
 import {setActiveTab} from '../actions/embed';
-import {addExternalConfig} from 'coral-framework/actions/config';
 import {setCommentCountCache, viewAllComments} from '../actions/stream';
 import {getDefinitionName, separateDataAndRoot} from 'coral-framework/utils';
 
@@ -21,17 +20,6 @@ const {logout, checkLogin} = authActions;
 const {fetchAssetSuccess} = assetActions;
 
 class EmbedContainer extends React.Component {
-  componentDidMount() {
-    pym.sendMessage('childReady');
-
-    pym.onMessage('config', config => {
-      this.props.addExternalConfig(JSON.parse(config));
-    });
-  }
-
-  componentWillUnmount() {
-    pym.remove();
-  }
 
   componentWillReceiveProps(nextProps) {
     if (this.props.root.me && !nextProps.root.me) {
@@ -114,7 +102,6 @@ const mapDispatchToProps = dispatch =>
       checkLogin,
       setActiveTab,
       viewAllComments,
-      addExternalConfig,
       fetchAssetSuccess,
       setCommentCountCache
     },
@@ -123,6 +110,6 @@ const mapDispatchToProps = dispatch =>
 
 export default compose(
   connect(mapStateToProps, mapDispatchToProps),
-  branch(props => !props.auth.checkedInitialLogin, renderComponent(Spinner)),
+  branch(props => !props.auth.checkedInitialLogin && props.config, renderComponent(Spinner)),
   withQuery
 )(EmbedContainer);
diff --git a/client/coral-embed-stream/src/index.js b/client/coral-embed-stream/src/index.js
index 2fd1e2731..52a585fb2 100644
--- a/client/coral-embed-stream/src/index.js
+++ b/client/coral-embed-stream/src/index.js
@@ -4,10 +4,12 @@ import {ApolloProvider} from 'react-apollo';
 
 import {client} from 'coral-framework/services/client';
 import {checkLogin} from 'coral-framework/actions/auth';
+import {addExternalConfig} from 'coral-embed-stream/src/actions/config';
 
 import reducers from './reducers';
 import localStore, {injectReducers} from 'coral-framework/services/store';
 import AppRouter from './AppRouter';
+import {pym} from 'coral-framework';
 
 injectReducers(reducers);
 
@@ -16,6 +18,12 @@ const store = (window.opener && window.opener.coralStore) ? window.opener.coralS
 // Don't run this in the popup.
 if (store === localStore) {
   store.dispatch(checkLogin());
+
+  pym.sendMessage('getConfig');
+
+  pym.onMessage('config', config => {
+    store.dispatch(addExternalConfig(JSON.parse(config)));
+  });
 }
 
 render(
diff --git a/client/coral-framework/reducers/config.js b/client/coral-embed-stream/src/reducers/config.js
similarity index 100%
rename from client/coral-framework/reducers/config.js
rename to client/coral-embed-stream/src/reducers/config.js
diff --git a/client/coral-embed-stream/src/reducers/index.js b/client/coral-embed-stream/src/reducers/index.js
index a9049fc14..590b87eea 100644
--- a/client/coral-embed-stream/src/reducers/index.js
+++ b/client/coral-embed-stream/src/reducers/index.js
@@ -1,7 +1,9 @@
-import stream from './stream';
 import embed from './embed';
+import config from './config';
+import stream from './stream';
 
 export default {
-  stream,
   embed,
+  stream,
+  config
 };
diff --git a/client/coral-embed/src/index.js b/client/coral-embed/src/index.js
index cc2612376..570a63aed 100644
--- a/client/coral-embed/src/index.js
+++ b/client/coral-embed/src/index.js
@@ -46,20 +46,19 @@ function buildStreamIframeUrl(talkBaseUrl, query) {
 // e.g. to resize the iframe, and navigate the host page
 function configurePymParent(pymParent, opts) {
   let notificationOffset = 200;
-  let DOMReady = false;
   let cachedHeight;
   const snackbar = document.createElement('div');
 
-  // Sets DOMReady
-  function completed() {
-    DOMReady = true;
-  }
-
   // Sends config to pymChild
   function sendConfig(config) {
     pymParent.sendMessage('config', JSON.stringify(config));
   }
 
+  // Sends config to the child
+  pymParent.onMessage('getConfig', function() {
+    sendConfig(opts || {});
+  });
+
   snackbar.id = 'coral-notif';
 
   for (let key in snackbarStyles) {
@@ -121,31 +120,6 @@ function configurePymParent(pymParent, opts) {
     pymParent.sendMessage('position', position);
   });
 
-  // Sends config to the child
-  pymParent.onMessage('getConfig', function() {
-    sendConfig(opts || {});
-  });
-
-  document.addEventListener('DOMContentLoaded', completed, false);
-
-  // A fallback to window.onload, that will always work
-  window.addEventListener('load', completed, false);
-
-  // Tell child when parent's DOMContentLoaded
-  pymParent.onMessage('childReady', function() {
-    const interval = setInterval(function() {
-      if (DOMReady) {
-        window.clearInterval(interval);
-
-        // DOMContentLoaded is ready
-        pymParent.sendMessage('DOMContentLoaded');
-
-        // Sending the config to the child
-        sendConfig(opts || {});
-      }
-    }, 100);
-  });
-
   // When end-user clicks link in iframe, open it in parent context
   pymParent.onMessage('navigate', function(url) {
     window.open(url, '_blank').focus();
diff --git a/client/coral-framework/components/Slot.js b/client/coral-framework/components/Slot.js
index eac90c6df..68b5e9964 100644
--- a/client/coral-framework/components/Slot.js
+++ b/client/coral-framework/components/Slot.js
@@ -4,10 +4,10 @@ import styles from './Slot.css';
 import {connect} from 'react-redux';
 import {getSlotElements} from 'coral-framework/helpers/plugins';
 
-function Slot ({fill, inline = false, plugin_config: {debug, config}, ...rest}) {
+function Slot ({fill, inline = false, plugin_config: {debug, ...config}, ...rest}) {
   return (
     <div className={cn({[styles.inline]: inline, [styles.debug]: debug})}>
-      {getSlotElements(fill, {config, ...rest})}
+      {getSlotElements(fill, {...config, ...rest})}
     </div>
   );
 }
diff --git a/client/coral-framework/constants/config.js b/client/coral-framework/constants/config.js
deleted file mode 100644
index a7b2fa8fb..000000000
--- a/client/coral-framework/constants/config.js
+++ /dev/null
@@ -1,13 +0,0 @@
-export const UPDATE_CONFIG_REQUEST = 'UPDATE_CONFIG_REQUEST';
-export const UPDATE_CONFIG_SUCCESS = 'UPDATE_CONFIG_SUCCESS';
-export const UPDATE_CONFIG_FAILURE = 'UPDATE_CONFIG_FAILURE';
-
-export const UPDATE_CONFIG = 'UPDATE_CONFIG';
-
-export const OPEN_COMMENTS = 'OPEN_COMMENTS';
-export const CLOSE_COMMENTS = 'CLOSE_COMMENTS';
-export const ADD_ITEM = 'ADD_ITEM';
-
-// TODO: Deprecate old constants
-
-export const ADD_EXTERNAL_CONFIG = 'ADD_EXTERNAL_CONFIG';
diff --git a/client/coral-framework/reducers/index.js b/client/coral-framework/reducers/index.js
index 7067bfb55..d5b66bbae 100644
--- a/client/coral-framework/reducers/index.js
+++ b/client/coral-framework/reducers/index.js
@@ -1,7 +1,6 @@
 import auth from './auth';
 import user from './user';
 import asset from './asset';
-import config from './config';
 import {reducer as commentBox} from '../../coral-plugin-commentbox';
 import {pluginReducers} from '../helpers/plugins';
 
@@ -9,7 +8,6 @@ export default {
   auth,
   user,
   asset,
-  config,
   commentBox,
   ...pluginReducers
 };

From 76d0fdfd6767ba6425042a509fd3973599842cb8 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Tue, 9 May 2017 15:32:19 -0600
Subject: [PATCH 080/132] Added docs

---
 README.md            |  7 +++++--
 services/passport.js |  5 ++++-
 services/users.js    | 18 +++++++++---------
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 74097d48c..ec952b321 100644
--- a/README.md
+++ b/README.md
@@ -24,10 +24,13 @@ The Talk application looks for the following configuration values either as envi
 
 - `TALK_MONGO_URL` (*required*) - the database connection string for the MongoDB database.
 - `TALK_REDIS_URL` (*required*) - the database connection string for the Redis database.
-- `TALK_SESSION_SECRET` (*required*) - a random string which will be used to
-secure cookies.
 - `TALK_ROOT_URL` (*required*) - root url of the installed application externally
 available in the format: `<scheme>://<host>` without the path.
+- `TALK_JWT_SECRET` (*required*) - a long and cryptographical secure random string which will be used to
+sign and verify tokens via a `HS256` algorithm.
+- `TALK_JWT_EXPIRY` (_optional_) - the expiry duration (`exp`) for the tokens issued for logged in sessions (Default `1 day`)
+- `TALK_JWT_ISSUER` (_optional_) - the issuer (`iss`) claim for login JWT tokens (Default `process.env.TALK_ROOT_URL`)
+- `TALK_JWT_AUDIENCE` (_optional_) - the audience (`aud`) claim for login JWT tokens (Default `talk`)
 - `TALK_SMTP_EMAIL` (*required for email*) - the address to send emails from using the
   SMTP provider.
 - `TALK_SMTP_USERNAME` (*required for email*) - username of the SMTP provider you are using.
diff --git a/services/passport.js b/services/passport.js
index a455fa745..41d57a539 100644
--- a/services/passport.js
+++ b/services/passport.js
@@ -11,7 +11,10 @@ const debug = require('debug')('talk:passport');
 
 // JWT_SECRET is the secret used to sign and verify tokens issued by this
 // application.
-const JWT_SECRET = process.env.JWT_SECRET;
+const JWT_SECRET = process.env.JWT_SECRET || null;
+if (JWT_SECRET === null) {
+  throw new Error('JWT_SECRET must be provided in the environment to sign/verify tokens');
+}
 
 // JWT_EXPIRY is the time for which a given token is valid for.
 const JWT_EXPIRY = process.env.JWT_EXPIRY || '1 day';
diff --git a/services/users.js b/services/users.js
index 14301ccf4..59cc6ba7d 100644
--- a/services/users.js
+++ b/services/users.js
@@ -22,12 +22,12 @@ const SettingsService = require('./settings');
 const ActionsService = require('./actions');
 const MailerService = require('./mailer');
 
-// In the event that the TALK_SESSION_SECRET is missing but we are testing, then
-// set the process.env.TALK_SESSION_SECRET.
-if (process.env.NODE_ENV === 'test' && !process.env.TALK_SESSION_SECRET) {
-  process.env.TALK_SESSION_SECRET = 'keyboard cat';
-} else if (!process.env.TALK_SESSION_SECRET) {
-  throw new Error('TALK_SESSION_SECRET must be defined to encode JSON Web Tokens and other auth functionality');
+// In the event that the TALK_JWT_SECRET is missing but we are testing, then
+// set the process.env.TALK_JWT_SECRET.
+if (process.env.NODE_ENV === 'test' && !process.env.TALK_JWT_SECRET) {
+  process.env.TALK_JWT_SECRET = 'keyboard cat';
+} else if (!process.env.TALK_JWT_SECRET) {
+  throw new Error('TALK_JWT_SECRET must be defined to encode JSON Web Tokens and other auth functionality');
 }
 
 const EMAIL_CONFIRM_JWT_SUBJECT = 'email_confirm';
@@ -564,7 +564,7 @@ module.exports = class UsersService {
           version: user.__v
         };
 
-        return jwt.sign(payload, process.env.TALK_SESSION_SECRET, {
+        return jwt.sign(payload, process.env.TALK_JWT_SECRET, {
           algorithm: 'HS256',
           expiresIn: '1d',
           subject: PASSWORD_RESET_JWT_SUBJECT
@@ -583,7 +583,7 @@ module.exports = class UsersService {
       // Set the allowed algorithms.
       options.algorithms = ['HS256'];
 
-      jwt.verify(token, process.env.TALK_SESSION_SECRET, options, (err, decoded) => {
+      jwt.verify(token, process.env.TALK_JWT_SECRET, options, (err, decoded) => {
         if (err) {
           return reject(err);
         }
@@ -740,7 +740,7 @@ module.exports = class UsersService {
         email,
         referer,
         userID: user.id
-      }, process.env.TALK_SESSION_SECRET, tokenOptions);
+      }, process.env.TALK_JWT_SECRET, tokenOptions);
     });
   }
 

From f37a2104790a4f5c3741972f52889b33bf337db0 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Tue, 9 May 2017 15:02:26 -0700
Subject: [PATCH 081/132] Only use errors from errors.js for EditWindowHasEnded

---
 errors.js                 | 9 ++++++++-
 graph/mutators/comment.js | 5 -----
 services/comments.js      | 6 +++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/errors.js b/errors.js
index 67ae0693a..19b0ec90c 100644
--- a/errors.js
+++ b/errors.js
@@ -153,6 +153,12 @@ const ErrLoginAttemptMaximumExceeded = new APIError('You have made too many inco
   status: 429
 });
 
+class ErrEditWindowHasEnded extends APIError {
+  constructor(message) {
+    super(message || 'Edit window is over.', {status: 403, translation_key: 'error.editWindowExpired'});
+  }
+}
+
 module.exports = {
   ExtendableError,
   APIError,
@@ -174,5 +180,6 @@ module.exports = {
   ErrPermissionUpdateUsername,
   ErrSettingsInit,
   ErrInstallLock,
-  ErrLoginAttemptMaximumExceeded
+  ErrLoginAttemptMaximumExceeded,
+  ErrEditWindowHasEnded,
 };
diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index 17c75a94b..7e5bc3a1b 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -249,11 +249,6 @@ const editComment = async ({user, loaders: {Comments}}, {id, asset_id, edit}) =>
       throw new errors.APIError('Comment not found', {
         status: 404,
         translation_key: 'NOT_FOUND',
-      });        
-    case 'EditWindowExpired':
-      throw new errors.APIError('You can no longer edit this comment. The window to do so has expired.', {
-        status: 401,
-        translation_key: 'error.editWindowExpired',
       });
     case 'NotAuthorizedToEdit':
       throw errors.ErrNotAuthorized;
diff --git a/services/comments.js b/services/comments.js
index 6e3d79edd..002e7b1af 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -3,6 +3,8 @@ 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'},
@@ -115,9 +117,7 @@ module.exports = class CommentsService {
           name: 'NotAuthorizedToEdit'
         });
       } else if (( ! ignoreEditWindow) && editWindowExpired(comment)) {
-        throw Object.assign(new Error('Edit window is over.'), {
-          name: 'EditWindowExpired'
-        });
+        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.');
     }

From 785e5a4ac8bccfa9ea8e822150b091f7857182c3 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Tue, 9 May 2017 16:49:11 -0600
Subject: [PATCH 082/132] Collected config

---
 bin/cli-serve               |   6 +-
 bin/commander.js            |   5 --
 config.js                   | 147 ++++++++++++++++++++++++++++++++++++
 plugins.js                  |   5 +-
 routes/admin/index.js       |   5 +-
 routes/api/account/index.js |   5 +-
 routes/api/users/index.js   |   5 +-
 routes/embed/index.js       |   5 +-
 services/mailer.js          |  29 ++++---
 services/mongoose.js        |  19 ++---
 services/passport.js        |  42 ++---------
 services/redis.js           |   6 +-
 services/setup.js           |   5 +-
 services/users.js           |  24 +++---
 webpack.config.js           |   7 +-
 15 files changed, 221 insertions(+), 94 deletions(-)
 create mode 100644 config.js

diff --git a/bin/cli-serve b/bin/cli-serve
index eca23303b..7978c6c85 100755
--- a/bin/cli-serve
+++ b/bin/cli-serve
@@ -9,13 +9,15 @@ const kue = require('../services/kue');
 const mongoose = require('../services/mongoose');
 const util = require('./util');
 const {createSubscriptionManager} = require('../graph/subscriptions');
+const {
+  PORT
+} = require('../config');
 
 /**
 * Get port from environment and store in Express.
 */
 
-const port = normalizePort(process.env.TALK_PORT || '3000');
-
+const port = normalizePort(PORT);
 app.set('port', port);
 
 /**
diff --git a/bin/commander.js b/bin/commander.js
index ad346a911..328a25b29 100644
--- a/bin/commander.js
+++ b/bin/commander.js
@@ -3,11 +3,6 @@ const dotenv = require('dotenv');
 const fs = require('fs');
 const program = require('commander');
 
-// Perform rewrites to the runtime environment variables based on the contents
-// of the process.env.REWRITE_ENV if it exists. This is done here as it is the
-// entrypoint for the entire application.
-require('env-rewrite').rewrite();
-
 //==============================================================================
 // Setting up the program command line arguments.
 //==============================================================================
diff --git a/config.js b/config.js
new file mode 100644
index 000000000..271f13420
--- /dev/null
+++ b/config.js
@@ -0,0 +1,147 @@
+// This file serves as the entrypoint to all configuration loaded by the
+// application. All defaults are assumed here, validation should also be
+// completed here.
+
+// Perform rewrites to the runtime environment variables based on the contents
+// of the process.env.REWRITE_ENV if it exists. This is done here as it is the
+// entrypoint for the entire applications configuration.
+require('env-rewrite').rewrite();
+
+//==============================================================================
+// CONFIG INITIALIZATION
+//==============================================================================
+
+const CONFIG = {
+
+  //------------------------------------------------------------------------------
+  // JWT based configuration
+  //------------------------------------------------------------------------------
+
+  // JWT_SECRET is the secret used to sign and verify tokens issued by this
+  // application.
+  JWT_SECRET: process.env.TALK_JWT_SECRET || null,
+
+  // JWT_AUDIENCE is the value for the audience claim for the tokens that will be
+  // verified when decoding. If `JWT_AUDIENCE` is not in the environment, then it
+  // will default to `talk`.
+  JWT_AUDIENCE: process.env.TALK_JWT_AUDIENCE || 'talk',
+
+  // JWT_ISSUER is the value for the issuer for the tokens that will be verified
+  // when decoding. If `JWT_ISSUER` is not in the environment, then it will try
+  // `TALK_ROOT_URL`, otherwise, it will be undefined.
+  JWT_ISSUER: process.env.TALK_JWT_ISSUER || process.env.TALK_ROOT_URL || undefined,
+
+  // JWT_EXPIRY is the time for which a given token is valid for.
+  JWT_EXPIRY: process.env.TALK_JWT_EXPIRY || '1 day',
+
+  //------------------------------------------------------------------------------
+  // Installation locks
+  //------------------------------------------------------------------------------
+
+  INSTALL_LOCK: process.env.TALK_INSTALL_LOCK === 'TRUE',
+
+  //------------------------------------------------------------------------------
+  // External database url's
+  //------------------------------------------------------------------------------
+
+  MONGO_URL: process.env.TALK_MONGO_URL,
+  REDIS_URL: process.env.TALK_REDIS_URL,
+
+  //------------------------------------------------------------------------------
+  // Plugins
+  //------------------------------------------------------------------------------
+
+  PLUGINS_JSON: process.env.TALK_PLUGINS_JSON,
+
+  //------------------------------------------------------------------------------
+  // Server Config
+  //------------------------------------------------------------------------------
+
+  // Port to bind to.
+  PORT: process.env.TALK_PORT || '3000',
+
+  // The URL for this Talk Instance as viewable from the outside.
+  ROOT_URL: process.env.TALK_ROOT_URL,
+  
+  //------------------------------------------------------------------------------
+  // Recaptcha configuration
+  //------------------------------------------------------------------------------
+
+  RECAPTCHA_ENABLED: false, // updated below
+  RECAPTCHA_PUBLIC: process.env.TALK_RECAPTCHA_PUBLIC,
+  RECAPTCHA_SECRET: process.env.TALK_RECAPTCHA_SECRET,
+
+  //------------------------------------------------------------------------------
+  // SMTP Server configuration
+  //------------------------------------------------------------------------------
+
+  SMTP_FROM_ADDRESS: process.env.TALK_SMTP_FROM_ADDRESS,
+  SMTP_HOST: process.env.TALK_SMTP_HOST,
+  SMTP_PASSWORD: process.env.TALK_SMTP_PASSWORD,
+  SMTP_PORT: process.env.TALK_SMTP_PORT,
+  SMTP_USERNAME: process.env.TALK_SMTP_USERNAME
+};
+
+//==============================================================================
+// CONFIG VALIDATION
+//==============================================================================
+
+//------------------------------------------------------------------------------
+// JWT based configuration
+//------------------------------------------------------------------------------
+
+if (process.env.NODE_ENV === 'test' && !CONFIG.JWT_SECRET) {
+  CONFIG.JWT_SECRET = 'keyboard cat';
+} else if (!CONFIG.JWT_SECRET) {
+  throw new Error('TALK_JWT_SECRET must be provided in the environment to sign/verify tokens');
+}
+
+//------------------------------------------------------------------------------
+// External database url's
+//------------------------------------------------------------------------------
+
+// Reset the mongo url in the event it hasn't been overrided and we are in a
+// testing environment. Every new mongo instance comes with a test database by
+// default, this is consistent with common testing and use case practices.
+if (process.env.NODE_ENV === 'test' && !CONFIG.MONGO_URL) {
+  CONFIG.MONGO_URL = 'mongodb://localhost/test';
+}
+
+// Reset the redis url in the event it hasn't been overrided and we are in a
+// testing environment.
+if (process.env.NODE_ENV === 'test' && !CONFIG.REDIS_URL) {
+  CONFIG.REDIS_URL = 'redis://localhost';
+}
+
+//------------------------------------------------------------------------------
+// Recaptcha configuration
+//------------------------------------------------------------------------------
+
+/**
+ * This is true when the recaptcha secret is provided and the Recaptcha feature
+ * is to be enabled.
+ */
+CONFIG.RECAPTCHA_ENABLED = CONFIG.RECAPTCHA_SECRET && CONFIG.RECAPTCHA_SECRET.length > 0 &&
+                           CONFIG.RECAPTCHA_PUBLIC && CONFIG.RECAPTCHA_PUBLIC.length > 0;
+if (!CONFIG.RECAPTCHA_ENABLED) {
+  console.warn('Recaptcha is not enabled for login/signup abuse prevention, set TALK_RECAPTCHA_SECRET and TALK_RECAPTCHA_PUBLIC to enable Recaptcha.');
+}
+
+//------------------------------------------------------------------------------
+// SMTP Server configuration
+//------------------------------------------------------------------------------
+
+{
+  const requiredProps = [
+    'SMTP_FROM_ADDRESS',
+    'SMTP_USERNAME',
+    'SMTP_PASSWORD',
+    'SMTP_HOST'
+  ];
+
+  if (requiredProps.some((prop) => !CONFIG[prop])) {
+    console.warn(`${requiredProps.map((v) => `TALK_${v}`).join(', ')} should be defined in the environment if you would like to send password reset emails from Talk`);
+  }
+}
+
+module.exports = CONFIG;
diff --git a/plugins.js b/plugins.js
index 22293c975..f353cd392 100644
--- a/plugins.js
+++ b/plugins.js
@@ -4,6 +4,9 @@ const resolve = require('resolve');
 const debug = require('debug')('talk:plugins');
 const Joi = require('joi');
 const amp = require('app-module-path');
+const {
+  PLUGINS_JSON
+} = require('./config');
 
 // Add the current path to the module root.
 amp.addPath(__dirname);
@@ -18,7 +21,7 @@ try {
   let customPlugins = path.join(__dirname, 'plugins.json');
   let defaultPlugins = path.join(__dirname, 'plugins.default.json');
 
-  if (process.env.TALK_PLUGINS_JSON && process.env.TALK_PLUGINS_JSON.length > 0) {
+  if (PLUGINS_JSON && PLUGINS_JSON.length > 0) {
     debug('Now using TALK_PLUGINS_JSON environment variable for plugins');
     plugins = require(envPlugins);
   } else if (fs.existsSync(customPlugins)) {
diff --git a/routes/admin/index.js b/routes/admin/index.js
index 1a9769591..44ce83222 100644
--- a/routes/admin/index.js
+++ b/routes/admin/index.js
@@ -1,5 +1,8 @@
 const express = require('express');
 const router = express.Router();
+const {
+  RECAPTCHA_PUBLIC
+} = require('../../config');
 
 // Get /email-confirmation expects a signed JWT in the hash
 router.get('/confirm-email', (req, res) => {
@@ -17,7 +20,7 @@ router.get('/password-reset', (req, res) => {
 
 router.get('*', (req, res) => {
   const data = {
-    TALK_RECAPTCHA_PUBLIC: process.env.TALK_RECAPTCHA_PUBLIC
+    TALK_RECAPTCHA_PUBLIC: RECAPTCHA_PUBLIC
   };
 
   res.render('admin', {basePath: '/client/coral-admin', data});
diff --git a/routes/api/account/index.js b/routes/api/account/index.js
index e1c73d638..4c49c00a5 100644
--- a/routes/api/account/index.js
+++ b/routes/api/account/index.js
@@ -4,6 +4,9 @@ const UsersService = require('../../../services/users');
 const mailer = require('../../../services/mailer');
 const authorization = require('../../../middleware/authorization');
 const errors = require('../../../errors');
+const {
+  ROOT_URL
+} = require('../../../config');
 
 //==============================================================================
 // ROUTES
@@ -62,7 +65,7 @@ router.post('/password/reset', (req, res, next) => {
         template: 'password-reset',             // needed to know which template to render!
         locals: {                                     // specifies the template locals.
           token,
-          rootURL: process.env.TALK_ROOT_URL
+          rootURL: ROOT_URL
         },
         subject: 'Password Reset',
         to: email
diff --git a/routes/api/users/index.js b/routes/api/users/index.js
index a01fed2c9..9d81b87b7 100644
--- a/routes/api/users/index.js
+++ b/routes/api/users/index.js
@@ -5,6 +5,9 @@ const CommentsService = require('../../../services/comments');
 const mailer = require('../../../services/mailer');
 const errors = require('../../../errors');
 const authorization = require('../../../middleware/authorization');
+const {
+  ROOT_URL
+} = require('../../../config');
 
 // get a list of users.
 router.get('/', authorization.needed('ADMIN'), (req, res, next) => {
@@ -108,7 +111,7 @@ const SendEmailConfirmation = (app, userID, email, referer) => UsersService
       template: 'email-confirm',              // needed to know which template to render!
       locals: {                                     // specifies the template locals.
         token,
-        rootURL: process.env.TALK_ROOT_URL,
+        rootURL: ROOT_URL,
         email
       },
       subject: 'Email Confirmation',
diff --git a/routes/embed/index.js b/routes/embed/index.js
index efa563422..0aaa9ff9c 100644
--- a/routes/embed/index.js
+++ b/routes/embed/index.js
@@ -1,6 +1,9 @@
 const express = require('express');
 const router = express.Router();
 const SettingsService = require('../../services/settings');
+const {
+  RECAPTCHA_PUBLIC
+} = require('../../config');
 
 router.use('/:embed', (req, res, next) => {
   switch (req.params.embed) {
@@ -8,7 +11,7 @@ router.use('/:embed', (req, res, next) => {
     return SettingsService.retrieve()
       .then(({customCssUrl}) => {
         const data = {
-          TALK_RECAPTCHA_PUBLIC: process.env.TALK_RECAPTCHA_PUBLIC
+          TALK_RECAPTCHA_PUBLIC: RECAPTCHA_PUBLIC
         };
 
         return res.render('embed/stream', {customCssUrl, data});
diff --git a/services/mailer.js b/services/mailer.js
index 35741ee9f..f3d9235ba 100644
--- a/services/mailer.js
+++ b/services/mailer.js
@@ -5,16 +5,13 @@ const path = require('path');
 const fs = require('fs');
 const _ = require('lodash');
 
-const smtpRequiredProps = [
-  'TALK_SMTP_FROM_ADDRESS',
-  'TALK_SMTP_USERNAME',
-  'TALK_SMTP_PASSWORD',
-  'TALK_SMTP_HOST'
-];
-
-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`);
-}
+const {
+  SMTP_HOST,
+  SMTP_USERNAME,
+  SMTP_PORT,
+  SMTP_PASSWORD,
+  SMTP_FROM_ADDRESS
+} = require('../config');
 
 // load all the templates as strings
 const templates = {
@@ -56,15 +53,15 @@ templates.render = (name, format = 'txt', context) => new Promise((resolve, reje
 });
 
 const options = {
-  host: process.env.TALK_SMTP_HOST,
+  host: SMTP_HOST,
   auth: {
-    user: process.env.TALK_SMTP_USERNAME,
-    pass: process.env.TALK_SMTP_PASSWORD
+    user: SMTP_USERNAME,
+    pass: SMTP_PASSWORD
   }
 };
 
-if (process.env.TALK_SMTP_PORT) {
-  options.port = process.env.TALK_SMTP_PORT;
+if (SMTP_PORT) {
+  options.port = SMTP_PORT;
 } else {
   options.port = 25;
 }
@@ -126,7 +123,7 @@ const mailer = module.exports = {
       debug(`Starting to send mail for Job[${id}]`);
 
       // Set the `from` field.
-      data.message.from = process.env.TALK_SMTP_FROM_ADDRESS;
+      data.message.from = SMTP_FROM_ADDRESS;
 
       // Actually send the email.
       defaultTransporter.sendMail(data.message, (err) => {
diff --git a/services/mongoose.js b/services/mongoose.js
index c7092326f..acda2f564 100644
--- a/services/mongoose.js
+++ b/services/mongoose.js
@@ -1,7 +1,12 @@
 const mongoose = require('mongoose');
 const debug = require('debug')('talk:db');
+const enabled = require('debug').enabled;
 const queryDebuger = require('debug')('talk:db:query');
 
+const {
+  MONGO_URL
+} = require('../config');
+
 // Loading the formatter from Mongoose:
 //
 // https://github.com/Automattic/mongoose/blob/1a93d1f4d12e441e17ddf451e96fbc5f6e8f54b8/lib/drivers/node-mongodb-native/collection.js#L182
@@ -24,18 +29,6 @@ function debugQuery(name, i, ...args) {
   queryDebuger(functionCall + params);
 }
 
-const enabled = require('debug').enabled;
-
-// Pull the mongo url out of the environment.
-let url = process.env.TALK_MONGO_URL;
-
-// Reset the mongo url in the event it hasn't been overrided and we are in a
-// testing environment. Every new mongo instance comes with a test database by
-// default, this is consistent with common testing and use case practices.
-if (process.env.NODE_ENV === 'test' && !url) {
-  url = 'mongodb://localhost/test';
-}
-
 // Use native promises
 mongoose.Promise = global.Promise;
 
@@ -48,7 +41,7 @@ if (enabled('talk:db')) {
 }
 
 // Connect to the Mongo instance.
-mongoose.connect(url, (err) => {
+mongoose.connect(MONGO_URL, (err) => {
   if (err) {
     throw err;
   }
diff --git a/services/passport.js b/services/passport.js
index 41d57a539..fd56a8c86 100644
--- a/services/passport.js
+++ b/services/passport.js
@@ -9,25 +9,14 @@ const errors = require('../errors');
 const uuid = require('uuid');
 const debug = require('debug')('talk:passport');
 
-// JWT_SECRET is the secret used to sign and verify tokens issued by this
-// application.
-const JWT_SECRET = process.env.JWT_SECRET || null;
-if (JWT_SECRET === null) {
-  throw new Error('JWT_SECRET must be provided in the environment to sign/verify tokens');
-}
-
-// JWT_EXPIRY is the time for which a given token is valid for.
-const JWT_EXPIRY = process.env.JWT_EXPIRY || '1 day';
-
-// JWT_ISSUER is the value for the issuer for the tokens that will be verified
-// when decoding. If `JWT_ISSUER` is not in the environment, then it will try
-// `TALK_ROOT_URL`, otherwise, it will be undefined.
-const JWT_ISSUER = process.env.JWT_ISSUER || process.env.TALK_ROOT_URL || undefined;
-
-// JWT_AUDIENCE is the value for the audience claim for the tokens that will be
-// verified when decoding. If `JWT_AUDIENCE` is not in the environment, then it
-// will default to `talk`.
-const JWT_AUDIENCE = process.env.JWT_AUDIENCE || 'talk';
+const {
+  JWT_SECRET,
+  JWT_ISSUER,
+  JWT_EXPIRY,
+  JWT_AUDIENCE,
+  RECAPTCHA_SECRET,
+  RECAPTCHA_ENABLED
+} = require('../config');
 
 // GenerateToken will sign a token to include all the authorization information
 // needed for the front end.
@@ -200,21 +189,6 @@ const CheckIfNeedsRecaptcha = (user, email) => {
   return false;
 };
 
-/**
- * This stores the Recaptcha secret.
- */
-const RECAPTCHA_SECRET = process.env.TALK_RECAPTCHA_SECRET;
-const RECAPTCHA_PUBLIC = process.env.TALK_RECAPTCHA_PUBLIC;
-
-/**
- * This is true when the recaptcha secret is provided and the Recaptcha feature
- * is to be enabled.
- */
-const RECAPTCHA_ENABLED = RECAPTCHA_SECRET && RECAPTCHA_SECRET.length > 0 && RECAPTCHA_PUBLIC && RECAPTCHA_PUBLIC.length > 0;
-if (!RECAPTCHA_ENABLED) {
-  console.log('Recaptcha is not enabled for login/signup abuse prevention, set TALK_RECAPTCHA_SECRET and TALK_RECAPTCHA_PUBLIC to enable Recaptcha.');
-}
-
 /**
  * This sends the request details down Google to check to see if the response is
  * genuine or not.
diff --git a/services/redis.js b/services/redis.js
index d27303fca..c049b2d00 100644
--- a/services/redis.js
+++ b/services/redis.js
@@ -1,9 +1,11 @@
 const redis = require('redis');
 const debug = require('debug')('talk:redis');
-const url = process.env.TALK_REDIS_URL || 'redis://localhost';
+const {
+  REDIS_URL
+} = require('../config');
 
 const connectionOptions = {
-  url,
+  url: REDIS_URL,
   retry_strategy: function(options) {
     if (options.error && options.error.code === 'ECONNREFUSED') {
 
diff --git a/services/setup.js b/services/setup.js
index 1f1542d5e..233021c17 100644
--- a/services/setup.js
+++ b/services/setup.js
@@ -2,6 +2,9 @@ const UsersService = require('./users');
 const SettingsService = require('./settings');
 const SettingsModel = require('../models/setting');
 const errors = require('../errors');
+const {
+  INSTALL_LOCK
+} = require('../config');
 
 /**
  * This service is used when we want to setup the application. It is consumed by
@@ -15,7 +18,7 @@ module.exports = class SetupService {
   static isAvailable() {
 
     // Check if we have an install lock present.
-    if (process.env.TALK_INSTALL_LOCK === 'TRUE') {
+    if (INSTALL_LOCK) {
       return Promise.reject(errors.ErrInstallLock);
     }
 
diff --git a/services/users.js b/services/users.js
index 59cc6ba7d..03c1671d5 100644
--- a/services/users.js
+++ b/services/users.js
@@ -1,12 +1,14 @@
 const assert = require('assert');
+const uuid = require('uuid');
 const bcrypt = require('bcrypt');
 const url = require('url');
 const jwt = require('jsonwebtoken');
 const Wordlist = require('./wordlist');
-
 const errors = require('../errors');
-
-const uuid = require('uuid');
+const {
+  JWT_SECRET,
+  ROOT_URL
+} = require('../config');
 
 const redis = require('./redis');
 const redisClient = redis.createClient();
@@ -22,14 +24,6 @@ const SettingsService = require('./settings');
 const ActionsService = require('./actions');
 const MailerService = require('./mailer');
 
-// In the event that the TALK_JWT_SECRET is missing but we are testing, then
-// set the process.env.TALK_JWT_SECRET.
-if (process.env.NODE_ENV === 'test' && !process.env.TALK_JWT_SECRET) {
-  process.env.TALK_JWT_SECRET = 'keyboard cat';
-} else if (!process.env.TALK_JWT_SECRET) {
-  throw new Error('TALK_JWT_SECRET must be defined to encode JSON Web Tokens and other auth functionality');
-}
-
 const EMAIL_CONFIRM_JWT_SUBJECT = 'email_confirm';
 const PASSWORD_RESET_JWT_SUBJECT = 'password_reset';
 
@@ -564,7 +558,7 @@ module.exports = class UsersService {
           version: user.__v
         };
 
-        return jwt.sign(payload, process.env.TALK_JWT_SECRET, {
+        return jwt.sign(payload, JWT_SECRET, {
           algorithm: 'HS256',
           expiresIn: '1d',
           subject: PASSWORD_RESET_JWT_SUBJECT
@@ -583,7 +577,7 @@ module.exports = class UsersService {
       // Set the allowed algorithms.
       options.algorithms = ['HS256'];
 
-      jwt.verify(token, process.env.TALK_JWT_SECRET, options, (err, decoded) => {
+      jwt.verify(token, JWT_SECRET, options, (err, decoded) => {
         if (err) {
           return reject(err);
         }
@@ -697,7 +691,7 @@ module.exports = class UsersService {
    * @param  {String} email The email that we are needing to get confirmed.
    * @return {Promise}
    */
-  static createEmailConfirmToken(userID = null, email, referer = process.env.TALK_ROOT_URL) {
+  static createEmailConfirmToken(userID = null, email, referer = ROOT_URL) {
     if (!email || typeof email !== 'string') {
       return Promise.reject('email is required when creating a JWT for resetting passord');
     }
@@ -740,7 +734,7 @@ module.exports = class UsersService {
         email,
         referer,
         userID: user.id
-      }, process.env.TALK_JWT_SECRET, tokenOptions);
+      }, JWT_SECRET, tokenOptions);
     });
   }
 
diff --git a/webpack.config.js b/webpack.config.js
index 3a54e85c0..5aade15a1 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -9,13 +9,18 @@ const webpack = require('webpack');
 // Possibly load the config from the .env file (if there is one).
 require('dotenv').config();
 
+// Load the config after dotenv has does it's thing.
+const {
+  PLUGINS_JSON
+} = require('./config');
+
 let pluginsConfigPath;
 
 let envPlugins = path.join(__dirname, 'plugins.env.js');
 let customPlugins = path.join(__dirname, 'plugins.json');
 let defaultPlugins = path.join(__dirname, 'plugins.default.json');
 
-if (process.env.TALK_PLUGINS_JSON && process.env.TALK_PLUGINS_JSON.length > 0) {
+if (PLUGINS_JSON && PLUGINS_JSON.length > 0) {
   pluginsConfigPath = envPlugins;
 } else if (fs.existsSync(customPlugins)) {
   pluginsConfigPath = customPlugins;

From 17b9e43c14c924168d731a96feabb9577e46abf6 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Tue, 9 May 2017 16:53:30 -0600
Subject: [PATCH 083/132] moved webpack config

---
 webpack.config.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/webpack.config.js b/webpack.config.js
index 5aade15a1..3a54e85c0 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -9,18 +9,13 @@ const webpack = require('webpack');
 // Possibly load the config from the .env file (if there is one).
 require('dotenv').config();
 
-// Load the config after dotenv has does it's thing.
-const {
-  PLUGINS_JSON
-} = require('./config');
-
 let pluginsConfigPath;
 
 let envPlugins = path.join(__dirname, 'plugins.env.js');
 let customPlugins = path.join(__dirname, 'plugins.json');
 let defaultPlugins = path.join(__dirname, 'plugins.default.json');
 
-if (PLUGINS_JSON && PLUGINS_JSON.length > 0) {
+if (process.env.TALK_PLUGINS_JSON && process.env.TALK_PLUGINS_JSON.length > 0) {
   pluginsConfigPath = envPlugins;
 } else if (fs.existsSync(customPlugins)) {
   pluginsConfigPath = customPlugins;

From f8b207e563794ba74efafc5ebc78ee1f5a460d8e Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 10 May 2017 10:29:20 -0600
Subject: [PATCH 084/132] Return a meaningful error

---
 services/passport.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/passport.js b/services/passport.js
index fd56a8c86..467605a1a 100644
--- a/services/passport.js
+++ b/services/passport.js
@@ -56,7 +56,7 @@ const HandleAuthPopupCallback = (req, res, next) => (err, user) => {
   }
 
   if (!user) {
-    return res.render('auth-callback', {auth: JSON.stringify({err, data: null})});
+    return res.render('auth-callback', {auth: JSON.stringify({err: errors.ErrNotAuthorized, data: null})});
   }
 
   // Generate the token to re-issue to the frontend.

From 3e1b7591e006091ffa91b4368b1f4f1f1f54eadb Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 10 May 2017 14:07:58 -0300
Subject: [PATCH 085/132] Adds displayName for WrappedReactions and
 alreadyReacted

---
 client/coral-framework/helpers/hoc.js          |  3 +++
 client/coral-framework/hocs/withFragments.js   |  6 +-----
 client/coral-framework/hocs/withReaction.js    |  8 +++++++-
 plugins/coral-plugin-love/client/LoveButton.js | 10 +++++-----
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/client/coral-framework/helpers/hoc.js b/client/coral-framework/helpers/hoc.js
index e69de29bb..bb034b179 100644
--- a/client/coral-framework/helpers/hoc.js
+++ b/client/coral-framework/helpers/hoc.js
@@ -0,0 +1,3 @@
+export function getDisplayName(WrappedComponent) {
+  return WrappedComponent.displayName || WrappedComponent.name || 'Component';
+}
diff --git a/client/coral-framework/hocs/withFragments.js b/client/coral-framework/hocs/withFragments.js
index a2686d94b..a5060f27a 100644
--- a/client/coral-framework/hocs/withFragments.js
+++ b/client/coral-framework/hocs/withFragments.js
@@ -1,11 +1,7 @@
 import React from 'react';
+import {getDisplayName} from '../helpers/hoc';
 
 // TODO: revisit `filtering` after https://github.com/apollographql/graphql-anywhere/issues/38.
-
-function getDisplayName(WrappedComponent) {
-  return WrappedComponent.displayName || WrappedComponent.name || 'Component';
-}
-
 export default fragments => WrappedComponent => {
   class WithFragments extends React.Component {
     render() {
diff --git a/client/coral-framework/hocs/withReaction.js b/client/coral-framework/hocs/withReaction.js
index bd641a885..393d6db3a 100644
--- a/client/coral-framework/hocs/withReaction.js
+++ b/client/coral-framework/hocs/withReaction.js
@@ -3,6 +3,7 @@ import get from 'lodash/get';
 import uuid from 'uuid/v4';
 import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
+import {getDisplayName} from '../helpers/hoc';
 import {compose, gql, graphql} from 'react-apollo';
 import withFragments from 'coral-framework/hocs/withFragments';
 import {showSignInDialog} from 'coral-framework/actions/auth';
@@ -31,7 +32,10 @@ export default reaction => WrappedComponent => {
         comment
       );
 
-      const withReactionProps = {reactionSummary, count};
+      const alreadyReacted = () => !!reactionSummary;
+
+      const withReactionProps = {reactionSummary, count, alreadyReacted};
+
 
       return <WrappedComponent {...this.props} {...withReactionProps} />;
     }
@@ -234,5 +238,7 @@ export default reaction => WrappedComponent => {
     withPostReaction
   );
 
+  WithReactions.displayName = `WithReactions(${getDisplayName(WrappedComponent)})`;
+
   return enhance(WithReactions);
 };
diff --git a/plugins/coral-plugin-love/client/LoveButton.js b/plugins/coral-plugin-love/client/LoveButton.js
index 260c5fc99..383873f63 100644
--- a/plugins/coral-plugin-love/client/LoveButton.js
+++ b/plugins/coral-plugin-love/client/LoveButton.js
@@ -12,7 +12,7 @@ class LoveButton extends React.Component {
       postReaction,
       deleteReaction,
       showSignInDialog,
-      reactionSummary
+      alreadyReacted
     } = this.props;
     const {root: {me}, comment} = this.props;
 
@@ -27,7 +27,7 @@ class LoveButton extends React.Component {
       return;
     }
 
-    if (reactionSummary) {
+    if (alreadyReacted()) {
       deleteReaction();
     } else {
       postReaction();
@@ -35,13 +35,13 @@ class LoveButton extends React.Component {
   };
 
   render() {
-    const {count, reactionSummary} = this.props;
+    const {count, alreadyReacted} = this.props;
     return (
       <button
-        className={`${styles.button} ${reactionSummary ? styles.loved : ''}`}
+        className={`${styles.button} ${alreadyReacted() ? styles.loved : ''}`}
         onClick={this.handleClick}
       >
-        <span>{lang.t(reactionSummary ? 'loved' : 'love')}</span>
+        <span>{lang.t(alreadyReacted() ? 'loved' : 'love')}</span>
         <Icon name="favorite" />
         <span>{count > 0 && count}</span>
       </button>

From 26e5631f5214096d64b40587718fd344b65e28cd Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 10 May 2017 14:13:32 -0300
Subject: [PATCH 086/132] Changing path for hocs

---
 client/coral-framework/hocs/index.js           | 7 +++++++
 client/coral-framework/index.js                | 2 ++
 plugins/coral-plugin-love/client/LoveButton.js | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 client/coral-framework/hocs/index.js

diff --git a/client/coral-framework/hocs/index.js b/client/coral-framework/hocs/index.js
new file mode 100644
index 000000000..6b05553d9
--- /dev/null
+++ b/client/coral-framework/hocs/index.js
@@ -0,0 +1,7 @@
+import withFragments from './withFragments';
+import withReaction from './withReaction';
+
+export default {
+  withFragments,
+  withReaction
+}
\ No newline at end of file
diff --git a/client/coral-framework/index.js b/client/coral-framework/index.js
index b85b69bcd..46ee704f4 100644
--- a/client/coral-framework/index.js
+++ b/client/coral-framework/index.js
@@ -1,6 +1,7 @@
 import pym from './services/PymConnection';
 import I18n from './modules/i18n/i18n';
 import actions from './actions';
+import hocs from './hocs';
 
 // TODO (bc): Deprecate old actions. Spreading actions is now needed.
 
@@ -8,5 +9,6 @@ export default {
   pym,
   I18n,
   actions,
+  ...hocs,
   ...actions
 };
diff --git a/plugins/coral-plugin-love/client/LoveButton.js b/plugins/coral-plugin-love/client/LoveButton.js
index 383873f63..b85d7280b 100644
--- a/plugins/coral-plugin-love/client/LoveButton.js
+++ b/plugins/coral-plugin-love/client/LoveButton.js
@@ -3,7 +3,7 @@ import {Icon} from 'coral-ui';
 import styles from './styles.css';
 import {I18n} from 'coral-framework';
 import translations from './translations.json';
-import withReaction from 'coral-framework/hocs/withReaction';
+import {withReaction} from 'coral-framework';
 const lang = new I18n(translations);
 
 class LoveButton extends React.Component {

From 644d00d5d8ac7fc9174567269959a8577a8efd31 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 10 May 2017 14:57:24 -0300
Subject: [PATCH 087/132] Adding coral-plugin-api

---
 client/coral-plugin-api/index.js               | 5 +++++
 plugins/coral-plugin-love/client/LoveButton.js | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 client/coral-plugin-api/index.js

diff --git a/client/coral-plugin-api/index.js b/client/coral-plugin-api/index.js
new file mode 100644
index 000000000..8aa03205b
--- /dev/null
+++ b/client/coral-plugin-api/index.js
@@ -0,0 +1,5 @@
+import hocs from '../coral-framework/hocs';
+
+export default {
+  ...hocs
+};
diff --git a/plugins/coral-plugin-love/client/LoveButton.js b/plugins/coral-plugin-love/client/LoveButton.js
index b85d7280b..4364c4818 100644
--- a/plugins/coral-plugin-love/client/LoveButton.js
+++ b/plugins/coral-plugin-love/client/LoveButton.js
@@ -3,7 +3,7 @@ import {Icon} from 'coral-ui';
 import styles from './styles.css';
 import {I18n} from 'coral-framework';
 import translations from './translations.json';
-import {withReaction} from 'coral-framework';
+import {withReaction} from 'coral-plugin-api';
 const lang = new I18n(translations);
 
 class LoveButton extends React.Component {

From 2673de5059799ceb630eeef67b2ed9d57dd5bce6 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 10 May 2017 14:59:10 -0300
Subject: [PATCH 088/132] lintin

---
 client/coral-framework/hocs/index.js        | 2 +-
 client/coral-framework/hocs/withReaction.js | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/coral-framework/hocs/index.js b/client/coral-framework/hocs/index.js
index 6b05553d9..831c356d2 100644
--- a/client/coral-framework/hocs/index.js
+++ b/client/coral-framework/hocs/index.js
@@ -4,4 +4,4 @@ import withReaction from './withReaction';
 export default {
   withFragments,
   withReaction
-}
\ No newline at end of file
+};
diff --git a/client/coral-framework/hocs/withReaction.js b/client/coral-framework/hocs/withReaction.js
index 393d6db3a..c383dbed8 100644
--- a/client/coral-framework/hocs/withReaction.js
+++ b/client/coral-framework/hocs/withReaction.js
@@ -36,7 +36,6 @@ export default reaction => WrappedComponent => {
 
       const withReactionProps = {reactionSummary, count, alreadyReacted};
 
-
       return <WrappedComponent {...this.props} {...withReactionProps} />;
     }
   }

From 74ffc00c200ae412db0f75bcaf19d790a5318cd7 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 10 May 2017 15:02:43 -0300
Subject: [PATCH 089/132] Adding changes

---
 client/coral-embed-stream/src/actions/embed.js    | 7 +------
 client/coral-embed-stream/src/containers/Embed.js | 3 ++-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/client/coral-embed-stream/src/actions/embed.js b/client/coral-embed-stream/src/actions/embed.js
index c0eb7d844..509de7237 100644
--- a/client/coral-embed-stream/src/actions/embed.js
+++ b/client/coral-embed-stream/src/actions/embed.js
@@ -6,9 +6,4 @@ export const setActiveTab = (tab) => (dispatch, getState) => {
   if (getState().stream.commentId) {
     dispatch(viewAllComments());
   }
-};
-
-export const addExternalConfig = externalConfig => ({
-  type: 'ADD_EXTERNAL_CONFIG',
-  externalConfig
-});
+};
\ No newline at end of file
diff --git a/client/coral-embed-stream/src/containers/Embed.js b/client/coral-embed-stream/src/containers/Embed.js
index 75d5dcbaf..3572877ce 100644
--- a/client/coral-embed-stream/src/containers/Embed.js
+++ b/client/coral-embed-stream/src/containers/Embed.js
@@ -92,7 +92,8 @@ const mapStateToProps = state => ({
   commentId: state.stream.commentId,
   assetId: state.stream.assetId,
   assetUrl: state.stream.assetUrl,
-  activeTab: state.embed.activeTab
+  activeTab: state.embed.activeTab,
+  config: state.config
 });
 
 const mapDispatchToProps = dispatch =>

From a3a8d2379759eda4a52f23f0704ec0609226ea50 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 10 May 2017 12:18:42 -0600
Subject: [PATCH 090/132] patched bug with adding action

---
 services/comments.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/comments.js b/services/comments.js
index d77118705..d51caefcf 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -240,7 +240,7 @@ module.exports = class CommentsService {
    * @param {String} action the new action to the comment
    * @return {Promise}
    */
-  static addAction(item_id, user_id, action_type, metadata) {
+  static addAction(item_id, user_id, action_type, metadata = {}) {
     return ActionsService.insertUserAction({
       item_id,
       item_type: 'COMMENTS',

From c3dff79e6eda6ac302c603d3c97a0f30ca8d4203 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 10 May 2017 15:35:32 -0300
Subject: [PATCH 091/132] Updated

---
 client/coral-framework/components/Slot.js                   | 6 +++---
 .../coral-plugin-offtopic/client/components/OffTopicTag.js  | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/coral-framework/components/Slot.js b/client/coral-framework/components/Slot.js
index 68b5e9964..9640ca9de 100644
--- a/client/coral-framework/components/Slot.js
+++ b/client/coral-framework/components/Slot.js
@@ -4,10 +4,10 @@ import styles from './Slot.css';
 import {connect} from 'react-redux';
 import {getSlotElements} from 'coral-framework/helpers/plugins';
 
-function Slot ({fill, inline = false, plugin_config: {debug, ...config}, ...rest}) {
+function Slot ({fill, inline = false, plugin_config: {...config}, ...rest}) {
   return (
-    <div className={cn({[styles.inline]: inline, [styles.debug]: debug})}>
-      {getSlotElements(fill, {...config, ...rest})}
+    <div className={cn({[styles.inline]: inline, [styles.debug]: config.debug})}>
+      {getSlotElements(fill, {...rest, ...config})}
     </div>
   );
 }
diff --git a/plugins/coral-plugin-offtopic/client/components/OffTopicTag.js b/plugins/coral-plugin-offtopic/client/components/OffTopicTag.js
index 73e2372ed..5a84fc360 100644
--- a/plugins/coral-plugin-offtopic/client/components/OffTopicTag.js
+++ b/plugins/coral-plugin-offtopic/client/components/OffTopicTag.js
@@ -7,6 +7,7 @@ const isOffTopic = (tags) => {
 
 export default (props) => (
   <span>
+    {console.log(props)}
     {
       isOffTopic(props.comment.tags) ? (
         <span className={styles.tag}>

From 0a2b26b599590f6098aecf23cc7ec714ab08cc13 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 10 May 2017 15:53:33 -0300
Subject: [PATCH 092/132] Exports

---
 client/coral-plugin-api/index.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/client/coral-plugin-api/index.js b/client/coral-plugin-api/index.js
index 8aa03205b..f0f5ad9cc 100644
--- a/client/coral-plugin-api/index.js
+++ b/client/coral-plugin-api/index.js
@@ -1,5 +1 @@
-import hocs from '../coral-framework/hocs';
-
-export default {
-  ...hocs
-};
+export {withReaction} from '../coral-framework/hocs';

From 10e8a32c2111fa0da87152a9bedef98fececf45c Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 10 May 2017 15:57:21 -0300
Subject: [PATCH 093/132] Changes

---
 client/coral-framework/components/Slot.js                     | 4 ++--
 .../coral-plugin-offtopic/client/components/OffTopicTag.js    | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/client/coral-framework/components/Slot.js b/client/coral-framework/components/Slot.js
index 9640ca9de..3c9c17476 100644
--- a/client/coral-framework/components/Slot.js
+++ b/client/coral-framework/components/Slot.js
@@ -4,10 +4,10 @@ import styles from './Slot.css';
 import {connect} from 'react-redux';
 import {getSlotElements} from 'coral-framework/helpers/plugins';
 
-function Slot ({fill, inline = false, plugin_config: {...config}, ...rest}) {
+function Slot ({fill, inline = false, plugin_config: config, ...rest}) {
   return (
     <div className={cn({[styles.inline]: inline, [styles.debug]: config.debug})}>
-      {getSlotElements(fill, {...rest, ...config})}
+      {getSlotElements(fill, {...rest, config}}
     </div>
   );
 }
diff --git a/plugins/coral-plugin-offtopic/client/components/OffTopicTag.js b/plugins/coral-plugin-offtopic/client/components/OffTopicTag.js
index 5a84fc360..73e2372ed 100644
--- a/plugins/coral-plugin-offtopic/client/components/OffTopicTag.js
+++ b/plugins/coral-plugin-offtopic/client/components/OffTopicTag.js
@@ -7,7 +7,6 @@ const isOffTopic = (tags) => {
 
 export default (props) => (
   <span>
-    {console.log(props)}
     {
       isOffTopic(props.comment.tags) ? (
         <span className={styles.tag}>

From 57d2b81b0580d667cdc35bc5cbd2face9ab346c1 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 10 May 2017 16:05:52 -0300
Subject: [PATCH 094/132] missing _

---
 client/coral-embed-stream/src/actions/embed.js | 2 +-
 client/coral-framework/components/Slot.js      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-embed-stream/src/actions/embed.js b/client/coral-embed-stream/src/actions/embed.js
index 509de7237..98505cb99 100644
--- a/client/coral-embed-stream/src/actions/embed.js
+++ b/client/coral-embed-stream/src/actions/embed.js
@@ -6,4 +6,4 @@ export const setActiveTab = (tab) => (dispatch, getState) => {
   if (getState().stream.commentId) {
     dispatch(viewAllComments());
   }
-};
\ No newline at end of file
+};
diff --git a/client/coral-framework/components/Slot.js b/client/coral-framework/components/Slot.js
index 3c9c17476..939068e83 100644
--- a/client/coral-framework/components/Slot.js
+++ b/client/coral-framework/components/Slot.js
@@ -7,7 +7,7 @@ import {getSlotElements} from 'coral-framework/helpers/plugins';
 function Slot ({fill, inline = false, plugin_config: config, ...rest}) {
   return (
     <div className={cn({[styles.inline]: inline, [styles.debug]: config.debug})}>
-      {getSlotElements(fill, {...rest, config}}
+      {getSlotElements(fill, {...rest, config})}
     </div>
   );
 }

From c3048e599dee386151a2d08312b45a2a638958dd Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Wed, 10 May 2017 20:56:07 -0600
Subject: [PATCH 095/132] remove ability to un-flag a comment

---
 client/coral-plugin-flags/FlagButton.js | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/client/coral-plugin-flags/FlagButton.js b/client/coral-plugin-flags/FlagButton.js
index e5daf72c9..fc7c427b0 100644
--- a/client/coral-plugin-flags/FlagButton.js
+++ b/client/coral-plugin-flags/FlagButton.js
@@ -15,8 +15,7 @@ class FlagButton extends Component {
     message: '',
     step: 0,
     posted: false,
-    localPost: null,
-    localDelete: false
+    localPost: null
   }
 
   componentDidUpdate () {
@@ -27,17 +26,12 @@ class FlagButton extends Component {
 
   // When the "report" button is clicked expand the menu
   onReportClick = () => {
-    const {currentUser, deleteAction, flaggedByCurrentUser, flag} = this.props;
-    const {localPost, localDelete} = this.state;
-    const localFlagged = (flaggedByCurrentUser && !localDelete) || localPost;
+    const {currentUser} = this.props;
     if (!currentUser) {
       this.props.showSignInDialog();
       return;
     }
-    if (localFlagged) {
-      this.setState((prev) => prev.localPost ? {...prev, localPost: null, step: 0} : {...prev, localDelete: true});
-      deleteAction(localPost || flag.current_user.id);
-    } else if (this.state.showMenu){
+    if (this.state.showMenu) {
       this.closeMenu();
     } else {
       this.setState({showMenu: true});
@@ -136,14 +130,14 @@ class FlagButton extends Component {
 
   render () {
     const {getPopupMenu, flaggedByCurrentUser} = this.props;
-    const {localPost, localDelete} = this.state;
-    const flagged = (flaggedByCurrentUser && !localDelete) || localPost;
+    const {localPost} = this.state;
+    const flagged = flaggedByCurrentUser || localPost;
     const popupMenu = getPopupMenu[this.state.step](this.state.itemType);
 
     return <div className={`${name}-container`}>
       <button
         ref={ref => this.flagButton = ref}
-        onClick={!this.props.banned ? this.onReportClick : null}
+        onClick={!this.props.banned && !flaggedByCurrentUser && !localPost ? this.onReportClick : null}
         className={`${name}-button`}>
         {
           flagged

From ef502bf7a86cb280c71803651e7634544e4f95b7 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Thu, 11 May 2017 09:46:04 -0400
Subject: [PATCH 096/132] Update LICENSE

---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index 41cbbd5aa..597d8fa73 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2016 Mozilla Foundation
+Copyright 2017 Mozilla Foundation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

From 604894e43cded76da243d4a6029dcd1f5668372d Mon Sep 17 00:00:00 2001
From: Andrew Losowsky <andrew@losowsky.com>
Date: Thu, 11 May 2017 11:11:37 -0400
Subject: [PATCH 097/132] removed the beta tag

we left beta a while ago!
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 74097d48c..09cd33114 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Talk [![CircleCI](https://circleci.com/gh/coralproject/talk.svg?style=svg)](https://circleci.com/gh/coralproject/talk)
 
-Talk is currently in Beta! [Read more about Talk here.](https://coralproject.net/products/talk.html)
+Online comments are broken. Our open-source Talk tool rethinks how moderation, comment display, and conversation function, creating the opportunity for safer, smarter discussions around your work. [Read more about Talk here.](https://coralproject.net/products/talk.html)
 
 Third party licenses are available via the `/client/3rdpartylicenses.txt`
 endpoint when the server is running with built assets.

From cb908028967b5bd3794f05fae285e9f60606485b Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Thu, 11 May 2017 09:34:33 -0700
Subject: [PATCH 098/132] Fix bad merge when CommentBox calls
 setCommentCountCache

---
 client/coral-plugin-commentbox/CommentBox.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-plugin-commentbox/CommentBox.js b/client/coral-plugin-commentbox/CommentBox.js
index f7f76161c..e703a3058 100644
--- a/client/coral-plugin-commentbox/CommentBox.js
+++ b/client/coral-plugin-commentbox/CommentBox.js
@@ -74,9 +74,9 @@ class CommentBox extends React.Component {
         notifyForNewCommentStatus(addNotification, postedComment.status);
 
         if (postedComment.status === 'REJECTED') {
-          !isReply && setCommentCountCache(assetId, commentCountCache);
+          !isReply && setCommentCountCache(commentCountCache);
         } else if (postedComment.status === 'PREMOD') {
-          !isReply && setCommentCountCache(assetId, commentCountCache);
+          !isReply && setCommentCountCache(commentCountCache);
         }
 
         if (commentPostedHandler) {

From cd7b1f2b2becb0bf61d4400091f2dad12f5b2abb Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Thu, 11 May 2017 10:38:48 -0700
Subject: [PATCH 099/132] editComment mutation doesn't refetch streamQuery.
 Instead a reducer updates streamQuery client-side

---
 .../src/components/Comment.js                 | 13 ++++-
 .../src/containers/Embed.js                   | 56 ++++++++++++++-----
 .../graphql/mutations/index.js                |  4 +-
 3 files changed, 54 insertions(+), 19 deletions(-)

diff --git a/client/coral-embed-stream/src/components/Comment.js b/client/coral-embed-stream/src/components/Comment.js
index 000e0caad..13d286296 100644
--- a/client/coral-embed-stream/src/components/Comment.js
+++ b/client/coral-embed-stream/src/components/Comment.js
@@ -43,6 +43,7 @@ class Comment extends React.Component {
     // timeout to keep track of Comment edit window expiration
     this.editWindowExpiryTimeout = null;
     this.onClickEdit = this.onClickEdit.bind(this);
+    this.stopEditing = this.stopEditing.bind(this);
     this.state = {
 
       // Whether the comment should be editable (e.g. after a commenter clicking the 'Edit' button on their own comment)
@@ -125,7 +126,14 @@ class Comment extends React.Component {
     this.setState({isEditing: true});
   }
 
+  stopEditing () {
+    if (this._isMounted) {
+      this.setState({isEditing: false});
+    }
+  }
+
   componentDidMount() {
+    this._isMounted = true;
     if (this.editWindowExpiryTimeout) {
       this.editWindowExpiryTimeout = clearTimeout(this.editWindowExpiryTimeout);
     }
@@ -143,7 +151,8 @@ class Comment extends React.Component {
   componentWillUnmount() {
     if (this.editWindowExpiryTimeout) {
       this.editWindowExpiryTimeout = clearTimeout(this.editWindowExpiryTimeout);
-    }    
+    }
+    this._isMounted = false;
   }
   render () {
     const {
@@ -287,7 +296,7 @@ class Comment extends React.Component {
                 currentUser={currentUser}
                 maxCharCount={maxCharCount}
                 parentId={parentId}
-                stopEditing={() => this.setState({isEditing: false})}
+                stopEditing={this.stopEditing}
                 />
             : <div>
                 <Content body={comment.body} />
diff --git a/client/coral-embed-stream/src/containers/Embed.js b/client/coral-embed-stream/src/containers/Embed.js
index 754191c9b..a249ce842 100644
--- a/client/coral-embed-stream/src/containers/Embed.js
+++ b/client/coral-embed-stream/src/containers/Embed.js
@@ -140,7 +140,7 @@ function reduceEditCommentActionsToUpdateStreamQuery(previousResult, action) {
   if (resultHasErrors(action.result)) {
     return previousResult;
   }
-  const {variables: {id, edit}} = action;
+  const {variables: {id, edit}, result: {data: {editComment: {comment: {status}}}}} = action;
   const updateCommentWithEdit = (comment, edit) => {
     const {body} = edit;
     const editedComment = update(comment, {
@@ -151,24 +151,52 @@ function reduceEditCommentActionsToUpdateStreamQuery(previousResult, action) {
     });
     return editedComment;
   };
+  const commentIsStillVisible = (comment) => {
+    return ! ((id === comment.id) && (['PREMOD', 'REJECTED'].includes(status)));
+  };
   const resultReflectingEdit = update(previousResult, {
     asset: {
       comments: {
-        $apply: comments => comments.map(comment => {
-          if (comment.id === id) {
-            return updateCommentWithEdit(comment, edit);
-          }
-          return update(comment, {
-            replies: {
-              $apply: (comments) => comments.map(comment => {
-                if (comment.id === id) {
-                  return updateCommentWithEdit(comment, edit);                          
+        $apply: comments => {
+          return comments.filter(commentIsStillVisible).map(comment => {
+            let replyWasEditedToBeHidden = false;
+            if (comment.id === id) {
+              return updateCommentWithEdit(comment, edit);
+            }
+            const commentWithUpdatedReplies = update(comment, {
+              replies: {
+                $apply: (comments) => {
+                  return comments
+                    .filter(c => {
+                      if (commentIsStillVisible(c)) {
+                        return true;
+                      }
+                      replyWasEditedToBeHidden = true;
+                      return false;
+                    })
+                    .map(comment => {
+                      if (comment.id === id) {
+                        return updateCommentWithEdit(comment, edit);                          
+                      }
+                      return comment;
+                    });
                 }
-                return comment;
-              })
-            },
+              },
+            });
+
+            // If a reply was edited to be hdiden, then this parent needs its replyCount to be decremented.
+            if (replyWasEditedToBeHidden) {
+              return update(commentWithUpdatedReplies, {
+                replyCount: {
+                  $apply: (replyCount) => {
+                    return replyCount - 1;
+                  }
+                }
+              });
+            }
+            return commentWithUpdatedReplies;
           });
-        })
+        }
       }
     }
   });
diff --git a/client/coral-framework/graphql/mutations/index.js b/client/coral-framework/graphql/mutations/index.js
index df3e58ed0..4fb87c42c 100644
--- a/client/coral-framework/graphql/mutations/index.js
+++ b/client/coral-framework/graphql/mutations/index.js
@@ -183,9 +183,7 @@ export const editComment = graphql(EDIT_COMMENT, {
             asset_id,
             edit,
           },
-          refetchQueries: [
-            'EmbedQuery'
-          ]
+          refetchQueries: []
         });
       }
     };

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 100/132] 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 101/132] 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 102/132] 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 103/132] 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 104/132] 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 105/132] 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 95a7a1ca47a1f4e103cd9522b3f1478c92a9d5da Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 12 May 2017 20:15:04 +0700
Subject: [PATCH 106/132] Rename registry

---
 .../coral-embed-stream/src/graphql/index.js   |  6 +--
 client/coral-framework/helpers/plugins.js     |  2 +-
 client/coral-framework/hocs/withMutation.js   |  6 +--
 client/coral-framework/hocs/withQuery.js      |  4 +-
 .../{registry.js => graphqlRegistry.js}       | 44 +++++++++----------
 5 files changed, 31 insertions(+), 31 deletions(-)
 rename client/coral-framework/services/{registry.js => graphqlRegistry.js} (76%)

diff --git a/client/coral-embed-stream/src/graphql/index.js b/client/coral-embed-stream/src/graphql/index.js
index a123de7e7..daa8389b3 100644
--- a/client/coral-embed-stream/src/graphql/index.js
+++ b/client/coral-embed-stream/src/graphql/index.js
@@ -1,8 +1,8 @@
 import {gql} from 'react-apollo';
-import {registerConfig} from 'coral-framework/services/registry';
+import {add} from 'coral-framework/services/graphqlRegistry';
 import update from 'immutability-helper';
 
-const config = {
+const extension = {
   fragments: {
     EditCommentResponse: gql`
       fragment CoralEmbedStream_EditCommentResponse on EditCommentResponse {
@@ -267,4 +267,4 @@ const config = {
   },
 };
 
-registerConfig(config);
+add(extension);
diff --git a/client/coral-framework/helpers/plugins.js b/client/coral-framework/helpers/plugins.js
index e55715e4b..bde7f9d68 100644
--- a/client/coral-framework/helpers/plugins.js
+++ b/client/coral-framework/helpers/plugins.js
@@ -82,7 +82,7 @@ export function getSlotsFragments(slots) {
   };
 }
 
-export function getGraphQLConfigs() {
+export function getGraphQLExtensions() {
   return plugins
     .map(o => pick(o.module, ['mutations', 'queries', 'fragments']))
     .filter(o => o);
diff --git a/client/coral-framework/hocs/withMutation.js b/client/coral-framework/hocs/withMutation.js
index 59a4fb627..c08a53614 100644
--- a/client/coral-framework/hocs/withMutation.js
+++ b/client/coral-framework/hocs/withMutation.js
@@ -4,13 +4,13 @@ import merge from 'lodash/merge';
 import uniq from 'lodash/uniq';
 import flatten from 'lodash/flatten';
 import isEmpty from 'lodash/isEmpty';
-import {getMutationOptions, resolveFragments} from 'coral-framework/services/registry';
+import {getMutationOptions, resolveFragments} from 'coral-framework/services/graphqlRegistry';
 import {store} from 'coral-framework/services/store';
 import {getDefinitionName} from '../utils';
 
 /**
  * Exports a HOC with the same signature as `graphql`, that will
- * apply mutation options registered in the registry.
+ * apply mutation options registered in the graphRegistry.
  */
 export default (document, config) => WrappedComponent => {
   config = {
@@ -80,7 +80,7 @@ export default (document, config) => WrappedComponent => {
     return config.props({...data, mutate});
   };
 
-  // Lazily resolve fragments from registry to support circular dependencies.
+  // Lazily resolve fragments from graphRegistry to support circular dependencies.
   let memoized = null;
   const getWrapped = () => {
     if (!memoized) {
diff --git a/client/coral-framework/hocs/withQuery.js b/client/coral-framework/hocs/withQuery.js
index 6a5fa7c14..a29d25241 100644
--- a/client/coral-framework/hocs/withQuery.js
+++ b/client/coral-framework/hocs/withQuery.js
@@ -1,11 +1,11 @@
 import * as React from 'react';
 import {graphql} from 'react-apollo';
-import {getQueryOptions, resolveFragments} from 'coral-framework/services/registry';
+import {getQueryOptions, resolveFragments} from 'coral-framework/services/graphqlRegistry';
 import {getDefinitionName, separateDataAndRoot} from '../utils';
 
 /**
  * Exports a HOC with the same signature as `graphql`, that will
- * apply query options registered in the registry.
+ * apply query options registered in the graphRegistry.
  */
 export default (document, config) => WrappedComponent => {
   config = {
diff --git a/client/coral-framework/services/registry.js b/client/coral-framework/services/graphqlRegistry.js
similarity index 76%
rename from client/coral-framework/services/registry.js
rename to client/coral-framework/services/graphqlRegistry.js
index 8fe934730..78d27d038 100644
--- a/client/coral-framework/services/registry.js
+++ b/client/coral-framework/services/graphqlRegistry.js
@@ -1,5 +1,5 @@
 import {getDefinitionName, mergeDocuments} from 'coral-framework/utils';
-import {getGraphQLConfigs} from 'coral-framework/helpers/plugins';
+import {getGraphQLExtensions} from 'coral-framework/helpers/plugins';
 import globalFragments from 'coral-framework/graphql/fragments';
 import uniq from 'lodash/uniq';
 
@@ -10,16 +10,16 @@ const queryOptions = {};
 const getTypeName = (ast) => ast.definitions[0].typeCondition.name.value;
 
 /**
- * Register fragment
+ * Add fragment
  *
  * Example:
- * registerFragment('MyFragment', gql`
+ * addFragment('MyFragment', gql`
  *   fragment Plugin_MyFragment on Comment {
  *     body
  *   }
  * `);
  */
-export function registerFragment(key, document) {
+export function addFragment(key, document) {
   const type = getTypeName(document);
   const name = getDefinitionName(document);
   if (!(key in fragments)) {
@@ -34,12 +34,12 @@ export function registerFragment(key, document) {
 }
 
 /**
- * Register mutation options.
+ * Add mutation options.
  *
  * Example:
  * // state is the current redux state, which is sometimes
  * // necessary to fill the optimistic response.
- * registerMutationOptions('PostComment', ({variables, state}) => ({
+ * addMutationOptions('PostComment', ({variables, state}) => ({
  *   optimisticResponse: {
  *     CreateComment: {
  *       extra: '',
@@ -55,7 +55,7 @@ export function registerFragment(key, document) {
  *   },
  * })
  */
-export function registerMutationOptions(key, config) {
+export function addMutationOptions(key, config) {
   if (!(key in mutationOptions)) {
     mutationOptions[key] = [config];
   } else {
@@ -64,14 +64,14 @@ export function registerMutationOptions(key, config) {
 }
 
 /**
- * Register query options.
+ * Add query options.
  *
  * Example:
- * registerQueryOptions('EmbedQuery', {
+ * addQueryOptions('EmbedQuery', {
  *   reducer: (previousResult, action, variables) => previousResult,
  * });
  */
-export function registerQueryOptions(key, config) {
+export function addQueryOptions(key, config) {
   if (!(key in queryOptions)) {
     queryOptions[key] = [config];
   } else {
@@ -80,10 +80,10 @@ export function registerQueryOptions(key, config) {
 }
 
 /**
- * Register all fragments, mutation options, and query options defined in the object.
+ * Add all fragments, mutation options, and query options defined in the object.
  *
  * Example:
- * registerConfig({
+ * add({
  *   fragments: {
  *     CreateCommentResponse: gql`
  *       fragment CoralRandomEmoji_CreateCommentResponse on CreateCommentResponse {
@@ -116,10 +116,10 @@ export function registerQueryOptions(key, config) {
  *   },
  * });
  */
-export function registerConfig(cfg) {
-  Object.keys(cfg.fragments || []).forEach(key => registerFragment(key, cfg.fragments[key]));
-  Object.keys(cfg.mutations || []).forEach(key => registerMutationOptions(key, cfg.mutations[key]));
-  Object.keys(cfg.queries || []).forEach(key => registerQueryOptions(key, cfg.queries[key]));
+export function add(extension) {
+  Object.keys(extension.fragments || []).forEach(key => addFragment(key, extension.fragments[key]));
+  Object.keys(extension.mutations || []).forEach(key => addMutationOptions(key, extension.mutations[key]));
+  Object.keys(extension.queries || []).forEach(key => addQueryOptions(key, extension.queries[key]));
 }
 
 /**
@@ -140,7 +140,7 @@ export function getQueryOptions(key) {
 
 /**
  * Get a document with a fragment named `key`, which contains
- * all fragments registered under this key.
+ * all fragments added under this key.
  */
 export function getFragmentDocument(key) {
   init();
@@ -162,20 +162,20 @@ export function getFragmentDocument(key) {
 }
 
 // The fragments and configs are lazily loaded to allow circular dependencies to work.
-// TODO: We might want to change this to an explicit register after we have lazy Queries and Mutations.
+// TODO: We might want to change this to an explicit add after we have lazy Queries and Mutations.
 let initialized = false;
 
 function init() {
   if (initialized) { return; }
   initialized = true;
 
-  // Register fragments from framework.
+  // Add fragments from framework.
   [globalFragments].forEach(map =>
-    Object.keys(map).forEach(key => registerFragment(key, map[key]))
+    Object.keys(map).forEach(key => addFragment(key, map[key]))
   );
 
-  // Register configs from plugins.
-  getGraphQLConfigs().forEach(cfg => registerConfig(cfg));
+  // Add configs from plugins.
+  getGraphQLExtensions().forEach(ext => add(ext));
 }
 
 export function resolveFragments(document) {

From e5a4fbc1cde1ac9bfee7ada76d31ed1e6f2015d3 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 12 May 2017 12:07:55 -0300
Subject: [PATCH 107/132] DOCS Hooks

---
 docs/frontend/HOOKS.md   |  0
 docs/frontend/PLUGINS.md | 28 ++++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 docs/frontend/HOOKS.md

diff --git a/docs/frontend/HOOKS.md b/docs/frontend/HOOKS.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/docs/frontend/PLUGINS.md b/docs/frontend/PLUGINS.md
index 8377d0359..4d993c0be 100644
--- a/docs/frontend/PLUGINS.md
+++ b/docs/frontend/PLUGINS.md
@@ -170,6 +170,34 @@ Our `style.css` should could look like this.
 }
 ```
 
+## Plugin Hooks
+The plugins injected in the CommentBox such as `commentInputDetailArea` will inherit through props tools for handling hooks.
+
+### Available hook types:
+`preSubmit` : To perform actions before submitting the comment.
+`postSubmit` : To perform actions after submitting the comment.
+
+### Register Hooks
+`registerHook` is a function that takes: the hook type, a hook function and returns the hook data.
+
+#### Usage:
+```js
+      this.addCommentTagHook = this.props.registerHook('postSubmit', (data) => {
+        const {comment} = data.createComment;
+        this.props.addCommentTag({
+          id: comment.id,
+          tag: 'OFF_TOPIC'
+        });
+      });
+```
+
+### Unregister Hooks
+
+`unregisterHook` will remove the hook.
+
+```js
+	this.props.unregisterHook(this.addCommentTagHook);
+```
 
 ### The server folder and the index file
 Read more about the `/server` and how to extend Talk here.

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 108/132] 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 674ac500352a1ea20d50dc9256157c43a2e0003b Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 12 May 2017 12:29:02 -0300
Subject: [PATCH 109/132] =?UTF-8?q?=C3=81dding=20reaction=20docs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/frontend/PLUGINS.md | 72 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 69 insertions(+), 3 deletions(-)

diff --git a/docs/frontend/PLUGINS.md b/docs/frontend/PLUGINS.md
index 4d993c0be..0edc4d455 100644
--- a/docs/frontend/PLUGINS.md
+++ b/docs/frontend/PLUGINS.md
@@ -3,9 +3,10 @@ We can build plugins to extend the functionality of Talk.
 
 This guide is a walkthrough of our plugin architecture and components that we provide that allow you to build on top of Core coral components without having to understand the concepts there in. It is organized into three sections:
 
-* Plugin architecture
+* [Plugin Architecture](#plugin-architecture)
 * Using our building block components
-* Styling
+* [Reactions](#reactions)
+* [Styling](#styling-plugins)
 
 Advanced users will quickly realize that our plugins have complete access to core code. If you would like to write advanced plugins that reach outside of our published API as described in this document, please see [our notes on experimental pluginss](PLUGINS-experimental.md).
 
@@ -97,12 +98,77 @@ Slots properties take an`Array` so we can add as many components as we want.
 
 In order to allow you to build more complex plugins, we have wrapped some of our functionality in higher order components that expose a simple api.
 
-### Reactions
+## Reactions
 
 Reactions provide users the ability to 'like', 'respect', etc... comments.
 
 Note: some server side work will need to accompany this client side component. See the like and respect plugins as examples.
 
+### Building Reactions
+
+#### Our `client/index.js` :
+
+```js
+import LoveButton from './LoveButton';
+
+export default {
+  slots: {
+    commentReactions: [LoveButton]
+  }
+};
+
+```
+In this example we add our reaction component to the `commentReaction` Slot
+ 
+#### Our Reaction component:
+   
+```js
+import React from 'react';
+import {withReaction} from 'coral-plugin-api';
+
+class LoveButton extends React.Component {
+  handleClick = () => {
+    const {
+      postReaction,
+      deleteReaction,
+      alreadyReacted
+    } = this.props;
+
+    if (alreadyReacted()) {
+      deleteReaction();
+    } else {
+      postReaction();
+    }
+  };
+
+  render() {
+    const {count} = this.props;
+    return (
+      <button onClick={this.handleClick}>
+        <span>Love</span>
+        <span>{count > 0 && count}</span>
+      </button>
+    );
+  }
+}
+
+export default withReaction('love')(LoveButton);
+```
+
+
+This feature introduces `withReaction` HOC.  `withReaction` takes, as argument, a reaction string and it allows our component to receive specific props for handling reactions. 
+
+	* `postReaction` - Posts the reaction
+	
+	* `deleteReaction` - Removes the reaction
+	
+	* `alreadyReacted` - A function that returns a boolean.
+	    
+	* `count` - The reaction count
+
+
+For full reference: Please, check `coral-plugin-love`: [LoveButton.js](https://github.com/coralproject/talk/blob/master/plugins/coral-plugin-love/client/LoveButton.js)
+
 ### Comment Stream
 
 Comment streams may be created with filtering and ordering in place:

From 072437b0fdd87dc44ed4c9b919fcd22777b19801 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 12 May 2017 22:45:33 +0700
Subject: [PATCH 110/132] Prevent empty edit

---
 client/coral-plugin-commentbox/CommentForm.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/coral-plugin-commentbox/CommentForm.js b/client/coral-plugin-commentbox/CommentForm.js
index dc27a1906..5dc52af4f 100644
--- a/client/coral-plugin-commentbox/CommentForm.js
+++ b/client/coral-plugin-commentbox/CommentForm.js
@@ -85,8 +85,8 @@ 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 isRespectingMaxCount = (length) => charCountEnable && maxCharCount && length > maxCharCount;
+    const disablePostComment = !length || isRespectingMaxCount(length) || !saveCommentEnabled({body});
 
     return <div>
       <div className={`${name}-container`}>
@@ -106,8 +106,8 @@ export class CommentForm extends React.Component {
           rows={3}/>
         <Slot fill='commentInputArea' />
       </div>
-      { 
-        this.props.charCountEnable && 
+      {
+        this.props.charCountEnable &&
         <div className={`${name}-char-count ${length > maxCharCount ? `${name}-char-max` : ''}`}>
           {maxCharCount && `${maxCharCount - length} ${lang.t('characters-remaining')}`}
         </div>

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 111/132] 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 112/132] 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 113/132] 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 5e8a02c461d79a77beee702d1c00b6675d7d720f Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 12 May 2017 15:40:53 -0300
Subject: [PATCH 114/132] Removing CSRF

---
 client/coral-admin/src/constants/auth.js   |  2 --
 client/coral-framework/constants/auth.js   |  2 --
 client/coral-framework/helpers/response.js | 13 -------------
 client/coral-framework/reducers/auth.js    |  3 ---
 4 files changed, 20 deletions(-)

diff --git a/client/coral-admin/src/constants/auth.js b/client/coral-admin/src/constants/auth.js
index 93cd61544..610b21c89 100644
--- a/client/coral-admin/src/constants/auth.js
+++ b/client/coral-admin/src/constants/auth.js
@@ -2,8 +2,6 @@ export const CHECK_LOGIN_REQUEST = 'CHECK_LOGIN_REQUEST';
 export const CHECK_LOGIN_SUCCESS = 'CHECK_LOGIN_SUCCESS';
 export const CHECK_LOGIN_FAILURE = 'CHECK_LOGIN_FAILURE';
 
-export const CHECK_CSRF_TOKEN = 'CHECK_CSRF_TOKEN';
-
 export const LOGOUT_REQUEST = 'LOGOUT_REQUEST';
 export const LOGOUT_SUCCESS = 'LOGOUT_SUCCESS';
 export const LOGOUT_FAILURE = 'LOGOUT_FAILURE';
diff --git a/client/coral-framework/constants/auth.js b/client/coral-framework/constants/auth.js
index ce5d860b4..b5d80e32f 100644
--- a/client/coral-framework/constants/auth.js
+++ b/client/coral-framework/constants/auth.js
@@ -44,8 +44,6 @@ export const CHECK_LOGIN_REQUEST = 'CHECK_LOGIN_REQUEST';
 export const CHECK_LOGIN_SUCCESS = 'CHECK_LOGIN_SUCCESS';
 export const CHECK_LOGIN_FAILURE = 'CHECK_LOGIN_FAILURE';
 
-export const CHECK_CSRF_TOKEN = 'CHECK_CSRF_TOKEN';
-
 export const VERIFY_EMAIL_REQUEST = 'VERIFY_EMAIL_REQUEST';
 export const VERIFY_EMAIL_SUCCESS = 'VERIFY_EMAIL_SUCCESS';
 export const VERIFY_EMAIL_FAILURE = 'VERIFY_EMAIL_FAILURE';
diff --git a/client/coral-framework/helpers/response.js b/client/coral-framework/helpers/response.js
index 0fce878cd..05d515b7d 100644
--- a/client/coral-framework/helpers/response.js
+++ b/client/coral-framework/helpers/response.js
@@ -2,8 +2,6 @@ export const base = '/api/v1';
 
 const buildOptions = (inputOptions = {}) => {
 
-  const csurfDOM = document.head.querySelector('[property=csrf]');
-
   const defaultOptions = {
     method: 'GET',
     headers: {
@@ -11,22 +9,11 @@ const buildOptions = (inputOptions = {}) => {
       'Accept': 'application/json'
     },
     credentials: 'same-origin',
-    _csrf: csurfDOM ? csurfDOM.content : false
   };
 
   let options = Object.assign({}, defaultOptions, inputOptions);
   options.headers = Object.assign({}, defaultOptions.headers, inputOptions.headers);
 
-  if (options._csrf) {
-    switch (options.method.toLowerCase()) {
-    case 'post':
-    case 'put':
-    case 'delete':
-      options.headers['x-csrf-token'] = options._csrf;
-      break;
-    }
-  }
-
   if (options.method.toLowerCase() !== 'get') {
     options.body = JSON.stringify(options.body);
   }
diff --git a/client/coral-framework/reducers/auth.js b/client/coral-framework/reducers/auth.js
index 83ea49ce5..dc68a442c 100644
--- a/client/coral-framework/reducers/auth.js
+++ b/client/coral-framework/reducers/auth.js
@@ -64,9 +64,6 @@ export default function auth (state = initialState, action) {
       .set('view', action.view);
   case actions.CLEAN_STATE:
     return initialState;
-  case actions.CHECK_CSRF_TOKEN:
-    return state
-      .set('_csrf', action._csrf);
   case actions.FETCH_SIGNIN_REQUEST:
     return state
       .set('isLoading', true);

From 7fd55094901ab2398afc54ab2ece32d78283cb1d Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 12 May 2017 15:48:19 -0300
Subject: [PATCH 115/132] Prettier

---
 client/coral-framework/actions/auth.js | 111 +++++++++++++++++--------
 1 file changed, 77 insertions(+), 34 deletions(-)

diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js
index d689aeb63..0f96a463e 100644
--- a/client/coral-framework/actions/auth.js
+++ b/client/coral-framework/actions/auth.js
@@ -28,7 +28,8 @@ const ME_QUERY = gql`
 function fetchMe() {
   return client.query({
     fetchPolicy: 'network-only',
-    query: ME_QUERY});
+    query: ME_QUERY
+  });
 }
 
 // Dialog Actions
@@ -61,14 +62,26 @@ export const hideSignInDialog = () => dispatch => {
   window.close();
 };
 
-export const createUsernameRequest = () => ({type: actions.CREATE_USERNAME_REQUEST});
-export const showCreateUsernameDialog = () => ({type: actions.SHOW_CREATEUSERNAME_DIALOG});
-export const hideCreateUsernameDialog = () => ({type: actions.HIDE_CREATEUSERNAME_DIALOG});
+export const createUsernameRequest = () => ({
+  type: actions.CREATE_USERNAME_REQUEST
+});
+export const showCreateUsernameDialog = () => ({
+  type: actions.SHOW_CREATEUSERNAME_DIALOG
+});
+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 updateUsername = ({username}) => ({
+  type: actions.UPDATE_USERNAME,
+  username
+});
 
 export const createUsername = (userId, formData) => dispatch => {
   dispatch(createUsernameRequest());
@@ -89,15 +102,15 @@ export const changeView = view => dispatch => {
     view
   });
 
-  switch(view) {
-  case 'SIGNUP':
-    window.resizeTo(500, 800);
-    break;
-  case 'FORGOT':
-    window.resizeTo(500, 400);
-    break;
-  default:
-    window.resizeTo(500, 550);
+  switch (view) {
+    case 'SIGNUP':
+      window.resizeTo(500, 800);
+      break;
+    case 'FORGOT':
+      window.resizeTo(500, 400);
+      break;
+    default:
+      window.resizeTo(500, 550);
   }
 };
 
@@ -112,17 +125,17 @@ const signInRequest = () => ({type: actions.FETCH_SIGNIN_REQUEST});
 //
 const signInFailure = error => ({type: actions.FETCH_SIGNIN_FAILURE, error});
 
-export const fetchSignIn = (formData) => (dispatch) => {
+export const fetchSignIn = formData => dispatch => {
   dispatch(signInRequest());
   return coralApi('/auth/local', {method: 'POST', body: formData})
     .then(() => dispatch(hideSignInDialog()))
     .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)));
+        dispatch(
+          signInFailure(lang.t('error.emailNotVerified', error.metadata))
+        );
       } else {
-
         // invalid credentials
         dispatch(signInFailure(lang.t('error.emailPasswordError')));
       }
@@ -131,9 +144,17 @@ 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 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
+});
 
 export const fetchSignInFacebook = () => dispatch => {
   dispatch(signInFacebookRequest());
@@ -146,7 +167,9 @@ export const fetchSignInFacebook = () => dispatch => {
 
 // Sign Up Facebook
 
-const signUpFacebookRequest = () => ({type: actions.FETCH_SIGNUP_FACEBOOK_REQUEST});
+const signUpFacebookRequest = () => ({
+  type: actions.FETCH_SIGNUP_FACEBOOK_REQUEST
+});
 
 export const fetchSignUpFacebook = () => dispatch => {
   dispatch(signUpFacebookRequest());
@@ -180,10 +203,14 @@ 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});
 
-export const fetchSignUp = (formData, redirectUri) => (dispatch) => {
+export const fetchSignUp = (formData, redirectUri) => dispatch => {
   dispatch(signUpRequest());
 
-  coralApi('/users', {method: 'POST', body: formData, headers: {'X-Pym-Url': redirectUri}})
+  coralApi('/users', {
+    method: 'POST',
+    body: formData,
+    headers: {'X-Pym-Url': redirectUri}
+  })
     .then(({user}) => {
       dispatch(signUpSuccess(user));
     })
@@ -200,14 +227,23 @@ export const fetchSignUp = (formData, redirectUri) => (dispatch) => {
 
 // Forgot Password Actions
 
-const forgotPassowordRequest = () => ({type: actions.FETCH_FORGOT_PASSWORD_REQUEST});
-const forgotPassowordSuccess = () => ({type: actions.FETCH_FORGOT_PASSWORD_SUCCESS});
-const forgotPassowordFailure = () => ({type: actions.FETCH_FORGOT_PASSWORD_FAILURE});
+const forgotPassowordRequest = () => ({
+  type: actions.FETCH_FORGOT_PASSWORD_REQUEST
+});
+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}})
+  coralApi('/account/password/reset', {
+    method: 'POST',
+    body: {email, loc: redirectUri}
+  })
     .then(() => dispatch(forgotPassowordSuccess()))
     .catch(error => dispatch(forgotPassowordFailure(error)));
 };
@@ -236,13 +272,17 @@ 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 checkLoginSuccess = (user, isAdmin) => ({
+  type: actions.CHECK_LOGIN_SUCCESS,
+  user,
+  isAdmin
+});
 const checkLoginFailure = error => ({type: actions.CHECK_LOGIN_FAILURE, error});
 
 export const checkLogin = () => dispatch => {
   dispatch(checkLoginRequest());
   coralApi('/auth')
-    .then((result) => {
+    .then(result => {
       if (!result.user) {
         throw new Error('Not logged in');
       }
@@ -262,12 +302,15 @@ const verifyEmailFailure = () => ({type: actions.VERIFY_EMAIL_FAILURE});
 
 export const requestConfirmEmail = (email, redirectUri) => dispatch => {
   dispatch(verifyEmailRequest());
-  return coralApi('/users/resend-verify', {method: 'POST', body: {email}, headers: {'X-Pym-Url': redirectUri}})
+  return coralApi('/users/resend-verify', {
+    method: 'POST',
+    body: {email},
+    headers: {'X-Pym-Url': redirectUri}
+  })
     .then(() => {
       dispatch(verifyEmailSuccess());
     })
     .catch(err => {
-
       // email might have already been verifyed
       dispatch(verifyEmailFailure(err));
     });

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 116/132] 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 964cc362e79651d8f7f0317c554baa1e43a21f3d Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 12 May 2017 18:26:24 -0300
Subject: [PATCH 117/132] Login, logout with tokens. WIP

---
 client/coral-framework/actions/auth.js     | 130 ++++++++++++++-------
 client/coral-framework/constants/auth.js   |   4 +-
 client/coral-framework/helpers/response.js |  18 ++-
 client/coral-framework/helpers/storage.js  |  65 +++++++++++
 client/coral-framework/reducers/auth.js    |   2 +-
 5 files changed, 164 insertions(+), 55 deletions(-)
 create mode 100644 client/coral-framework/helpers/storage.js

diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js
index 0f96a463e..a27231cb6 100644
--- a/client/coral-framework/actions/auth.js
+++ b/client/coral-framework/actions/auth.js
@@ -1,11 +1,13 @@
 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);
+import {pym} from 'coral-framework';
+import * as Storage from '../helpers/storage';
 import * as actions from '../constants/auth';
 import coralApi, {base} from '../helpers/response';
-import {pym} from 'coral-framework';
+import client from 'coral-framework/services/client';
+
+const lang = new I18n(translations);
+import translations from './../translations';
+import I18n from '../../coral-framework/modules/i18n/i18n';
 
 const ME_QUERY = gql`
   query Me {
@@ -72,7 +74,10 @@ export const hideCreateUsernameDialog = () => ({
   type: actions.HIDE_CREATEUSERNAME_DIALOG
 });
 
-const createUsernameSuccess = () => ({type: actions.CREATE_USERNAME_SUCCESS});
+const createUsernameSuccess = () => ({
+  type: actions.CREATE_USERNAME_SUCCESS
+});
+
 const createUsernameFailure = error => ({
   type: actions.CREATE_USERNAME_FAILURE,
   error
@@ -114,21 +119,41 @@ export const changeView = view => dispatch => {
   }
 };
 
-export const cleanState = () => ({type: actions.CLEAN_STATE});
+export const cleanState = () => ({
+  type: actions.CLEAN_STATE
+});
 
 // Sign In Actions
 
-const signInRequest = () => ({type: actions.FETCH_SIGNIN_REQUEST});
+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
+});
+
+//==============================================================================
+// AUTH TOKEN
+//==============================================================================
+
+const handleAuthToken = token => dispatch => {
+  Storage.setItem('token', token);
+  dispatch({type: 'HANDLE_AUTH_TOKEN'});
+};
+
+//==============================================================================
+// SIGN IN
+//==============================================================================
 
 export const fetchSignIn = formData => dispatch => {
   dispatch(signInRequest());
   return coralApi('/auth/local', {method: 'POST', body: formData})
-    .then(() => dispatch(hideSignInDialog()))
+    .then(({token}) => {
+      dispatch(handleAuthToken(token));
+      dispatch(hideSignInDialog());
+    })
     .catch(error => {
       if (error.metadata) {
         // the user might not have a valid email. prompt the user user re-request the confirmation email
@@ -142,7 +167,9 @@ export const fetchSignIn = formData => dispatch => {
     });
 };
 
-// Sign In - Facebook
+//==============================================================================
+// SIGN IN - FACEBOOK
+//==============================================================================
 
 const signInFacebookRequest = () => ({
   type: actions.FETCH_SIGNIN_FACEBOOK_REQUEST
@@ -165,7 +192,9 @@ export const fetchSignInFacebook = () => dispatch => {
   );
 };
 
-// Sign Up Facebook
+//==============================================================================
+// SIGN UP - FACEBOOK
+//==============================================================================
 
 const signUpFacebookRequest = () => ({
   type: actions.FETCH_SIGNUP_FACEBOOK_REQUEST
@@ -197,7 +226,9 @@ export const facebookCallback = (err, data) => dispatch => {
   }
 };
 
-// Sign Up Actions
+//==============================================================================
+// SIGN UP
+//==============================================================================
 
 const signUpRequest = () => ({type: actions.FETCH_SIGNUP_REQUEST});
 const signUpSuccess = user => ({type: actions.FETCH_SIGNUP_SUCCESS, user});
@@ -225,59 +256,54 @@ export const fetchSignUp = (formData, redirectUri) => dispatch => {
     });
 };
 
-// Forgot Password Actions
+//==============================================================================
+// FORGOT PASSWORD
+//==============================================================================
 
-const forgotPassowordRequest = () => ({
+const forgotPasswordRequest = () => ({
   type: actions.FETCH_FORGOT_PASSWORD_REQUEST
 });
-const forgotPassowordSuccess = () => ({
+
+const forgotPasswordSuccess = () => ({
   type: actions.FETCH_FORGOT_PASSWORD_SUCCESS
 });
-const forgotPassowordFailure = () => ({
+
+const forgotPasswordFailure = () => ({
   type: actions.FETCH_FORGOT_PASSWORD_FAILURE
 });
 
 export const fetchForgotPassword = email => dispatch => {
-  dispatch(forgotPassowordRequest(email));
+  dispatch(forgotPasswordRequest(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)));
+    .then(() => dispatch(forgotPasswordSuccess()))
+    .catch(error => dispatch(forgotPasswordFailure(error)));
 };
 
-// LogOut Actions
-
-const logOutRequest = () => ({type: actions.LOGOUT_REQUEST});
-const logOutSuccess = () => ({type: actions.LOGOUT_SUCCESS});
-const logOutFailure = () => ({type: actions.LOGOUT_FAILURE});
+//==============================================================================
+// LOGOUT
+//==============================================================================
 
 export const logout = () => dispatch => {
-  dispatch(logOutRequest());
-  return coralApi('/auth', {method: 'DELETE'})
-    .then(() => {
-      dispatch(logOutSuccess());
-      fetchMe();
-    })
-    .catch(error => dispatch(logOutFailure(error)));
+  Storage.clear();
+  dispatch({type: actions.LOGOUT});
 };
 
-// LogOut Actions
-
-export const validForm = () => ({type: actions.VALID_FORM});
-export const invalidForm = error => ({type: actions.INVALID_FORM, error});
-
-// Check Login
+//==============================================================================
+// CHECK LOGIN
+//==============================================================================
 
 const checkLoginRequest = () => ({type: actions.CHECK_LOGIN_REQUEST});
+const checkLoginFailure = error => ({type: actions.CHECK_LOGIN_FAILURE, error});
+
 const checkLoginSuccess = (user, isAdmin) => ({
   type: actions.CHECK_LOGIN_SUCCESS,
   user,
   isAdmin
 });
-const checkLoginFailure = error => ({type: actions.CHECK_LOGIN_FAILURE, error});
 
 export const checkLogin = () => dispatch => {
   dispatch(checkLoginRequest());
@@ -295,10 +321,24 @@ export const checkLogin = () => dispatch => {
       dispatch(checkLoginFailure(`${error.translation_key}`));
     });
 };
+export const validForm = () => ({type: actions.VALID_FORM});
+export const invalidForm = error => ({type: actions.INVALID_FORM, error});
 
-const verifyEmailRequest = () => ({type: actions.VERIFY_EMAIL_REQUEST});
-const verifyEmailSuccess = () => ({type: actions.VERIFY_EMAIL_SUCCESS});
-const verifyEmailFailure = () => ({type: actions.VERIFY_EMAIL_FAILURE});
+//==============================================================================
+// VERIFY EMAIL
+//==============================================================================
+
+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 => {
   dispatch(verifyEmailRequest());
diff --git a/client/coral-framework/constants/auth.js b/client/coral-framework/constants/auth.js
index b5d80e32f..24599ac50 100644
--- a/client/coral-framework/constants/auth.js
+++ b/client/coral-framework/constants/auth.js
@@ -33,9 +33,7 @@ export const FETCH_FORGOT_PASSWORD_REQUEST = 'FETCH_FORGOT_PASSWORD_REQUEST';
 export const FETCH_FORGOT_PASSWORD_SUCCESS = 'FETCH_FORGOT_PASSWORD_SUCCESS';
 export const FETCH_FORGOT_PASSWORD_FAILURE = 'FETCH_FORGOT_PASSWORD_FAILURE';
 
-export const LOGOUT_REQUEST = 'LOGOUT_REQUEST';
-export const LOGOUT_SUCCESS = 'LOGOUT_SUCCESS';
-export const LOGOUT_FAILURE = 'LOGOUT_FAILURE';
+export const LOGOUT = 'LOGOUT';
 
 export const INVALID_FORM = 'INVALID_FORM';
 export const VALID_FORM = 'VALID_FORM';
diff --git a/client/coral-framework/helpers/response.js b/client/coral-framework/helpers/response.js
index 05d515b7d..342577391 100644
--- a/client/coral-framework/helpers/response.js
+++ b/client/coral-framework/helpers/response.js
@@ -1,18 +1,22 @@
-export const base = '/api/v1';
+import * as Storage from './storage';
 
 const buildOptions = (inputOptions = {}) => {
-
   const defaultOptions = {
     method: 'GET',
     headers: {
-      'Content-Type': 'application/json',
-      'Accept': 'application/json'
+      Accept: 'application/json',
+      Authorization: `Bearer ${Storage.getItem('token')}`,
+      'Content-Type': 'application/json'
     },
-    credentials: 'same-origin',
+    credentials: 'same-origin'
   };
 
   let options = Object.assign({}, defaultOptions, inputOptions);
-  options.headers = Object.assign({}, defaultOptions.headers, inputOptions.headers);
+  options.headers = Object.assign(
+    {},
+    defaultOptions.headers,
+    inputOptions.headers
+  );
 
   if (options.method.toLowerCase() !== 'get') {
     options.body = JSON.stringify(options.body);
@@ -45,6 +49,8 @@ const handleResp = res => {
   }
 };
 
+export const base = '/api/v1';
+
 export default (url, options) => {
   return fetch(`${base}${url}`, buildOptions(options)).then(handleResp);
 };
diff --git a/client/coral-framework/helpers/storage.js b/client/coral-framework/helpers/storage.js
new file mode 100644
index 000000000..aea85bdeb
--- /dev/null
+++ b/client/coral-framework/helpers/storage.js
@@ -0,0 +1,65 @@
+let available, error;
+
+function storageAvailable(type) {
+  try {
+    let storage = window[type], x = '__storage_test__';
+    storage.setItem(x, x);
+    storage.removeItem(x);
+    return true;
+  } catch (e) {
+    error = e;
+    return (
+      e instanceof DOMException &&
+
+      // everything except Firefox
+      (e.code === 22 ||
+
+      // Firefox
+
+      e.code === 1014 ||
+
+      // test name field too, because code might not be present
+
+      // everything except Firefox
+      e.name === 'QuotaExceededError' ||
+
+      // Firefox
+      e.name === 'NS_ERROR_DOM_QUOTA_REACHED') &&
+
+      // acknowledge QuotaExceededError only if there's something already stored
+      storage.length !== 0
+    );
+  }
+}
+
+export function getItem(item = '') {
+  if (typeof available === 'undefined') {
+    available = storageAvailable('localStorage');
+  }
+
+  if (available) {
+    return localStorage.getItem(item);
+  } else {
+    console.error(`Cannot get from localStorage. localStorage is not available. ${error}`);
+  }
+}
+
+export function setItem(item = '', value) {
+  if (typeof available === 'undefined') {
+    available = storageAvailable('localStorage');
+  }
+
+  if (available) {
+    return localStorage.setItem(item, value);
+  } else {
+    console.error(`Cannot set localStorage. localStorage is not available. ${error}`);
+  }
+}
+
+export function clear() {
+  if (available) {
+    return localStorage.clear();
+  } else {
+    console.error(`Cannot clear localStorage. localStorage is not available. ${error}`);
+  }
+}
diff --git a/client/coral-framework/reducers/auth.js b/client/coral-framework/reducers/auth.js
index dc68a442c..34a8dbcd5 100644
--- a/client/coral-framework/reducers/auth.js
+++ b/client/coral-framework/reducers/auth.js
@@ -113,7 +113,7 @@ export default function auth (state = initialState, action) {
     return state
       .set('isLoading', false)
       .set('successSignUp', true);
-  case actions.LOGOUT_SUCCESS:
+  case actions.LOGOUT:
     return state
       .set('user', null)
       .set('isLoading', false)

From e218de811b1c7913cc91fd4bd14970092ba77174 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 12 May 2017 15:53:25 -0600
Subject: [PATCH 118/132] removed csrf reference

---
 views/admin/confirm-email.ejs  | 3 ---
 views/admin/password-reset.ejs | 4 ----
 2 files changed, 7 deletions(-)

diff --git a/views/admin/confirm-email.ejs b/views/admin/confirm-email.ejs
index 6b4d456d8..20d213fa2 100644
--- a/views/admin/confirm-email.ejs
+++ b/views/admin/confirm-email.ejs
@@ -74,9 +74,6 @@
             url: '/api/v1/account/email/verify',
             contentType: 'application/json',
             method: 'POST',
-            headers: {
-              'X-CSRF-Token': '<%= csrfToken %>'
-            },
             data: JSON.stringify({token: location.hash.replace('#', '')})
           }).then(function (success) {
             location.href = success.redirectUri;
diff --git a/views/admin/password-reset.ejs b/views/admin/password-reset.ejs
index 4b25d1279..704b5213d 100644
--- a/views/admin/password-reset.ejs
+++ b/views/admin/password-reset.ejs
@@ -82,7 +82,6 @@
   <body>
     <div id="root">
       <form id="reset-password-form">
-        <input type="hidden" name="_csrf" value={{csrfToken}}/>
         <legend class="legend">Set new password</legend>
         <label for="password">
           New password
@@ -121,9 +120,6 @@
             url: '/api/v1/account/password/reset',
             contentType: 'application/json',
             method: 'PUT',
-            headers: {
-              'X-CSRF-Token': '<%= csrfToken %>'
-            },
             data: JSON.stringify({password: password, token: location.hash.replace('#', '')})
           }).then(function (success) {
             location.href = success.redirect;

From 76b96a66a25eed369f47bf8864bec95d19c694af Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 15 May 2017 11:41:36 -0300
Subject: [PATCH 119/132] Adding Bearer token to the Graph Client

---
 client/coral-framework/services/transport.js |   6 +-
 package.json                                 |   5 +-
 yarn.lock                                    | 788 ++++++++++---------
 3 files changed, 405 insertions(+), 394 deletions(-)

diff --git a/client/coral-framework/services/transport.js b/client/coral-framework/services/transport.js
index 2bd6ac636..923d28e86 100644
--- a/client/coral-framework/services/transport.js
+++ b/client/coral-framework/services/transport.js
@@ -1,11 +1,15 @@
 import {createNetworkInterface} from 'apollo-client';
+import * as Storage from '../helpers/storage';
 
 export default function getNetworkInterface(apiUrl = '/api/v1/graph/ql', headers = {}) {
   return new createNetworkInterface({
     uri: apiUrl,
     opts: {
       credentials: 'same-origin',
-      headers,
+      headers: {
+        Authorization: `Bearer ${Storage.getItem('token')}`,
+        ...headers
+      },
     },
   });
 }
diff --git a/package.json b/package.json
index 6476223b3..a765dfa36 100644
--- a/package.json
+++ b/package.json
@@ -93,18 +93,17 @@
     "nodemailer": "^2.6.4",
     "parse-duration": "^0.1.1",
     "passport": "^0.3.2",
+    "passport-jwt": "^2.2.1",
     "passport-local": "^1.0.0",
     "prop-types": "^15.5.8",
     "react-apollo": "^1.1.0",
     "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/yarn.lock b/yarn.lock
index 7a1930df8..5a5496cc9 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:
@@ -4551,7 +4553,7 @@ jsonpointer@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
 
-jsonwebtoken@^7.3.0:
+jsonwebtoken@^7.0.0, jsonwebtoken@^7.3.0:
   version "7.4.0"
   resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-7.4.0.tgz#515bf2bba070ec615bad97fd2e945027eb476946"
   dependencies:
@@ -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"
@@ -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:
@@ -5821,13 +5823,20 @@ parseurl@~1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.1.tgz#c8ab8c9223ba34888aa64a297b28853bec18da56"
 
+passport-jwt@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/passport-jwt/-/passport-jwt-2.2.1.tgz#0e004c94071319d673d9d9bcfd1574a868011527"
+  dependencies:
+    jsonwebtoken "^7.0.0"
+    passport-strategy "^1.0.0"
+
 passport-local@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/passport-local/-/passport-local-1.0.0.tgz#1fe63268c92e75606626437e3b906662c15ba6ee"
   dependencies:
     passport-strategy "1.x.x"
 
-passport-strategy@1.x.x:
+passport-strategy@1.x.x, passport-strategy@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/passport-strategy/-/passport-strategy-1.0.0.tgz#b5539aa8fc225a3d1ad179476ddf236b440f52e4"
 
@@ -5864,16 +5873,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 +6192,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 +6384,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 +6401,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 +6465,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 +6628,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 +6656,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 +6683,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 +6752,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 +6867,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 +6900,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 +6924,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 +6933,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 +7126,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 +7178,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 +7201,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 +7250,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 +7292,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 +7326,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 +7401,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 +7413,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 +7491,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 +7518,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 +7540,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 +7636,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 +7665,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 +7719,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 +7772,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 +7808,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 +7875,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 +8032,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 +8080,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 +8116,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 +8157,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 +8296,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 +8321,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 +8351,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 +8358,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 +8416,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 +8542,3 @@ yauzl@^2.5.0:
   dependencies:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.0.1"
-

From 292f758ac9dc7d0227f296d9b1344f2d1f156b75 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 15 May 2017 12:17:30 -0300
Subject: [PATCH 120/132] Comment history relies on authtokens

---
 client/coral-framework/actions/auth.js        |  4 +-
 client/coral-framework/helpers/storage.js     | 22 ++++-
 client/coral-framework/services/transport.js  |  9 +-
 .../containers/ProfileContainer.js            | 90 ++++++++++---------
 4 files changed, 73 insertions(+), 52 deletions(-)

diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js
index aa0d7faaa..0a95bab07 100644
--- a/client/coral-framework/actions/auth.js
+++ b/client/coral-framework/actions/auth.js
@@ -290,8 +290,8 @@ export const fetchForgotPassword = email => dispatch => {
 //==============================================================================
 
 export const logout = () => dispatch => {
-  Storage.clear();
   dispatch({type: actions.LOGOUT});
+  Storage.removeItem('token');
 };
 
 //==============================================================================
@@ -312,6 +312,7 @@ export const checkLogin = () => dispatch => {
   coralApi('/auth')
     .then(result => {
       if (!result.user) {
+        Storage.removeItem('token');
         throw new Error('Not logged in');
       }
 
@@ -323,6 +324,7 @@ export const checkLogin = () => dispatch => {
       dispatch(checkLoginFailure(`${error.translation_key}`));
     });
 };
+
 export const validForm = () => ({type: actions.VALID_FORM});
 export const invalidForm = error => ({type: actions.INVALID_FORM, error});
 
diff --git a/client/coral-framework/helpers/storage.js b/client/coral-framework/helpers/storage.js
index 9a5997193..2b23d6440 100644
--- a/client/coral-framework/helpers/storage.js
+++ b/client/coral-framework/helpers/storage.js
@@ -32,10 +32,14 @@ function storageAvailable(type) {
   }
 }
 
-export function getItem(item = '') {
+function lazyCheckStorage() {
   if (typeof available === 'undefined') {
     available = storageAvailable('localStorage');
   }
+}
+
+export function getItem(item = '') {
+  lazyCheckStorage();
 
   if (available) {
     return localStorage.getItem(item);
@@ -45,9 +49,7 @@ export function getItem(item = '') {
 }
 
 export function setItem(item = '', value) {
-  if (typeof available === 'undefined') {
-    available = storageAvailable('localStorage');
-  }
+  lazyCheckStorage();
 
   if (available) {
     return localStorage.setItem(item, value);
@@ -56,7 +58,19 @@ export function setItem(item = '', value) {
   }
 }
 
+export function removeItem(item = '') {
+  lazyCheckStorage();
+
+  if (available) {
+    return localStorage.removeItem(item);
+  } else {
+    console.error(`Cannot remove item from localStorage. localStorage is not available. ${error}`);
+  }
+}
+
 export function clear() {
+  lazyCheckStorage();
+
   if (available) {
     return localStorage.clear();
   } else {
diff --git a/client/coral-framework/services/transport.js b/client/coral-framework/services/transport.js
index 923d28e86..0ea69cb96 100644
--- a/client/coral-framework/services/transport.js
+++ b/client/coral-framework/services/transport.js
@@ -1,7 +1,10 @@
 import {createNetworkInterface} from 'apollo-client';
 import * as Storage from '../helpers/storage';
 
-export default function getNetworkInterface(apiUrl = '/api/v1/graph/ql', headers = {}) {
+export default function getNetworkInterface(
+  apiUrl = '/api/v1/graph/ql',
+  headers = {}
+) {
   return new createNetworkInterface({
     uri: apiUrl,
     opts: {
@@ -9,7 +12,7 @@ export default function getNetworkInterface(apiUrl = '/api/v1/graph/ql', headers
       headers: {
         Authorization: `Bearer ${Storage.getItem('token')}`,
         ...headers
-      },
-    },
+      }
+    }
   });
 }
diff --git a/client/coral-settings/containers/ProfileContainer.js b/client/coral-settings/containers/ProfileContainer.js
index f9c8d892f..1c6be1ee9 100644
--- a/client/coral-settings/containers/ProfileContainer.js
+++ b/client/coral-settings/containers/ProfileContainer.js
@@ -17,71 +17,68 @@ import translations from '../translations';
 const lang = new I18n(translations);
 
 class ProfileContainer extends Component {
-  constructor (props) {
-    super(props);
-    this.state = {
-      activeTab: 0,
-    };
+  constructor() {
+    super();
 
-    this.handleTabChange = this.handleTabChange.bind(this);
+    this.state = {
+      activeTab: 0
+    };
   }
 
-  handleTabChange(tab) {
+  handleTabChange = tab => {
     this.setState({
       activeTab: tab
     });
-  }
+  };
 
   render() {
-    const {asset, data, showSignInDialog, myIgnoredUsersData, stopIgnoringUser} = this.props;
-    const {me} = this.props.data;
+    const {
+      auth,
+      data,
+      asset,
+      showSignInDialog,
+      stopIgnoringUser,
+      myIgnoredUsersData
+    } = this.props;
 
-    if (data.loading) {
-      return <Spinner/>;
-    }
+    const {me} = data;
 
-    if (!me) {
+    if (!auth.loggedIn) {
       return <NotLoggedIn showSignInDialog={showSignInDialog} />;
     }
 
-    const localProfile = this.props.user.profiles.find(p => p.provider === 'local');
+    if (data.loading) {
+      return <Spinner />;
+    }
+
+    const localProfile = this.props.user.profiles.find(
+      p => p.provider === 'local'
+    );
+
     const emailAddress = localProfile && localProfile.id;
 
     return (
       <div>
         <h2>{this.props.user.username}</h2>
-        { emailAddress
-          ? <p>{ emailAddress }</p>
-          : null
-        }
+        {emailAddress ? <p>{emailAddress}</p> : null}
 
-        {
-          myIgnoredUsersData.myIgnoredUsers && myIgnoredUsersData.myIgnoredUsers.length
-          ? (
-            <div>
+        {myIgnoredUsersData.myIgnoredUsers &&
+          myIgnoredUsersData.myIgnoredUsers.length
+          ? <div>
               <h3>Ignored users</h3>
               <IgnoredUsers
                 users={myIgnoredUsersData.myIgnoredUsers}
                 stopIgnoring={stopIgnoringUser}
               />
             </div>
-          )
-          : null
-        }
+          : null}
 
         <hr />
 
         <h3>My comments</h3>
-        {
-          me.comments.length ?
-            <CommentHistory
-              comments={me.comments}
-              asset={asset}
-              link={link}
-            />
-          :
-            <p>{lang.t('userNoComment')}</p>
-        }
+        {me.comments.length
+          ? <CommentHistory comments={me.comments} asset={asset} link={link} />
+          : <p>{lang.t('userNoComment')}</p>}
       </div>
     );
   }
@@ -89,21 +86,25 @@ class ProfileContainer extends Component {
 
 // TODO: These currently relies on refetching (see ignoreUser and stopIgnoringUser mutations).
 //
-const withMyIgnoredUsersQuery = graphql(gql`
+const withMyIgnoredUsersQuery = graphql(
+  gql`
   query myIgnoredUsers {
     myIgnoredUsers {
       id,
       username,
     }
-  }`, {
+  }`,
+  {
     props: ({data}) => {
-      return ({
+      return {
         myIgnoredUsersData: data
-      });
+      };
     }
-  });
+  }
+);
 
-const withMyCommentHistoryQuery = graphql(gql`
+const withMyCommentHistoryQuery = graphql(
+  gql`
   query myCommentHistory {
     me {
       comments {
@@ -117,7 +118,8 @@ const withMyCommentHistoryQuery = graphql(gql`
           created_at
       }
     }
-  }`);
+  }`
+);
 
 const mapStateToProps = state => ({
   user: state.user.toJS(),
@@ -132,5 +134,5 @@ export default compose(
   connect(mapStateToProps, mapDispatchToProps),
   withMyCommentHistoryQuery,
   withMyIgnoredUsersQuery,
-  withStopIgnoringUser,
+  withStopIgnoringUser
 )(ProfileContainer);

From 370cdf8c096e6cf4e9e9004d1f98cd71b06ce1c5 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 15 May 2017 12:51:07 -0300
Subject: [PATCH 121/132] =?UTF-8?q?=C3=81dding=20middlewares=20to=20our=20?=
 =?UTF-8?q?network=20interface?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/coral-framework/helpers/storage.js    | 41 +++++++++++--------
 client/coral-framework/services/client.js    |  4 +-
 client/coral-framework/services/transport.js | 43 +++++++++++++-------
 3 files changed, 54 insertions(+), 34 deletions(-)

diff --git a/client/coral-framework/helpers/storage.js b/client/coral-framework/helpers/storage.js
index 2b23d6440..83d7cc41c 100644
--- a/client/coral-framework/helpers/storage.js
+++ b/client/coral-framework/helpers/storage.js
@@ -10,22 +10,17 @@ function storageAvailable(type) {
     error = e;
     return (
       e instanceof DOMException &&
-
       // everything except Firefox
       (e.code === 22 ||
+        // Firefox
 
-      // Firefox
-
-      e.code === 1014 ||
-
-      // test name field too, because code might not be present
-
-      // everything except Firefox
-      e.name === 'QuotaExceededError' ||
-
-      // Firefox
-      e.name === 'NS_ERROR_DOM_QUOTA_REACHED') &&
+        e.code === 1014 ||
+        // test name field too, because code might not be present
 
+        // everything except Firefox
+        e.name === 'QuotaExceededError' ||
+        // Firefox
+        e.name === 'NS_ERROR_DOM_QUOTA_REACHED') &&
       // acknowledge QuotaExceededError only if there's something already stored
       storage.length !== 0
     );
@@ -39,12 +34,15 @@ function lazyCheckStorage() {
 }
 
 export function getItem(item = '') {
+  console.log(`asking for item ${item}`);
   lazyCheckStorage();
 
   if (available) {
     return localStorage.getItem(item);
   } else {
-    console.error(`Cannot get from localStorage. localStorage is not available. ${error}`);
+    console.error(
+      `Cannot get from localStorage. localStorage is not available. ${error}`
+    );
   }
 }
 
@@ -54,7 +52,9 @@ export function setItem(item = '', value) {
   if (available) {
     return localStorage.setItem(item, value);
   } else {
-    console.error(`Cannot set localStorage. localStorage is not available. ${error}`);
+    console.error(
+      `Cannot set localStorage. localStorage is not available. ${error}`
+    );
   }
 }
 
@@ -64,7 +64,9 @@ export function removeItem(item = '') {
   if (available) {
     return localStorage.removeItem(item);
   } else {
-    console.error(`Cannot remove item from localStorage. localStorage is not available. ${error}`);
+    console.error(
+      `Cannot remove item from localStorage. localStorage is not available. ${error}`
+    );
   }
 }
 
@@ -74,6 +76,13 @@ export function clear() {
   if (available) {
     return localStorage.clear();
   } else {
-    console.error(`Cannot clear localStorage. localStorage is not available. ${error}`);
+    console.error(
+      `Cannot clear localStorage. localStorage is not available. ${error}`
+    );
   }
 }
+
+window.addEventListener('storage', function(e) {
+  const msg = `${e.key} " was changed in page ${e.url} from ${e.oldValue} to ${e.newValue}`;
+  console.log(msg);
+});
diff --git a/client/coral-framework/services/client.js b/client/coral-framework/services/client.js
index 07bd13ca1..47ea9c352 100644
--- a/client/coral-framework/services/client.js
+++ b/client/coral-framework/services/client.js
@@ -1,5 +1,5 @@
 import ApolloClient, {addTypename} from 'apollo-client';
-import getNetworkInterface from './transport';
+import {networkInterface} from './transport';
 
 // import {SubscriptionClient, addGraphQLSubscriptions} from 'subscriptions-transport-ws';
 
@@ -11,8 +11,6 @@ import getNetworkInterface from './transport';
 //   getNetworkInterface(),
 //   wsClient,
 // );
-const networkInterface = getNetworkInterface();
-
 export const client = new ApolloClient({
   connectToDevTools: true,
   queryTransformer: addTypename,
diff --git a/client/coral-framework/services/transport.js b/client/coral-framework/services/transport.js
index 0ea69cb96..0e9c93dfa 100644
--- a/client/coral-framework/services/transport.js
+++ b/client/coral-framework/services/transport.js
@@ -1,18 +1,31 @@
-import {createNetworkInterface} from 'apollo-client';
+import ApolloClient, {createNetworkInterface} from 'apollo-client';
 import * as Storage from '../helpers/storage';
 
-export default function getNetworkInterface(
-  apiUrl = '/api/v1/graph/ql',
-  headers = {}
-) {
-  return new createNetworkInterface({
-    uri: apiUrl,
-    opts: {
-      credentials: 'same-origin',
-      headers: {
-        Authorization: `Bearer ${Storage.getItem('token')}`,
-        ...headers
-      }
+//==============================================================================
+// NETWORK INTERFACE
+//==============================================================================
+
+const networkInterface = createNetworkInterface({
+  uri: '/api/v1/graph/ql',
+  opts: {
+    credentials: 'same-origin'
+  }
+});
+
+//==============================================================================
+// MIDDLEWARES
+//==============================================================================
+
+networkInterface.use([{
+  applyMiddleware(req, next) {
+    if (!req.options.headers) {
+      req.options.headers = {};  // Create the header object if needed.
     }
-  });
-}
+    req.options.headers['authorization'] = `Bearer ${Storage.getItem('token')}`;
+    next();
+  }
+}]);
+
+export {
+  networkInterface
+};

From 57ced201ebbe6ccabcbdd14812254332e26bd51e Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 15 May 2017 12:52:54 -0300
Subject: [PATCH 122/132] WebStorage events

---
 client/coral-framework/helpers/storage.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/client/coral-framework/helpers/storage.js b/client/coral-framework/helpers/storage.js
index 83d7cc41c..5a1620291 100644
--- a/client/coral-framework/helpers/storage.js
+++ b/client/coral-framework/helpers/storage.js
@@ -82,7 +82,8 @@ export function clear() {
   }
 }
 
-window.addEventListener('storage', function(e) {
-  const msg = `${e.key} " was changed in page ${e.url} from ${e.oldValue} to ${e.newValue}`;
-  console.log(msg);
-});
+// Enable this to debug WEB Storage events
+// window.addEventListener('storage', function(e) {
+//   const msg = `${e.key} " was changed in page ${e.url} from ${e.oldValue} to ${e.newValue}`;
+//   console.log(msg);
+// });

From 9bee31198e5479910fb02b2627067a93dc8c7d0f Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Mon, 15 May 2017 10:03:03 -0600
Subject: [PATCH 123/132] Added logout routes

---
 routes/api/auth/index.js |  7 ++++-
 services/passport.js     | 58 +++++++++++++++++++++++++++++++++++++---
 2 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/routes/api/auth/index.js b/routes/api/auth/index.js
index 54932ac03..6f610e2b0 100644
--- a/routes/api/auth/index.js
+++ b/routes/api/auth/index.js
@@ -1,5 +1,5 @@
 const express = require('express');
-const {passport, HandleGenerateCredentials} = require('../../../services/passport');
+const {passport, HandleGenerateCredentials, HandleLogout} = require('../../../services/passport');
 
 const router = express.Router();
 
@@ -19,6 +19,11 @@ router.get('/', (req, res, next) => {
   res.json({user: req.user});
 });
 
+/**
+ * This blacklists the token used to authenticate.
+ */
+router.delete('/', HandleLogout);
+
 //==============================================================================
 // PASSPORT ROUTES
 //==============================================================================
diff --git a/services/passport.js b/services/passport.js
index 467605a1a..c64bb2334 100644
--- a/services/passport.js
+++ b/services/passport.js
@@ -8,6 +8,10 @@ const LocalStrategy = require('passport-local').Strategy;
 const errors = require('../errors');
 const uuid = require('uuid');
 const debug = require('debug')('talk:passport');
+const {createClient} = require('./redis');
+
+// Create a redis client to use for authentication.
+const client = createClient();
 
 const {
   JWT_SECRET,
@@ -116,6 +120,41 @@ function ValidateUserLogin(loginProfile, user, done) {
 // JWT STRATEGY
 //==============================================================================
 
+/**
+ * Revoke the token on the request.
+ */
+const HandleLogout = (req, res, next) => {
+  const {jwt} = req;
+
+  const now = new Date();
+  const expiry = (jwt.exp - now.getTime() / 1000).toFixed(0);
+
+  client.set(`jtir[${jwt.jti}]`, now.toISOString(), 'EX', expiry, (err) => {
+    if (err) {
+      return next(err);
+    }
+
+    res.status(204).end();
+  });
+};
+
+/**
+ * Check if the given token is already blacklisted, throw an error if it is.
+ */
+const CheckBlacklisted = (jwt) => new Promise((resolve, reject) => {
+  client.get(`jtir[${jwt.jti}]`, (err, expiry) => {
+    if (err) {
+      return reject(err);
+    }
+
+    if (expiry != null) {
+      return reject(new errors.ErrAuthentication('token was revoked'));
+    }
+
+    return resolve();
+  });
+});
+
 const JwtStrategy = require('passport-jwt').Strategy;
 const ExtractJwt = require('passport-jwt').ExtractJwt;
 
@@ -136,14 +175,25 @@ passport.use(new JwtStrategy({
   audience: JWT_AUDIENCE,
 
   // Enable only the HS256 algorithm.
-  algorithms: ['HS256']
-}, async (jwt, done) => {
+  algorithms: ['HS256'],
+
+  // Pass the request objecto back to the callback so we can attach the JWT to
+  // it.
+  passReqToCallback: true
+}, async (req, jwt, done) => {
 
   // Load the user from the environment, because we just got a user from the
   // header.
   try {
+
+    // Check to see if the token has been revoked
+    await CheckBlacklisted(jwt);
+
     let user = await UsersService.findById(jwt.sub);
 
+    // Attach the JWT to the request.
+    req.jwt = jwt;
+
     return done(null, user);
   } catch(e) {
     return done(e);
@@ -374,5 +424,7 @@ module.exports = {
   ValidateUserLogin,
   HandleFailedAttempt,
   HandleAuthPopupCallback,
-  HandleGenerateCredentials
+  HandleGenerateCredentials,
+  HandleLogout,
+  CheckBlacklisted
 };

From 4e86e4197cb4ac9dc3d2e254b45914bab9562a4b Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 15 May 2017 13:13:28 -0300
Subject: [PATCH 124/132] handling logout

---
 client/coral-framework/actions/auth.js       | 10 ++++++++--
 client/coral-framework/helpers/storage.js    |  6 +++++-
 client/coral-framework/services/transport.js |  2 +-
 package.json                                 |  1 +
 yarn.lock                                    |  4 ++++
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js
index 0a95bab07..976b8ee1f 100644
--- a/client/coral-framework/actions/auth.js
+++ b/client/coral-framework/actions/auth.js
@@ -4,6 +4,7 @@ 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);
 import translations from './../translations';
@@ -139,6 +140,7 @@ const signInFailure = error => ({
 //==============================================================================
 
 const handleAuthToken = token => dispatch => {
+  Storage.setItem('exp', jwtDecode(token).exp);
   Storage.setItem('token', token);
   dispatch({type: 'HANDLE_AUTH_TOKEN'});
 };
@@ -290,8 +292,12 @@ export const fetchForgotPassword = email => dispatch => {
 //==============================================================================
 
 export const logout = () => dispatch => {
-  dispatch({type: actions.LOGOUT});
-  Storage.removeItem('token');
+  return coralApi('/auth', {method: 'DELETE'})
+    .then(() => {
+      dispatch({type: actions.LOGOUT});
+      Storage.removeItem('token');
+      fetchMe();
+    });
 };
 
 //==============================================================================
diff --git a/client/coral-framework/helpers/storage.js b/client/coral-framework/helpers/storage.js
index 5a1620291..fa20fa168 100644
--- a/client/coral-framework/helpers/storage.js
+++ b/client/coral-framework/helpers/storage.js
@@ -10,17 +10,22 @@ function storageAvailable(type) {
     error = e;
     return (
       e instanceof DOMException &&
+
       // everything except Firefox
       (e.code === 22 ||
+
         // Firefox
 
         e.code === 1014 ||
+
         // test name field too, because code might not be present
 
         // everything except Firefox
         e.name === 'QuotaExceededError' ||
+
         // Firefox
         e.name === 'NS_ERROR_DOM_QUOTA_REACHED') &&
+
       // acknowledge QuotaExceededError only if there's something already stored
       storage.length !== 0
     );
@@ -34,7 +39,6 @@ function lazyCheckStorage() {
 }
 
 export function getItem(item = '') {
-  console.log(`asking for item ${item}`);
   lazyCheckStorage();
 
   if (available) {
diff --git a/client/coral-framework/services/transport.js b/client/coral-framework/services/transport.js
index 0e9c93dfa..e421ca3da 100644
--- a/client/coral-framework/services/transport.js
+++ b/client/coral-framework/services/transport.js
@@ -1,4 +1,4 @@
-import ApolloClient, {createNetworkInterface} from 'apollo-client';
+import {createNetworkInterface} from 'apollo-client';
 import * as Storage from '../helpers/storage';
 
 //==============================================================================
diff --git a/package.json b/package.json
index a765dfa36..262dc43b4 100644
--- a/package.json
+++ b/package.json
@@ -79,6 +79,7 @@
     "inquirer": "^3.0.6",
     "joi": "^10.4.1",
     "jsonwebtoken": "^7.3.0",
+    "jwt-decode": "^2.2.0",
     "kue": "^0.11.5",
     "linkify-it": "^2.0.3",
     "lodash": "^4.16.6",
diff --git a/yarn.lock b/yarn.lock
index 5a5496cc9..3b6abc40f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4600,6 +4600,10 @@ jws@^3.1.4:
     jwa "^1.1.4"
     safe-buffer "^5.0.1"
 
+jwt-decode@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-2.2.0.tgz#7d86bd56679f58ce6a84704a657dd392bba81a79"
+
 kareem@1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/kareem/-/kareem-1.4.0.tgz#640285bc0174f10d4bf2127bb30e861bc0372c1c"

From 843c3a16c890dab668552c81195b7118af94c6b9 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 15 May 2017 14:48:12 -0300
Subject: [PATCH 125/132] Admin share same network interface, and unifying
 actions

---
 client/coral-admin/src/actions/auth.js        | 75 ++++++++++++-------
 client/coral-admin/src/constants/auth.js      |  4 +-
 .../src/containers/LayoutContainer.js         | 56 +++++++++-----
 client/coral-admin/src/reducers/auth.js       |  4 +-
 .../coral-admin/src/services/PymConnection.js |  2 +-
 client/coral-admin/src/services/client.js     |  4 +-
 .../src/services/fragmentMatcher.js           | 10 +--
 client/coral-admin/src/services/transport.js  | 11 ---
 client/coral-framework/actions/auth.js        |  2 +-
 9 files changed, 96 insertions(+), 72 deletions(-)
 delete mode 100644 client/coral-admin/src/services/transport.js

diff --git a/client/coral-admin/src/actions/auth.js b/client/coral-admin/src/actions/auth.js
index 89b56d4dc..faa18a199 100644
--- a/client/coral-admin/src/actions/auth.js
+++ b/client/coral-admin/src/actions/auth.js
@@ -1,7 +1,12 @@
 import * as actions from '../constants/auth';
+import * as Storage from 'coral-framework/helpers/storage';
 import coralApi from 'coral-framework/helpers/response';
+import {handleAuthToken, logout} from 'coral-framework/actions/auth';
+
+//==============================================================================
+// SIGN IN
+//==============================================================================
 
-// Log In.
 export const handleLogin = (email, password, recaptchaResponse) => dispatch => {
   dispatch({type: actions.LOGIN_REQUEST});
   const params = {method: 'POST', body: {email, password}};
@@ -9,27 +14,44 @@ export const handleLogin = (email, password, recaptchaResponse) => dispatch => {
     params.headers = {'X-Recaptcha-Response': recaptchaResponse};
   }
   return coralApi('/auth/local', params)
-    .then(({user}) => {
+    .then(({user, token}) => {
       if (!user) {
+        Storage.removeItem('token');
         return dispatch(checkLoginFailure('not logged in'));
       }
-
+      dispatch(handleAuthToken(token));
       const isAdmin = !!user.roles.filter(i => i === 'ADMIN').length;
       dispatch(checkLoginSuccess(user, isAdmin));
     })
     .catch(error => {
-
+      console.log(error);
       if (error.translation_key === 'LOGIN_MAXIMUM_EXCEEDED') {
-        dispatch({type: actions.LOGIN_MAXIMUM_EXCEEDED, message: error.translation_key});
+        dispatch({
+          type: actions.LOGIN_MAXIMUM_EXCEEDED,
+          message: error.translation_key
+        });
       } else {
         dispatch({type: actions.LOGIN_FAILURE, message: error.translation_key});
       }
     });
 };
 
-const forgotPassowordRequest = () => ({type: actions.FETCH_FORGOT_PASSWORD_REQUEST});
-const forgotPassowordSuccess = () => ({type: actions.FETCH_FORGOT_PASSWORD_SUCCESS});
-const forgotPassowordFailure = () => ({type: actions.FETCH_FORGOT_PASSWORD_FAILURE});
+//==============================================================================
+// FORGOT PASSWORD
+//==============================================================================
+
+
+const forgotPassowordRequest = () => ({
+  type: actions.FETCH_FORGOT_PASSWORD_REQUEST
+});
+
+const forgotPassowordSuccess = () => ({
+  type: actions.FETCH_FORGOT_PASSWORD_SUCCESS
+});
+
+const forgotPassowordFailure = () => ({
+  type: actions.FETCH_FORGOT_PASSWORD_FAILURE
+});
 
 export const requestPasswordReset = email => dispatch => {
   dispatch(forgotPassowordRequest(email));
@@ -38,17 +60,31 @@ export const requestPasswordReset = email => dispatch => {
     .catch(error => dispatch(forgotPassowordFailure(error)));
 };
 
-// Check Login
+//==============================================================================
+// 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 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
+});
 
 export const checkLogin = () => dispatch => {
   dispatch(checkLoginRequest());
   return coralApi('/auth')
     .then(({user}) => {
       if (!user) {
+        Storage.removeItem('token');
         return dispatch(checkLoginFailure('not logged in'));
       }
 
@@ -59,17 +95,4 @@ export const checkLogin = () => dispatch => {
       console.error(error);
       dispatch(checkLoginFailure(`${error.translation_key}`));
     });
-};
-
-// LogOut Actions
-
-const logOutRequest = () => ({type: actions.LOGOUT_REQUEST});
-const logOutSuccess = () => ({type: actions.LOGOUT_SUCCESS});
-const logOutFailure = () => ({type: actions.LOGOUT_FAILURE});
-
-export const logout = () => dispatch => {
-  dispatch(logOutRequest());
-  return coralApi('/auth', {method: 'DELETE'})
-    .then(() => dispatch(logOutSuccess()))
-    .catch(error => dispatch(logOutFailure(error)));
-};
+};
\ No newline at end of file
diff --git a/client/coral-admin/src/constants/auth.js b/client/coral-admin/src/constants/auth.js
index 610b21c89..a0c06f72e 100644
--- a/client/coral-admin/src/constants/auth.js
+++ b/client/coral-admin/src/constants/auth.js
@@ -2,9 +2,7 @@ export const CHECK_LOGIN_REQUEST = 'CHECK_LOGIN_REQUEST';
 export const CHECK_LOGIN_SUCCESS = 'CHECK_LOGIN_SUCCESS';
 export const CHECK_LOGIN_FAILURE = 'CHECK_LOGIN_FAILURE';
 
-export const LOGOUT_REQUEST = 'LOGOUT_REQUEST';
-export const LOGOUT_SUCCESS = 'LOGOUT_SUCCESS';
-export const LOGOUT_FAILURE = 'LOGOUT_FAILURE';
+export const LOGOUT = 'LOGOUT';
 
 export const LOGIN_REQUEST = 'LOGIN_REQUEST';
 export const LOGIN_SUCCESS = 'LOGIN_SUCCESS';
diff --git a/client/coral-admin/src/containers/LayoutContainer.js b/client/coral-admin/src/containers/LayoutContainer.js
index 42e2baade..04a83e39b 100644
--- a/client/coral-admin/src/containers/LayoutContainer.js
+++ b/client/coral-admin/src/containers/LayoutContainer.js
@@ -1,20 +1,21 @@
 import React, {Component} from 'react';
 import {connect} from 'react-redux';
 import Layout from '../components/ui/Layout';
-import {checkLogin, handleLogin, logout, requestPasswordReset} from '../actions/auth';
-import {toggleModal as toggleShortcutModal} from '../actions/moderation';
 import {fetchConfig} from '../actions/config';
+import {logout} from 'coral-framework/actions/auth';
 import {FullLoading} from '../components/FullLoading';
 import AdminLogin from '../components/AdminLogin';
+import {toggleModal as toggleShortcutModal} from '../actions/moderation';
+import {checkLogin, handleLogin, requestPasswordReset} from '../actions/auth';
 
 class LayoutContainer extends Component {
-  componentWillMount () {
+  componentWillMount() {
     const {checkLogin, fetchConfig} = this.props;
 
     checkLogin();
     fetchConfig();
   }
-  render () {
+  render() {
     const {
       isAdmin,
       loggedIn,
@@ -24,19 +25,34 @@ class LayoutContainer extends Component {
       passwordRequestSuccess
     } = this.props.auth;
 
-    const {handleLogout, toggleShortcutModal, TALK_RECAPTCHA_PUBLIC} = this.props;
-    if (loadingUser) { return <FullLoading />; }
+    const {
+      handleLogout,
+      toggleShortcutModal,
+      TALK_RECAPTCHA_PUBLIC
+    } = this.props;
+    if (loadingUser) {
+      return <FullLoading />;
+    }
     if (!isAdmin) {
-      return <AdminLogin
-        loginMaxExceeded={loginMaxExceeded}
-        handleLogin={this.props.handleLogin}
-        requestPasswordReset={this.props.requestPasswordReset}
-        passwordRequestSuccess={passwordRequestSuccess}
-        recaptchaPublic={TALK_RECAPTCHA_PUBLIC}
-        errorMessage={loginError} />;
+      return (
+        <AdminLogin
+          loginMaxExceeded={loginMaxExceeded}
+          handleLogin={this.props.handleLogin}
+          requestPasswordReset={this.props.requestPasswordReset}
+          passwordRequestSuccess={passwordRequestSuccess}
+          recaptchaPublic={TALK_RECAPTCHA_PUBLIC}
+          errorMessage={loginError}
+        />
+      );
     }
     if (isAdmin && loggedIn) {
-      return <Layout handleLogout={handleLogout} toggleShortcutModal={toggleShortcutModal} {...this.props} />;
+      return (
+        <Layout
+          handleLogout={handleLogout}
+          toggleShortcutModal={toggleShortcutModal}
+          {...this.props}
+        />
+      );
     }
     return <FullLoading />;
   }
@@ -44,19 +60,19 @@ class LayoutContainer extends Component {
 
 const mapStateToProps = state => ({
   auth: state.auth.toJS(),
-  TALK_RECAPTCHA_PUBLIC: state.config.get('data').get('TALK_RECAPTCHA_PUBLIC', null)
+  TALK_RECAPTCHA_PUBLIC: state.config
+    .get('data')
+    .get('TALK_RECAPTCHA_PUBLIC', null)
 });
 
 const mapDispatchToProps = dispatch => ({
   checkLogin: () => dispatch(checkLogin()),
   fetchConfig: () => dispatch(fetchConfig()),
-  handleLogin: (username, password, recaptchaResponse) => dispatch(handleLogin(username, password, recaptchaResponse)),
+  handleLogin: (username, password, recaptchaResponse) =>
+    dispatch(handleLogin(username, password, recaptchaResponse)),
   requestPasswordReset: email => dispatch(requestPasswordReset(email)),
   toggleShortcutModal: toggle => dispatch(toggleShortcutModal(toggle)),
   handleLogout: () => dispatch(logout())
 });
 
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(LayoutContainer);
+export default connect(mapStateToProps, mapDispatchToProps)(LayoutContainer);
diff --git a/client/coral-admin/src/reducers/auth.js b/client/coral-admin/src/reducers/auth.js
index a7054ddfa..1e080d37e 100644
--- a/client/coral-admin/src/reducers/auth.js
+++ b/client/coral-admin/src/reducers/auth.js
@@ -26,10 +26,8 @@ export default function auth (state = initialState, action) {
       .set('loadingUser', false)
       .set('isAdmin', action.isAdmin)
       .set('user', action.user);
-  case actions.LOGOUT_SUCCESS:
+  case actions.LOGOUT:
     return initialState;
-  case actions.LOGIN_REQUEST:
-    return state.set('loginError', null);
   case actions.LOGIN_SUCCESS:
     return state.set('loginMaxExceeded', false).set('loginError', null);
   case actions.LOGIN_FAILURE:
diff --git a/client/coral-admin/src/services/PymConnection.js b/client/coral-admin/src/services/PymConnection.js
index ca592b824..1ac24ec45 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-admin/src/services/client.js b/client/coral-admin/src/services/client.js
index 7d65f3f92..ff8216373 100644
--- a/client/coral-admin/src/services/client.js
+++ b/client/coral-admin/src/services/client.js
@@ -1,5 +1,5 @@
 import ApolloClient, {addTypename} from 'apollo-client';
-import getNetworkInterface from './transport';
+import {networkInterface} from 'coral-framework/services/transport';
 import fragmentMatcher from './fragmentMatcher';
 
 export const client = new ApolloClient({
@@ -12,5 +12,5 @@ export const client = new ApolloClient({
     }
     return null;
   },
-  networkInterface: getNetworkInterface()
+  networkInterface
 });
diff --git a/client/coral-admin/src/services/fragmentMatcher.js b/client/coral-admin/src/services/fragmentMatcher.js
index 531708f31..3b57de0b1 100644
--- a/client/coral-admin/src/services/fragmentMatcher.js
+++ b/client/coral-admin/src/services/fragmentMatcher.js
@@ -39,7 +39,7 @@ const fm = new IntrospectionFragmentMatcher({
             {name: 'DefaultAction'},
             {name: 'FlagAction'},
             {name: 'DontAgreeAction'}
-          ],
+          ]
         },
         {
           kind: 'INTERFACE',
@@ -48,18 +48,18 @@ const fm = new IntrospectionFragmentMatcher({
             {name: 'DefaultActionSummary'},
             {name: 'FlagActionSummary'},
             {name: 'DontAgreeActionSummary'}
-          ],
+          ]
         },
         {
           kind: 'INTERFACE',
           name: 'AssetActionSummary',
           possibleTypes: [
             {name: 'DefaultAssetActionSummary'},
-            {name: 'FlagAssetActionSummary'},
+            {name: 'FlagAssetActionSummary'}
           ]
         }
-      ],
-    },
+      ]
+    }
   }
 });
 
diff --git a/client/coral-admin/src/services/transport.js b/client/coral-admin/src/services/transport.js
deleted file mode 100644
index 2bd6ac636..000000000
--- a/client/coral-admin/src/services/transport.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import {createNetworkInterface} from 'apollo-client';
-
-export default function getNetworkInterface(apiUrl = '/api/v1/graph/ql', headers = {}) {
-  return new createNetworkInterface({
-    uri: apiUrl,
-    opts: {
-      credentials: 'same-origin',
-      headers,
-    },
-  });
-}
diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js
index 976b8ee1f..98c87845f 100644
--- a/client/coral-framework/actions/auth.js
+++ b/client/coral-framework/actions/auth.js
@@ -139,7 +139,7 @@ const signInFailure = error => ({
 // AUTH TOKEN
 //==============================================================================
 
-const handleAuthToken = token => dispatch => {
+export const handleAuthToken = token => dispatch => {
   Storage.setItem('exp', jwtDecode(token).exp);
   Storage.setItem('token', token);
   dispatch({type: 'HANDLE_AUTH_TOKEN'});

From 75aa8d79df8c3c530d41057ad6c69e145ad61feb Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 15 May 2017 14:50:26 -0300
Subject: [PATCH 126/132] linting

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

diff --git a/client/coral-admin/src/actions/auth.js b/client/coral-admin/src/actions/auth.js
index faa18a199..e50273fa6 100644
--- a/client/coral-admin/src/actions/auth.js
+++ b/client/coral-admin/src/actions/auth.js
@@ -1,7 +1,7 @@
 import * as actions from '../constants/auth';
 import * as Storage from 'coral-framework/helpers/storage';
 import coralApi from 'coral-framework/helpers/response';
-import {handleAuthToken, logout} from 'coral-framework/actions/auth';
+import {handleAuthToken} from 'coral-framework/actions/auth';
 
 //==============================================================================
 // SIGN IN
@@ -24,7 +24,6 @@ export const handleLogin = (email, password, recaptchaResponse) => dispatch => {
       dispatch(checkLoginSuccess(user, isAdmin));
     })
     .catch(error => {
-      console.log(error);
       if (error.translation_key === 'LOGIN_MAXIMUM_EXCEEDED') {
         dispatch({
           type: actions.LOGIN_MAXIMUM_EXCEEDED,
@@ -40,7 +39,6 @@ export const handleLogin = (email, password, recaptchaResponse) => dispatch => {
 // FORGOT PASSWORD
 //==============================================================================
 
-
 const forgotPassowordRequest = () => ({
   type: actions.FETCH_FORGOT_PASSWORD_REQUEST
 });
@@ -95,4 +93,4 @@ export const checkLogin = () => dispatch => {
       console.error(error);
       dispatch(checkLoginFailure(`${error.translation_key}`));
     });
-};
\ No newline at end of file
+};

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 127/132] 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 128/132] 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 129/132] 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 5aca83993bcbda09686563cb6f91a059361bed30 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Mon, 15 May 2017 13:35:51 -0600
Subject: [PATCH 130/132] fixed build process

---
 config.js  | 6 ------
 plugins.js | 5 ++---
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/config.js b/config.js
index 271f13420..3d75f44a8 100644
--- a/config.js
+++ b/config.js
@@ -47,12 +47,6 @@ const CONFIG = {
   MONGO_URL: process.env.TALK_MONGO_URL,
   REDIS_URL: process.env.TALK_REDIS_URL,
 
-  //------------------------------------------------------------------------------
-  // Plugins
-  //------------------------------------------------------------------------------
-
-  PLUGINS_JSON: process.env.TALK_PLUGINS_JSON,
-
   //------------------------------------------------------------------------------
   // Server Config
   //------------------------------------------------------------------------------
diff --git a/plugins.js b/plugins.js
index f353cd392..f0c31407f 100644
--- a/plugins.js
+++ b/plugins.js
@@ -4,9 +4,8 @@ const resolve = require('resolve');
 const debug = require('debug')('talk:plugins');
 const Joi = require('joi');
 const amp = require('app-module-path');
-const {
-  PLUGINS_JSON
-} = require('./config');
+
+const PLUGINS_JSON = process.env.TALK_PLUGINS_JSON;
 
 // Add the current path to the module root.
 amp.addPath(__dirname);

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 131/132] 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 132/132] 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(