From 5284ccc8b70aaf695eaca83b5050130c862afaf3 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Mon, 12 Dec 2016 15:05:19 -0700
Subject: [PATCH 01/54] Added support for the suspect wordlist

---
 .eslintrc.json                     |  1 -
 models/action.js                   | 11 ++++-
 models/asset.js                    | 14 ++++---
 models/setting.js                  |  9 ++++-
 routes/api/comments/index.js       | 14 ++++++-
 services/wordlist.js               | 65 +++++++++++++++++++++---------
 tests/routes/api/comments/index.js | 46 ++++++++++++++++++---
 tests/services/wordlist.js         | 37 ++++++++++-------
 8 files changed, 148 insertions(+), 49 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 035a86189..0c31cbb90 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -26,7 +26,6 @@
         "yoda": [1],
         "no-path-concat": [2],
         "eol-last": [1],
-        "no-continue": [1],
         "no-nested-ternary": [1],
         "no-tabs": [2],
         "no-unneeded-ternary": [1],
diff --git a/models/action.js b/models/action.js
index ed18e48c5..b098f871f 100644
--- a/models/action.js
+++ b/models/action.js
@@ -39,8 +39,17 @@ ActionSchema.statics.findById = function(id) {
  */
 ActionSchema.statics.insertUserAction = (action) => {
 
+  // Actions are made unique by using a query that can be reproducable, i.e.,
+  // not containing user inputable values.
+  let query = {
+    action_type: action.action_type,
+    item_type: action.item_type,
+    item_id: action.item_id,
+    user_id: action.user_id
+  };
+
   // Create/Update the action.
-  return Action.findOneAndUpdate(action, action, {
+  return Action.findOneAndUpdate(query, action, {
 
     // Ensure that if it's new, we return the new object created.
     new: true,
diff --git a/models/asset.js b/models/asset.js
index 3c68b7c13..094f25363 100644
--- a/models/asset.js
+++ b/models/asset.js
@@ -25,10 +25,6 @@ const AssetSchema = new Schema({
     type: Date,
     default: null
   },
-  settings: {
-    type: Schema.Types.Mixed,
-    default: null
-  },
   closedAt: {
     type: Date,
     default: null
@@ -44,7 +40,15 @@ const AssetSchema = new Schema({
   subsection: String,
   author: String,
   publication_date: Date,
-  modified_date: Date
+  modified_date: Date,
+
+  // This object is used exclusivly for storing settings that are to override
+  // the base settings from the base Settings object. This is to be accessed
+  // always after running `rectifySettings` against it.
+  settings: {
+    type: Schema.Types.Mixed,
+    default: null
+  },
 }, {
   versionKey: false,
   timestamps: {
diff --git a/models/setting.js b/models/setting.js
index c7589ca56..d8554bc0d 100644
--- a/models/setting.js
+++ b/models/setting.js
@@ -3,6 +3,13 @@ const Schema = mongoose.Schema;
 const _ = require('lodash');
 const cache = require('../cache');
 
+const WordlistSchema = new Schema({
+  banned: [String],
+  suspect: [String]
+}, {
+  _id: false
+});
+
 /**
  * SettingSchema manages application settings that get used on front and backend.
  * @type {Schema}
@@ -38,7 +45,7 @@ const SettingSchema = new Schema({
     type: String,
     default: ''
   },
-  wordlist: [String]
+  wordlist: WordlistSchema,
 }, {
   timestamps: {
     createdAt: 'created_at',
diff --git a/routes/api/comments/index.js b/routes/api/comments/index.js
index 168b89fc3..d0d490bb3 100644
--- a/routes/api/comments/index.js
+++ b/routes/api/comments/index.js
@@ -76,7 +76,7 @@ router.post('/', wordlist.filter('body'), (req, res, next) => {
   // premod, set it to `premod`.
   let status;
 
-  if (req.wordlist.matched) {
+  if (req.wordlist.banned) {
     status = Promise.resolve('rejected');
   } else {
     status = Asset
@@ -97,7 +97,7 @@ router.post('/', wordlist.filter('body'), (req, res, next) => {
 
       // 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}) => moderation === 'pre' ? 'premod' : '');
+      .then(({moderation}) => moderation === 'pre' ? 'premod' : false);
   }
 
   status.then((status) => Comment.publicCreate({
@@ -108,6 +108,16 @@ router.post('/', wordlist.filter('body'), (req, res, next) => {
     author_id: req.user.id
   }))
   .then((comment) => {
+    if (req.wordlist.suspect) {
+      return Comment
+        .addAction(comment.id, null, 'flag', 'body', 'Matched suspect word filters.')
+        .then(() => comment);
+    }
+
+    return comment;
+  })
+  .then((comment) => {
+
     // The comment was created! Send back the created comment.
     res.status(201).json(comment);
   })
diff --git a/services/wordlist.js b/services/wordlist.js
index 59a842817..2103c7267 100644
--- a/services/wordlist.js
+++ b/services/wordlist.js
@@ -9,7 +9,10 @@ const Setting = require('../models/setting');
  * @type {Object}
  */
 const wordlist = {
-  list: [],
+  lists: {
+    banned: [],
+    suspect: []
+  },
   enabled: false
 };
 
@@ -32,15 +35,19 @@ wordlist.init = () => {
  * Inserts the wordlist data and enables the wordlist.
  * @param  {Array} list list of words to be added to the wordlist
  */
-wordlist.insert = (list) => {
+wordlist.insert = (lists) => {
 
   // Add the words to this array, but also lowercase the words so that an
   // easy comparison can take place.
-  wordlist.list = _.uniq(wordlist.list.concat(list.map((word) => {
-    return tokenizer.tokenize(word.toLowerCase());
-  })));
+  ['banned', 'suspect'].forEach((k) => {
+    if (!(k in lists)) {
+      return;
+    }
 
-  debug(`Added ${list.length} words to the wordlist, now the wordlist is ${wordlist.list.length} entries long.`);
+    wordlist.lists[k] = wordlist.parseList(lists[k]);
+
+    debug(`Added ${lists[k].length} words to the ${k} wordlist.`);
+  });
 
   // Enable the wordlist.
   wordlist.enabled = true;
@@ -48,12 +55,21 @@ wordlist.insert = (list) => {
   return Promise.resolve(wordlist);
 };
 
+/**
+ * Parses the list content.
+ * @param  {Array} list array of words to parse for a list.
+ * @return {Array}      the parsed list
+ */
+wordlist.parseList = (list) => _.uniq(list.map((word) => {
+  return tokenizer.tokenize(word.toLowerCase());
+}));
+
 /**
  * Tests the phrase to see if it contains any of the defined blockwords.
  * @param  {String} phrase value to check for blockwords.
  * @return {Boolean}       true if a blockword is found, false otherwise.
  */
-wordlist.match = (phrase) => {
+wordlist.match = (list, phrase) => {
 
   // Lowercase the word to ensure that we don't miss a match due to
   // capitalization.
@@ -61,7 +77,7 @@ wordlist.match = (phrase) => {
 
   // This will return true in the event that at least one blockword is found
   // in the phrase.
-  return wordlist.list.some((blockphrase) => {
+  return list.some((blockphrase) => {
 
     // First, let's see if we can find the first word in the blockphrase in the
     // source phrase.
@@ -133,28 +149,39 @@ wordlist.filter = (...fields) => (req, res, next) => {
   }
 
   // Loop over all the fields from the body that we want to check.
-  const containsProfanity = fields.some((field) => {
+  for (let i = 0; i < fields.length; i++) {
+    let field = fields[i];
+
     let phrase = _.get(req.body, field, false);
 
     // If the field doesn't exist in the body, then it can't be profane!
     if (!phrase) {
 
       // Return that there wasn't a profane word here.
-      return false;
+      continue;
     }
 
-    // Check if the field contains a profane word.
-    if (wordlist.match(phrase)) {
-      debug(`the field "${field}" contained a phrase "${phrase}" which contained a wordlisted word/phrase`);
-      return true;
+    // Check if the field contains a banned word.
+    if (wordlist.match(wordlist.lists.banned, phrase)) {
+      debug(`the field "${field}" contained a phrase "${phrase}" which contained a banned word/phrase`);
+
+      req.wordlist.banned = ErrContainsProfanity;
+
+      // Stop looping through the fields now, we discovered the worst possible
+      // situation (a banned word).
+      break;
     }
 
-    return false;
-  });
+    // Check if the field contains a banned word.
+    if (wordlist.match(wordlist.lists.suspect, phrase)) {
+      debug(`the field "${field}" contained a phrase "${phrase}" which contained a suspected word/phrase`);
 
-  // The body could contain some profanity, address that here.
-  if (containsProfanity) {
-    req.wordlist.matched = ErrContainsProfanity;
+      req.wordlist.suspect = ErrContainsProfanity;
+
+      // Continue looping through the fields now, we discovered a possible bad
+      // word (suspect).
+      continue;
+    }
   }
 
   next();
diff --git a/tests/routes/api/comments/index.js b/tests/routes/api/comments/index.js
index b3e4e2675..c720130c0 100644
--- a/tests/routes/api/comments/index.js
+++ b/tests/routes/api/comments/index.js
@@ -21,7 +21,7 @@ describe('/api/v1/comments', () => {
 
   // Ensure that the settings are always available.
   beforeEach(() => Promise.all([
-    wordlist.insert(['bad words']),
+    wordlist.insert({banned: ['bad words'], suspect: ['suspect words']}),
     Setting.init(settings)
   ]));
 
@@ -145,12 +145,22 @@ describe('/api/v1/comments', () => {
   describe('#post', () => {
 
     let asset_id;
+    let postmod_asset_id;
 
-    beforeEach(() => Asset.findOrCreateByUrl('https://coralproject.net/section/article-is-the-best').then((asset) => {
+    beforeEach(() => Promise.all([
+      Asset.findOrCreateByUrl('https://coralproject.net/section/article-is-the-best').then((asset) => {
 
-      // Update the asset id.
-      asset_id = asset.id;
-    }));
+        // Update the asset id.
+        asset_id = asset.id;
+      }),
+      Asset.findOrCreateByUrl('https://coralproject.net/section/postmod-article-is-the-best').then((asset) => {
+
+        // Update the asset id.
+        postmod_asset_id = asset.id;
+
+        return Asset.overrideSettings(postmod_asset_id, {moderation: 'post'});
+      }),
+    ]));
 
     it('should create a comment', () => {
       return chai.request(app)
@@ -175,6 +185,32 @@ describe('/api/v1/comments', () => {
         });
     });
 
+    it('should create a comment with no status and a flag if it contains a suspected word', () => {
+      return chai.request(app)
+        .post('/api/v1/comments')
+        .set(passport.inject({roles: []}))
+        .send({'body': 'suspect words are the most suspicious', 'author_id': '123', 'asset_id': postmod_asset_id, 'parent_id': ''})
+        .then((res) => {
+          expect(res).to.have.status(201);
+          expect(res.body).to.have.property('id');
+          expect(res.body).to.have.property('status', null);
+
+          return Promise.all([
+            res.body,
+            Action.findByType('flag', 'comments')
+          ]);
+        })
+        .then(([comment, actions]) => {
+          expect(actions).to.have.length(1);
+
+          let action = actions[0];
+
+          expect(action).to.have.property('item_id', comment.id);
+          expect(action).to.have.property('field', 'body');
+          expect(action).to.have.property('detail', 'Matched suspect word filters.');
+        });
+    });
+
     it('should create a comment with a premod status if it\'s asset is has pre-moderation enabled', () => {
       return Asset
         .findOrCreateByUrl('https://coralproject.net/article1')
diff --git a/tests/services/wordlist.js b/tests/services/wordlist.js
index 0ae76c176..c65be3b11 100644
--- a/tests/services/wordlist.js
+++ b/tests/services/wordlist.js
@@ -4,22 +4,25 @@ const wordlist = require('../../services/wordlist');
 
 describe('wordlist: services', () => {
 
-  before(() => wordlist.insert([
-    'BAD',
-    'bad',
-    'how to murder',
-    'how to kill'
-  ]));
-
-  beforeEach(() => {
-    expect(wordlist.list).to.not.be.empty;
-    expect(wordlist.enabled).to.be.true;
-  });
+  const wordlists = {
+    banned: [
+      'BAD',
+      'bad',
+      'how to murder',
+      'how to kill'
+    ],
+    suspect: [
+      'murder'
+    ]
+  };
 
   describe('#init', () => {
 
+    before(() => wordlist.insert(wordlists));
+
     it('has entries', () => {
-      expect(wordlist.list).to.not.be.empty;
+      expect(wordlist.lists.banned).to.not.be.empty;
+      expect(wordlist.lists.suspect).to.not.be.empty;
       expect(wordlist.enabled).to.be.true;
     });
 
@@ -27,6 +30,8 @@ describe('wordlist: services', () => {
 
   describe('#match', () => {
 
+    const bannedList = wordlist.parseList(wordlists.banned);
+
     it('does match on a bad word', () => {
       [
         'how to kill',
@@ -36,7 +41,7 @@ describe('wordlist: services', () => {
         'how to murder',
         'How To mUrDer'
       ].forEach((word) => {
-        expect(wordlist.match(word)).to.be.true;
+        expect(wordlist.match(bannedList, word)).to.be.true;
       });
     });
 
@@ -48,7 +53,7 @@ describe('wordlist: services', () => {
         'how to be a great person?',
         'how to not kill?'
       ].forEach((word) => {
-        expect(wordlist.match(word)).to.be.false;
+        expect(wordlist.match(bannedList, word)).to.be.false;
       });
     });
 
@@ -56,6 +61,8 @@ describe('wordlist: services', () => {
 
   describe('#filter', () => {
 
+    before(() => wordlist.insert(wordlists));
+
     it('matches on bodies containing bad words', (done) => {
 
       let req = {
@@ -68,7 +75,7 @@ describe('wordlist: services', () => {
         expect(err).to.be.undefined;
         expect(req).to.have.property('wordlist');
         expect(req.wordlist).to.have.property('matched');
-        expect(req.wordlist.matched).to.be.equal(wordlist.ErrContainsProfanity);
+        expect(req.wordlist.banned).to.be.equal(wordlist.ErrContainsProfanity);
 
         done();
       });

From fe2487dea56a51b9f2fffb1ad33d7714c6a05941 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Wed, 14 Dec 2016 15:02:26 -0500
Subject: [PATCH 02/54] Add streams option and sidebar.

---
 client/coral-admin/src/AppRouter.js           |  2 +
 .../coral-admin/src/components/ui/Header.js   |  2 +
 .../src/containers/Streams/Streams.css        | 40 +++++++++++++++++++
 .../src/containers/Streams/Streams.js         | 40 +++++++++++++++++++
 client/coral-admin/src/translations.json      |  1 +
 5 files changed, 85 insertions(+)
 create mode 100644 client/coral-admin/src/containers/Streams/Streams.css
 create mode 100644 client/coral-admin/src/containers/Streams/Streams.js

diff --git a/client/coral-admin/src/AppRouter.js b/client/coral-admin/src/AppRouter.js
index 6d55d7b18..bc9747f34 100644
--- a/client/coral-admin/src/AppRouter.js
+++ b/client/coral-admin/src/AppRouter.js
@@ -4,6 +4,7 @@ import {Router, Route, IndexRoute, browserHistory} from 'react-router';
 import ModerationQueue from 'containers/ModerationQueue/ModerationQueue';
 import CommentStream from 'containers/CommentStream/CommentStream';
 import Configure from 'containers/Configure/Configure';
+import Streams from 'containers/Streams/Streams';
 import CommunityContainer from 'containers/Community/CommunityContainer';
 import LayoutContainer from 'containers/LayoutContainer';
 
@@ -13,6 +14,7 @@ const routes = (
     <Route path='embed' component={CommentStream} />
     <Route path='community' component={CommunityContainer} />
     <Route path='configure' component={Configure} />
+    <Route path='streams' component={Streams} />
   </Route>
 );
 
diff --git a/client/coral-admin/src/components/ui/Header.js b/client/coral-admin/src/components/ui/Header.js
index e4d151d30..4c76424cc 100644
--- a/client/coral-admin/src/components/ui/Header.js
+++ b/client/coral-admin/src/components/ui/Header.js
@@ -16,6 +16,8 @@ export default ({handleLogout}) => (
             activeClassName={styles.active}>{lang.t('configure.community')}</Link>
       <Link className={styles.navLink} to="/admin/configure"
             activeClassName={styles.active}>{lang.t('configure.configure')}</Link>
+          <Link className={styles.navLink} to="/admin/streams"
+            activeClassName={styles.active}>{lang.t('configure.streams')}</Link>
     </Navigation>
     <div className={styles.rightPanel}>
       <ul>
diff --git a/client/coral-admin/src/containers/Streams/Streams.css b/client/coral-admin/src/containers/Streams/Streams.css
new file mode 100644
index 000000000..56d757863
--- /dev/null
+++ b/client/coral-admin/src/containers/Streams/Streams.css
@@ -0,0 +1,40 @@
+.container {
+  padding: 10px;
+  display: flex;
+}
+
+.leftColumn {
+  width: 200px;
+}
+
+.mainContent {
+  width: calc(70% - 300px)
+}
+
+.searchIcon {
+  vertical-align: middle;
+  font-size: 18px;
+  color: #ccc;
+}
+
+.searchBox {
+  padding: 3px;
+  border: 1px solid #ccc;
+  border-radius: 3px;
+  width: 90%;
+  display: flex;
+}
+
+.searchBoxInput {
+  border: none;
+  flex: 1;
+  font-size: 14px;
+}
+
+.searchBoxInput:focus {
+  outline: none;
+}
+
+.hidden {
+  display: none;
+}
diff --git a/client/coral-admin/src/containers/Streams/Streams.js b/client/coral-admin/src/containers/Streams/Streams.js
new file mode 100644
index 000000000..0e3e0d3f1
--- /dev/null
+++ b/client/coral-admin/src/containers/Streams/Streams.js
@@ -0,0 +1,40 @@
+import React from 'react';
+import styles from './Streams.css';
+import I18n from 'coral-framework/modules/i18n/i18n';
+import translations from '../../translations.json';
+import {
+  RadioGroup,
+  Radio,
+  Icon
+} from 'react-mdl';
+
+const Streams = () => <div className={styles.container}>
+  <div className={styles.leftColumn}>
+  <div className={styles.searchBox}>
+    <Icon name='search' className={styles.searchIcon}/>
+    <input
+      type='text'
+      className={styles.searchBoxInput}
+      onChange={() => {}}
+      placeholder="Search"/>
+  </div>
+  <div>{lang.t('streams.filter-streams')}</div>
+  <div>{lang.t('streams.stream-status')}</div>
+  <RadioGroup name='status' value='all'>
+    <Radio value='all'>{lang.t('streams.all')}</Radio>
+    <Radio value='open'>{lang.t('streams.open')}</Radio>
+    <Radio value='closed'>{lang.t('streams.closed')}</Radio>
+  </RadioGroup>
+  <div>{lang.t('streams.sort-by')}</div>
+  <RadioGroup name='sortBy' value='newest'>
+    <Radio value='newest'>{lang.t('streams.newest')}</Radio>
+    <Radio value='oldest'>{lang.t('streams.oldest')}</Radio>
+  </RadioGroup>
+  </div>
+  <div className={styles.mainContent}>
+  </div>
+</div>;
+
+export default Streams;
+
+const lang = new I18n(translations);
diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json
index e462f7567..4d3525dd9 100644
--- a/client/coral-admin/src/translations.json
+++ b/client/coral-admin/src/translations.json
@@ -55,6 +55,7 @@
       "moderate": "Moderate",
       "configure": "Configure",
       "community": "Community",
+      "streams": "Streams",
       "closed-comments-desc": "Write a message for closed threads",
       "closed-comments-label": "Write a message...",
       "comment-count-header": "Limit Comment Length",

From dad46cc8defa45288d50041a0350d09b00be2562 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Wed, 14 Dec 2016 15:15:13 -0500
Subject: [PATCH 03/54] Add style and language to left nav.

---
 .../src/containers/Streams/Streams.css        | 15 +++++++++++++
 .../src/containers/Streams/Streams.js         | 10 ++++-----
 client/coral-admin/src/translations.json      | 22 +++++++++++++++++++
 3 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/client/coral-admin/src/containers/Streams/Streams.css b/client/coral-admin/src/containers/Streams/Streams.css
index 56d757863..07724baa8 100644
--- a/client/coral-admin/src/containers/Streams/Streams.css
+++ b/client/coral-admin/src/containers/Streams/Streams.css
@@ -35,6 +35,21 @@
   outline: none;
 }
 
+.optionHeader {
+  font-size: 16px;
+  font-weight: 900;
+  margin-top: 15px;
+}
+
+.optionDetail {
+  font-size: 16px;
+  margin-top: 3px;
+}
+
+.radio {
+  display: block;
+}
+
 .hidden {
   display: none;
 }
diff --git a/client/coral-admin/src/containers/Streams/Streams.js b/client/coral-admin/src/containers/Streams/Streams.js
index 0e3e0d3f1..ee5d205ae 100644
--- a/client/coral-admin/src/containers/Streams/Streams.js
+++ b/client/coral-admin/src/containers/Streams/Streams.js
@@ -16,16 +16,16 @@ const Streams = () => <div className={styles.container}>
       type='text'
       className={styles.searchBoxInput}
       onChange={() => {}}
-      placeholder="Search"/>
+      placeholder={lang.t('streams.search')}/>
   </div>
-  <div>{lang.t('streams.filter-streams')}</div>
-  <div>{lang.t('streams.stream-status')}</div>
-  <RadioGroup name='status' value='all'>
+  <div className={styles.optionHeader}>{lang.t('streams.filter-streams')}</div>
+  <div className={styles.optionDetail}>{lang.t('streams.stream-status')}</div>
+  <RadioGroup name='status' value='all' childContainer={<div/>}>
     <Radio value='all'>{lang.t('streams.all')}</Radio>
     <Radio value='open'>{lang.t('streams.open')}</Radio>
     <Radio value='closed'>{lang.t('streams.closed')}</Radio>
   </RadioGroup>
-  <div>{lang.t('streams.sort-by')}</div>
+  <div className={styles.optionHeader}>{lang.t('streams.sort-by')}</div>
   <RadioGroup name='sortBy' value='newest'>
     <Radio value='newest'>{lang.t('streams.newest')}</Radio>
     <Radio value='oldest'>{lang.t('streams.oldest')}</Radio>
diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json
index 4d3525dd9..da859c49c 100644
--- a/client/coral-admin/src/translations.json
+++ b/client/coral-admin/src/translations.json
@@ -69,6 +69,17 @@
       "note": "Note: Banning this user will also place this comment in the Rejected queue.",
       "cancel": "Cancel",
       "yes_ban_user": "Yes, Ban User"
+    },
+    "streams": {
+      "search": "Search",
+      "filter-streams": "Filter Streams",
+      "stream-status": "Stream Status",
+      "all": "All",
+      "open": "Open",
+      "closed": "Closed",
+      "newest": "Newest",
+      "oldest": "Oldest",
+      "sort-by": "Sort By"
     }
   },
   "es": {
@@ -129,6 +140,17 @@
       "note": "Nota: Suspender este usuario también va a colocar este comentario en la cola de Rechazados.",
       "cancel": "Cancelar",
       "yes_ban_user": "Si, Suspendan el usuario"
+    },
+    "streams": {
+      "search": "",
+      "filter-streams": "",
+      "stream-status": "",
+      "all": "",
+      "open": "",
+      "closed": "",
+      "newest": "",
+      "oldest": "",
+      "sort-by": ""
     }
   }
 }

From 7c6299243f6ecd77f4eb49806736fc1d494925d7 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Wed, 14 Dec 2016 15:29:56 -0500
Subject: [PATCH 04/54] Connecting sorting options to state.

---
 .../src/containers/Streams/Streams.js         | 80 ++++++++++++-------
 1 file changed, 53 insertions(+), 27 deletions(-)

diff --git a/client/coral-admin/src/containers/Streams/Streams.js b/client/coral-admin/src/containers/Streams/Streams.js
index ee5d205ae..c6c9feeb3 100644
--- a/client/coral-admin/src/containers/Streams/Streams.js
+++ b/client/coral-admin/src/containers/Streams/Streams.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {Component} from 'react';
 import styles from './Streams.css';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../../translations.json';
@@ -8,32 +8,58 @@ import {
   Icon
 } from 'react-mdl';
 
-const Streams = () => <div className={styles.container}>
-  <div className={styles.leftColumn}>
-  <div className={styles.searchBox}>
-    <Icon name='search' className={styles.searchIcon}/>
-    <input
-      type='text'
-      className={styles.searchBoxInput}
-      onChange={() => {}}
-      placeholder={lang.t('streams.search')}/>
-  </div>
-  <div className={styles.optionHeader}>{lang.t('streams.filter-streams')}</div>
-  <div className={styles.optionDetail}>{lang.t('streams.stream-status')}</div>
-  <RadioGroup name='status' value='all' childContainer={<div/>}>
-    <Radio value='all'>{lang.t('streams.all')}</Radio>
-    <Radio value='open'>{lang.t('streams.open')}</Radio>
-    <Radio value='closed'>{lang.t('streams.closed')}</Radio>
-  </RadioGroup>
-  <div className={styles.optionHeader}>{lang.t('streams.sort-by')}</div>
-  <RadioGroup name='sortBy' value='newest'>
-    <Radio value='newest'>{lang.t('streams.newest')}</Radio>
-    <Radio value='oldest'>{lang.t('streams.oldest')}</Radio>
-  </RadioGroup>
-  </div>
-  <div className={styles.mainContent}>
-  </div>
-</div>;
+class Streams extends Component {
+
+  state = {
+    searchTerm: '',
+    sortBy: 'newest',
+    statusFilter: 'all'
+  }
+
+  onSettingChange = (setting) => (e) => {
+    this.setState({[setting]: e.target.value});
+  }
+
+  render () {
+    const {searchTerm, sortBy, statusFilter} = this.state;
+
+    return <div className={styles.container}>
+      <div className={styles.leftColumn}>
+      <div className={styles.searchBox}>
+        <Icon name='search' className={styles.searchIcon}/>
+        <input
+          type='text'
+          value={searchTerm}
+          className={styles.searchBoxInput}
+          onChange={this.onSettingChange('searchTerm')}
+          placeholder={lang.t('streams.search')}/>
+      </div>
+      <div className={styles.optionHeader}>{lang.t('streams.filter-streams')}</div>
+      <div className={styles.optionDetail}>{lang.t('streams.stream-status')}</div>
+      <RadioGroup
+        name='status filter'
+        value={statusFilter}
+        childContainer='div'
+        onChange={this.onSettingChange('statusFilter')}>
+        <Radio value='all'>{lang.t('streams.all')}</Radio>
+        <Radio value='open'>{lang.t('streams.open')}</Radio>
+        <Radio value='closed'>{lang.t('streams.closed')}</Radio>
+      </RadioGroup>
+      <div className={styles.optionHeader}>{lang.t('streams.sort-by')}</div>
+      <RadioGroup
+        name='sort by'
+        value={sortBy}
+        childContainer='div'
+        onChange={this.onSettingChange('sortBy')}>
+        <Radio value='newest'>{lang.t('streams.newest')}</Radio>
+        <Radio value='oldest'>{lang.t('streams.oldest')}</Radio>
+      </RadioGroup>
+      </div>
+      <div className={styles.mainContent}>
+      </div>
+    </div>;
+  }
+}
 
 export default Streams;
 

From 65b308a0612789aeda3da097ad51942394938146 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Wed, 14 Dec 2016 16:01:43 -0500
Subject: [PATCH 05/54] Adding initial stream list.

---
 .../src/containers/Streams/Streams.css        |  2 +-
 .../src/containers/Streams/Streams.js         | 89 ++++++++++++-------
 2 files changed, 60 insertions(+), 31 deletions(-)

diff --git a/client/coral-admin/src/containers/Streams/Streams.css b/client/coral-admin/src/containers/Streams/Streams.css
index 07724baa8..7ab1b5199 100644
--- a/client/coral-admin/src/containers/Streams/Streams.css
+++ b/client/coral-admin/src/containers/Streams/Streams.css
@@ -8,7 +8,7 @@
 }
 
 .mainContent {
-  width: calc(70% - 300px)
+  width: calc(90% - 200px);
 }
 
 .searchIcon {
diff --git a/client/coral-admin/src/containers/Streams/Streams.js b/client/coral-admin/src/containers/Streams/Streams.js
index c6c9feeb3..bec61e995 100644
--- a/client/coral-admin/src/containers/Streams/Streams.js
+++ b/client/coral-admin/src/containers/Streams/Streams.js
@@ -5,7 +5,9 @@ import translations from '../../translations.json';
 import {
   RadioGroup,
   Radio,
-  Icon
+  Icon,
+  DataTable,
+  TableHeader
 } from 'react-mdl';
 
 class Streams extends Component {
@@ -20,42 +22,69 @@ class Streams extends Component {
     this.setState({[setting]: e.target.value});
   }
 
+  renderDate = (date) => {
+    const d = new Date(date);
+    return `${d.getMonth()}/${d.getDate()}/${d.getYear()}`;
+  }
+
+  renderStatus = (status) => {
+    return <div>{status}</div>;
+  }
+
   render () {
     const {searchTerm, sortBy, statusFilter} = this.state;
 
     return <div className={styles.container}>
       <div className={styles.leftColumn}>
-      <div className={styles.searchBox}>
-        <Icon name='search' className={styles.searchIcon}/>
-        <input
-          type='text'
-          value={searchTerm}
-          className={styles.searchBoxInput}
-          onChange={this.onSettingChange('searchTerm')}
-          placeholder={lang.t('streams.search')}/>
-      </div>
-      <div className={styles.optionHeader}>{lang.t('streams.filter-streams')}</div>
-      <div className={styles.optionDetail}>{lang.t('streams.stream-status')}</div>
-      <RadioGroup
-        name='status filter'
-        value={statusFilter}
-        childContainer='div'
-        onChange={this.onSettingChange('statusFilter')}>
-        <Radio value='all'>{lang.t('streams.all')}</Radio>
-        <Radio value='open'>{lang.t('streams.open')}</Radio>
-        <Radio value='closed'>{lang.t('streams.closed')}</Radio>
-      </RadioGroup>
-      <div className={styles.optionHeader}>{lang.t('streams.sort-by')}</div>
-      <RadioGroup
-        name='sort by'
-        value={sortBy}
-        childContainer='div'
-        onChange={this.onSettingChange('sortBy')}>
-        <Radio value='newest'>{lang.t('streams.newest')}</Radio>
-        <Radio value='oldest'>{lang.t('streams.oldest')}</Radio>
-      </RadioGroup>
+
+        <div className={styles.searchBox}>
+          <Icon name='search' className={styles.searchIcon}/>
+          <input
+            type='text'
+            value={searchTerm}
+            className={styles.searchBoxInput}
+            onChange={this.onSettingChange('searchTerm')}
+            placeholder={lang.t('streams.search')}/>
+        </div>
+
+        <div className={styles.optionHeader}>{lang.t('streams.filter-streams')}</div>
+        <div className={styles.optionDetail}>{lang.t('streams.stream-status')}</div>
+          <RadioGroup
+            name='status filter'
+            value={statusFilter}
+            childContainer='div'
+            onChange={this.onSettingChange('statusFilter')}>
+            <Radio value='all'>{lang.t('streams.all')}</Radio>
+            <Radio value='open'>{lang.t('streams.open')}</Radio>
+            <Radio value='closed'>{lang.t('streams.closed')}</Radio>
+          </RadioGroup>
+          <div className={styles.optionHeader}>{lang.t('streams.sort-by')}</div>
+          <RadioGroup
+            name='sort by'
+            value={sortBy}
+            childContainer='div'
+            onChange={this.onSettingChange('sortBy')}>
+            <Radio value='newest'>{lang.t('streams.newest')}</Radio>
+            <Radio value='oldest'>{lang.t('streams.oldest')}</Radio>
+          </RadioGroup>
       </div>
+
       <div className={styles.mainContent}>
+      <DataTable
+        rows={[
+            {article: 'Acrylic (Transparent)', pubdate: 25, status: 2.90},
+            {article: 'Plywood (Birch)', pubdate: 50, status: 1.25},
+            {article: 'Laminate (Gold on Blue)', pubdate: 10, status: 2.35}
+        ]}
+      >
+        <TableHeader name="article">{lang.t('streams.article')}</TableHeader>
+        <TableHeader name="pubdate" cellFormatter={this.renderDate}>
+          {lang.t('streams.pubdate')}
+        </TableHeader>
+        <TableHeader name="status" cellFormatter={this.renderStatus}>
+          {lang.t('streams.status')}
+        </TableHeader>
+      </DataTable>
       </div>
     </div>;
   }

From b98201afa3269c1bae428367effd03a33f4d6b08 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Wed, 14 Dec 2016 19:03:07 -0500
Subject: [PATCH 06/54] Adding and testing function to fetch assets in talk
 reducer.

---
 client/coral-admin/src/actions/assets.js      |  0
 client/coral-admin/src/constants/comments.js  |  2 +-
 client/coral-admin/src/reducers/comments.js   |  2 +-
 .../coral-admin/src/services/talk-adapter.js  | 34 ++++++---
 .../coral-admin/services/talk-adapter.js      | 75 +++++++++++++++++++
 .../{itemActions.spec.js => itemActions.js}   |  0
 .../{itemReducer.spec.js => itemReducer.js}   |  0
 7 files changed, 100 insertions(+), 13 deletions(-)
 create mode 100644 client/coral-admin/src/actions/assets.js
 create mode 100644 tests/client/coral-admin/services/talk-adapter.js
 rename tests/client/coral-framework/store/{itemActions.spec.js => itemActions.js} (100%)
 rename tests/client/coral-framework/store/{itemReducer.spec.js => itemReducer.js} (100%)

diff --git a/client/coral-admin/src/actions/assets.js b/client/coral-admin/src/actions/assets.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/client/coral-admin/src/constants/comments.js b/client/coral-admin/src/constants/comments.js
index 856f619d0..16d72e889 100644
--- a/client/coral-admin/src/constants/comments.js
+++ b/client/coral-admin/src/constants/comments.js
@@ -1,3 +1,3 @@
 export const SHOW_BANUSER_DIALOG = 'SHOW_BANUSER_DIALOG';
 export const HIDE_BANUSER_DIALOG = 'HIDE_BANUSER_DIALOG';
-export const USER_BAN_SUCESS = 'USER_BAN_SUCESS';
+export const USER_BAN_SUCCESS = 'USER_BAN_SUCCESS';
diff --git a/client/coral-admin/src/reducers/comments.js b/client/coral-admin/src/reducers/comments.js
index dca726b5e..d5fd85ab6 100644
--- a/client/coral-admin/src/reducers/comments.js
+++ b/client/coral-admin/src/reducers/comments.js
@@ -32,7 +32,7 @@ export default (state = initialState, action) => {
   case 'COMMENT_STREAM_FETCH_SUCCESS': return replaceComments(action, state);
   case actions.SHOW_BANUSER_DIALOG: return setBanUser(state, true, action);
   case actions.HIDE_BANUSER_DIALOG: return setBanUser(state, false, action);
-  case actions.USER_BAN_SUCESS: return setBanUser(state, false, action);
+  case actions.USER_BAN_SUCCESS: return setBanUser(state, false, action);
   default: return state;
   }
 };
diff --git a/client/coral-admin/src/services/talk-adapter.js b/client/coral-admin/src/services/talk-adapter.js
index ab542b4a0..6dc4d5827 100644
--- a/client/coral-admin/src/services/talk-adapter.js
+++ b/client/coral-admin/src/services/talk-adapter.js
@@ -11,22 +11,20 @@ import coralApi from '../../../coral-framework/helpers/response';
 // Intercept redux actions and act over the ones we are interested
 export default store => next => action => {
 
+  next(action);
+
   switch (action.type) {
   case 'COMMENTS_MODERATION_QUEUE_FETCH':
-    fetchModerationQueueComments(store);
-    break;
+    return fetchModerationQueueComments(store);
   case 'COMMENT_UPDATE':
-    updateComment(store, action.comment);
-    break;
+    return updateComment(store, action.comment);
   case 'COMMENT_CREATE':
-    createComment(store, action.name, action.body);
-    break;
+    return createComment(store, action.name, action.body);
   case 'USER_BAN':
-    userStatusUpdate(store, action.status, action.userId, action.commentId);
-    break;
+    return userStatusUpdate(store, action.status, action.userId, action.commentId);
+  case 'ASSETS_FETCH':
+    return fetchAssets(store, action);
   }
-
-  next(action);
 };
 
 // Get comments to fill each of the three lists on the mod queue
@@ -88,6 +86,20 @@ const createComment = (store, name, comment) => {
 // Ban a user
 const userStatusUpdate = (store, status, userId, commentId) => {
   return coralApi(`/users/${userId}/status`, {method: 'POST', body: {status: status, comment_id: commentId}})
-  .then(res => store.dispatch({type: 'USER_BAN_SUCESS', res}))
+  .then(res => store.dispatch({type: 'USER_BAN_SUCCESS', res}))
   .catch(error => store.dispatch({type: 'USER_BAN_FAILED', error}));
 };
+
+// Fetch a page of assets
+// Get comments to fill each of the three lists on the mod queue
+const fetchAssets = (store, action) => {
+  const {skip, limit, search} = action;
+  return coralApi(`/assets?skip=${skip}&limit=${limit}&search=${search}`)
+  .then(({result, count}) =>
+    /* Post comments and users to redux store. Actions will be posted when they are needed. */
+    store.dispatch({type: 'ASSETS_FETCH_SUCCESS',
+      assets: result,
+      count
+    }))
+    .catch(error => store.dispatch({type: 'ASSETS_FETCH_FAILED', error}));
+};
diff --git a/tests/client/coral-admin/services/talk-adapter.js b/tests/client/coral-admin/services/talk-adapter.js
new file mode 100644
index 000000000..27ae8efcb
--- /dev/null
+++ b/tests/client/coral-admin/services/talk-adapter.js
@@ -0,0 +1,75 @@
+import 'react';
+import 'redux';
+import {expect} from 'chai';
+import fetchMock from 'fetch-mock';
+import adapter from '../../../../client/coral-admin/src/services/talk-adapter';
+import {Map} from 'immutable';
+
+import configureStore from 'redux-mock-store';
+
+const mockStore = configureStore();
+
+describe('talk-adapter.js', () => {
+  let store;
+
+  beforeEach(() => {
+    store = mockStore(new Map({}));
+    fetchMock.restore();
+  });
+
+  describe('ASSETS_FETCH', () => {
+
+    const assets = [
+      {
+        url: 'http://test.com',
+        id: '123',
+        status: 'closed'
+      },
+      {
+        url: 'http://test.org',
+        id: '456',
+        status: 'open'
+      }
+    ];
+
+    it('should fetch a list of assets', () => {
+
+      const action = {
+        type: 'ASSETS_FETCH',
+        skip: 2,
+        limit: 20,
+        search: ''
+      };
+
+      fetchMock.get('*', JSON.stringify({
+        result: assets,
+        count: 2
+      }));
+
+      return adapter(store)(()=>{})(action)
+        .then(() => {
+          expect(store.getActions()[0]).to.have.property('type', 'ASSETS_FETCH_SUCCESS');
+          expect(store.getActions()[0]).to.have.property('count', 2);
+          expect(store.getActions()[0]).to.have.property('assets').
+            and.to.deep.equal(assets);
+        });
+    });
+
+    it('should return an error appropriatly', () => {
+
+      const action = {
+        type: 'ASSETS_FETCH',
+        skip: 2,
+        limit: 20,
+        search: ''
+      };
+
+      fetchMock.get('*', 404);
+
+      return adapter(store)(()=>{})(action)
+        .then(() => {
+          expect(store.getActions()[0]).to.have.property('type', 'ASSETS_FETCH_FAILED');
+        });
+    });
+  });
+});
diff --git a/tests/client/coral-framework/store/itemActions.spec.js b/tests/client/coral-framework/store/itemActions.js
similarity index 100%
rename from tests/client/coral-framework/store/itemActions.spec.js
rename to tests/client/coral-framework/store/itemActions.js
diff --git a/tests/client/coral-framework/store/itemReducer.spec.js b/tests/client/coral-framework/store/itemReducer.js
similarity index 100%
rename from tests/client/coral-framework/store/itemReducer.spec.js
rename to tests/client/coral-framework/store/itemReducer.js

From 78c81aeaf4f538ae2419226490a5108036eab15f Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Wed, 14 Dec 2016 19:30:59 -0500
Subject: [PATCH 07/54] Adding asset reducer.

---
 client/coral-admin/src/actions/assets.js    |  0
 client/coral-admin/src/reducers/assets.js   | 20 +++++++++++
 tests/client/coral-admin/reducers/assets.js | 39 +++++++++++++++++++++
 3 files changed, 59 insertions(+)
 delete mode 100644 client/coral-admin/src/actions/assets.js
 create mode 100644 client/coral-admin/src/reducers/assets.js
 create mode 100644 tests/client/coral-admin/reducers/assets.js

diff --git a/client/coral-admin/src/actions/assets.js b/client/coral-admin/src/actions/assets.js
deleted file mode 100644
index e69de29bb..000000000
diff --git a/client/coral-admin/src/reducers/assets.js b/client/coral-admin/src/reducers/assets.js
new file mode 100644
index 000000000..bdd1bcaf9
--- /dev/null
+++ b/client/coral-admin/src/reducers/assets.js
@@ -0,0 +1,20 @@
+import {Map, List, fromJS} from 'immutable';
+
+const initialState = Map({
+  byId: Map(),
+  ids: List()
+});
+
+export default (state = initialState, action) => {
+  switch (action.type) {
+  case 'ASSETS_FETCH_SUCCESS': return replaceAssets(action, state);
+  default: return state;
+  }
+};
+
+const replaceAssets = (action, state) => {
+  const assets = fromJS(action.assets.reduce((prev, curr) => { prev[curr.id] = curr; return prev; }, {}));
+  return state.set('byId', assets)
+  .set('count', action.count)
+  .set('ids', List(assets.keys()));
+};
diff --git a/tests/client/coral-admin/reducers/assets.js b/tests/client/coral-admin/reducers/assets.js
new file mode 100644
index 000000000..cf3e0dac4
--- /dev/null
+++ b/tests/client/coral-admin/reducers/assets.js
@@ -0,0 +1,39 @@
+import {Map} from 'immutable';
+import {expect} from 'chai';
+import assetsReducer from '../../../../client/coral-admin/src/reducers/assets';
+
+describe ('assetsReducer', () => {
+  describe('ASSETS_FETCH_SUCCESS', () => {
+    it('should replace the existing assets', () => {
+      const action = {
+        type: 'ASSETS_FETCH_SUCCESS',
+        count: 200,
+        assets: [
+          {
+            id: '123',
+            url: 'http://test.com',
+            closedAt: 'tomorrow'
+          },
+          {
+            id: '456',
+            url: 'http://test2.com',
+            closedAt: 'thursday'
+          },
+        ]
+      };
+      const store = new Map({});
+      const result = assetsReducer(store, action);
+      console.log(result.getIn(['byId', '123']).toJS());
+      expect(result.getIn(['byId', '123']).toJS()).to.deep.equal({
+        url: 'http://test.com',
+        closedAt: 'tomorrow',
+        id: '123'
+      });
+      expect(result.getIn(['ids']).toJS()).to.deep.equal([
+        '123',
+        '456'
+      ]);
+      expect(result.getIn(['count'])).to.equal(200);
+    });
+  });
+});

From faafbfa78cf3142b35430abb198002985910b173 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Wed, 14 Dec 2016 19:58:04 -0500
Subject: [PATCH 08/54] Loading assets and adding to store.

---
 client/coral-admin/src/constants/assets.js    |  1 +
 .../src/containers/Streams/Streams.js         | 23 ++++++++++++++++++-
 client/coral-admin/src/reducers/index.js      |  4 +++-
 routes/api/assets/index.js                    |  4 ++--
 4 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 client/coral-admin/src/constants/assets.js

diff --git a/client/coral-admin/src/constants/assets.js b/client/coral-admin/src/constants/assets.js
new file mode 100644
index 000000000..59b76390f
--- /dev/null
+++ b/client/coral-admin/src/constants/assets.js
@@ -0,0 +1 @@
+export const ASSETS_FETCH = 'ASSETS_FETCH';
diff --git a/client/coral-admin/src/containers/Streams/Streams.js b/client/coral-admin/src/containers/Streams/Streams.js
index bec61e995..ea365d0d1 100644
--- a/client/coral-admin/src/containers/Streams/Streams.js
+++ b/client/coral-admin/src/containers/Streams/Streams.js
@@ -1,6 +1,8 @@
 import React, {Component} from 'react';
 import styles from './Streams.css';
+import {connect} from 'react-redux';
 import I18n from 'coral-framework/modules/i18n/i18n';
+import {ASSETS_FETCH} from '../../constants/assets';
 import translations from '../../translations.json';
 import {
   RadioGroup,
@@ -18,6 +20,10 @@ class Streams extends Component {
     statusFilter: 'all'
   }
 
+  componentDidMount () {
+    this.props.fetchAssets(0, 25, '', 'desc');
+  }
+
   onSettingChange = (setting) => (e) => {
     this.setState({[setting]: e.target.value});
   }
@@ -90,6 +96,21 @@ class Streams extends Component {
   }
 }
 
-export default Streams;
+const mapStateToProps = () => {};
+const mapDispatchToProps = (dispatch) => {
+  return {
+    fetchAssets: (skip, limit, search, sort) => {
+      dispatch({
+        type: ASSETS_FETCH,
+        skip,
+        limit,
+        search,
+        sort
+      });
+    }
+  };
+};
+
+export default connect(mapStateToProps, mapDispatchToProps)(Streams);
 
 const lang = new I18n(translations);
diff --git a/client/coral-admin/src/reducers/index.js b/client/coral-admin/src/reducers/index.js
index 1f1b444fc..fca4694d8 100644
--- a/client/coral-admin/src/reducers/index.js
+++ b/client/coral-admin/src/reducers/index.js
@@ -4,6 +4,7 @@ import settings from 'reducers/settings';
 import community from 'reducers/community';
 import users from 'reducers/users';
 import auth from 'reducers/auth';
+import assets from 'reducers/assets';
 
 // Combine all reducers into a main one
 export default combineReducers({
@@ -11,5 +12,6 @@ export default combineReducers({
   comments,
   community,
   auth,
-  users
+  users,
+  assets
 });
diff --git a/routes/api/assets/index.js b/routes/api/assets/index.js
index 5aa9b8cc6..a602d7fd0 100644
--- a/routes/api/assets/index.js
+++ b/routes/api/assets/index.js
@@ -20,8 +20,8 @@ router.get('/', (req, res, next) => {
     Asset
       .search(search)
       .sort({[field]: (sort === 'asc') ? 1 : -1})
-      .skip(skip)
-      .limit(limit),
+      .skip(parseInt(skip))
+      .limit(parseInt(limit)),
     Asset
       .search(search)
       .count()

From d5268989627c9e2f1e1bd2e1778e275c60716217 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Wed, 14 Dec 2016 20:19:27 -0500
Subject: [PATCH 09/54] Loading assets into Streams component.

---
 .../src/containers/Streams/Streams.css        |  4 +++
 .../src/containers/Streams/Streams.js         | 26 ++++++++++---------
 client/coral-admin/src/translations.json      | 14 ++++++++--
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/client/coral-admin/src/containers/Streams/Streams.css b/client/coral-admin/src/containers/Streams/Streams.css
index 7ab1b5199..5ad875b35 100644
--- a/client/coral-admin/src/containers/Streams/Streams.css
+++ b/client/coral-admin/src/containers/Streams/Streams.css
@@ -46,6 +46,10 @@
   margin-top: 3px;
 }
 
+.streamsTable {
+  width: 100%;
+}
+
 .radio {
   display: block;
 }
diff --git a/client/coral-admin/src/containers/Streams/Streams.js b/client/coral-admin/src/containers/Streams/Streams.js
index ea365d0d1..7b1778012 100644
--- a/client/coral-admin/src/containers/Streams/Streams.js
+++ b/client/coral-admin/src/containers/Streams/Streams.js
@@ -30,15 +30,17 @@ class Streams extends Component {
 
   renderDate = (date) => {
     const d = new Date(date);
-    return `${d.getMonth()}/${d.getDate()}/${d.getYear()}`;
+    return `${d.getMonth() + 1}/${d.getDate()}/${d.getFullYear()}`;
   }
 
-  renderStatus = (status) => {
+  renderStatus = (closedAt) => {
+    const status = closedAt && new Date(closedAt) < Date.now ? lang.t('streams.closed') : lang.t('streams.open');
     return <div>{status}</div>;
   }
 
   render () {
     const {searchTerm, sortBy, statusFilter} = this.state;
+    const {assets} = this.props;
 
     return <div className={styles.container}>
       <div className={styles.leftColumn}>
@@ -77,17 +79,13 @@ class Streams extends Component {
 
       <div className={styles.mainContent}>
       <DataTable
-        rows={[
-            {article: 'Acrylic (Transparent)', pubdate: 25, status: 2.90},
-            {article: 'Plywood (Birch)', pubdate: 50, status: 1.25},
-            {article: 'Laminate (Gold on Blue)', pubdate: 10, status: 2.35}
-        ]}
-      >
-        <TableHeader name="article">{lang.t('streams.article')}</TableHeader>
-        <TableHeader name="pubdate" cellFormatter={this.renderDate}>
+        className={styles.streamsTable}
+        rows={assets.ids.map((id) => assets.byId[id])}>
+        <TableHeader name="title">{lang.t('streams.article')}</TableHeader>
+        <TableHeader numeric name="publication_date" cellFormatter={this.renderDate}>
           {lang.t('streams.pubdate')}
         </TableHeader>
-        <TableHeader name="status" cellFormatter={this.renderStatus}>
+        <TableHeader numeric name="closedAt" cellFormatter={this.renderStatus}>
           {lang.t('streams.status')}
         </TableHeader>
       </DataTable>
@@ -96,7 +94,11 @@ class Streams extends Component {
   }
 }
 
-const mapStateToProps = () => {};
+const mapStateToProps = ({assets}) => {
+  return {
+    assets: assets.toJS()
+  };
+};
 const mapDispatchToProps = (dispatch) => {
   return {
     fetchAssets: (skip, limit, search, sort) => {
diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json
index da859c49c..c093f7ae0 100644
--- a/client/coral-admin/src/translations.json
+++ b/client/coral-admin/src/translations.json
@@ -79,7 +79,12 @@
       "closed": "Closed",
       "newest": "Newest",
       "oldest": "Oldest",
-      "sort-by": "Sort By"
+      "sort-by": "Sort By",
+      "open": "Open",
+      "closed": "Closed",
+      "article": "Article",
+      "pubdate": "Publication Date",
+      "status": "Status"
     }
   },
   "es": {
@@ -150,7 +155,12 @@
       "closed": "",
       "newest": "",
       "oldest": "",
-      "sort-by": ""
+      "sort-by": "",
+      "open": "",
+      "closed": "",
+      "article": "",
+      "pubdate": "",
+      "status": ""
     }
   }
 }

From 86eef68b163e9412a24a478a0e2dd3644cebf0b4 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Thu, 15 Dec 2016 12:25:43 -0500
Subject: [PATCH 10/54] Adding status menu.

---
 client/coral-admin/src/actions/assets.js      | 13 +++++
 client/coral-admin/src/constants/assets.js    |  5 +-
 .../src/containers/Streams/Streams.css        | 24 ++++++++
 .../src/containers/Streams/Streams.js         | 55 ++++++++++++++-----
 client/coral-admin/src/reducers/assets.js     |  3 +-
 .../coral-admin/src/services/talk-adapter.js  |  6 +-
 6 files changed, 88 insertions(+), 18 deletions(-)
 create mode 100644 client/coral-admin/src/actions/assets.js

diff --git a/client/coral-admin/src/actions/assets.js b/client/coral-admin/src/actions/assets.js
new file mode 100644
index 000000000..1e5f2716d
--- /dev/null
+++ b/client/coral-admin/src/actions/assets.js
@@ -0,0 +1,13 @@
+import {FETCH_ASSETS, UPDATE_ASSET} from '../constants/assets';
+
+/**
+ * Action disptacher related to assets
+ */
+
+export const updateAsset = (id, property, value) => (dispatch) => {
+  dispatch({type: UPDATE_ASSET, id, property, value});
+};
+
+export const fetchAssets = (skip, limit, search, sort) => (dispatch) => {
+  dispatch({type: FETCH_ASSETS, skip, limit, search, sort});
+};
diff --git a/client/coral-admin/src/constants/assets.js b/client/coral-admin/src/constants/assets.js
index 59b76390f..b13534726 100644
--- a/client/coral-admin/src/constants/assets.js
+++ b/client/coral-admin/src/constants/assets.js
@@ -1 +1,4 @@
-export const ASSETS_FETCH = 'ASSETS_FETCH';
+export const FETCH_ASSETS = 'FETCH_ASSETS';
+export const FETCH_ASSETS_SUCCESS = 'FETCH_ASSETS_SUCCESS';
+export const FETCH_ASSETS_FAILED = 'FETCH_ASSETS_FAILED';
+export const UPDATE_ASSET = 'UPDATE_ASSET';
diff --git a/client/coral-admin/src/containers/Streams/Streams.css b/client/coral-admin/src/containers/Streams/Streams.css
index 5ad875b35..c64de7974 100644
--- a/client/coral-admin/src/containers/Streams/Streams.css
+++ b/client/coral-admin/src/containers/Streams/Streams.css
@@ -54,6 +54,30 @@
   display: block;
 }
 
+.statusMenu {
+  border-radius: 3px;
+  width: 10em;
+  text-align: center;
+  float: right;
+  border: 1px solid #ccc;
+  color: #fff;
+  cursor: pointer;
+}
+
+.statusMenuOpen {
+  padding: 10px;
+  background-color: #4caf50;
+}
+
+.statusMenuIcon {
+  float: right;
+}
+
+.statusMenuClosed {
+  padding: 10px;
+  background-color: #000;
+}
+
 .hidden {
   display: none;
 }
diff --git a/client/coral-admin/src/containers/Streams/Streams.js b/client/coral-admin/src/containers/Streams/Streams.js
index 7b1778012..078f7c98a 100644
--- a/client/coral-admin/src/containers/Streams/Streams.js
+++ b/client/coral-admin/src/containers/Streams/Streams.js
@@ -2,7 +2,7 @@ import React, {Component} from 'react';
 import styles from './Streams.css';
 import {connect} from 'react-redux';
 import I18n from 'coral-framework/modules/i18n/i18n';
-import {ASSETS_FETCH} from '../../constants/assets';
+import {fetchAssets, updateAsset} from '../../actions/assets';
 import translations from '../../translations.json';
 import {
   RadioGroup,
@@ -17,7 +17,8 @@ class Streams extends Component {
   state = {
     searchTerm: '',
     sortBy: 'newest',
-    statusFilter: 'all'
+    statusFilter: 'all',
+    statusMenus: {}
   }
 
   componentDidMount () {
@@ -33,9 +34,40 @@ class Streams extends Component {
     return `${d.getMonth() + 1}/${d.getDate()}/${d.getFullYear()}`;
   }
 
-  renderStatus = (closedAt) => {
-    const status = closedAt && new Date(closedAt) < Date.now ? lang.t('streams.closed') : lang.t('streams.open');
-    return <div>{status}</div>;
+  onStatusClick = (closeStream, id, statusMenuOpen) => () => {
+    if (statusMenuOpen) {
+      this.setState(prev => {
+        prev.statusMenus[id] = false;
+        return prev;
+      });
+      this.props.updateAsset(id, 'closedAt', closeStream ? Date.now() : null);
+    } else {
+      this.setState(prev => {
+        prev.statusMenus[id] = true;
+        return prev;
+      });
+    }
+  }
+
+  renderStatus = (closedAt, id) => {
+    const closed = closedAt && new Date(closedAt) < Date.now;
+    const statusMenuOpen = this.state.statusMenus[id];
+    return <div className={styles.statusMenu}>
+      <div
+        className={closed ? styles.statusMenuClosed : styles.statusMenuOpen}
+        onClick={this.onStatusClick(closed, id, statusMenuOpen)}>
+        {closed ? lang.t('streams.closed') : lang.t('streams.open')}
+        {!statusMenuOpen && <Icon className={styles.statusMenuIcon} name='keyboard_arrow_down'/>}
+      </div>
+      {
+        statusMenuOpen &&
+        <div
+          className={!closed ? styles.statusMenuClosed : styles.statusMenuOpen}
+          onClick={this.onStatusClick(!closed, id, statusMenuOpen)}>
+          {!closed ? lang.t('streams.closed') : lang.t('streams.open')}
+        </div>
+      }
+    </div>;
   }
 
   render () {
@@ -101,14 +133,11 @@ const mapStateToProps = ({assets}) => {
 };
 const mapDispatchToProps = (dispatch) => {
   return {
-    fetchAssets: (skip, limit, search, sort) => {
-      dispatch({
-        type: ASSETS_FETCH,
-        skip,
-        limit,
-        search,
-        sort
-      });
+    fetchAssets: (...args) => {
+      dispatch(fetchAssets.apply(this, args));
+    },
+    updateAsset: (...args) => {
+      dispatch(updateAsset.apply(this, args));
     }
   };
 };
diff --git a/client/coral-admin/src/reducers/assets.js b/client/coral-admin/src/reducers/assets.js
index bdd1bcaf9..a1ca4c831 100644
--- a/client/coral-admin/src/reducers/assets.js
+++ b/client/coral-admin/src/reducers/assets.js
@@ -1,4 +1,5 @@
 import {Map, List, fromJS} from 'immutable';
+import {FETCH_ASSETS_SUCCESS} from '../constants/assets';
 
 const initialState = Map({
   byId: Map(),
@@ -7,7 +8,7 @@ const initialState = Map({
 
 export default (state = initialState, action) => {
   switch (action.type) {
-  case 'ASSETS_FETCH_SUCCESS': return replaceAssets(action, state);
+  case FETCH_ASSETS_SUCCESS: return replaceAssets(action, state);
   default: return state;
   }
 };
diff --git a/client/coral-admin/src/services/talk-adapter.js b/client/coral-admin/src/services/talk-adapter.js
index 6dc4d5827..1b824c13e 100644
--- a/client/coral-admin/src/services/talk-adapter.js
+++ b/client/coral-admin/src/services/talk-adapter.js
@@ -22,7 +22,7 @@ export default store => next => action => {
     return createComment(store, action.name, action.body);
   case 'USER_BAN':
     return userStatusUpdate(store, action.status, action.userId, action.commentId);
-  case 'ASSETS_FETCH':
+  case 'FETCH_ASSETS':
     return fetchAssets(store, action);
   }
 };
@@ -97,9 +97,9 @@ const fetchAssets = (store, action) => {
   return coralApi(`/assets?skip=${skip}&limit=${limit}&search=${search}`)
   .then(({result, count}) =>
     /* Post comments and users to redux store. Actions will be posted when they are needed. */
-    store.dispatch({type: 'ASSETS_FETCH_SUCCESS',
+    store.dispatch({type: 'FETCH_ASSETS_SUCCESS',
       assets: result,
       count
     }))
-    .catch(error => store.dispatch({type: 'ASSETS_FETCH_FAILED', error}));
+    .catch(error => store.dispatch({type: 'FETCH_ASSETS_FAILED', error}));
 };

From c7b232f0b3e89aafbe64531826138a323479581e Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Thu, 15 Dec 2016 13:10:23 -0500
Subject: [PATCH 11/54] Adding action to upate asset state.

---
 client/coral-admin/src/actions/assets.js      |  6 +-
 client/coral-admin/src/constants/assets.js    |  4 +-
 .../coral-admin/src/services/talk-adapter.js  | 28 ++++++-
 tests/client/coral-admin/reducers/assets.js   |  4 +-
 .../coral-admin/services/talk-adapter.js      | 73 ++++++++++++++-----
 5 files changed, 87 insertions(+), 28 deletions(-)

diff --git a/client/coral-admin/src/actions/assets.js b/client/coral-admin/src/actions/assets.js
index 1e5f2716d..5918d1df8 100644
--- a/client/coral-admin/src/actions/assets.js
+++ b/client/coral-admin/src/actions/assets.js
@@ -1,11 +1,11 @@
-import {FETCH_ASSETS, UPDATE_ASSET} from '../constants/assets';
+import {FETCH_ASSETS, UPDATE_ASSET_STATE} from '../constants/assets';
 
 /**
  * Action disptacher related to assets
  */
 
-export const updateAsset = (id, property, value) => (dispatch) => {
-  dispatch({type: UPDATE_ASSET, id, property, value});
+export const updateAssetState = (id, property, value) => (dispatch) => {
+  dispatch({type: UPDATE_ASSET_STATE, id, property, value});
 };
 
 export const fetchAssets = (skip, limit, search, sort) => (dispatch) => {
diff --git a/client/coral-admin/src/constants/assets.js b/client/coral-admin/src/constants/assets.js
index b13534726..8927b351d 100644
--- a/client/coral-admin/src/constants/assets.js
+++ b/client/coral-admin/src/constants/assets.js
@@ -1,4 +1,6 @@
 export const FETCH_ASSETS = 'FETCH_ASSETS';
 export const FETCH_ASSETS_SUCCESS = 'FETCH_ASSETS_SUCCESS';
 export const FETCH_ASSETS_FAILED = 'FETCH_ASSETS_FAILED';
-export const UPDATE_ASSET = 'UPDATE_ASSET';
+export const UPDATE_ASSET_STATE = 'UPDATE_ASSET_STATE';
+export const UPDATE_ASSET_STATE_SUCCESS = 'UPDATE_ASSET_STATE_SUCCESS';
+export const UPDATE_ASSET_STATE_FAILED = 'UPDATE_ASSET_STATE_FAILED';
diff --git a/client/coral-admin/src/services/talk-adapter.js b/client/coral-admin/src/services/talk-adapter.js
index 1b824c13e..dea4d7cb2 100644
--- a/client/coral-admin/src/services/talk-adapter.js
+++ b/client/coral-admin/src/services/talk-adapter.js
@@ -1,5 +1,12 @@
 import coralApi from '../../../coral-framework/helpers/response';
-
+import {
+  FETCH_ASSETS,
+  FETCH_ASSETS_FAILED,
+  FETCH_ASSETS_SUCCESS,
+  UPDATE_ASSET_STATE,
+  UPDATE_ASSET_STATE_SUCCESS,
+  UPDATE_ASSET_STATE_FAILED,
+} from '../constants/assets';
 /**
  * The adapter is a redux middleware that interecepts the actions that need
  * to interface with the backend, do the job and return the results.
@@ -22,8 +29,10 @@ export default store => next => action => {
     return createComment(store, action.name, action.body);
   case 'USER_BAN':
     return userStatusUpdate(store, action.status, action.userId, action.commentId);
-  case 'FETCH_ASSETS':
+  case FETCH_ASSETS:
     return fetchAssets(store, action);
+  case UPDATE_ASSET_STATE:
+    return updateAssetState(store, action);
   }
 };
 
@@ -97,9 +106,20 @@ const fetchAssets = (store, action) => {
   return coralApi(`/assets?skip=${skip}&limit=${limit}&search=${search}`)
   .then(({result, count}) =>
     /* Post comments and users to redux store. Actions will be posted when they are needed. */
-    store.dispatch({type: 'FETCH_ASSETS_SUCCESS',
+    store.dispatch({type: FETCH_ASSETS_SUCCESS,
       assets: result,
       count
     }))
-    .catch(error => store.dispatch({type: 'FETCH_ASSETS_FAILED', error}));
+    .catch(error => store.dispatch({type: FETCH_ASSETS_FAILED, error}));
+};
+
+// Update an asset state
+// Get comments to fill each of the three lists on the mod queue
+const updateAssetState = (store, action) => {
+  const {id, closedAt} = action;
+  return coralApi(`/assets/${id}/status`, {method: 'PUT', body: {closedAt}})
+  .then(() =>
+    /* Post comments and users to redux store. Actions will be posted when they are needed. */
+    store.dispatch({type: UPDATE_ASSET_STATE_SUCCESS, closedAt}))
+    .catch(error => store.dispatch({type: UPDATE_ASSET_STATE_FAILED, error}));
 };
diff --git a/tests/client/coral-admin/reducers/assets.js b/tests/client/coral-admin/reducers/assets.js
index cf3e0dac4..2a3c15b45 100644
--- a/tests/client/coral-admin/reducers/assets.js
+++ b/tests/client/coral-admin/reducers/assets.js
@@ -3,10 +3,10 @@ import {expect} from 'chai';
 import assetsReducer from '../../../../client/coral-admin/src/reducers/assets';
 
 describe ('assetsReducer', () => {
-  describe('ASSETS_FETCH_SUCCESS', () => {
+  describe('FETCH_ASSETS_SUCCESS', () => {
     it('should replace the existing assets', () => {
       const action = {
-        type: 'ASSETS_FETCH_SUCCESS',
+        type: 'FETCH_ASSETS_SUCCESS',
         count: 200,
         assets: [
           {
diff --git a/tests/client/coral-admin/services/talk-adapter.js b/tests/client/coral-admin/services/talk-adapter.js
index 27ae8efcb..b30ae3905 100644
--- a/tests/client/coral-admin/services/talk-adapter.js
+++ b/tests/client/coral-admin/services/talk-adapter.js
@@ -12,30 +12,30 @@ const mockStore = configureStore();
 describe('talk-adapter.js', () => {
   let store;
 
+  const assets = [
+    {
+      url: 'http://test.com',
+      id: '123',
+      status: 'closed'
+    },
+    {
+      url: 'http://test.org',
+      id: '456',
+      status: 'open'
+    }
+  ];
+
   beforeEach(() => {
     store = mockStore(new Map({}));
     fetchMock.restore();
   });
 
-  describe('ASSETS_FETCH', () => {
-
-    const assets = [
-      {
-        url: 'http://test.com',
-        id: '123',
-        status: 'closed'
-      },
-      {
-        url: 'http://test.org',
-        id: '456',
-        status: 'open'
-      }
-    ];
+  describe('FETCH_ASSETS', () => {
 
     it('should fetch a list of assets', () => {
 
       const action = {
-        type: 'ASSETS_FETCH',
+        type: 'FETCH_ASSETS',
         skip: 2,
         limit: 20,
         search: ''
@@ -48,7 +48,7 @@ describe('talk-adapter.js', () => {
 
       return adapter(store)(()=>{})(action)
         .then(() => {
-          expect(store.getActions()[0]).to.have.property('type', 'ASSETS_FETCH_SUCCESS');
+          expect(store.getActions()[0]).to.have.property('type', 'FETCH_ASSETS_SUCCESS');
           expect(store.getActions()[0]).to.have.property('count', 2);
           expect(store.getActions()[0]).to.have.property('assets').
             and.to.deep.equal(assets);
@@ -58,7 +58,7 @@ describe('talk-adapter.js', () => {
     it('should return an error appropriatly', () => {
 
       const action = {
-        type: 'ASSETS_FETCH',
+        type: 'FETCH_ASSETS',
         skip: 2,
         limit: 20,
         search: ''
@@ -68,7 +68,44 @@ describe('talk-adapter.js', () => {
 
       return adapter(store)(()=>{})(action)
         .then(() => {
-          expect(store.getActions()[0]).to.have.property('type', 'ASSETS_FETCH_FAILED');
+          expect(store.getActions()[0]).to.have.property('type', 'FETCH_ASSETS_FAILED');
+        });
+    });
+  });
+
+  describe('UPDATE_ASSET_STATE', () => {
+
+    it('should update an asset', () => {
+      const action = {
+        type: 'UPDATE_ASSET_STATE',
+        id: '123',
+        property: 'closedAt',
+        value: Date.now()
+      };
+
+      fetchMock.put('*', JSON.stringify(assets[0]));
+
+      return adapter(store)(()=>{})(action)
+        .then(() => {
+          expect(store.getActions()[0]).to.have.property('type', 'UPDATE_ASSET_STATE_SUCCESS');
+        });
+
+    });
+
+    it('should return an error appropriately', () => {
+
+      const action = {
+        type: 'UPDATE_ASSET_STATE',
+        id: '123',
+        property: 'closedAt',
+        value: Date.now()
+      };
+
+      fetchMock.put('*', 404);
+
+      return adapter(store)(()=>{})(action)
+        .then(() => {
+          expect(store.getActions()[0]).to.have.property('type', 'UPDATE_ASSET_STATE_FAILED');
         });
     });
   });

From 328eaad8e521a35e7fce4dfa1207f6e6adbf8937 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Thu, 15 Dec 2016 14:05:10 -0500
Subject: [PATCH 12/54] Adding update state to reducer.

---
 client/coral-admin/src/reducers/assets.js   |  7 +++--
 tests/client/coral-admin/reducers/assets.js | 29 +++++++++++++++++++--
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/client/coral-admin/src/reducers/assets.js b/client/coral-admin/src/reducers/assets.js
index a1ca4c831..f18aaec33 100644
--- a/client/coral-admin/src/reducers/assets.js
+++ b/client/coral-admin/src/reducers/assets.js
@@ -1,5 +1,5 @@
 import {Map, List, fromJS} from 'immutable';
-import {FETCH_ASSETS_SUCCESS} from '../constants/assets';
+import {FETCH_ASSETS_SUCCESS, UPDATE_ASSET_STATE} from '../constants/assets';
 
 const initialState = Map({
   byId: Map(),
@@ -8,7 +8,10 @@ const initialState = Map({
 
 export default (state = initialState, action) => {
   switch (action.type) {
-  case FETCH_ASSETS_SUCCESS: return replaceAssets(action, state);
+  case FETCH_ASSETS_SUCCESS:
+    return replaceAssets(action, state);
+  case UPDATE_ASSET_STATE:
+    return state.setIn(['byId', action.id, 'closedAt'], action.closedAt);
   default: return state;
   }
 };
diff --git a/tests/client/coral-admin/reducers/assets.js b/tests/client/coral-admin/reducers/assets.js
index 2a3c15b45..60972f47a 100644
--- a/tests/client/coral-admin/reducers/assets.js
+++ b/tests/client/coral-admin/reducers/assets.js
@@ -1,4 +1,4 @@
-import {Map} from 'immutable';
+import {Map, fromJS} from 'immutable';
 import {expect} from 'chai';
 import assetsReducer from '../../../../client/coral-admin/src/reducers/assets';
 
@@ -23,7 +23,6 @@ describe ('assetsReducer', () => {
       };
       const store = new Map({});
       const result = assetsReducer(store, action);
-      console.log(result.getIn(['byId', '123']).toJS());
       expect(result.getIn(['byId', '123']).toJS()).to.deep.equal({
         url: 'http://test.com',
         closedAt: 'tomorrow',
@@ -36,4 +35,30 @@ describe ('assetsReducer', () => {
       expect(result.getIn(['count'])).to.equal(200);
     });
   });
+
+  describe('UPDATE_ASSET_STATE', () => {
+    it('should update the state of a particular asset', () => {
+      const action = {
+        type: 'UPDATE_ASSET_STATE',
+        id: '123',
+        closedAt: null
+      };
+      const store = new fromJS({
+        byId: {
+          '123': {
+            id: '123',
+            url: 'http://test.com',
+            closedAt: Date.now()
+          },
+          '456': {
+            id: '456',
+            url: 'http://test2.com',
+            closedAt: 'thursday'
+          }
+        }
+      });
+      const result = assetsReducer(store, action);
+      expect(result.getIn(['byId', '123', 'closedAt'])).to.equal.null;
+    });
+  });
 });

From 1154b65c9166b86370e5e070faeb859cad606fd0 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Thu, 15 Dec 2016 14:19:44 -0500
Subject: [PATCH 13/54] Updating state from menu.

---
 client/coral-admin/src/actions/assets.js             |  4 ++--
 client/coral-admin/src/containers/Streams/Streams.js | 12 ++++++------
 client/coral-admin/src/services/talk-adapter.js      |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/client/coral-admin/src/actions/assets.js b/client/coral-admin/src/actions/assets.js
index 5918d1df8..b13454a21 100644
--- a/client/coral-admin/src/actions/assets.js
+++ b/client/coral-admin/src/actions/assets.js
@@ -4,8 +4,8 @@ import {FETCH_ASSETS, UPDATE_ASSET_STATE} from '../constants/assets';
  * Action disptacher related to assets
  */
 
-export const updateAssetState = (id, property, value) => (dispatch) => {
-  dispatch({type: UPDATE_ASSET_STATE, id, property, value});
+export const updateAssetState = (id, closedAt) => (dispatch) => {
+  dispatch({type: UPDATE_ASSET_STATE, id, closedAt});
 };
 
 export const fetchAssets = (skip, limit, search, sort) => (dispatch) => {
diff --git a/client/coral-admin/src/containers/Streams/Streams.js b/client/coral-admin/src/containers/Streams/Streams.js
index 078f7c98a..53db75c89 100644
--- a/client/coral-admin/src/containers/Streams/Streams.js
+++ b/client/coral-admin/src/containers/Streams/Streams.js
@@ -2,7 +2,7 @@ import React, {Component} from 'react';
 import styles from './Streams.css';
 import {connect} from 'react-redux';
 import I18n from 'coral-framework/modules/i18n/i18n';
-import {fetchAssets, updateAsset} from '../../actions/assets';
+import {fetchAssets, updateAssetState} from '../../actions/assets';
 import translations from '../../translations.json';
 import {
   RadioGroup,
@@ -40,7 +40,7 @@ class Streams extends Component {
         prev.statusMenus[id] = false;
         return prev;
       });
-      this.props.updateAsset(id, 'closedAt', closeStream ? Date.now() : null);
+      this.props.updateAssetState(id, closeStream ? Date.now() : null);
     } else {
       this.setState(prev => {
         prev.statusMenus[id] = true;
@@ -49,8 +49,8 @@ class Streams extends Component {
     }
   }
 
-  renderStatus = (closedAt, id) => {
-    const closed = closedAt && new Date(closedAt) < Date.now;
+  renderStatus = (closedAt, {id}) => {
+    const closed = closedAt && new Date(closedAt).getTime() < Date.now();
     const statusMenuOpen = this.state.statusMenus[id];
     return <div className={styles.statusMenu}>
       <div
@@ -136,8 +136,8 @@ const mapDispatchToProps = (dispatch) => {
     fetchAssets: (...args) => {
       dispatch(fetchAssets.apply(this, args));
     },
-    updateAsset: (...args) => {
-      dispatch(updateAsset.apply(this, args));
+    updateAssetState: (...args) => {
+      dispatch(updateAssetState.apply(this, args));
     }
   };
 };
diff --git a/client/coral-admin/src/services/talk-adapter.js b/client/coral-admin/src/services/talk-adapter.js
index dea4d7cb2..67835e30d 100644
--- a/client/coral-admin/src/services/talk-adapter.js
+++ b/client/coral-admin/src/services/talk-adapter.js
@@ -120,6 +120,6 @@ const updateAssetState = (store, action) => {
   return coralApi(`/assets/${id}/status`, {method: 'PUT', body: {closedAt}})
   .then(() =>
     /* Post comments and users to redux store. Actions will be posted when they are needed. */
-    store.dispatch({type: UPDATE_ASSET_STATE_SUCCESS, closedAt}))
+    store.dispatch({type: UPDATE_ASSET_STATE_SUCCESS}))
     .catch(error => store.dispatch({type: UPDATE_ASSET_STATE_FAILED, error}));
 };

From d4880ff183423306cf925e12d8f9816f69a7f00c Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Fri, 16 Dec 2016 15:35:15 -0500
Subject: [PATCH 14/54] Adding asset sorting to endpoint.

---
 .../src/containers/Streams/Streams.js         | 13 ++++---
 routes/api/assets/index.js                    | 28 +++++++++++---
 tests/routes/api/assets/index.js              | 38 ++++++++++++++++++-
 3 files changed, 67 insertions(+), 12 deletions(-)

diff --git a/client/coral-admin/src/containers/Streams/Streams.js b/client/coral-admin/src/containers/Streams/Streams.js
index 53db75c89..5d8508f33 100644
--- a/client/coral-admin/src/containers/Streams/Streams.js
+++ b/client/coral-admin/src/containers/Streams/Streams.js
@@ -12,21 +12,24 @@ import {
   TableHeader
 } from 'react-mdl';
 
+const limit = 25;
+
 class Streams extends Component {
 
   state = {
-    searchTerm: '',
-    sortBy: 'newest',
+    search: '',
+    sort: 'desc',
     statusFilter: 'all',
     statusMenus: {}
   }
 
   componentDidMount () {
-    this.props.fetchAssets(0, 25, '', 'desc');
+    this.props.fetchAssets(0, limit, '', this.state.sortBy);
   }
 
   onSettingChange = (setting) => (e) => {
     this.setState({[setting]: e.target.value});
+    this.props.fetchAssets(0, limit, this.state.search, this.state.sort);
   }
 
   renderDate = (date) => {
@@ -104,8 +107,8 @@ class Streams extends Component {
             value={sortBy}
             childContainer='div'
             onChange={this.onSettingChange('sortBy')}>
-            <Radio value='newest'>{lang.t('streams.newest')}</Radio>
-            <Radio value='oldest'>{lang.t('streams.oldest')}</Radio>
+            <Radio value='desc'>{lang.t('streams.newest')}</Radio>
+            <Radio value='asc'>{lang.t('streams.oldest')}</Radio>
           </RadioGroup>
       </div>
 
diff --git a/routes/api/assets/index.js b/routes/api/assets/index.js
index a602d7fd0..a661d64e8 100644
--- a/routes/api/assets/index.js
+++ b/routes/api/assets/index.js
@@ -12,22 +12,40 @@ router.get('/', (req, res, next) => {
     skip = 0,
     sort = 'asc',
     field = 'created_at',
+    filter = 'all',
     search = ''
   } = req.query;
 
+  const assets = (filter, search) => {
+    switch(filter) {
+    case 'open':
+      return Asset.search(search)
+        .find({
+          $or: [
+              {closedAt: null},
+              {closedAt: {$gt: Date.now()}}
+          ]
+        });
+    case 'closed':
+      return Asset.search(search)
+        .find({
+          closedAt: {$lt: Date.now()}
+        });
+    default:
+      return Asset.search(search);
+    }
+  };
+
   // Find all the assets.
   Promise.all([
-    Asset
-      .search(search)
+    assets(filter, search)
       .sort({[field]: (sort === 'asc') ? 1 : -1})
       .skip(parseInt(skip))
       .limit(parseInt(limit)),
-    Asset
-      .search(search)
+    assets(filter, search)
       .count()
   ])
   .then(([result, count]) => {
-
     // Send back the asset data.
     res.json({
       result,
diff --git a/tests/routes/api/assets/index.js b/tests/routes/api/assets/index.js
index 8e94c81fc..da011bf7b 100644
--- a/tests/routes/api/assets/index.js
+++ b/tests/routes/api/assets/index.js
@@ -18,12 +18,14 @@ describe('/api/v1/assets', () => {
         url: 'https://coralproject.net/news/asset1',
         title: 'Asset 1',
         description: 'term1',
-        id: '1'
+        id: '1',
+        closedAt: Date.now()
       },
       {
         url: 'https://coralproject.net/news/asset2',
         title: 'Asset 2',
-        description: 'term2'
+        description: 'term2',
+        closedAt: null
       }
     ]);
   });
@@ -81,6 +83,38 @@ describe('/api/v1/assets', () => {
         });
     });
 
+    it('should return only closed assets', () => {
+      return chai.request(app)
+        .get('/api/v1/assets?filter=closed')
+        .set(passport.inject({roles: ['admin']}))
+        .then((res) => {
+          const body = res.body;
+
+          expect(body).to.have.property('count', 1);
+          expect(body).to.have.property('result');
+
+          const assets = body.result;
+
+          expect(assets[0]).to.have.property('title', 'Asset 1');
+        });
+    });
+
+    it('should return only opened assets', () => {
+      return chai.request(app)
+        .get('/api/v1/assets?filter=open')
+        .set(passport.inject({roles: ['admin']}))
+        .then((res) => {
+          const body = res.body;
+
+          expect(body).to.have.property('count', 1);
+          expect(body).to.have.property('result');
+
+          const assets = body.result;
+
+          expect(assets[0]).to.have.property('title', 'Asset 2');
+        });
+    });
+
   });
 
   describe('#put', () => {

From 979b54166bbb3060b3944d612f4bf66e332a6ebc Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Fri, 16 Dec 2016 16:24:32 -0500
Subject: [PATCH 15/54] Updating search with delay.

---
 client/coral-admin/src/actions/assets.js      |  4 +--
 .../src/containers/Streams/Streams.js         | 35 +++++++++++++------
 .../coral-admin/src/services/talk-adapter.js  |  4 +--
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/client/coral-admin/src/actions/assets.js b/client/coral-admin/src/actions/assets.js
index b13454a21..df2e1bd60 100644
--- a/client/coral-admin/src/actions/assets.js
+++ b/client/coral-admin/src/actions/assets.js
@@ -8,6 +8,6 @@ export const updateAssetState = (id, closedAt) => (dispatch) => {
   dispatch({type: UPDATE_ASSET_STATE, id, closedAt});
 };
 
-export const fetchAssets = (skip, limit, search, sort) => (dispatch) => {
-  dispatch({type: FETCH_ASSETS, skip, limit, search, sort});
+export const fetchAssets = (skip, limit, search, sort, filter) => (dispatch) => {
+  dispatch({type: FETCH_ASSETS, skip, limit, search, sort, filter});
 };
diff --git a/client/coral-admin/src/containers/Streams/Streams.js b/client/coral-admin/src/containers/Streams/Streams.js
index 5d8508f33..58c1c9b61 100644
--- a/client/coral-admin/src/containers/Streams/Streams.js
+++ b/client/coral-admin/src/containers/Streams/Streams.js
@@ -19,8 +19,9 @@ class Streams extends Component {
   state = {
     search: '',
     sort: 'desc',
-    statusFilter: 'all',
-    statusMenus: {}
+    filter: 'all',
+    statusMenus: {},
+    timer: null
   }
 
   componentDidMount () {
@@ -28,8 +29,22 @@ class Streams extends Component {
   }
 
   onSettingChange = (setting) => (e) => {
+    let options = this.state;
     this.setState({[setting]: e.target.value});
-    this.props.fetchAssets(0, limit, this.state.search, this.state.sort);
+    options[setting] = e.target.value;
+    this.props.fetchAssets(0, limit, options.search, options.sort, options.filter);
+  }
+
+  onSearchChange = (e) => {
+    this.setState({search: e.target.value});
+    this.setState((prevState) => {
+      clearTimeout(prevState.timer);
+      const fetchAssets = this.props.fetchAssets;
+      prevState.timer = setTimeout(() => {
+        fetchAssets(0, limit, this.state.search, this.state.sort, this.state.filter);
+      }, 350);
+      return prevState;
+    });
   }
 
   renderDate = (date) => {
@@ -74,7 +89,7 @@ class Streams extends Component {
   }
 
   render () {
-    const {searchTerm, sortBy, statusFilter} = this.state;
+    const {search, sort, filter} = this.state;
     const {assets} = this.props;
 
     return <div className={styles.container}>
@@ -84,9 +99,9 @@ class Streams extends Component {
           <Icon name='search' className={styles.searchIcon}/>
           <input
             type='text'
-            value={searchTerm}
+            value={search}
             className={styles.searchBoxInput}
-            onChange={this.onSettingChange('searchTerm')}
+            onChange={this.onSearchChange}
             placeholder={lang.t('streams.search')}/>
         </div>
 
@@ -94,9 +109,9 @@ class Streams extends Component {
         <div className={styles.optionDetail}>{lang.t('streams.stream-status')}</div>
           <RadioGroup
             name='status filter'
-            value={statusFilter}
+            value={filter}
             childContainer='div'
-            onChange={this.onSettingChange('statusFilter')}>
+            onChange={this.onSettingChange('filter')}>
             <Radio value='all'>{lang.t('streams.all')}</Radio>
             <Radio value='open'>{lang.t('streams.open')}</Radio>
             <Radio value='closed'>{lang.t('streams.closed')}</Radio>
@@ -104,9 +119,9 @@ class Streams extends Component {
           <div className={styles.optionHeader}>{lang.t('streams.sort-by')}</div>
           <RadioGroup
             name='sort by'
-            value={sortBy}
+            value={sort}
             childContainer='div'
-            onChange={this.onSettingChange('sortBy')}>
+            onChange={this.onSettingChange('sort')}>
             <Radio value='desc'>{lang.t('streams.newest')}</Radio>
             <Radio value='asc'>{lang.t('streams.oldest')}</Radio>
           </RadioGroup>
diff --git a/client/coral-admin/src/services/talk-adapter.js b/client/coral-admin/src/services/talk-adapter.js
index 67835e30d..fcc334953 100644
--- a/client/coral-admin/src/services/talk-adapter.js
+++ b/client/coral-admin/src/services/talk-adapter.js
@@ -102,8 +102,8 @@ const userStatusUpdate = (store, status, userId, commentId) => {
 // Fetch a page of assets
 // Get comments to fill each of the three lists on the mod queue
 const fetchAssets = (store, action) => {
-  const {skip, limit, search} = action;
-  return coralApi(`/assets?skip=${skip}&limit=${limit}&search=${search}`)
+  const {skip, limit, sort, search, filter} = action;
+  return coralApi(`/assets?skip=${skip}&limit=${limit}&sort=${sort}&search=${search}&filter=${filter}`)
   .then(({result, count}) =>
     /* Post comments and users to redux store. Actions will be posted when they are needed. */
     store.dispatch({type: FETCH_ASSETS_SUCCESS,

From 0d2d6b52a5d0468d020f672745844dfacb474ed8 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Fri, 16 Dec 2016 17:07:59 -0500
Subject: [PATCH 16/54] Adding pagination.

---
 .../src/containers/Community/Community.js     |  2 +-
 .../src/containers/Streams/Streams.js         | 19 +++++++++++++++++--
 .../components}/Pager.css                     |  0
 .../components}/Pager.js                      |  0
 4 files changed, 18 insertions(+), 3 deletions(-)
 rename client/{coral-admin/src/containers/Community => coral-ui/components}/Pager.css (100%)
 rename client/{coral-admin/src/containers/Community => coral-ui/components}/Pager.js (100%)

diff --git a/client/coral-admin/src/containers/Community/Community.js b/client/coral-admin/src/containers/Community/Community.js
index e798266f0..286a7f364 100644
--- a/client/coral-admin/src/containers/Community/Community.js
+++ b/client/coral-admin/src/containers/Community/Community.js
@@ -7,7 +7,7 @@ import styles from './Community.css';
 import Table from './Table';
 import Loading from './Loading';
 import NoResults from './NoResults';
-import Pager from './Pager';
+import Pager from 'coral-ui/components/Pager';
 
 const lang = new I18n(translations);
 
diff --git a/client/coral-admin/src/containers/Streams/Streams.js b/client/coral-admin/src/containers/Streams/Streams.js
index 58c1c9b61..4841d2a1b 100644
--- a/client/coral-admin/src/containers/Streams/Streams.js
+++ b/client/coral-admin/src/containers/Streams/Streams.js
@@ -11,8 +11,9 @@ import {
   DataTable,
   TableHeader
 } from 'react-mdl';
+import Pager from 'coral-ui/components/Pager';
 
-const limit = 25;
+const limit = 10;
 
 class Streams extends Component {
 
@@ -21,7 +22,8 @@ class Streams extends Component {
     sort: 'desc',
     filter: 'all',
     statusMenus: {},
-    timer: null
+    timer: null,
+    page: 0
   }
 
   componentDidMount () {
@@ -88,10 +90,18 @@ class Streams extends Component {
     </div>;
   }
 
+  onPageClick = (page) => {
+    this.setState({page});
+    const {search, sort, filter} = this.state;
+    this.props.fetchAssets((page - 1) * limit, limit, search, sort, filter);
+  }
+
   render () {
     const {search, sort, filter} = this.state;
     const {assets} = this.props;
 
+    console.log(assets);
+
     return <div className={styles.container}>
       <div className={styles.leftColumn}>
 
@@ -139,6 +149,11 @@ class Streams extends Component {
           {lang.t('streams.status')}
         </TableHeader>
       </DataTable>
+      <Pager
+        totalPages={Math.ceil((assets.count || 0) / limit)}
+        page={this.state.page}
+        onNewPageHandler={this.onPageClick}
+      />
       </div>
     </div>;
   }
diff --git a/client/coral-admin/src/containers/Community/Pager.css b/client/coral-ui/components/Pager.css
similarity index 100%
rename from client/coral-admin/src/containers/Community/Pager.css
rename to client/coral-ui/components/Pager.css
diff --git a/client/coral-admin/src/containers/Community/Pager.js b/client/coral-ui/components/Pager.js
similarity index 100%
rename from client/coral-admin/src/containers/Community/Pager.js
rename to client/coral-ui/components/Pager.js

From c34bf5036e10348796485af8643a52004a176437 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Fri, 16 Dec 2016 17:20:31 -0500
Subject: [PATCH 17/54] Updating page count.

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

diff --git a/client/coral-admin/src/containers/Streams/Streams.js b/client/coral-admin/src/containers/Streams/Streams.js
index 4841d2a1b..55fe10fc2 100644
--- a/client/coral-admin/src/containers/Streams/Streams.js
+++ b/client/coral-admin/src/containers/Streams/Streams.js
@@ -13,7 +13,7 @@ import {
 } from 'react-mdl';
 import Pager from 'coral-ui/components/Pager';
 
-const limit = 10;
+const limit = 25;
 
 class Streams extends Component {
 

From 871836f636bcba97805b302b3034394a384c729c Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Fri, 16 Dec 2016 18:19:05 -0500
Subject: [PATCH 18/54] Adding description field to flags.

---
 client/coral-embed-stream/style/default.css |  2 ++
 client/coral-plugin-flags/FlagButton.js     | 27 ++++++++++-----------
 client/coral-plugin-flags/FlagComment.js    |  3 ++-
 client/coral-plugin-flags/translations.json |  6 +++--
 models/action.js                            |  1 +
 5 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css
index 463c8dc68..bc5ce27bc 100644
--- a/client/coral-embed-stream/style/default.css
+++ b/client/coral-embed-stream/style/default.css
@@ -241,6 +241,7 @@ hr {
 .coral-plugin-flags-popup-radio-label {
   margin:5px;
   font-size: 14px;
+  font-weight: 700;
 }
 
 .coral-plugin-flags-popup-counter {
@@ -256,6 +257,7 @@ hr {
 
 .coral-plugin-flags-other-text {
   margin-left: 20px;
+  margin-top: 5px;
   width: 75%;
 }
 
diff --git a/client/coral-plugin-flags/FlagButton.js b/client/coral-plugin-flags/FlagButton.js
index d0b9cb6b4..57b3d1946 100644
--- a/client/coral-plugin-flags/FlagButton.js
+++ b/client/coral-plugin-flags/FlagButton.js
@@ -10,10 +10,9 @@ class FlagButton extends Component {
 
   state = {
     showMenu: false,
-    showOther: false,
     itemType: '',
     detail: '',
-    otherText: '',
+    description: '',
     step: 0,
     posted: false
   }
@@ -30,7 +29,7 @@ class FlagButton extends Component {
 
   onPopupContinue = () => {
     const {postAction, addItem, updateItem, flag, id, author_id} = this.props;
-    const {itemType, field, detail, step, otherText, posted} = this.state;
+    const {itemType, field, detail, step, description, posted} = this.state;
 
     //Proceed to the next step or close the menu if we've reached the end
     if (step + 1 >= this.props.getPopupMenu.length) {
@@ -42,7 +41,6 @@ class FlagButton extends Component {
     // If itemType and detail are both set, post the action
     if (itemType && detail && !posted) {
       // Set the text from the "other" field if it exists.
-      const updatedDetail = otherText || detail;
       let item_id;
       switch(itemType) {
       case 'comments':
@@ -55,7 +53,8 @@ class FlagButton extends Component {
       const action = {
         action_type: 'flag',
         field,
-        detail: updatedDetail
+        detail,
+        description
       };
       postAction(item_id, itemType, action)
         .then((action) => {
@@ -92,7 +91,7 @@ class FlagButton extends Component {
   }
 
   onOtherTextChange = (e) => {
-    this.setState({otherText: e.target.value});
+    this.setState({description: e.target.value});
   }
 
   handleClickOutside () {
@@ -141,16 +140,16 @@ class FlagButton extends Component {
                   )
                 }
                 {
-                  this.state.showOther && <div>
-                    <input
+                  this.state.detail && <div>
+                  <label htmlFor={'description'} className={`${name}-popup-radio-label`}>
+                    {lang.t('flag-reason')}
+                  </label><br/>
+                <textarea
                       className={`${name}-other-text`}
-                      type="text"
-                      id="otherText"
+                      id="description"
+                      rows={4}
                       onChange={this.onOtherTextChange}
-                      value={this.state.otherText}/>
-                    <label htmlFor={'otherText'} className={`${name}-popup-radio-label screen-reader-text`}>
-                      lang.t('flag-reason')
-                    </label><br/>
+                      value={this.state.description}/>
                   </div>
                 }
               </form>
diff --git a/client/coral-plugin-flags/FlagComment.js b/client/coral-plugin-flags/FlagComment.js
index 2d5b33039..4a2634b6c 100644
--- a/client/coral-plugin-flags/FlagComment.js
+++ b/client/coral-plugin-flags/FlagComment.js
@@ -22,12 +22,13 @@ const getPopupMenu = [
     [
       {val: 'I don\'t agree with this comment', text: lang.t('no-agree-comment')},
       {val: 'This comment is offensive', text: lang.t('comment-offensive')},
-      {val: 'This comment reveals personally identifiable infomration', text: lang.t('personal-info')},
+      {val: 'This looks like an ad/marketing', text: lang.t('marketing')},
       {val: 'other', text: lang.t('other')}
     ]
     : [
       {val: 'This username is offensive', text: lang.t('username-offensive')},
       {val: 'I don\'t like this username', text: lang.t('no-like-username')},
+      {val: 'This user is impersonating', text: lang.t('user-impersonating')},
       {val: 'This looks like an ad/marketing', text: lang.t('marketing')},
       {val: 'other', text: lang.t('other')}
     ];
diff --git a/client/coral-plugin-flags/translations.json b/client/coral-plugin-flags/translations.json
index 0c2ce594d..28eff28ee 100644
--- a/client/coral-plugin-flags/translations.json
+++ b/client/coral-plugin-flags/translations.json
@@ -19,8 +19,9 @@
     "bio-offensive": "This bio is offensive",
     "no-like-bio": "I don't like this bio",
     "marketing": "This looks like an ad/marketing",
+    "user-impersonating": "This user is impersonating",
     "thank-you": "We value your safety and feedback. A moderator will review your flag.",
-    "flag-reason": "Reason for flag",
+    "flag-reason": "Reason for flag (Optional)",
     "other": "Other"
   },
   "es": {
@@ -42,9 +43,10 @@
     "no-like-username": "No me gusta ese nombre de usuario",
     "bio-offensive": "Esta bio es ofensiva",
     "no-like-bio": "No me gusta esta bio",
+    "user-impersonating": "This user is impersonating",
     "marketing": "Esto parece una publicidad/marketing",
     "thank-you": "Nos interesa tu protección y comentarios. Un moderador va a mirar tu marca.",
-    "flag-reason": "Razón por la que marcar",
+    "flag-reason": "Razón por la que marcar (Opcional)",
     "other": "Otro"
   }
 }
diff --git a/models/action.js b/models/action.js
index 45f828226..ef3d0c525 100644
--- a/models/action.js
+++ b/models/action.js
@@ -15,6 +15,7 @@ const ActionSchema = new Schema({
   user_id: String,
   field: String, // Used when an action references a particular field of an object. (e.g. a flag on a username or bio)
   detail: String, // Describes the reason for an action (e.g. 'Username is offensive')
+  description: String, // Describes the reason for the action in more detail (e.g. A description of why the comment is offensive.)
 }, {
   timestamps: {
     createdAt: 'created_at',

From 59735600439edbd2533bba679a2e128b93c5619d Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Fri, 16 Dec 2016 18:20:31 -0500
Subject: [PATCH 19/54] Updating translation.

---
 .../src/containers/Community => coral-plugin-flags}/Pager.css   | 0
 .../src/containers/Community => coral-plugin-flags}/Pager.js    | 0
 client/coral-plugin-flags/translations.json                     | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename client/{coral-admin/src/containers/Community => coral-plugin-flags}/Pager.css (100%)
 rename client/{coral-admin/src/containers/Community => coral-plugin-flags}/Pager.js (100%)

diff --git a/client/coral-admin/src/containers/Community/Pager.css b/client/coral-plugin-flags/Pager.css
similarity index 100%
rename from client/coral-admin/src/containers/Community/Pager.css
rename to client/coral-plugin-flags/Pager.css
diff --git a/client/coral-admin/src/containers/Community/Pager.js b/client/coral-plugin-flags/Pager.js
similarity index 100%
rename from client/coral-admin/src/containers/Community/Pager.js
rename to client/coral-plugin-flags/Pager.js
diff --git a/client/coral-plugin-flags/translations.json b/client/coral-plugin-flags/translations.json
index 28eff28ee..caac6cbf1 100644
--- a/client/coral-plugin-flags/translations.json
+++ b/client/coral-plugin-flags/translations.json
@@ -43,7 +43,7 @@
     "no-like-username": "No me gusta ese nombre de usuario",
     "bio-offensive": "Esta bio es ofensiva",
     "no-like-bio": "No me gusta esta bio",
-    "user-impersonating": "This user is impersonating",
+    "user-impersonating": "Este usario suplanta a alguien",
     "marketing": "Esto parece una publicidad/marketing",
     "thank-you": "Nos interesa tu protección y comentarios. Un moderador va a mirar tu marca.",
     "flag-reason": "Razón por la que marcar (Opcional)",

From dc966afe8e0c5d81f62b6f006657b1969b678366 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 16 Dec 2016 17:06:56 -0700
Subject: [PATCH 20/54] adjusted query style

---
 routes/api/assets/index.js | 42 +++++++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/routes/api/assets/index.js b/routes/api/assets/index.js
index a661d64e8..e92eab72e 100644
--- a/routes/api/assets/index.js
+++ b/routes/api/assets/index.js
@@ -16,36 +16,47 @@ router.get('/', (req, res, next) => {
     search = ''
   } = req.query;
 
-  const assets = (filter, search) => {
+  const FilterOpenAssets = (query, filter) => {
     switch(filter) {
     case 'open':
-      return Asset.search(search)
-        .find({
-          $or: [
-              {closedAt: null},
-              {closedAt: {$gt: Date.now()}}
-          ]
-        });
+      return query.merge({
+        $or: [
+          {
+            closedAt: null
+          },
+          {
+            closedAt: {
+              $gt: Date.now()
+            }
+          }
+        ]
+      });
     case 'closed':
-      return Asset.search(search)
-        .find({
-          closedAt: {$lt: Date.now()}
-        });
+      return query.merge({
+        closedAt: {
+          $lt: Date.now()
+        }
+      });
     default:
-      return Asset.search(search);
+      return query;
     }
   };
 
   // Find all the assets.
   Promise.all([
-    assets(filter, search)
+
+    // Find the actuall assets.
+    FilterOpenAssets(Asset.search(search), filter)
       .sort({[field]: (sort === 'asc') ? 1 : -1})
       .skip(parseInt(skip))
       .limit(parseInt(limit)),
-    assets(filter, search)
+
+    // Get the count of actual assets.
+    FilterOpenAssets(Asset.search(search), filter)
       .count()
   ])
   .then(([result, count]) => {
+
     // Send back the asset data.
     res.json({
       result,
@@ -124,7 +135,6 @@ router.put('/:asset_id/status', (req, res, next) => {
       }
     })
     .then(() => {
-
       res.status(204).json();
     })
     .catch((err) => {

From 7742dbf9a202479051b56179534388a8c76dbc98 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Mon, 19 Dec 2016 13:07:50 -0700
Subject: [PATCH 21/54] add a suspect words card

---
 .../containers/Configure/CommentSettings.js   | 201 +++++++++---------
 .../src/containers/Configure/Configure.css    |   4 +-
 .../src/containers/Configure/Configure.js     |  23 +-
 .../src/containers/Configure/EmbedLink.js     |  25 ++-
 .../src/containers/Configure/Wordlist.js      |  36 +++-
 client/coral-admin/src/translations.json      |  12 +-
 6 files changed, 166 insertions(+), 135 deletions(-)

diff --git a/client/coral-admin/src/containers/Configure/CommentSettings.js b/client/coral-admin/src/containers/Configure/CommentSettings.js
index 050432743..7fe0a7938 100644
--- a/client/coral-admin/src/containers/Configure/CommentSettings.js
+++ b/client/coral-admin/src/containers/Configure/CommentSettings.js
@@ -69,109 +69,114 @@ const updateClosedTimeout = (updateSettings, ts, isMeasure) => (event) => {
   }
 };
 
-const CommentSettings = ({fetchingSettings, updateSettings, settingsError, settings, errors}) => {
+const CommentSettings = ({fetchingSettings, title, updateSettings, settingsError, settings, errors}) => {
   if (fetchingSettings) {
     /* maybe a spinner here at some point */
     return <p>Loading settings...</p>;
   }
 
-  return <List>
-    <ListItem className={`${styles.configSetting} ${settings.moderation === 'pre' ? styles.enabledSetting : styles.disabledSetting}`}>
-      <ListItemAction>
-        <Checkbox
-          onChange={updateModeration(updateSettings, settings.moderation)}
-          checked={settings.moderation === 'pre'} />
-      </ListItemAction>
-      <ListItemContent>
-      <div className={styles.settingsHeader}>{lang.t('configure.enable-pre-moderation')}</div>
-      <p className={settings.moderation === 'pre' ? '' : styles.disabledSettingText}>
-        {lang.t('configure.enable-pre-moderation-text')}
-      </p>
-    </ListItemContent>
-    </ListItem>
-    <ListItem className={`${styles.configSetting} ${settings.charCountEnable ? styles.enabledSetting : styles.disabledSetting}`}>
-      <ListItemAction>
-        <Checkbox
-          onChange={updateCharCountEnable(updateSettings, settings.charCountEnable)}
-          checked={settings.charCountEnable} />
-      </ListItemAction>
-      <ListItemContent>
-        <div className={styles.settingsHeader}>{lang.t('configure.comment-count-header')}</div>
-        <p className={settings.charCountEnable ? '' : styles.disabledSettingText}>
-          <span>{lang.t('configure.comment-count-text-pre')}</span>
-          <input type='text'
-            className={`${styles.charCountTexfield} ${settings.charCountEnable && styles.charCountTexfieldEnabled}`}
-            htmlFor='charCount'
-            onChange={updateCharCount(updateSettings, settingsError)}
-            value={settings.charCount}/>
-          <span>{lang.t('configure.comment-count-text-post')}</span>
-            {
-              errors.charCount &&
-              <span className={styles.settingsError}>
-                <br/>
-                <Icon name="error_outline"/>
-                {lang.t('configure.comment-count-error')}
-              </span>
-            }
-        </p>
-      </ListItemContent>
-    </ListItem>
-    <ListItem threeLine className={`${styles.configSettingInfoBox} ${settings.infoBoxEnable ? styles.enabledSetting : styles.disabledSetting}`}>
-      <ListItemAction>
-        <Checkbox
-          onChange={updateInfoBoxEnable(updateSettings, settings.infoBoxEnable)}
-          checked={settings.infoBoxEnable} />
-      </ListItemAction>
-      <ListItemContent>
-        {lang.t('configure.include-comment-stream')}
-        <p>
-          {lang.t('configure.include-comment-stream-desc')}
-        </p>
-      </ListItemContent>
-    </ListItem>
-    <ListItem className={`${styles.configSettingInfoBox} ${settings.infoBoxEnable ? null : styles.hidden}`} >
-      <ListItemContent>
-        <Textfield
-          onChange={updateInfoBoxContent(updateSettings)}
-          value={settings.infoBoxContent}
-          label={lang.t('configure.include-text')}
-          rows={3}/>
-      </ListItemContent>
-    </ListItem>
-    <ListItem className={styles.configSettingInfoBox}>
-      <ListItemContent>
-        {lang.t('configure.close-after')}
-        <br />
-        <Textfield
-          type='number'
-          pattern='[0-9]+'
-          style={{width: 50}}
-          onChange={updateClosedTimeout(updateSettings, settings.closedTimeout)}
-          value={getTimeoutAmount(settings.closedTimeout)}
-          label={lang.t('configure.closed-comments-label')} />
-        <div className={styles.configTimeoutSelect}>
-          <SelectField
-            label="comments closed time window"
-            value={getTimeoutMeasure(settings.closedTimeout)}
-            onChange={updateClosedTimeout(updateSettings, settings.closedTimeout, true)}>
-            <Option value={'hours'}>{lang.t('configure.hours')}</Option>
-            <Option value={'days'}>{lang.t('configure.days')}</Option>
-            <Option value={'weeks'}>{lang.t('configure.weeks')}</Option>
-          </SelectField>
-        </div>
-      </ListItemContent>
-    </ListItem>
-    <ListItem className={styles.configSettingInfoBox}>
-      <ListItemContent>
-        {lang.t('configure.closed-comments-desc')}
-        <Textfield
-          onChange={updateClosedMessage(updateSettings)}
-          value={settings.closedMessage}
-          label={lang.t('configure.closed-comments-label')}
-          rows={3}/>
-      </ListItemContent>
-    </ListItem>
-  </List>;
+  return (
+    <div>
+      <h3>{title}</h3>
+      <List>
+        <ListItem className={`${styles.configSetting} ${settings.moderation === 'pre' ? styles.enabledSetting : styles.disabledSetting}`}>
+          <ListItemAction>
+            <Checkbox
+              onChange={updateModeration(updateSettings, settings.moderation)}
+              checked={settings.moderation === 'pre'} />
+          </ListItemAction>
+          <ListItemContent>
+          <div className={styles.settingsHeader}>{lang.t('configure.enable-pre-moderation')}</div>
+          <p className={settings.moderation === 'pre' ? '' : styles.disabledSettingText}>
+            {lang.t('configure.enable-pre-moderation-text')}
+          </p>
+        </ListItemContent>
+        </ListItem>
+        <ListItem className={`${styles.configSetting} ${settings.charCountEnable ? styles.enabledSetting : styles.disabledSetting}`}>
+          <ListItemAction>
+            <Checkbox
+              onChange={updateCharCountEnable(updateSettings, settings.charCountEnable)}
+              checked={settings.charCountEnable} />
+          </ListItemAction>
+          <ListItemContent>
+            <div className={styles.settingsHeader}>{lang.t('configure.comment-count-header')}</div>
+            <p className={settings.charCountEnable ? '' : styles.disabledSettingText}>
+              <span>{lang.t('configure.comment-count-text-pre')}</span>
+              <input type='text'
+                className={`${styles.charCountTexfield} ${settings.charCountEnable && styles.charCountTexfieldEnabled}`}
+                htmlFor='charCount'
+                onChange={updateCharCount(updateSettings, settingsError)}
+                value={settings.charCount}/>
+              <span>{lang.t('configure.comment-count-text-post')}</span>
+                {
+                  errors.charCount &&
+                  <span className={styles.settingsError}>
+                    <br/>
+                    <Icon name="error_outline"/>
+                    {lang.t('configure.comment-count-error')}
+                  </span>
+                }
+            </p>
+          </ListItemContent>
+        </ListItem>
+        <ListItem threeLine className={`${styles.configSettingInfoBox} ${settings.infoBoxEnable ? styles.enabledSetting : styles.disabledSetting}`}>
+          <ListItemAction>
+            <Checkbox
+              onChange={updateInfoBoxEnable(updateSettings, settings.infoBoxEnable)}
+              checked={settings.infoBoxEnable} />
+          </ListItemAction>
+          <ListItemContent>
+            {lang.t('configure.include-comment-stream')}
+            <p>
+              {lang.t('configure.include-comment-stream-desc')}
+            </p>
+          </ListItemContent>
+        </ListItem>
+        <ListItem className={`${styles.configSettingInfoBox} ${settings.infoBoxEnable ? null : styles.hidden}`} >
+          <ListItemContent>
+            <Textfield
+              onChange={updateInfoBoxContent(updateSettings)}
+              value={settings.infoBoxContent}
+              label={lang.t('configure.include-text')}
+              rows={3}/>
+          </ListItemContent>
+        </ListItem>
+        <ListItem className={styles.configSettingInfoBox}>
+          <ListItemContent>
+            {lang.t('configure.close-after')}
+            <br />
+            <Textfield
+              type='number'
+              pattern='[0-9]+'
+              style={{width: 50}}
+              onChange={updateClosedTimeout(updateSettings, settings.closedTimeout)}
+              value={getTimeoutAmount(settings.closedTimeout)}
+              label={lang.t('configure.closed-comments-label')} />
+            <div className={styles.configTimeoutSelect}>
+              <SelectField
+                label="comments closed time window"
+                value={getTimeoutMeasure(settings.closedTimeout)}
+                onChange={updateClosedTimeout(updateSettings, settings.closedTimeout, true)}>
+                <Option value={'hours'}>{lang.t('configure.hours')}</Option>
+                <Option value={'days'}>{lang.t('configure.days')}</Option>
+                <Option value={'weeks'}>{lang.t('configure.weeks')}</Option>
+              </SelectField>
+            </div>
+          </ListItemContent>
+        </ListItem>
+        <ListItem className={styles.configSettingInfoBox}>
+          <ListItemContent>
+            {lang.t('configure.closed-comments-desc')}
+            <Textfield
+              onChange={updateClosedMessage(updateSettings)}
+              value={settings.closedMessage}
+              label={lang.t('configure.closed-comments-label')}
+              rows={3}/>
+          </ListItemContent>
+        </ListItem>
+      </List>
+    </div>
+  );
 };
 
 export default CommentSettings;
diff --git a/client/coral-admin/src/containers/Configure/Configure.css b/client/coral-admin/src/containers/Configure/Configure.css
index c0646c9e2..2b5c8d578 100644
--- a/client/coral-admin/src/containers/Configure/Configure.css
+++ b/client/coral-admin/src/containers/Configure/Configure.css
@@ -112,12 +112,12 @@
   letter-spacing: 0.03em;
 }
 
-#bannedWordlist {
+#bannedWordlist, #suspectWordlist {
     width: 100%;
     padding: 10px;
 }
 
-.bannedWordHeader {
+.wordlistHeader {
   font-weight: bold;
   font-size:18px;
   margin-bottom:3px;
diff --git a/client/coral-admin/src/containers/Configure/Configure.js b/client/coral-admin/src/containers/Configure/Configure.js
index ed8ba9b26..6af02cf05 100644
--- a/client/coral-admin/src/containers/Configure/Configure.js
+++ b/client/coral-admin/src/containers/Configure/Configure.js
@@ -36,7 +36,8 @@ class Configure extends React.Component {
       || !this.props.settings.wordlist)
       && newProps.settings.wordlist
       && newProps.settings.wordlist.length !== 0 ) {
-      this.setState({wordlist: newProps.settings.wordlist.join(', ')});
+      console.log('wordlist?', newProps.settings.wordlist);
+      this.setState({wordlist: newProps.settings.wordlist.banned.join(', ')});
     }
   }
 
@@ -74,46 +75,43 @@ class Configure extends React.Component {
     });
   }
 
-  getSection = (section) => {
+  getSection (section) {
+    const pageTitle = this.getPageTitle(section);
     switch(section){
     case 'comments':
       return <CommentSettings
+        title={pageTitle}
         fetchingSettings={this.props.fetchingSettings}
         settings={this.props.settings}
         updateSettings={this.onSettingUpdate}
         errors={this.state.errors}
         settingsError={this.onSettingError}/>;
     case 'embed':
-      return <EmbedLink/>;
+      return <EmbedLink title={pageTitle} />;
     case 'wordlist':
       return <Wordlist
-        wordlist={this.state.wordlist}
+        bannedWords={this.state.wordlist}
         onChangeWordlist={this.onChangeWordlist}/>;
     }
   }
 
-  getPageTitle = (section) => {
+  getPageTitle (section) {
     switch(section) {
     case 'comments':
       return lang.t('configure.comment-settings');
     case 'embed':
       return lang.t('configure.embed-comment-stream');
-    case 'wordlist':
-      return lang.t('configure.wordlist');
+    default:
+      return '';
     }
   }
 
   render () {
-    let pageTitle = this.getPageTitle(this.state.activeSection);
     const section = this.getSection(this.state.activeSection);
 
     const showSave = Object.keys(this.state.errors).reduce(
       (bool, error) => this.state.errors[error] ? false : bool, this.state.changed);
 
-    if (this.props.fetchingSettings) {
-      pageTitle += ' - Loading...';
-    }
-
     return (
         <div className={styles.container}>
           <div className={styles.leftColumn}>
@@ -151,7 +149,6 @@ class Configure extends React.Component {
 
           </div>
           <div className={styles.mainContent}>
-            <h1>{pageTitle}</h1>
             { this.props.saveFetchingError }
             { this.props.fetchSettingsError }
             { section }
diff --git a/client/coral-admin/src/containers/Configure/EmbedLink.js b/client/coral-admin/src/containers/Configure/EmbedLink.js
index 6c5c3da99..374d78ea3 100644
--- a/client/coral-admin/src/containers/Configure/EmbedLink.js
+++ b/client/coral-admin/src/containers/Configure/EmbedLink.js
@@ -31,16 +31,21 @@ class EmbedLink extends Component {
   render () {
     const embedText = `<div id='coralStreamEmbed'></div><script type='text/javascript' src='${window.location.protocol}//pym.nprapps.org/pym.v1.min.js'></script><script>var pymParent = new pym.Parent('coralStreamEmbed', '${window.location.protocol}//${window.location.host}/embed/stream', {title: 'Comments'});</script>`;
 
-    return <List>
-      <ListItem className={styles.configSettingEmbed}>
-        <p>{lang.t('configure.copy-and-paste')}</p>
-        <textarea rows={5} type='text' className={styles.embedInput} value={embedText} readOnly={true}/>
-        <Button raised colored className={styles.copyButton} onClick={this.copyToClipBoard}>
-          {lang.t('embedlink.copy')}
-        </Button>
-        <div className={styles.copiedText}>{this.state.copied && 'Copied!'}</div>
-      </ListItem>
-    </List>;
+    return (
+      <div>
+        <h3>{this.props.title}</h3>
+        <List>
+          <ListItem className={styles.configSettingEmbed}>
+            <p>{lang.t('configure.copy-and-paste')}</p>
+            <textarea rows={5} type='text' className={styles.embedInput} value={embedText} readOnly={true}/>
+            <Button raised colored className={styles.copyButton} onClick={this.copyToClipBoard}>
+              {lang.t('embedlink.copy')}
+            </Button>
+            <div className={styles.copiedText}>{this.state.copied && 'Copied!'}</div>
+          </ListItem>
+        </List>
+      </div>
+    );
   }
 }
 
diff --git a/client/coral-admin/src/containers/Configure/Wordlist.js b/client/coral-admin/src/containers/Configure/Wordlist.js
index 8ffb5920b..fd48c44d2 100644
--- a/client/coral-admin/src/containers/Configure/Wordlist.js
+++ b/client/coral-admin/src/containers/Configure/Wordlist.js
@@ -6,16 +6,32 @@ import {
   Card
 } from 'react-mdl';
 
-const Wordlist = ({wordlist, onChangeWordlist}) => <Card id={styles.bannedWordlist} shadow={2}>
-  <p className={styles.bannedWordHeader}>{lang.t('configure.banned-word-header')}</p>
-  <p className={styles.bannedWordText}>{lang.t('configure.banned-word-text')}</p>
-  <textarea
-    rows={5}
-    type='text'
-    className={styles.bannedWordInput}
-    onChange={onChangeWordlist}
-    value={wordlist}/>
-</Card>;
+const Wordlist = ({suspectWords, bannedWords, onChangeWordlist}) => (
+  <div>
+    <h3>{lang.t('configure.banned-words-title')}</h3>
+    <Card id={styles.bannedWordlist} shadow={2}>
+      <p className={styles.wordlistHeader}>{lang.t('configure.banned-word-header')}</p>
+      <p className={styles.wordlistDesc}>{lang.t('configure.banned-word-text')}</p>
+      <textarea
+        rows={5}
+        type='text'
+        className={styles.wordlistInput}
+        onChange={onChangeWordlist}
+        value={bannedWords} />
+    </Card>
+    <h3>{lang.t('configure.suspect-words-title')}</h3>
+    <Card id={styles.suspectWordlist} shadow={2}>
+      <p className={styles.wordlistHeader}>{lang.t('configure.suspect-word-header')}</p>
+      <p className={styles.wordlistDesc}>{lang.t('configure.suspect-word-text')}</p>
+      <textarea
+        rows={5}
+        type='text'
+        className={styles.wordlistInput}
+        onChange={() => {}}
+        value={suspectWords} />
+    </Card>
+  </div>
+);
 
 export default Wordlist;
 
diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json
index 6f8e76c4b..5a7e413bf 100644
--- a/client/coral-admin/src/translations.json
+++ b/client/coral-admin/src/translations.json
@@ -49,8 +49,12 @@
       "comment-settings": "Comment Settings",
       "embed-comment-stream": "Embed Comment Stream",
       "banned-word-header": "Write the bannned words list",
-      "banned-word-text": "Comments which contain these words or phrases, not separated by commas and not case sensitive, will be automatically removed from the comment stream.",
-      "wordlist": "Banned words list",
+      "banned-word-text": "Comments which contain these words or phrases, not separated by commas and not case-sensitive, will be automatically removed from the comment stream.",
+      "suspect-word-header": "Write the suspect words list",
+      "suspect-word-text": "Comments which contain these words or phrases, not separated by commas and not case-sensitive will be highlighted in the comment stream",
+      "wordlist": "Banned & Suspect Words",
+      "banned-words-title": "Banned words list",
+      "suspect-words-title": "Suspect words list",
       "save-changes": "Save Changes",
       "copy-and-paste": "Copy and paste code below into your CMS to embed your comment box in your articles",
       "moderate": "Moderate",
@@ -116,6 +120,10 @@
       "wordlist": "Lista de palabras no permitidas",
       "banned-word-header": "Escribir las palabras no permitidas",
       "banned-word-text": "Comentarios que contengan estas palabras o frases, no separadas por comas y en mayusculas o minusuculas, serán automaticamente separadas de los comentarios publicados.",
+      "suspect-word-header": "",
+      "suspect-word-text": "",
+      "banned-words-title": "",
+      "suspect-words-title": "",
       "save-changes": "Guardar Cambios",
       "copy-and-paste": "Copiar y pegar el código de más abajo en tu CMS para colocar la caja de comentarios en tus articulos",
       "moderate": "Moderar",

From 86c74d69c70ddc26c7ed0f51109097385bc2c20a Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Mon, 19 Dec 2016 15:03:18 -0700
Subject: [PATCH 22/54] save wordlist to  the server

---
 client/coral-admin/src/actions/settings.js    |  9 ++++++
 .../src/containers/Configure/Configure.js     | 31 +++++++++++--------
 .../src/containers/Configure/Wordlist.js      |  4 +--
 client/coral-admin/src/reducers/settings.js   | 11 +++++++
 client/coral-admin/src/translations.json      |  2 +-
 5 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/client/coral-admin/src/actions/settings.js b/client/coral-admin/src/actions/settings.js
index 1dfda51b9..3c9b46f59 100644
--- a/client/coral-admin/src/actions/settings.js
+++ b/client/coral-admin/src/actions/settings.js
@@ -10,6 +10,8 @@ export const SAVE_SETTINGS_LOADING = 'SAVE_SETTINGS_LOADING';
 export const SAVE_SETTINGS_SUCCESS = 'SAVE_SETTINGS_SUCCESS';
 export const SAVE_SETTINGS_FAILED = 'SAVE_SETTINGS_FAILED';
 
+export const WORDLIST_UPDATED = 'WORDLIST_UPDATED';
+
 export const fetchSettings = () => dispatch => {
   dispatch({type: SETTINGS_LOADING});
   coralApi('/settings')
@@ -21,12 +23,19 @@ export const fetchSettings = () => dispatch => {
     });
 };
 
+// for updating top-level settings
 export const updateSettings = settings => {
   return {type: SETTINGS_UPDATED, settings};
 };
 
+// this is a nested property, so it needs a special action.
+export const updateWordlist = (listName, list) => {
+  return {type: WORDLIST_UPDATED, listName, list};
+};
+
 export const saveSettingsToServer = () => (dispatch, getState) => {
   let settings = getState().settings.toJS().settings;
+  console.log('about to save settings to server', settings);
   if (settings.charCount) {
     settings.charCount = parseInt(settings.charCount);
   }
diff --git a/client/coral-admin/src/containers/Configure/Configure.js b/client/coral-admin/src/containers/Configure/Configure.js
index 6af02cf05..1f31807ff 100644
--- a/client/coral-admin/src/containers/Configure/Configure.js
+++ b/client/coral-admin/src/containers/Configure/Configure.js
@@ -1,6 +1,11 @@
 import React from 'react';
 import {connect} from 'react-redux';
-import {fetchSettings, updateSettings, saveSettingsToServer} from '../../actions/settings';
+import {
+  fetchSettings,
+  updateSettings,
+  saveSettingsToServer,
+  updateWordlist,
+} from '../../actions/settings';
 import {
   List,
   ListItem,
@@ -21,7 +26,8 @@ class Configure extends React.Component {
 
     this.state = {
       activeSection: 'comments',
-      wordlist: [],
+      banned: [],
+      suspect: [],
       changed: false,
       errors: {}
     };
@@ -36,8 +42,10 @@ class Configure extends React.Component {
       || !this.props.settings.wordlist)
       && newProps.settings.wordlist
       && newProps.settings.wordlist.length !== 0 ) {
-      console.log('wordlist?', newProps.settings.wordlist);
-      this.setState({wordlist: newProps.settings.wordlist.banned.join(', ')});
+      this.setState({
+        banned: newProps.settings.wordlist.banned.join(', '),
+        suspect: newProps.settings.wordlist.suspect.join(', ')
+      });
     }
   }
 
@@ -50,15 +58,11 @@ class Configure extends React.Component {
     this.setState({activeSection});
   }
 
-  onChangeWordlist = (event) => {
+  onChangeWordlist = (event, list) => {
     event.preventDefault();
-    const newlist = event.target.value;
-    this.setState({wordlist: newlist.toLowerCase(), changed: true});
-    this.props.dispatch(updateSettings({
-      wordlist: newlist.toLowerCase()
-        .split(',')
-        .map((word) => word.trim())
-    }));
+    const newlist = event.target.value.toLowerCase();
+    this.setState({[list]: newlist, changed: true});
+    this.props.dispatch(updateWordlist(list, newlist.split(',').map(word => word.trim()) ));
   }
 
   onSettingUpdate = (setting) => {
@@ -90,7 +94,8 @@ class Configure extends React.Component {
       return <EmbedLink title={pageTitle} />;
     case 'wordlist':
       return <Wordlist
-        bannedWords={this.state.wordlist}
+        bannedWords={this.state.banned}
+        suspectWords={this.state.suspect}
         onChangeWordlist={this.onChangeWordlist}/>;
     }
   }
diff --git a/client/coral-admin/src/containers/Configure/Wordlist.js b/client/coral-admin/src/containers/Configure/Wordlist.js
index fd48c44d2..ad7db36a5 100644
--- a/client/coral-admin/src/containers/Configure/Wordlist.js
+++ b/client/coral-admin/src/containers/Configure/Wordlist.js
@@ -16,7 +16,7 @@ const Wordlist = ({suspectWords, bannedWords, onChangeWordlist}) => (
         rows={5}
         type='text'
         className={styles.wordlistInput}
-        onChange={onChangeWordlist}
+        onChange={e => onChangeWordlist(e, 'banned')}
         value={bannedWords} />
     </Card>
     <h3>{lang.t('configure.suspect-words-title')}</h3>
@@ -27,7 +27,7 @@ const Wordlist = ({suspectWords, bannedWords, onChangeWordlist}) => (
         rows={5}
         type='text'
         className={styles.wordlistInput}
-        onChange={() => {}}
+        onChange={e => onChangeWordlist(e, 'suspect')}
         value={suspectWords} />
     </Card>
   </div>
diff --git a/client/coral-admin/src/reducers/settings.js b/client/coral-admin/src/reducers/settings.js
index 20cd024f5..640fdfc8d 100644
--- a/client/coral-admin/src/reducers/settings.js
+++ b/client/coral-admin/src/reducers/settings.js
@@ -18,16 +18,27 @@ export default (state = initialState, action) => {
   case types.SAVE_SETTINGS_LOADING: return state.set('fetchingSettings', true).set('saveSettingsError', null);
   case types.SAVE_SETTINGS_SUCCESS: return saveComplete(state, action);
   case types.SAVE_SETTINGS_FAILED: return settingsSaveFailed(state, action);
+  case types.WORDLIST_UPDATED: return updateWordlist(state, action);
   default: return state;
   }
 };
 
 const updateSettings = (state, action) => {
+  console.log('updateSettings', state, action);
   const s = state.set('fetchingSettings', false).set('fetchSettingsError', null);
   const settings = s.get('settings').merge(action.settings);
   return s.set('settings', settings);
 };
 
+const updateWordlist = (state, action) => {
+  const wordlist = state
+    .get('settings')
+    .get('wordlist')
+    .merge({[action.listName]: action.list});
+  const settings = state.get('settings').merge({wordlist});
+  return state.set('settings', settings);
+};
+
 const saveComplete = (state, action) => {
   const s = state.set('fetchingSettings', false).set('saveSettingsError', null);
   const settings = s.get('settings').merge(action.settings);
diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json
index 5a7e413bf..028392497 100644
--- a/client/coral-admin/src/translations.json
+++ b/client/coral-admin/src/translations.json
@@ -117,7 +117,7 @@
       "include-text": "Incluir tu texto aqui.",
       "comment-settings": "Configuración de Comentarios",
       "embed-comment-stream": "Colocar Hilo de Comentarios",
-      "wordlist": "Lista de palabras no permitidas",
+      "wordlist": "Palabras Suspendidas y Suspechosas",
       "banned-word-header": "Escribir las palabras no permitidas",
       "banned-word-text": "Comentarios que contengan estas palabras o frases, no separadas por comas y en mayusculas o minusuculas, serán automaticamente separadas de los comentarios publicados.",
       "suspect-word-header": "",

From 123ba07b6342ec452cdc6c7274876bdf19b396e5 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Mon, 19 Dec 2016 16:43:00 -0700
Subject: [PATCH 23/54] add tag package to simplify wordlist ui

---
 .../src/containers/Configure/Configure.js     | 33 ++++--------
 .../src/containers/Configure/Wordlist.js      | 30 +++++------
 client/coral-admin/src/reducers/settings.js   |  2 +-
 package.json                                  |  1 +
 views/admin.ejs                               | 50 +++++++++++++++++++
 5 files changed, 77 insertions(+), 39 deletions(-)

diff --git a/client/coral-admin/src/containers/Configure/Configure.js b/client/coral-admin/src/containers/Configure/Configure.js
index 1f31807ff..c45297af4 100644
--- a/client/coral-admin/src/containers/Configure/Configure.js
+++ b/client/coral-admin/src/containers/Configure/Configure.js
@@ -19,6 +19,7 @@ import translations from '../../translations.json';
 import EmbedLink from './EmbedLink';
 import CommentSettings from './CommentSettings';
 import Wordlist from './Wordlist';
+import has from 'lodash/has';
 
 class Configure extends React.Component {
   constructor (props) {
@@ -26,8 +27,6 @@ class Configure extends React.Component {
 
     this.state = {
       activeSection: 'comments',
-      banned: [],
-      suspect: [],
       changed: false,
       errors: {}
     };
@@ -37,18 +36,6 @@ class Configure extends React.Component {
     this.props.dispatch(fetchSettings());
   }
 
-  componentWillUpdate = (newProps) => {
-    if ((!this.props.settings
-      || !this.props.settings.wordlist)
-      && newProps.settings.wordlist
-      && newProps.settings.wordlist.length !== 0 ) {
-      this.setState({
-        banned: newProps.settings.wordlist.banned.join(', '),
-        suspect: newProps.settings.wordlist.suspect.join(', ')
-      });
-    }
-  }
-
   saveSettings = () => {
     this.props.dispatch(saveSettingsToServer());
     this.setState({changed: false});
@@ -58,11 +45,8 @@ class Configure extends React.Component {
     this.setState({activeSection});
   }
 
-  onChangeWordlist = (event, list) => {
-    event.preventDefault();
-    const newlist = event.target.value.toLowerCase();
-    this.setState({[list]: newlist, changed: true});
-    this.props.dispatch(updateWordlist(list, newlist.split(',').map(word => word.trim()) ));
+  onChangeWordlist = (listName, list) => {
+    this.props.dispatch(updateWordlist(listName, list));
   }
 
   onSettingUpdate = (setting) => {
@@ -81,6 +65,7 @@ class Configure extends React.Component {
 
   getSection (section) {
     const pageTitle = this.getPageTitle(section);
+    console.log('getSection', this.props);
     switch(section){
     case 'comments':
       return <CommentSettings
@@ -93,10 +78,12 @@ class Configure extends React.Component {
     case 'embed':
       return <EmbedLink title={pageTitle} />;
     case 'wordlist':
-      return <Wordlist
-        bannedWords={this.state.banned}
-        suspectWords={this.state.suspect}
-        onChangeWordlist={this.onChangeWordlist}/>;
+      return has(this, 'props.settings.wordlist')
+        ? <Wordlist
+          bannedWords={this.props.settings.wordlist.banned}
+          suspectWords={this.props.settings.wordlist.suspect}
+          onChangeWordlist={this.onChangeWordlist} />
+        : <p>loading wordlists</p>;
     }
   }
 
diff --git a/client/coral-admin/src/containers/Configure/Wordlist.js b/client/coral-admin/src/containers/Configure/Wordlist.js
index ad7db36a5..29f3f67fc 100644
--- a/client/coral-admin/src/containers/Configure/Wordlist.js
+++ b/client/coral-admin/src/containers/Configure/Wordlist.js
@@ -1,10 +1,14 @@
 import React from 'react';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../../translations.json';
+import TagsInput from 'react-tagsinput';
+import tagStyles from 'react-tagsinput/react-tagsinput.css';
+
 import styles from './Configure.css';
-import {
-  Card
-} from 'react-mdl';
+
+import {Card} from 'react-mdl';
+
+console.log('tagStyles', tagStyles);
 
 const Wordlist = ({suspectWords, bannedWords, onChangeWordlist}) => (
   <div>
@@ -12,23 +16,19 @@ const Wordlist = ({suspectWords, bannedWords, onChangeWordlist}) => (
     <Card id={styles.bannedWordlist} shadow={2}>
       <p className={styles.wordlistHeader}>{lang.t('configure.banned-word-header')}</p>
       <p className={styles.wordlistDesc}>{lang.t('configure.banned-word-text')}</p>
-      <textarea
-        rows={5}
-        type='text'
-        className={styles.wordlistInput}
-        onChange={e => onChangeWordlist(e, 'banned')}
-        value={bannedWords} />
+      <TagsInput
+        value={bannedWords}
+        inputProps={{placeholder: 'word or phrase'}}
+        onChange={tags => onChangeWordlist('banned', tags)} />
     </Card>
     <h3>{lang.t('configure.suspect-words-title')}</h3>
     <Card id={styles.suspectWordlist} shadow={2}>
       <p className={styles.wordlistHeader}>{lang.t('configure.suspect-word-header')}</p>
       <p className={styles.wordlistDesc}>{lang.t('configure.suspect-word-text')}</p>
-      <textarea
-        rows={5}
-        type='text'
-        className={styles.wordlistInput}
-        onChange={e => onChangeWordlist(e, 'suspect')}
-        value={suspectWords} />
+      <TagsInput
+        value={suspectWords}
+        inputProps={{placeholder: 'word or phrase'}}
+        onChange={tags => onChangeWordlist('suspect', tags)} />
     </Card>
   </div>
 );
diff --git a/client/coral-admin/src/reducers/settings.js b/client/coral-admin/src/reducers/settings.js
index 640fdfc8d..8fbd67690 100644
--- a/client/coral-admin/src/reducers/settings.js
+++ b/client/coral-admin/src/reducers/settings.js
@@ -24,7 +24,6 @@ export default (state = initialState, action) => {
 };
 
 const updateSettings = (state, action) => {
-  console.log('updateSettings', state, action);
   const s = state.set('fetchingSettings', false).set('fetchSettingsError', null);
   const settings = s.get('settings').merge(action.settings);
   return s.set('settings', settings);
@@ -42,6 +41,7 @@ const updateWordlist = (state, action) => {
 const saveComplete = (state, action) => {
   const s = state.set('fetchingSettings', false).set('saveSettingsError', null);
   const settings = s.get('settings').merge(action.settings);
+  console.log('saveComplete', settings.toJS());
   return s.set('settings', settings);
 };
 
diff --git a/package.json b/package.json
index 4ec24a27a..e700f7113 100644
--- a/package.json
+++ b/package.json
@@ -132,6 +132,7 @@
     "react-onclickoutside": "^5.7.1",
     "react-redux": "^4.4.5",
     "react-router": "^3.0.0",
+    "react-tagsinput": "^3.14.0",
     "redux": "^3.6.0",
     "redux-mock-store": "^1.2.1",
     "redux-thunk": "^2.1.0",
diff --git a/views/admin.ejs b/views/admin.ejs
index 038fb58d7..ec451a51c 100644
--- a/views/admin.ejs
+++ b/views/admin.ejs
@@ -13,6 +13,56 @@
         margin: 0;
         background: #fff;
       }
+      .react-tagsinput {
+        background-color: #fff;
+        border: 1px solid #ccc;
+        overflow: hidden;
+        padding-left: 5px;
+        padding-top: 5px;
+      }
+
+      .react-tagsinput--focused {
+        border-color: rgb(142, 76, 65);
+      }
+
+      .react-tagsinput-tag {
+        background-color: rgb(244, 126, 107);
+        border-radius: 2px;
+        border: 1px solid rgb(142, 76, 65);
+        color: rgb(142, 76, 65);
+        display: inline-block;
+        font-family: sans-serif;
+        font-size: 13px;
+        font-weight: 400;
+        margin-bottom: 5px;
+        margin-right: 5px;
+        padding: 5px;
+      }
+
+      .react-tagsinput-remove {
+        cursor: pointer;
+        font-weight: bold;
+        color: rgb(101, 24, 23);
+      }
+
+      .react-tagsinput-tag a::before {
+        content: " ×";
+      }
+
+      .react-tagsinput-input {
+        background: transparent;
+        border: 0;
+        color: #777;
+        font-family: sans-serif;
+        font-size: 13px;
+        font-weight: 400;
+        margin-bottom: 6px;
+        margin-top: 1px;
+        outline: none;
+        padding: 5px;
+        width: 90px;
+      }
+
     </style>
   </head>
   <body>

From 706cefad9e1fa5a35cfd68aef76d550c3c60043c Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Mon, 19 Dec 2016 16:49:05 -0700
Subject: [PATCH 24/54] simplify wordlist ui further

---
 client/coral-admin/src/containers/Configure/Configure.js | 1 +
 client/coral-admin/src/containers/Configure/Wordlist.js  | 3 ---
 views/admin.ejs                                          | 7 ++++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/client/coral-admin/src/containers/Configure/Configure.js b/client/coral-admin/src/containers/Configure/Configure.js
index c45297af4..93f0becb2 100644
--- a/client/coral-admin/src/containers/Configure/Configure.js
+++ b/client/coral-admin/src/containers/Configure/Configure.js
@@ -46,6 +46,7 @@ class Configure extends React.Component {
   }
 
   onChangeWordlist = (listName, list) => {
+    this.setState({changed: true});
     this.props.dispatch(updateWordlist(listName, list));
   }
 
diff --git a/client/coral-admin/src/containers/Configure/Wordlist.js b/client/coral-admin/src/containers/Configure/Wordlist.js
index 29f3f67fc..01bbf5203 100644
--- a/client/coral-admin/src/containers/Configure/Wordlist.js
+++ b/client/coral-admin/src/containers/Configure/Wordlist.js
@@ -2,14 +2,11 @@ import React from 'react';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../../translations.json';
 import TagsInput from 'react-tagsinput';
-import tagStyles from 'react-tagsinput/react-tagsinput.css';
 
 import styles from './Configure.css';
 
 import {Card} from 'react-mdl';
 
-console.log('tagStyles', tagStyles);
-
 const Wordlist = ({suspectWords, bannedWords, onChangeWordlist}) => (
   <div>
     <h3>{lang.t('configure.banned-words-title')}</h3>
diff --git a/views/admin.ejs b/views/admin.ejs
index ec451a51c..49a921875 100644
--- a/views/admin.ejs
+++ b/views/admin.ejs
@@ -13,6 +13,7 @@
         margin: 0;
         background: #fff;
       }
+      /* putting this here until I can get webpack to behave */
       .react-tagsinput {
         background-color: #fff;
         border: 1px solid #ccc;
@@ -26,10 +27,10 @@
       }
 
       .react-tagsinput-tag {
-        background-color: rgb(244, 126, 107);
+        background-color: rgb(255, 220, 214);
         border-radius: 2px;
-        border: 1px solid rgb(142, 76, 65);
-        color: rgb(142, 76, 65);
+        border: 1px solid rgb(244, 126, 107);
+        color: rgb(244, 126, 107);
         display: inline-block;
         font-family: sans-serif;
         font-size: 13px;

From be3d50645991b6243dff621272ce9d55d23cb20f Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Mon, 19 Dec 2016 20:10:42 -0500
Subject: [PATCH 25/54] Moving action metadata to nested object.

---
 client/coral-plugin-flags/FlagButton.js | 30 +++++++++++++------------
 models/action.js                        |  4 +---
 models/comment.js                       |  5 ++---
 models/user.js                          |  5 ++---
 routes/api/comments/index.js            |  5 ++---
 routes/api/users/index.js               |  5 ++---
 tests/routes/api/comments/index.js      |  5 +++--
 tests/routes/api/user/index.js          |  8 ++++---
 8 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/client/coral-plugin-flags/FlagButton.js b/client/coral-plugin-flags/FlagButton.js
index 57b3d1946..3deeee1c9 100644
--- a/client/coral-plugin-flags/FlagButton.js
+++ b/client/coral-plugin-flags/FlagButton.js
@@ -11,8 +11,8 @@ class FlagButton extends Component {
   state = {
     showMenu: false,
     itemType: '',
-    detail: '',
-    description: '',
+    reason: '',
+    note: '',
     step: 0,
     posted: false
   }
@@ -29,7 +29,7 @@ class FlagButton extends Component {
 
   onPopupContinue = () => {
     const {postAction, addItem, updateItem, flag, id, author_id} = this.props;
-    const {itemType, field, detail, step, description, posted} = this.state;
+    const {itemType, field, reason, step, note, posted} = this.state;
 
     //Proceed to the next step or close the menu if we've reached the end
     if (step + 1 >= this.props.getPopupMenu.length) {
@@ -38,8 +38,8 @@ class FlagButton extends Component {
       this.setState({step: step + 1});
     }
 
-    // If itemType and detail are both set, post the action
-    if (itemType && detail && !posted) {
+    // If itemType and reason are both set, post the action
+    if (itemType && reason && !posted) {
       // Set the text from the "other" field if it exists.
       let item_id;
       switch(itemType) {
@@ -52,9 +52,11 @@ class FlagButton extends Component {
       }
       const action = {
         action_type: 'flag',
-        field,
-        detail,
-        description
+        metadata: {
+          field,
+          reason,
+          note
+        }
       };
       postAction(item_id, itemType, action)
         .then((action) => {
@@ -69,7 +71,7 @@ class FlagButton extends Component {
   onPopupOptionClick = (sets) => (e) => {
 
     // If the "other" option is clicked, show the other textbox
-    if(sets === 'detail' && e.target.value === 'other') {
+    if(sets === 'reason' && e.target.value === 'other') {
       this.setState({showOther: true});
     }
 
@@ -91,7 +93,7 @@ class FlagButton extends Component {
   }
 
   onOtherTextChange = (e) => {
-    this.setState({description: e.target.value});
+    this.setState({note: e.target.value});
   }
 
   handleClickOutside () {
@@ -140,16 +142,16 @@ class FlagButton extends Component {
                   )
                 }
                 {
-                  this.state.detail && <div>
-                  <label htmlFor={'description'} className={`${name}-popup-radio-label`}>
+                  this.state.reason && <div>
+                  <label htmlFor={'note'} className={`${name}-popup-radio-label`}>
                     {lang.t('flag-reason')}
                   </label><br/>
                 <textarea
                       className={`${name}-other-text`}
-                      id="description"
+                      id="note"
                       rows={4}
                       onChange={this.onOtherTextChange}
-                      value={this.state.description}/>
+                      value={this.state.note}/>
                   </div>
                 }
               </form>
diff --git a/models/action.js b/models/action.js
index ef3d0c525..79eabdd98 100644
--- a/models/action.js
+++ b/models/action.js
@@ -13,9 +13,7 @@ const ActionSchema = new Schema({
   item_type: String,
   item_id: String,
   user_id: String,
-  field: String, // Used when an action references a particular field of an object. (e.g. a flag on a username or bio)
-  detail: String, // Describes the reason for an action (e.g. 'Username is offensive')
-  description: String, // Describes the reason for the action in more detail (e.g. A description of why the comment is offensive.)
+  metadata: Object, //Holds arbitrary metadata about the action.
 }, {
   timestamps: {
     createdAt: 'created_at',
diff --git a/models/comment.js b/models/comment.js
index a855862d2..b2bd0367c 100644
--- a/models/comment.js
+++ b/models/comment.js
@@ -287,13 +287,12 @@ CommentSchema.statics.pushStatus = (id, status, assigned_by = null) => Comment.u
  * @param {String} action the new action to the comment
  * @return {Promise}
  */
-CommentSchema.statics.addAction = (item_id, user_id, action_type, field, detail) => Action.insertUserAction({
+CommentSchema.statics.addAction = (item_id, user_id, action_type, metadata) => Action.insertUserAction({
   item_id,
   item_type: 'comments',
   user_id,
   action_type,
-  field,
-  detail
+  metadata
 });
 
 /**
diff --git a/models/user.js b/models/user.js
index 287f57df2..d1be9e238 100644
--- a/models/user.js
+++ b/models/user.js
@@ -611,11 +611,10 @@ UserService.addBio = (id, bio) => (
  * @param {String} action the new action to the user
  * @return {Promise}
  */
-UserService.addAction = (item_id, user_id, action_type, field, detail) => Action.insertUserAction({
+UserService.addAction = (item_id, user_id, action_type, metadata) => Action.insertUserAction({
   item_id,
   item_type: 'users',
   user_id,
   action_type,
-  field,
-  detail
+  metadata
 });
diff --git a/routes/api/comments/index.js b/routes/api/comments/index.js
index 90b8b40f2..e8181e116 100644
--- a/routes/api/comments/index.js
+++ b/routes/api/comments/index.js
@@ -187,12 +187,11 @@ router.post('/:comment_id/actions', (req, res, next) => {
 
   const {
     action_type,
-    field,
-    detail
+    metadata
   } = req.body;
 
   Comment
-    .addAction(req.params.comment_id, req.user.id, action_type, field, detail)
+    .addAction(req.params.comment_id, req.user.id, action_type, metadata)
     .then((action) => {
       res.status(201).json(action);
     })
diff --git a/routes/api/users/index.js b/routes/api/users/index.js
index 5b0c48de8..3288a196f 100644
--- a/routes/api/users/index.js
+++ b/routes/api/users/index.js
@@ -161,12 +161,11 @@ router.put('/:user_id/bio', (req, res, next) => {
 router.post('/:user_id/actions',  authorization.needed(), (req, res, next) => {
   const {
     action_type,
-    field,
-    detail
+    metadata
   } = req.body;
 
   User
-    .addAction(req.params.user_id, req.user.id, action_type, field, detail)
+    .addAction(req.params.user_id, req.user.id, action_type, metadata)
     .then((action) => {
       res.status(201).json(action);
     })
diff --git a/tests/routes/api/comments/index.js b/tests/routes/api/comments/index.js
index 1d7ad5321..5e7045fb0 100644
--- a/tests/routes/api/comments/index.js
+++ b/tests/routes/api/comments/index.js
@@ -440,12 +440,13 @@ describe('/api/v1/comments/:comment_id/actions', () => {
       return chai.request(app)
         .post('/api/v1/comments/abc/actions')
         .set(passport.inject({id: '456', roles: ['admin']}))
-        .send({'action_type': 'flag', 'detail': 'Comment is too awesome.'})
+        .send({'action_type': 'flag', 'metadata': {'reason': 'Comment is too awesome.'}})
         .then((res) => {
           expect(res).to.have.status(201);
           expect(res).to.have.body;
           expect(res.body).to.have.property('action_type', 'flag');
-          expect(res.body).to.have.property('detail', 'Comment is too awesome.');
+          expect(res.body).to.have.property('metadata')
+            .and.to.deep.equal({'reason': 'Comment is too awesome.'});
           expect(res.body).to.have.property('item_id', 'abc');
         });
     });
diff --git a/tests/routes/api/user/index.js b/tests/routes/api/user/index.js
index 4c0c293d0..ad82b78bc 100644
--- a/tests/routes/api/user/index.js
+++ b/tests/routes/api/user/index.js
@@ -31,14 +31,16 @@ describe('/api/v1/users/:user_id/actions', () => {
       return chai.request(app)
         .post('/api/v1/users/abc/actions')
         .set(passport.inject({id: '456', roles: ['admin']}))
-        .send({'action_type': 'flag', 'detail': 'Bio is too awesome.'})
+        .send({'action_type': 'flag', 'metadata': {'reason': 'Bio is too awesome.'}})
         .then((res) => {
           expect(res).to.have.status(201);
           expect(res).to.have.body;
           expect(res.body).to.have.property('action_type', 'flag');
-          expect(res.body).to.have.property('detail', 'Bio is too awesome.');
+          expect(res.body).to.have.property('metadata')
+            .and.to.deep.equal({'reason': 'Bio is too awesome.'});
           expect(res.body).to.have.property('item_id', 'abc');
-        });
+        })
+        .catch(err => console.error(err.message));
     });
   });
 });

From 8849dcbf5c1d1d975c20ea33029c9e80723cc213 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Tue, 20 Dec 2016 10:29:49 -0700
Subject: [PATCH 26/54] add propTypes to CommentList

---
 .../coral-admin/src/components/CommentList.js | 33 ++++++++++++++++---
 .../ModerationQueue/ModerationQueue.js        |  9 ++++-
 client/coral-admin/src/translations.json      |  4 +--
 3 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/client/coral-admin/src/components/CommentList.js b/client/coral-admin/src/components/CommentList.js
index 597ea62a6..4f1d75d81 100644
--- a/client/coral-admin/src/components/CommentList.js
+++ b/client/coral-admin/src/components/CommentList.js
@@ -1,5 +1,4 @@
-
-import React from 'react';
+import React, {PropTypes} from 'react';
 import styles from './CommentList.css';
 import key from 'keymaster';
 import Hammer from 'hammerjs';
@@ -15,6 +14,28 @@ const actions = {
 
 // Renders a comment list and allow performing actions
 export default class CommentList extends React.Component {
+  static propTypes = {
+    isActive: PropTypes.bool,
+    singleView: PropTypes.bool,
+    commentIds: PropTypes.arrayOf(PropTypes.string).isRequired,
+    comments: PropTypes.object.isRequired,
+    users: PropTypes.object.isRequired,
+    onClickAction: PropTypes.func,
+    actions: PropTypes.arrayOf(PropTypes.string),
+    loading: PropTypes.bool,
+    // list of actions (flags, etc) associated with the comments
+    commentActions: PropTypes.arrayOf(
+      PropTypes.shape({
+        action_type: PropTypes.string,
+        count: PropTypes.number,
+        current_user: PropTypes.string,
+        item_id: PropTypes.string,
+        item_type: PropTypes.string
+      })
+    ),
+    suspectWords: PropTypes.arrayOf(PropTypes.string)
+  }
+
   constructor (props) {
     super(props);
 
@@ -122,7 +143,7 @@ export default class CommentList extends React.Component {
   }
 
   render () {
-    const {singleView, commentIds, comments, users, hideActive, key} = this.props;
+    const {singleView, commentIds, comments, users, hideActive, key, suspectWords, commentActions} = this.props;
     const {active} = this.state;
 
     return (
@@ -130,7 +151,11 @@ export default class CommentList extends React.Component {
         {commentIds.map((commentId, index) => {
           const comment = comments[commentId];
           const author = users[comment.author_id];
-          return <Comment comment={comment}
+          const localActions = commentActions.filter(action => action.item_id === commentId);
+          return <Comment
+            commentActions={localActions}
+            suspectWords={suspectWords}
+            comment={comment}
             author={author}
             key={index}
             index={index}
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
index a76652b18..692173f45 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
@@ -83,9 +83,11 @@ class ModerationQueue extends React.Component {
 
   // Render the tabbed lists moderation queues
   render () {
-    const {comments, users} = this.props;
+    const {comments, users, settings} = this.props;
     const {activeTab, singleView, modalOpen} = this.state;
 
+    console.log('ModerationQueue comments', comments);
+
     const premodIds = comments.ids.filter(id => comments.byId[id].status === 'premod');
     const rejectedIds = comments.ids.filter(id => comments.byId[id].status === 'rejected');
     const flaggedIds = comments.ids.filter(id => comments.byId[id].flagged === true);
@@ -108,6 +110,8 @@ class ModerationQueue extends React.Component {
           </div>
           <div className={`mdl-tabs__panel is-active ${styles.listContainer}`} id='pending'>
             <CommentList
+              suspectWords={['fishy', 'shady']}
+              commentActions={[]}
               isActive={activeTab === 'pending'}
               singleView={singleView}
               commentIds={premodIds}
@@ -125,6 +129,7 @@ class ModerationQueue extends React.Component {
           </div>
           <div className={`mdl-tabs__panel ${styles.listContainer}`} id='rejected'>
             <CommentList
+              commentActions={[]}
               isActive={activeTab === 'rejected'}
               singleView={singleView}
               commentIds={rejectedIds}
@@ -136,6 +141,7 @@ class ModerationQueue extends React.Component {
           </div>
           <div className={`mdl-tabs__panel ${styles.listContainer}`} id='flagged'>
             <CommentList
+              commentActions={[]}
               isActive={activeTab === 'flagged'}
               singleView={singleView}
               commentIds={flaggedIds}
@@ -157,6 +163,7 @@ class ModerationQueue extends React.Component {
 }
 
 const mapStateToProps = state => ({
+  settings: state.settings.toJS(),
   comments: state.comments.toJS(),
   users: state.users.toJS()
 });
diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json
index 028392497..eee0bc443 100644
--- a/client/coral-admin/src/translations.json
+++ b/client/coral-admin/src/translations.json
@@ -49,9 +49,9 @@
       "comment-settings": "Comment Settings",
       "embed-comment-stream": "Embed Comment Stream",
       "banned-word-header": "Write the bannned words list",
-      "banned-word-text": "Comments which contain these words or phrases, not separated by commas and not case-sensitive, will be automatically removed from the comment stream.",
+      "banned-word-text": "Comments which contain these words or phrases (not case-sensitive) will be automatically removed from the comment stream.",
       "suspect-word-header": "Write the suspect words list",
-      "suspect-word-text": "Comments which contain these words or phrases, not separated by commas and not case-sensitive will be highlighted in the comment stream",
+      "suspect-word-text": "Comments which contain these words or phrases (not case-sensitive) will be highlighted in the comment stream",
       "wordlist": "Banned & Suspect Words",
       "banned-words-title": "Banned words list",
       "suspect-words-title": "Suspect words list",

From d7829232a309010ee79779f8f135529c0d8bffa4 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Tue, 20 Dec 2016 12:00:56 -0800
Subject: [PATCH 27/54] Making font sizes relative.

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

diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css
index 463c8dc68..cb1a78a85 100644
--- a/client/coral-embed-stream/style/default.css
+++ b/client/coral-embed-stream/style/default.css
@@ -114,7 +114,6 @@ hr {
 .coral-plugin-commentbox-char-count {
   color: #ccc;
   text-align: right;
-  font-size: 12px;
 }
 
 .coral-plugin-commentbox-char-max {
@@ -230,7 +229,7 @@ hr {
 
 .coral-plugin-flags-popup-header {
   font-weight: bolder;
-  font-size: 16px;
+  font-size: 1.33rem;
   margin-bottom: 10px;
 }
 
@@ -240,7 +239,7 @@ hr {
 
 .coral-plugin-flags-popup-radio-label {
   margin:5px;
-  font-size: 14px;
+  font-size: 1.16rem;
 }
 
 .coral-plugin-flags-popup-counter {
@@ -290,7 +289,7 @@ hr {
 .close-comments-alert {
   background-color: #d65344;
   color: white;
-  font-size: 16px;
+  font-size: 1.33rem;
   padding: 5px;
 }
 

From 67225b3a4bdc09986da7cdf1a125d610862fece3 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Tue, 20 Dec 2016 13:39:04 -0800
Subject: [PATCH 28/54] Updating documentation for actions.

---
 docs/swagger.yaml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index f6aba4d25..808e11dfd 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -458,14 +458,22 @@ definitions:
     properties:
       item_id:
         type: string
+        description: The ID of the item which these actions target
       item_type:
-        type: string # comment, user...
+        type: string
+        description: The type of item which these actions target (comment, user, etc.)
       type:
-        type: string # flagged, likes, upvotes...
+        type: string
+        description: The type of action (like, flag, etc.)
       count:
         type: integer
+        description: The number of this type of actions performed on this item.
+      metadata:
+        type: array
+        description: An array of metadata from the actions performed on this item. This metadata can be defined differently for each action type.
       current_user:
-        type: boolean
+        type: Object
+        description: Will include the action performed by the currently logged in user if that user has taken an action on this item. Otherwise will return null.
   Action:
     type: object
     properties:

From c4510c1abf2c353a55f2a7dc91ffba6c42c9d247 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Tue, 20 Dec 2016 13:43:38 -0800
Subject: [PATCH 29/54] Updating action documentation.

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

diff --git a/client/coral-framework/actions/items.js b/client/coral-framework/actions/items.js
index 160dcb24c..243429863 100644
--- a/client/coral-framework/actions/items.js
+++ b/client/coral-framework/actions/items.js
@@ -208,7 +208,9 @@ export function postItem (item, type, id) {
 *
 * @params
 *   id - the id of the item on which the action is taking place
-*   action - the name of the action
+*   action - the action object.
+*       Must include an 'action_type' string.
+*       May optionally include a `metadata` object with arbitrary action data.
 *   user - the user performing the action
 *   host - the coral host
 *

From 9e0ab7d2a19a243933953c0646b6df58dcae7a35 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Tue, 20 Dec 2016 15:47:27 -0700
Subject: [PATCH 30/54] load actions in a reducer

---
 client/coral-admin/src/actions/comments.js    | 28 ++++++++++---------
 client/coral-admin/src/constants/actions.js   |  1 +
 client/coral-admin/src/constants/comments.js  |  6 ++--
 .../ModerationQueue/ModerationQueue.js        |  5 +++-
 client/coral-admin/src/reducers/actions.js    | 24 ++++++++++++++++
 client/coral-admin/src/reducers/comments.js   |  2 +-
 client/coral-admin/src/reducers/index.js      |  2 ++
 7 files changed, 50 insertions(+), 18 deletions(-)
 create mode 100644 client/coral-admin/src/constants/actions.js
 create mode 100644 client/coral-admin/src/reducers/actions.js

diff --git a/client/coral-admin/src/actions/comments.js b/client/coral-admin/src/actions/comments.js
index e755f1ed1..66543ef36 100644
--- a/client/coral-admin/src/actions/comments.js
+++ b/client/coral-admin/src/actions/comments.js
@@ -1,10 +1,11 @@
 import coralApi from '../../../coral-framework/helpers/response';
-import * as commentActions from '../constants/comments';
+import * as commentTypes from '../constants/comments';
+import * as actionTypes from '../constants/actions';
 
 // Get comments to fill each of the three lists on the mod queue
 export const fetchModerationQueueComments = () => {
   return dispatch => {
-    dispatch({type: commentActions.COMMENTS_MODERATION_QUEUE_FETCH});
+    dispatch({type: commentTypes.COMMENTS_MODERATION_QUEUE_FETCH});
     return Promise.all([
       coralApi('/queue/comments/pending'),
       coralApi('/comments?status=rejected'),
@@ -20,11 +21,12 @@ export const fetchModerationQueueComments = () => {
         actions: [...pending.actions, ...rejected.actions, ...flagged.actions]
       };
     })
-    .then(({comments, users}) => {
+    .then(({comments, users, actions}) => {
 
       /* Post comments and users to redux store. Actions will be posted when they are needed. */
-      dispatch({type: commentActions.USERS_MODERATION_QUEUE_FETCH_SUCCESS, users});
-      dispatch({type: commentActions.COMMENTS_MODERATION_QUEUE_FETCH_SUCCESS, comments});
+      dispatch({type: commentTypes.USERS_MODERATION_QUEUE_FETCH_SUCCESS, users});
+      dispatch({type: commentTypes.COMMENTS_MODERATION_QUEUE_FETCH_SUCCESS, comments});
+      dispatch({type: actionTypes.ACTIONS_MODERATION_QUEUE_FETCH_SUCCESS, actions});
 
     });
   };
@@ -35,8 +37,8 @@ export const createComment = (name, body) => {
   return dispatch => {
     const comment = {body, name};
     return coralApi('/comments', {method: 'POST', comment})
-      .then(res => dispatch({type: commentActions.COMMENT_CREATE_SUCCESS, comment: res}))
-      .catch(error => dispatch({type: commentActions.COMMENT_CREATE_FAILED, error}));
+      .then(res => dispatch({type: commentTypes.COMMENT_CREATE_SUCCESS, comment: res}))
+      .catch(error => dispatch({type: commentTypes.COMMENT_CREATE_FAILED, error}));
   };
 };
 
@@ -47,23 +49,23 @@ export const createComment = (name, body) => {
 // Update a comment. Now to update a comment we need to send back the whole object
 export const updateStatus = (status, comment) => {
   return dispatch => {
-    dispatch({type: commentActions.COMMENT_STATUS_UPDATE, id: comment.id, status});
+    dispatch({type: commentTypes.COMMENT_STATUS_UPDATE_REQUEST, id: comment.id, status});
     return coralApi(`/comments/${comment.id}/status`, {method: 'PUT', body: {status}})
-      .then(res => dispatch({type: commentActions.COMMENT_UPDATE_SUCCESS, res}))
-      .catch(error => dispatch({type: commentActions.COMMENT_UPDATE_FAILED, error}));
+      .then(res => dispatch({type: commentTypes.COMMENT_STATUS_UPDATE_SUCCESS, res}))
+      .catch(error => dispatch({type: commentTypes.COMMENT_STATUS_UPDATE_FAILURE, error}));
   };
 };
 
 export const flagComment = id => (dispatch, getState) => {
-  dispatch({type: commentActions.COMMENT_FLAG, id});
+  dispatch({type: commentTypes.COMMENT_FLAG, id});
   dispatch({type: 'COMMENT_UPDATE', comment: getState().comments.get('byId').get(id)});
 };
 
 // Dialog Actions
 export const showBanUserDialog = (userId, userName, commentId) => {
-  return {type: commentActions.SHOW_BANUSER_DIALOG, userId, userName, commentId};
+  return {type: commentTypes.SHOW_BANUSER_DIALOG, userId, userName, commentId};
 };
 
 export const hideBanUserDialog = (showDialog) => {
-  return {type: commentActions.HIDE_BANUSER_DIALOG, showDialog};
+  return {type: commentTypes.HIDE_BANUSER_DIALOG, showDialog};
 };
diff --git a/client/coral-admin/src/constants/actions.js b/client/coral-admin/src/constants/actions.js
new file mode 100644
index 000000000..d64c62d26
--- /dev/null
+++ b/client/coral-admin/src/constants/actions.js
@@ -0,0 +1 @@
+export const ACTIONS_MODERATION_QUEUE_FETCH_SUCCESS = 'ACTIONS_MODERATION_QUEUE_FETCH_SUCCESS';
diff --git a/client/coral-admin/src/constants/comments.js b/client/coral-admin/src/constants/comments.js
index c75911587..ea15a24c3 100644
--- a/client/coral-admin/src/constants/comments.js
+++ b/client/coral-admin/src/constants/comments.js
@@ -7,7 +7,7 @@ export const COMMENTS_MODERATION_QUEUE_FETCH_SUCCESS = 'COMMENTS_MODERATION_QUEU
 export const COMMENT_CREATE_SUCCESS = 'COMMENT_CREATE_SUCCESS';
 export const COMMENT_CREATE_FAILED = 'COMMENT_CREATE_FAILED';
 export const COMMENT_STREAM_FETCH_SUCCESS = 'COMMENT_STREAM_FETCH_SUCCESS';
-export const COMMENT_UPDATE_SUCCESS = 'COMMENT_UPDATE_SUCCESS';
-export const COMMENT_UPDATE_FAILED = 'COMMENT_UPDATE_FAILED';
-export const COMMENT_STATUS_UPDATE = 'COMMENT_STATUS_UPDATE';
+export const COMMENT_STATUS_UPDATE_SUCCESS = 'COMMENT_STATUS_UPDATE_SUCCESS';
+export const COMMENT_STATUS_UPDATE_FAILURE = 'COMMENT_STATUS_UPDATE_FAILURE';
+export const COMMENT_STATUS_UPDATE_REQUEST = 'COMMENT_STATUS_UPDATE_REQUEST';
 export const COMMENT_FLAG = 'COMMENT_FLAG';
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
index 451d53a3a..2e59e20ee 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
@@ -86,10 +86,12 @@ class ModerationQueue extends React.Component {
 
   // Render the tabbed lists moderation queues
   render () {
-    const {comments, users, settings} = this.props;
+    const {comments, users, settings, actions} = this.props;
     const {activeTab, singleView, modalOpen} = this.state;
 
     console.log('ModerationQueue comments', comments);
+    console.log('settings', settings);
+    console.log('actions', actions);
 
     const premodIds = comments.ids.filter(id => comments.byId[id].status === 'premod');
     const rejectedIds = comments.ids.filter(id => comments.byId[id].status === 'rejected');
@@ -158,6 +160,7 @@ class ModerationQueue extends React.Component {
 }
 
 const mapStateToProps = state => ({
+  actions: state.actions.toJS(),
   settings: state.settings.toJS(),
   comments: state.comments.toJS(),
   users: state.users.toJS()
diff --git a/client/coral-admin/src/reducers/actions.js b/client/coral-admin/src/reducers/actions.js
new file mode 100644
index 000000000..709de5257
--- /dev/null
+++ b/client/coral-admin/src/reducers/actions.js
@@ -0,0 +1,24 @@
+import {Map, Set} from 'immutable';
+import * as types from '../constants/actions';
+
+const initialState = Map({
+  ids: Set()
+});
+
+export default (state = initialState, action) => {
+  switch (action.type) {
+  case types.ACTIONS_MODERATION_QUEUE_FETCH_SUCCESS: return addActions(state, action);
+  default:
+    return state;
+  }
+};
+
+const addActions = (state, action) => {
+  const ids = action.actions.map(action => action.item_id);
+  const map = action.actions.reduce((memo, action) => {
+    memo[action.item_id] = action;
+    return memo;
+  }, {});
+  const newIds = state.get('ids').concat(ids);
+  return state.merge(map).set('ids', newIds);
+};
diff --git a/client/coral-admin/src/reducers/comments.js b/client/coral-admin/src/reducers/comments.js
index 2856b0a34..62a8f81a0 100644
--- a/client/coral-admin/src/reducers/comments.js
+++ b/client/coral-admin/src/reducers/comments.js
@@ -27,7 +27,7 @@ export default (state = initialState, action) => {
   case actions.COMMENTS_MODERATION_QUEUE_FETCH: return state.set('loading', true);
   case actions.COMMENTS_MODERATION_QUEUE_FETCH_SUCCESS: return replaceComments(action, state);
   case actions.COMMENTS_MODERATION_QUEUE_FAILED: return state.set('loading', false);
-  case actions.COMMENT_STATUS_UPDATE: return updateStatus(state, action);
+  case actions.COMMENT_STATUS_UPDATE_REQUEST: return updateStatus(state, action);
   case actions.COMMENT_FLAG: return flag(state, action);
   case actions.COMMENT_CREATE_SUCCESS: return addComment(state, action);
   case actions.COMMENT_STREAM_FETCH_SUCCESS: return replaceComments(action, state);
diff --git a/client/coral-admin/src/reducers/index.js b/client/coral-admin/src/reducers/index.js
index 1f1b444fc..a28e23aec 100644
--- a/client/coral-admin/src/reducers/index.js
+++ b/client/coral-admin/src/reducers/index.js
@@ -4,6 +4,7 @@ import settings from 'reducers/settings';
 import community from 'reducers/community';
 import users from 'reducers/users';
 import auth from 'reducers/auth';
+import actions from 'reducers/actions';
 
 // Combine all reducers into a main one
 export default combineReducers({
@@ -11,5 +12,6 @@ export default combineReducers({
   comments,
   community,
   auth,
+  actions,
   users
 });

From ef0055e6895f4bd1f1e30e63ca7f801be501c100 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Tue, 20 Dec 2016 16:42:16 -0700
Subject: [PATCH 31/54] highlight suspect words

---
 client/coral-admin/src/components/Comment.js  |  7 ++--
 .../coral-admin/src/components/CommentList.js | 34 +++++++------------
 .../ModerationQueue/ModerationQueue.js        | 14 ++++----
 package.json                                  |  1 +
 4 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/client/coral-admin/src/components/Comment.js b/client/coral-admin/src/components/Comment.js
index 291825c71..17bd56714 100644
--- a/client/coral-admin/src/components/Comment.js
+++ b/client/coral-admin/src/components/Comment.js
@@ -8,6 +8,7 @@ import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../translations.json';
 
 import {Icon} from 'react-mdl';
+import Highlighter from 'react-highlight-words';
 import {FabButton, Button} from 'coral-ui';
 
 const linkify = new Linkify();
@@ -31,7 +32,7 @@ export default props => {
           {links ?
           <span className={styles.hasLinks}><Icon name='error_outline'/> Contains Link</span> : null}
           <div className={`actions ${styles.actions}`}>
-            {props.actions.map((action, i) => getActionButton(action, i, props))}
+            {props.modActions.map((action, i) => getActionButton(action, i, props))}
           </div>
         </div>
         <div>
@@ -42,7 +43,9 @@ export default props => {
       <div className={styles.itemBody}>
         <span className={styles.body}>
           <Linkify  component='span' properties={{style: linkStyles}}>
-            {comment.body}
+            <Highlighter
+              searchWords={props.suspectWords}
+              textToHighlight={comment.body} />
           </Linkify>
         </span>
       </div>
diff --git a/client/coral-admin/src/components/CommentList.js b/client/coral-admin/src/components/CommentList.js
index c6682e5de..1d63577c1 100644
--- a/client/coral-admin/src/components/CommentList.js
+++ b/client/coral-admin/src/components/CommentList.js
@@ -5,7 +5,7 @@ import Hammer from 'hammerjs';
 import Comment from 'components/Comment';
 
 // Each action has different meaning and configuration
-const actions = {
+const modActions = {
   'reject': {status: 'rejected', icon: 'close', key: 'r'},
   'approve': {status: 'accepted', icon: 'done', key: 't'},
   'flag': {status: 'flagged', icon: 'flag', filter: 'Untouched'},
@@ -21,18 +21,12 @@ export default class CommentList extends React.Component {
     comments: PropTypes.object.isRequired,
     users: PropTypes.object.isRequired,
     onClickAction: PropTypes.func,
-    actions: PropTypes.arrayOf(PropTypes.string),
+    modActions: PropTypes.arrayOf(PropTypes.string),
     loading: PropTypes.bool,
     // list of actions (flags, etc) associated with the comments
-    commentActions: PropTypes.arrayOf(
-      PropTypes.shape({
-        action_type: PropTypes.string,
-        count: PropTypes.number,
-        current_user: PropTypes.string,
-        item_id: PropTypes.string,
-        item_type: PropTypes.string
-      })
-    ),
+    actions: PropTypes.shape({
+      ids: PropTypes.arrayOf(PropTypes.string)
+    }).isRequired,
     suspectWords: PropTypes.arrayOf(PropTypes.string)
   }
 
@@ -65,22 +59,22 @@ export default class CommentList extends React.Component {
 
   // Add swipe to approve or reject
   bindGestures () {
-    const {actions} = this.props;
+    const {modActions} = this.props;
     this._hammer = new Hammer(this.base);
     this._hammer.get('swipe').set({direction: Hammer.DIRECTION_HORIZONTAL});
 
-    if (actions.indexOf('reject') !== -1) {
+    if (modActions.indexOf('reject') !== -1) {
       this._hammer.on('swipeleft', () => this.props.singleView && this.actionKeyHandler('Rejected'));
     }
-    if (actions.indexOf('approve') !== -1) {
+    if (modActions.indexOf('approve') !== -1) {
       this._hammer.on('swiperight', () => this.props.singleView && this.actionKeyHandler('Approved'));
     }
   }
 
   // Add key handlers. Each action has one and added j/k for moving around
   bindKeyHandlers () {
-    this.props.actions.filter(action => actions[action].key).forEach(action => {
-      key(actions[action].key, 'commentList', () => this.props.isActive && this.actionKeyHandler(actions[action].status));
+    this.props.modActions.filter(action => modActions[action].key).forEach(action => {
+      key(modActions[action].key, 'commentList', () => this.props.isActive && this.actionKeyHandler(modActions[action].status));
     });
     key('j', 'commentList', () => this.props.isActive && this.moveKeyHandler('down'));
     key('k', 'commentList', () => this.props.isActive && this.moveKeyHandler('up'));
@@ -143,7 +137,7 @@ export default class CommentList extends React.Component {
   }
 
   render () {
-    const {singleView, commentIds, comments, users, hideActive, key, suspectWords, commentActions} = this.props;
+    const {singleView, commentIds, comments, users, hideActive, key, suspectWords} = this.props;
     const {active} = this.state;
 
     return (
@@ -154,9 +148,7 @@ export default class CommentList extends React.Component {
         {commentIds.map((commentId, index) => {
           const comment = comments[commentId];
           const author = users[comment.author_id];
-          const localActions = commentActions.filter(action => action.item_id === commentId);
           return <Comment
-            commentActions={localActions}
             suspectWords={suspectWords}
             comment={comment}
             author={author}
@@ -164,8 +156,8 @@ export default class CommentList extends React.Component {
             index={index}
             onClickAction={this.onClickAction}
             onClickShowBanDialog={this.onClickShowBanDialog}
-            actions={this.props.actions}
-            actionsMap={actions}
+            modActions={this.props.modActions}
+            actionsMap={modActions}
             isActive={commentId === active}
             hideActive={hideActive} />;
         })}
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
index 2e59e20ee..1d661ed01 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
@@ -111,7 +111,7 @@ class ModerationQueue extends React.Component {
           <div className={`mdl-tabs__panel is-active ${styles.listContainer}`} id='pending'>
             <CommentList
               suspectWords={['fishy', 'shady']}
-              commentActions={[]}
+              actions={actions}
               isActive={activeTab === 'pending'}
               singleView={singleView}
               commentIds={premodIds}
@@ -119,7 +119,7 @@ class ModerationQueue extends React.Component {
               users={users.byId}
               onClickAction={(action, comment) => this.onCommentAction(action, comment)}
               onClickShowBanDialog={(userId, userName, commentId) => this.showBanUserDialog(userId, userName, commentId)}
-              actions={['reject', 'approve', 'ban']}
+              modActions={['reject', 'approve', 'ban']}
               loading={comments.loading} />
             <BanUserDialog
               open={comments.showBanUserDialog}
@@ -129,26 +129,28 @@ class ModerationQueue extends React.Component {
         </div>
           <div className={`mdl-tabs__panel ${styles.listContainer}`} id='rejected'>
             <CommentList
-              commentActions={[]}
+              actions={actions}
+              suspectWords={[]}
               isActive={activeTab === 'rejected'}
               singleView={singleView}
               commentIds={rejectedIds}
               comments={comments.byId}
               users={users.byId}
               onClickAction={(action, comment) => this.onCommentAction(action, comment)}
-              actions={['approve']}
+              modActions={['approve']}
               loading={comments.loading} />
           </div>
           <div className={`mdl-tabs__panel ${styles.listContainer}`} id='flagged'>
             <CommentList
               isActive={activeTab === 'rejected'}
-              commentActions={[]}
+              actions={actions}
+              suspectWords={[]}
               singleView={singleView}
               commentIds={flaggedIds}
               comments={comments.byId}
               users={users.byId}
               onClickAction={(action, comment) => this.onCommentAction(action, comment)}
-              actions={['reject', 'approve']}
+              modActions={['reject', 'approve']}
               loading={comments.loading} />
           </div>
           <ModerationKeysModal open={modalOpen}
diff --git a/package.json b/package.json
index 752c4c2da..9d7c95d73 100644
--- a/package.json
+++ b/package.json
@@ -127,6 +127,7 @@
     "react": "15.3.2",
     "react-addons-test-utils": "15.3.2",
     "react-dom": "15.3.2",
+    "react-highlight-words": "^0.6.0",
     "react-linkify": "^0.1.3",
     "react-mdl": "^1.7.2",
     "react-mdl-selectfield": "^0.2.0",

From 9315337ce6917dac9d44113c1bc1c636fc344402 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Tue, 20 Dec 2016 16:56:16 -0700
Subject: [PATCH 32/54] suspect words are marked up

---
 client/coral-admin/src/components/CommentList.js      |  2 +-
 .../src/containers/ModerationQueue/ModerationQueue.js | 11 +++++------
 client/coral-admin/src/reducers/settings.js           |  9 +++++++--
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/client/coral-admin/src/components/CommentList.js b/client/coral-admin/src/components/CommentList.js
index 1d63577c1..f843fbe0c 100644
--- a/client/coral-admin/src/components/CommentList.js
+++ b/client/coral-admin/src/components/CommentList.js
@@ -26,7 +26,7 @@ export default class CommentList extends React.Component {
     // list of actions (flags, etc) associated with the comments
     actions: PropTypes.shape({
       ids: PropTypes.arrayOf(PropTypes.string)
-    }).isRequired,
+    }),
     suspectWords: PropTypes.arrayOf(PropTypes.string)
   }
 
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
index 1d661ed01..a84bdef62 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
@@ -13,6 +13,7 @@ import {
   fetchModerationQueueComments
 } from 'actions/comments';
 import {userStatusUpdate} from 'actions/users';
+import {fetchSettings} from 'actions/settings';
 import styles from './ModerationQueue.css';
 
 import I18n from 'coral-framework/modules/i18n/i18n';
@@ -36,6 +37,7 @@ class ModerationQueue extends React.Component {
 
   // Fetch comments and bind singleView key before render
   componentWillMount () {
+    this.props.dispatch(fetchSettings());
     this.props.dispatch(fetchModerationQueueComments());
     key('s', () => this.setState({singleView: !this.state.singleView}));
     key('shift+/', () => this.setState({modalOpen: true}));
@@ -110,8 +112,7 @@ class ModerationQueue extends React.Component {
           </div>
           <div className={`mdl-tabs__panel is-active ${styles.listContainer}`} id='pending'>
             <CommentList
-              suspectWords={['fishy', 'shady']}
-              actions={actions}
+              suspectWords={settings.settings.wordlist.suspect}
               isActive={activeTab === 'pending'}
               singleView={singleView}
               commentIds={premodIds}
@@ -129,8 +130,7 @@ class ModerationQueue extends React.Component {
         </div>
           <div className={`mdl-tabs__panel ${styles.listContainer}`} id='rejected'>
             <CommentList
-              actions={actions}
-              suspectWords={[]}
+              suspectWords={settings.settings.wordlist.suspect}
               isActive={activeTab === 'rejected'}
               singleView={singleView}
               commentIds={rejectedIds}
@@ -143,8 +143,7 @@ class ModerationQueue extends React.Component {
           <div className={`mdl-tabs__panel ${styles.listContainer}`} id='flagged'>
             <CommentList
               isActive={activeTab === 'rejected'}
-              actions={actions}
-              suspectWords={[]}
+              suspectWords={settings.settings.wordlist.suspect}
               singleView={singleView}
               commentIds={flaggedIds}
               comments={comments.byId}
diff --git a/client/coral-admin/src/reducers/settings.js b/client/coral-admin/src/reducers/settings.js
index 8fbd67690..a8604c6f9 100644
--- a/client/coral-admin/src/reducers/settings.js
+++ b/client/coral-admin/src/reducers/settings.js
@@ -1,8 +1,13 @@
-import {Map} from 'immutable';
+import {Map, List} from 'immutable';
 import * as types from '../actions/settings';
 
 const initialState = Map({
-  settings: Map(),
+  settings: Map({
+    wordlist: Map({
+      banned: List(),
+      suspect: List()
+    })
+  }),
   saveSettingsError: null,
   fetchSettingsError: null,
   fetchingSettings: false

From d998549fd0653a94984dd6a1f13656586537b059 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Tue, 20 Dec 2016 16:16:10 -0800
Subject: [PATCH 33/54] Updating swagger docs.

---
 docs/swagger.yaml | 147 ++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 136 insertions(+), 11 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 808e11dfd..6c1256b39 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -423,10 +423,6 @@ definitions:
       message:
         type: string
         description: The error that occured.
-  Item:
-    type: object
-  ModerationAction:
-    type: string
   Comment:
     type: object
     properties:
@@ -453,8 +449,29 @@ definitions:
       asset_id:
         type: string
         description: Display name of comment
+      status_history:
+        type: array
+        description: A history of status changes for this comment.
+        items:
+          type: object
+          properties:
+            type:
+              type: string
+              enum:
+                - accepted
+                - rejected
+                - premod
+            assigned_by:
+              type: string
+              description: ID of the user who assigned this status.
+            created_at:
+              type: string
+              format: date-time
+              description: Date when status was assigned.
+
   Actions:
     type: object
+    description: A summary of actions taken on a particular item which is with the comment stream.
     properties:
       item_id:
         type: string
@@ -470,22 +487,28 @@ definitions:
         description: The number of this type of actions performed on this item.
       metadata:
         type: array
-        description: An array of metadata from the actions performed on this item. This metadata can be defined differently for each action type.
+        items:
+          type: object
+          description: Metadata from the actions performed on this item. This metadata can be defined differently for each action type.
       current_user:
-        type: Object
+        type: object
         description: Will include the action performed by the currently logged in user if that user has taken an action on this item. Otherwise will return null.
   Action:
     type: object
+    description: A single action taken by a user.
     properties:
+      id:
+        type: string
+        description: The uuid.v4 id of the action.
       type:
         type: string
+        description: The type of action being taken (like, flag, etc.)
       user_id:
         type: string
-      moderation:
-        type: string
-        enum:
-            - pre
-            - post
+        description: The ID of the user taking this action.
+      metadata:
+        type: object
+        description: An object which contains arbitrary metadata about the action. Should be consistent for each action_type.
       created_at:
         type: string
         format: date-time
@@ -526,10 +549,112 @@ definitions:
         type: string
         format: datetime
         description: When this asset was published.
+      created_at:
+        type: string
+        format: date-time
+        description: Creation Date-Time
+      updated_at:
+        type: string
+        format: date-time
+        description: Updated Date-Time
   User:
     type: object
+    properties:
+      id:
+        type: string
+        description: The uuid.v4 id of the user.
+      displayName:
+        type: string
+        description: The name appearing next to the user's comments.
+      disabled:
+        type: boolean
+        description: Indicates whether the user's account has been disabled (ie if the user is banned).
+      password:
+        type: string
+        description: This provides a source of identity proof for users who login using the local provider. A local provider will be assumed for users who do not have any social profiles.
+      profiles:
+        type: array
+        description: The array of identities for a given user. Any one user can have multiple profiles associated with them (eg facebook, google, etc.)
+        items:
+          type: object
+          properties:
+              id:
+                type: string
+                description: A unique identifier for the profile.
+              provider:
+                type: string
+                description: The ame of the identity provider being used (e.g. 'facebook', 'twitter', etc.)
+      roles:
+        type: array
+        items:
+          type: string
+        description: Roles occupied by the user (e.g. 'admin', 'moderator', etc.)
+      status:
+        type: string
+        description: The current status of the user in the system.
+        enum:
+          - active
+          - banned
+      settings:
+        type: object
+        description: User-specific settings
+        properties:
+          bio:
+            type: string
+            description: A bio visible to other users.
+      created_at:
+        type: string
+        format: date-time
+        description: Creation Date-Time
+      updated_at:
+        type: string
+        format: date-time
+        description: Updated Date-Time
   Settings:
     type: object
+    properties:
+        id:
+          type: string
+          description: The id of the settings object. Defaults to 1 for global settings.
+        moderation:
+          type: string
+          enum:
+            - pre
+            - post
+          description: Indicates whether moderation occurs before or after a comment is made publicly visible.
+        infoBoxEnable:
+          type: boolean
+          description: Indicates whether an informational box will be shown above the comment input box.
+        infoBoxContent:
+          type: string
+          description: The text to appear in the informational box.
+        closedTimeout:
+          type: number
+          format: int32
+          description: The time after which streams will be automatically closed in seconds. Null will keep streams open forever.
+        closedMessage:
+          type: string
+          description: The message displayed when a stream is closed.
+        wordlist:
+          type: array
+          description: A list of banned word which will cause a comment to be automatically rejected.
+          items:
+            type: string
+        charCount:
+          type: number
+          format: int32
+          description: The maximum number of characters allowed in a comment.
+        charCountEnable:
+          type: boolean
+          description: Indicates whether a maximum character count should be enabled for comments.
+        created_at:
+          type: string
+          format: date-time
+          description: Creation Date-Time
+        updated_at:
+          type: string
+          format: date-time
+          description: Updated Date-Time
   Job:
     type: object
     properties:

From 0235d262956c3588964e7ef5be15d1ae30dd1a51 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Tue, 20 Dec 2016 16:34:27 -0800
Subject: [PATCH 34/54] Correcting accidentally moved pager files.

---
 .../src/containers/Community}/Pager.css                           | 0
 .../src/containers/Community}/Pager.js                            | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename client/{coral-plugin-flags => coral-admin/src/containers/Community}/Pager.css (100%)
 rename client/{coral-plugin-flags => coral-admin/src/containers/Community}/Pager.js (100%)

diff --git a/client/coral-plugin-flags/Pager.css b/client/coral-admin/src/containers/Community/Pager.css
similarity index 100%
rename from client/coral-plugin-flags/Pager.css
rename to client/coral-admin/src/containers/Community/Pager.css
diff --git a/client/coral-plugin-flags/Pager.js b/client/coral-admin/src/containers/Community/Pager.js
similarity index 100%
rename from client/coral-plugin-flags/Pager.js
rename to client/coral-admin/src/containers/Community/Pager.js

From 18d4c58a48af39febe57021a4daf2c07c7600061 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Wed, 21 Dec 2016 11:12:09 -0700
Subject: [PATCH 35/54] allow pasting comma-separated lists

---
 .../coral-admin/src/containers/Configure/Wordlist.js |  4 ++++
 client/coral-admin/src/translations.json             | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/client/coral-admin/src/containers/Configure/Wordlist.js b/client/coral-admin/src/containers/Configure/Wordlist.js
index 01bbf5203..595b5ea42 100644
--- a/client/coral-admin/src/containers/Configure/Wordlist.js
+++ b/client/coral-admin/src/containers/Configure/Wordlist.js
@@ -16,6 +16,8 @@ const Wordlist = ({suspectWords, bannedWords, onChangeWordlist}) => (
       <TagsInput
         value={bannedWords}
         inputProps={{placeholder: 'word or phrase'}}
+        addOnPaste={true}
+        pasteSplit={data => data.split(',').map(d => d.trim())}
         onChange={tags => onChangeWordlist('banned', tags)} />
     </Card>
     <h3>{lang.t('configure.suspect-words-title')}</h3>
@@ -25,6 +27,8 @@ const Wordlist = ({suspectWords, bannedWords, onChangeWordlist}) => (
       <TagsInput
         value={suspectWords}
         inputProps={{placeholder: 'word or phrase'}}
+        addOnPaste={true}
+        pasteSplit={data => data.split(',').map(d => d.trim())}
         onChange={tags => onChangeWordlist('suspect', tags)} />
     </Card>
   </div>
diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json
index eee0bc443..d92fc6fc0 100644
--- a/client/coral-admin/src/translations.json
+++ b/client/coral-admin/src/translations.json
@@ -49,9 +49,9 @@
       "comment-settings": "Comment Settings",
       "embed-comment-stream": "Embed Comment Stream",
       "banned-word-header": "Write the bannned words list",
-      "banned-word-text": "Comments which contain these words or phrases (not case-sensitive) will be automatically removed from the comment stream.",
       "suspect-word-header": "Write the suspect words list",
-      "suspect-word-text": "Comments which contain these words or phrases (not case-sensitive) will be highlighted in the comment stream",
+      "banned-word-text": "Comments which contain these words or phrases (not case-sensitive) will be automatically removed from the comment stream. Type a word and press Enter or Tab to add. Optionally paste a comma-separated list.",
+      "suspect-word-text": "Comments which contain these words or phrases (not case-sensitive) will be highlighted in the comment stream. Type a word and press Enter or Tab to add. Optionally paste a comma-separated list.",
       "wordlist": "Banned & Suspect Words",
       "banned-words-title": "Banned words list",
       "suspect-words-title": "Suspect words list",
@@ -119,11 +119,11 @@
       "embed-comment-stream": "Colocar Hilo de Comentarios",
       "wordlist": "Palabras Suspendidas y Suspechosas",
       "banned-word-header": "Escribir las palabras no permitidas",
+      "suspect-word-header": "Write the suspect words list",
       "banned-word-text": "Comentarios que contengan estas palabras o frases, no separadas por comas y en mayusculas o minusuculas, serán automaticamente separadas de los comentarios publicados.",
-      "suspect-word-header": "",
-      "suspect-word-text": "",
-      "banned-words-title": "",
-      "suspect-words-title": "",
+      "suspect-word-text": "Comments which contain these words or phrases (not case-sensitive) will be highlighted in the comment stream. Type a word and press Enter or Tab to add. Optionally paste a comma-separated list.",
+      "banned-words-title": "Banned words list",
+      "suspect-words-title": "Suspect words list",
       "save-changes": "Guardar Cambios",
       "copy-and-paste": "Copiar y pegar el código de más abajo en tu CMS para colocar la caja de comentarios en tus articulos",
       "moderate": "Moderar",

From f5b8c0bbba03e21a610458457be63534b4c9d2ec Mon Sep 17 00:00:00 2001
From: riley <riley.davis@gmail.com>
Date: Wed, 21 Dec 2016 11:19:17 -0700
Subject: [PATCH 36/54] fix lint

---
 client/coral-admin/src/components/CommentList.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/coral-admin/src/components/CommentList.js b/client/coral-admin/src/components/CommentList.js
index f843fbe0c..326d63cf1 100644
--- a/client/coral-admin/src/components/CommentList.js
+++ b/client/coral-admin/src/components/CommentList.js
@@ -23,6 +23,7 @@ export default class CommentList extends React.Component {
     onClickAction: PropTypes.func,
     modActions: PropTypes.arrayOf(PropTypes.string),
     loading: PropTypes.bool,
+
     // list of actions (flags, etc) associated with the comments
     actions: PropTypes.shape({
       ids: PropTypes.arrayOf(PropTypes.string)

From 4f9e7938106d7837df1d6a7e7fb3b7ac68f3c15e Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Wed, 21 Dec 2016 11:23:08 -0700
Subject: [PATCH 37/54] remove logs

---
 client/coral-admin/src/actions/settings.js                  | 1 -
 client/coral-admin/src/containers/Configure/Configure.js    | 1 -
 .../src/containers/ModerationQueue/ModerationQueue.js       | 6 +-----
 client/coral-admin/src/reducers/settings.js                 | 1 -
 4 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/client/coral-admin/src/actions/settings.js b/client/coral-admin/src/actions/settings.js
index 3c9b46f59..85ad5149e 100644
--- a/client/coral-admin/src/actions/settings.js
+++ b/client/coral-admin/src/actions/settings.js
@@ -35,7 +35,6 @@ export const updateWordlist = (listName, list) => {
 
 export const saveSettingsToServer = () => (dispatch, getState) => {
   let settings = getState().settings.toJS().settings;
-  console.log('about to save settings to server', settings);
   if (settings.charCount) {
     settings.charCount = parseInt(settings.charCount);
   }
diff --git a/client/coral-admin/src/containers/Configure/Configure.js b/client/coral-admin/src/containers/Configure/Configure.js
index 93f0becb2..9fc24ad53 100644
--- a/client/coral-admin/src/containers/Configure/Configure.js
+++ b/client/coral-admin/src/containers/Configure/Configure.js
@@ -66,7 +66,6 @@ class Configure extends React.Component {
 
   getSection (section) {
     const pageTitle = this.getPageTitle(section);
-    console.log('getSection', this.props);
     switch(section){
     case 'comments':
       return <CommentSettings
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
index a84bdef62..0a6c129fd 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
@@ -88,13 +88,9 @@ class ModerationQueue extends React.Component {
 
   // Render the tabbed lists moderation queues
   render () {
-    const {comments, users, settings, actions} = this.props;
+    const {comments, users, settings} = this.props;
     const {activeTab, singleView, modalOpen} = this.state;
 
-    console.log('ModerationQueue comments', comments);
-    console.log('settings', settings);
-    console.log('actions', actions);
-
     const premodIds = comments.ids.filter(id => comments.byId[id].status === 'premod');
     const rejectedIds = comments.ids.filter(id => comments.byId[id].status === 'rejected');
     const flaggedIds = comments.ids.filter(id => comments.byId[id].flagged === true);
diff --git a/client/coral-admin/src/reducers/settings.js b/client/coral-admin/src/reducers/settings.js
index a8604c6f9..87bfa6f07 100644
--- a/client/coral-admin/src/reducers/settings.js
+++ b/client/coral-admin/src/reducers/settings.js
@@ -46,7 +46,6 @@ const updateWordlist = (state, action) => {
 const saveComplete = (state, action) => {
   const s = state.set('fetchingSettings', false).set('saveSettingsError', null);
   const settings = s.get('settings').merge(action.settings);
-  console.log('saveComplete', settings.toJS());
   return s.set('settings', settings);
 };
 

From 8f877b87cb1531a79be5ec66985d36bf55864c0d Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Wed, 21 Dec 2016 11:32:30 -0800
Subject: [PATCH 38/54] Adding swagger endpoints.

---
 docs/swagger.yaml | 137 +++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 122 insertions(+), 15 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 6c1256b39..a5d71119b 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -18,12 +18,10 @@ paths:
       tags:
         - Comments
       parameters:
-        - name: status
+        - name: asset_id
           in: query
-          description: Performs a search based on the comment's status.
+          description: Returns comments for a particular asset, if null returns all commets.
           type: string
-          enum:
-            - flag
         - name: action_type
           in: query
           description: Performs a search based on the actions that have been added to it.
@@ -49,9 +47,18 @@ paths:
       parameters:
         - name: body
           in: body
-          description: The comment to create.
+          type: string
+          description: The text of comment to create.
           schema:
             $ref: '#/definitions/Comment'
+        - name: asset_id
+          in: body
+          type: string
+          description: The parent asset of this comment.
+        - name: parent_id
+          in: body
+          type: string
+          description: The parent comment of this comment (null if the comment is not a reply.)
       responses:
         201:
           description: The comment that was created.
@@ -132,9 +139,9 @@ paths:
         - Comments
         - Actions
       parameters:
-        - name: comment_id
+        - name: item_id
           in: path
-          description: The id of the comment to retrieve.
+          description: The id of the item which is the target of the action.
           type: string
           required: true
         - name: body
@@ -146,7 +153,10 @@ paths:
             properties:
               action_type:
                 type: string
-                description: The action to add
+                description: The type of action to add
+              metadata:
+                type: object
+                description: An arbitrary object describing the action, should be consistent per action type.
       responses:
         201:
           description: The action created.
@@ -240,6 +250,19 @@ paths:
           description: An error occured.
           schema:
             $ref: '#/definitions/Error'
+  /auth/facebook/callback:
+    get:
+      tags:
+        - Auth
+      responses:
+        200:
+          description: Logs in the user after FB Auth.
+          schema:
+            $ref: '#/definitions/User'
+        500:
+          description: An error occured.
+          schema:
+            $ref: '#/definitions/Error'
   /queue/comments/pending:
     get:
       tags:
@@ -249,9 +272,23 @@ paths:
         200:
           description: The comments that are not moderated.
           schema:
-            type: array
-            items:
-              - $ref: '#/definitions/Comment'
+            type: object
+            properties:
+              comments:
+                type: array
+                description: The comments that have yet to be moderated.
+                items:
+                  - $ref: '#/definitions/Comment'
+              users:
+                type: array
+                description: The users authoring these comments.
+                items:
+                  - $ref: '#/definitions/User'
+              actions:
+                type: array
+                description: The actions which have taken place on these comments.
+                items:
+                  - $ref: '#/definitions/Actions'
         500:
           description: An error occured.
           schema:
@@ -280,6 +317,17 @@ paths:
           in: query
           type: string
           description: Field to sort by.
+        - name: filter
+          in: query
+          type: string
+          enum:
+            - open
+            - closed
+          description: Comment status to filter by.
+        - name: search
+          in: query
+          type: string
+          description: String to search by.
       responses:
         200:
           description: Assets listed.
@@ -358,6 +406,31 @@ paths:
           schema:
             $ref: '#/definitions/Error'
 
+  /assets/{asset_id}/settings:
+    put:
+      parameters:
+        asset_id:
+          in: path
+          required: true
+          type: string
+          format: uuid
+          description: The id of the asset to be updated
+        body:
+          in: body
+          type: object
+          parameters:
+            closedAt:
+              type: number
+              description: The Unix timestamp when the stream will be or was previously closed.
+            closedMessage:
+              type: string
+              description: The message to display to users when the stream is closed.
+        responses:
+          204:
+            description: Status update successful.
+          500:
+            description: An error has occurred.
+
   /stream:
     get:
       tags:
@@ -368,7 +441,7 @@ paths:
       parameters:
         - name: asset_url
           in: query
-          description: The asset url to get the comment stream from.
+          description: The url of the asset for which to get the comment stream.
           type: string
           format: url
       responses:
@@ -377,20 +450,24 @@ paths:
           schema:
             type: object
             properties:
-              assets:
-                type: array
+              asset:
+                type: object
+                description: The asset for the url passed to this endpoint.
                 items:
                   - $ref: '#/definitions/Asset'
               comments:
                 type: array
+                description: All comments for this asset.
                 items:
                   - $ref: '#/definitions/Comment'
               users:
                 type: array
+                description: All authors of comments on this asset.
                 items:
                   - $ref: '#/definitions/User'
               actions:
                 type: array
+                description: All actions on comments on this asset and their authors.
                 items:
                   - $ref: '#/definitions/Actions'
         500:
@@ -401,7 +478,7 @@ paths:
     get:
       responses:
         200:
-          description: The settings.
+          description: All global settings.
           schema:
             $ref: '#/definitions/Settings'
         500:
@@ -410,12 +487,42 @@ paths:
             $ref: '#/definitions/Error'
     put:
       responses:
+        parameteters:
+          body:
+            type: object
+            description: Settings to be updated
         204:
           description: The settings were updated.
         500:
           description: An error occured.
           schema:
             $ref: '#/definitions/Error'
+    /users:
+      get:
+        value:
+          in: query
+          type: string
+          description: A term to search users' displayNames and email addresses.
+        sort:
+          in: query
+          type: string
+          enum:
+            asc
+            desc
+          description: Determines whether users sorted in are ascending or descending order.
+        field:
+          in: query
+          type: string
+          description: The field used to sort.
+        page:
+          in: query
+          type: number
+          description: The page of search results to return.
+        limit:
+          in: query
+          type: number
+          description: The number of search restults per page.
+
 definitions:
   Error:
     type: object

From 29fa26260c4817e0a0db4cb7915a1e0edda5a217 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Wed, 21 Dec 2016 11:39:21 -0800
Subject: [PATCH 39/54] Handling undefined values in fetchAssets call.

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

diff --git a/client/coral-admin/src/actions/assets.js b/client/coral-admin/src/actions/assets.js
index fce4bf4e9..30bd7909b 100644
--- a/client/coral-admin/src/actions/assets.js
+++ b/client/coral-admin/src/actions/assets.js
@@ -16,7 +16,7 @@ import coralApi from '../../../coral-framework/helpers/response';
 // Get comments to fill each of the three lists on the mod queue
 export const fetchAssets = (skip, limit, sort, search, filter) => (dispatch) => {
   dispatch({type: FETCH_ASSETS});
-  return coralApi(`/assets?skip=${skip}&limit=${limit}&sort=${sort}&search=${search}&filter=${filter}`)
+  return coralApi(`/assets?skip=${skip || ''}&limit=${limit || ''}&sort=${sort || ''}&search=${search || ''}&filter=${filter || ''}`)
   .then(({result, count}) =>
     dispatch({type: FETCH_ASSETS_SUCCESS,
       assets: result,

From 00cf81563e58917072b7f6249542dcef395643db Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Wed, 21 Dec 2016 12:01:37 -0800
Subject: [PATCH 40/54] Adding user endpoints to swagger.

---
 docs/swagger.yaml | 79 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 78 insertions(+), 1 deletion(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index a5d71119b..f45c86fe2 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -522,7 +522,84 @@ paths:
           in: query
           type: number
           description: The number of search restults per page.
-
+      responses:
+        200:
+          parameters:
+            result:
+              type: array
+              description: Users matching search criteria.
+              items:
+                $ref: '#/definitions/User'
+            limit:
+              type: number
+              description: Results per page.
+            count:
+              type: number
+              description: Total number of results.
+            page:
+              type: number
+              description: The current page.
+            totalPages:
+              type: number
+              description: The total number of pages.
+        500:
+          description: An error occured.
+          schema:
+            $ref: '#/definitions/Error'
+  /users/:user_id/role:
+    post:
+      user_id:
+        in: path
+        type: string
+        format: uuid
+        description: ID of the user to be updated.
+      body:
+        in: body
+        type: object
+        parameters:
+          role:
+            type: string
+            description: Role to be added to the user.
+            enum:
+              admin
+              moderator
+      responses:
+        204:
+          description: Role update successful.
+        500:
+          description: An error occured.
+          schema:
+            $ref: '#/definitions/Error'
+  /users/:user_id/status:
+    post:
+      user_id:
+        in: path
+        type: string
+        format: uuid
+        required: true
+        description: ID of the user to be updated.
+      body:
+        in: body
+        type: object
+        parameters:
+          status:
+            type: string
+            required: true
+            description: Status for the user to be set to.
+            enum:
+              active
+              banned
+          comment_id:
+            type: string
+            format: uuid
+            description: The id of the comment which triggered this status change.
+      responses:
+        200:
+          description: Status update successful.
+        500:
+          description: An error occured.
+          schema:
+            $ref: '#/definitions/Error'
 definitions:
   Error:
     type: object

From cfed42be2c09936f51292eb4749fd8c2e37c7a02 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Wed, 21 Dec 2016 12:05:25 -0800
Subject: [PATCH 41/54] Correcting bug in fetchAssets.

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

diff --git a/client/coral-admin/src/actions/assets.js b/client/coral-admin/src/actions/assets.js
index 30bd7909b..92f511d5f 100644
--- a/client/coral-admin/src/actions/assets.js
+++ b/client/coral-admin/src/actions/assets.js
@@ -14,7 +14,7 @@ import coralApi from '../../../coral-framework/helpers/response';
 
 // Fetch a page of assets
 // Get comments to fill each of the three lists on the mod queue
-export const fetchAssets = (skip, limit, sort, search, filter) => (dispatch) => {
+export const fetchAssets = (skip, limit, search, sort, filter) => (dispatch) => {
   dispatch({type: FETCH_ASSETS});
   return coralApi(`/assets?skip=${skip || ''}&limit=${limit || ''}&sort=${sort || ''}&search=${search || ''}&filter=${filter || ''}`)
   .then(({result, count}) =>

From c867ae8eeb8ae4c11d14f456ff2158cb75303fc4 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Wed, 21 Dec 2016 12:11:42 -0800
Subject: [PATCH 42/54] Removing Next and Prev from pager and updating tests.

---
 client/coral-ui/components/Pager.js | 5 ++---
 tests/routes/api/assets/index.js    | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/client/coral-ui/components/Pager.js b/client/coral-ui/components/Pager.js
index 3184cfca0..3d96660ad 100644
--- a/client/coral-ui/components/Pager.js
+++ b/client/coral-ui/components/Pager.js
@@ -12,7 +12,7 @@ const Pager = ({totalPages, page, onNewPageHandler}) => (
   <div className="pager">
     <ul>
       {
-        (totalPages > page) ?
+        (totalPages > page && totalPages >= 1) ?
           <li
             className={`mdl-button mdl-js-button ${styles.li}`}
             onClick={() => onNewPageHandler(page - 1)}>
@@ -23,7 +23,7 @@ const Pager = ({totalPages, page, onNewPageHandler}) => (
       }
       {Rows(page, totalPages, onNewPageHandler)}
       {
-        (page < totalPages) ?
+        (page < totalPages && totalPages >= 1) ?
         <li
           className={`mdl-button mdl-js-button ${styles.li}`}
           onClick={() => onNewPageHandler(page + 1)}>
@@ -42,4 +42,3 @@ Pager.propTypes = {
 };
 
 export default Pager;
-
diff --git a/tests/routes/api/assets/index.js b/tests/routes/api/assets/index.js
index da011bf7b..3354f9671 100644
--- a/tests/routes/api/assets/index.js
+++ b/tests/routes/api/assets/index.js
@@ -18,7 +18,6 @@ describe('/api/v1/assets', () => {
         url: 'https://coralproject.net/news/asset1',
         title: 'Asset 1',
         description: 'term1',
-        id: '1',
         closedAt: Date.now()
       },
       {

From 8233937f7a6a251eafc7758cfd2857e50ebb3093 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 21 Dec 2016 15:55:40 -0700
Subject: [PATCH 43/54] Moved wordlist loading into the middleware

---
 init.js                            |  10 +-
 services/wordlist.js               | 330 +++++++++++++++--------------
 tests/routes/api/comments/index.js |   8 +-
 tests/services/wordlist.js         |  13 +-
 4 files changed, 180 insertions(+), 181 deletions(-)

diff --git a/init.js b/init.js
index 768d02999..ec675d5a4 100644
--- a/init.js
+++ b/init.js
@@ -1,15 +1,7 @@
 const Setting = require('./models/setting');
-const wordlist = require('./services/wordlist');
 
 module.exports = () => Promise.all([
 
   // Upsert the settings object.
-  Setting
-    .init({id: '1', moderation: 'pre'})
-    .then(() => {
-
-      // Load in the wordlist now that settings have been init'd.
-      return wordlist.init();
-    })
-
+  Setting.init({id: '1', moderation: 'pre'})
 ]);
diff --git a/services/wordlist.js b/services/wordlist.js
index 2103c7267..49b646bcb 100644
--- a/services/wordlist.js
+++ b/services/wordlist.js
@@ -8,184 +8,194 @@ const Setting = require('../models/setting');
  * The root wordlist object.
  * @type {Object}
  */
-const wordlist = {
-  lists: {
-    banned: [],
-    suspect: []
-  },
-  enabled: false
-};
+class Wordlist {
 
-/**
- * Loads wordlists in from the naughty-words package based on languages
- * selected.
- * @param  {Array} languages language codes to add to the wordlist
- */
-wordlist.init = () => {
-  return Setting
-    .retrieve()
-    .then((settings) => {
+  constructor() {
+    this.lists = {
+      banned: [],
+      suspect: []
+    };
+  }
 
-      // Insert the settings wordlist.
-      wordlist.insert(settings.wordlist);
+  /**
+   * Loads wordlists in from the database
+   */
+  load() {
+    return Setting
+      .retrieve()
+      .then((settings) => {
+
+        // Insert the settings wordlist.
+        this.upsert(settings.wordlist);
+      });
+  }
+
+  /**
+   * Inserts the wordlist data
+   * @param  {Array} list list of words to be set to the wordlist
+   */
+  upsert(lists) {
+
+    // Add the words to this array, but also lowercase the words so that an
+    // easy comparison can take place.
+    ['banned', 'suspect'].forEach((k) => {
+      if (!(k in lists)) {
+        return;
+      }
+
+      this.lists[k] = Wordlist.parseList(lists[k]);
+
+      debug(`Added ${lists[k].length} words to the ${k} wordlist.`);
     });
-};
 
-/**
- * Inserts the wordlist data and enables the wordlist.
- * @param  {Array} list list of words to be added to the wordlist
- */
-wordlist.insert = (lists) => {
+    return Promise.resolve(this);
+  }
 
-  // Add the words to this array, but also lowercase the words so that an
-  // easy comparison can take place.
-  ['banned', 'suspect'].forEach((k) => {
-    if (!(k in lists)) {
-      return;
-    }
+  /**
+   * Parses the list content.
+   * @param  {Array} list array of words to parse for a list.
+   * @return {Array}      the parsed list
+   */
+  static parseList(list) {
+    return _.uniq(list.map((word) => tokenizer.tokenize(word.toLowerCase())));
+  }
 
-    wordlist.lists[k] = wordlist.parseList(lists[k]);
+  /**
+   * Tests the phrase to see if it contains any of the defined blockwords.
+   * @param  {String} phrase value to check for blockwords.
+   * @return {Boolean}       true if a blockword is found, false otherwise.
+   */
+  match(list, phrase) {
 
-    debug(`Added ${lists[k].length} words to the ${k} wordlist.`);
-  });
+    // Lowercase the word to ensure that we don't miss a match due to
+    // capitalization.
+    let lowerPhraseWords = tokenizer.tokenize(phrase.toLowerCase());
 
-  // Enable the wordlist.
-  wordlist.enabled = true;
+    // This will return true in the event that at least one blockword is found
+    // in the phrase.
+    return list.some((blockphrase) => {
 
-  return Promise.resolve(wordlist);
-};
+      // First, let's see if we can find the first word in the blockphrase in the
+      // source phrase.
+      let idx = lowerPhraseWords.indexOf(blockphrase[0]);
 
-/**
- * Parses the list content.
- * @param  {Array} list array of words to parse for a list.
- * @return {Array}      the parsed list
- */
-wordlist.parseList = (list) => _.uniq(list.map((word) => {
-  return tokenizer.tokenize(word.toLowerCase());
-}));
+      if (idx === -1) {
 
-/**
- * Tests the phrase to see if it contains any of the defined blockwords.
- * @param  {String} phrase value to check for blockwords.
- * @return {Boolean}       true if a blockword is found, false otherwise.
- */
-wordlist.match = (list, phrase) => {
-
-  // Lowercase the word to ensure that we don't miss a match due to
-  // capitalization.
-  let lowerPhraseWords = tokenizer.tokenize(phrase.toLowerCase());
-
-  // This will return true in the event that at least one blockword is found
-  // in the phrase.
-  return list.some((blockphrase) => {
-
-    // First, let's see if we can find the first word in the blockphrase in the
-    // source phrase.
-    let idx = lowerPhraseWords.indexOf(blockphrase[0]);
-
-    if (idx === -1) {
-
-      // The first blockword in the blockphrase did not match the source phrase
-      // anywhere.
-      return false;
-    }
-
-    // Here we'll quick respond with true in the event that the blockphrase was
-    // just a single word.
-    if (blockphrase.length === 1) {
-      return true;
-    }
-
-    // We found the first word in the source phrase! Lets ensure it matches the
-    // rest of the blockphrase...
-
-    // Check to see if it even has the length to support this word!
-    if (lowerPhraseWords.length < idx + blockphrase.length - 1) {
-
-      // We couldn't possibly have the entire phrase here because we don't have
-      // enough entries!
-      return false;
-    }
-
-    for (let i = 1; i < blockphrase.length; i++) {
-
-      // Check to see if the next word also matches!
-      if (lowerPhraseWords[idx + i] !== blockphrase[i]) {
+        // The first blockword in the blockphrase did not match the source phrase
+        // anywhere.
         return false;
       }
-    }
 
-    // We've walked over all the words of the blockphrase, and haven't had a
-    // mismatch... It does contain the whole word!
-    return true;
-  });
-};
+      // Here we'll quick respond with true in the event that the blockphrase was
+      // just a single word.
+      if (blockphrase.length === 1) {
+        return true;
+      }
+
+      // We found the first word in the source phrase! Lets ensure it matches the
+      // rest of the blockphrase...
+
+      // Check to see if it even has the length to support this word!
+      if (lowerPhraseWords.length < idx + blockphrase.length - 1) {
+
+        // We couldn't possibly have the entire phrase here because we don't have
+        // enough entries!
+        return false;
+      }
+
+      for (let i = 1; i < blockphrase.length; i++) {
+
+        // Check to see if the next word also matches!
+        if (lowerPhraseWords[idx + i] !== blockphrase[i]) {
+          return false;
+        }
+      }
+
+      // We've walked over all the words of the blockphrase, and haven't had a
+      // mismatch... It does contain the whole word!
+      return true;
+    });
+  }
+
+  filter(...fields) {
+    return (req, res, next) => {
+
+      // Start with the sensible default that the content does not contain
+      // profanity.
+      req.wordlist = {
+        matched: false
+      };
+
+      // Loop over all the fields from the body that we want to check.
+      for (let i = 0; i < fields.length; i++) {
+        let field = fields[i];
+
+        let phrase = _.get(req.body, field, false);
+
+        // If the field doesn't exist in the body, then it can't be profane!
+        if (!phrase) {
+
+          // Return that there wasn't a profane word here.
+          continue;
+        }
+
+        // Check if the field contains a banned word.
+        if (this.match(this.lists.banned, phrase)) {
+          debug(`the field "${field}" contained a phrase "${phrase}" which contained a banned word/phrase`);
+
+          req.wordlist.banned = ErrContainsProfanity;
+
+          // Stop looping through the fields now, we discovered the worst possible
+          // situation (a banned word).
+          break;
+        }
+
+        // Check if the field contains a banned word.
+        if (this.match(this.lists.suspect, phrase)) {
+          debug(`the field "${field}" contained a phrase "${phrase}" which contained a suspected word/phrase`);
+
+          req.wordlist.suspect = ErrContainsProfanity;
+
+          // Continue looping through the fields now, we discovered a possible bad
+          // word (suspect).
+          continue;
+        }
+      }
+
+      next();
+    };
+  }
+
+  /**
+   * Connect middleware for scanning request bodies for wordlisted words and
+   * attaching a ErrContainsProfanity to the req.wordlisted parameter, otherwise
+   * it will just set that parameter to false.
+   * @param  {Array} fields selectors for the body to extract the fields to be
+   *                        tested
+   * @return {Function}     the Connect middleware
+   */
+  static filter(...fields) {
+    return (req, res, next) => {
+
+      // Create a new instance of the Wordlist.
+      const wl = new Wordlist();
+
+      wl
+        .load()
+        .then(() => {
+
+          // Perform a filtering operation using the new instance of the
+          // Wordlist.
+          wl.filter(...fields)(req, res, next);
+        });
+    };
+  }
+}
 
 // ErrContainsProfanity is returned in the event that the middleware detects
 // profanity/wordlisted words in the payload.
 const ErrContainsProfanity = new Error('contains profanity');
 ErrContainsProfanity.status = 400;
 
-/**
- * Connect middleware for scanning request bodies for wordlisted words and
- * attaching a ErrContainsProfanity to the req.wordlisted parameter, otherwise
- * it will just set that parameter to false.
- * @param  {Array} fields selectors for the body to extract the fields to be
- *                        tested
- * @return {Function}     the Connect middleware
- */
-wordlist.filter = (...fields) => (req, res, next) => {
-
-  // Start with the sensible default that the content does not contain
-  // profanity.
-  req.wordlist = {
-    matched: false
-  };
-
-  // If the wordlist isn't enabled, then don't actually perform checking and
-  // forward the request!
-  if (!wordlist.enabled) {
-    return next();
-  }
-
-  // Loop over all the fields from the body that we want to check.
-  for (let i = 0; i < fields.length; i++) {
-    let field = fields[i];
-
-    let phrase = _.get(req.body, field, false);
-
-    // If the field doesn't exist in the body, then it can't be profane!
-    if (!phrase) {
-
-      // Return that there wasn't a profane word here.
-      continue;
-    }
-
-    // Check if the field contains a banned word.
-    if (wordlist.match(wordlist.lists.banned, phrase)) {
-      debug(`the field "${field}" contained a phrase "${phrase}" which contained a banned word/phrase`);
-
-      req.wordlist.banned = ErrContainsProfanity;
-
-      // Stop looping through the fields now, we discovered the worst possible
-      // situation (a banned word).
-      break;
-    }
-
-    // Check if the field contains a banned word.
-    if (wordlist.match(wordlist.lists.suspect, phrase)) {
-      debug(`the field "${field}" contained a phrase "${phrase}" which contained a suspected word/phrase`);
-
-      req.wordlist.suspect = ErrContainsProfanity;
-
-      // Continue looping through the fields now, we discovered a possible bad
-      // word (suspect).
-      continue;
-    }
-  }
-
-  next();
-};
-
-module.exports = wordlist;
+module.exports = Wordlist;
 module.exports.ErrContainsProfanity = ErrContainsProfanity;
diff --git a/tests/routes/api/comments/index.js b/tests/routes/api/comments/index.js
index ea439299e..b3c3a44fb 100644
--- a/tests/routes/api/comments/index.js
+++ b/tests/routes/api/comments/index.js
@@ -8,22 +8,18 @@ const expect = chai.expect;
 chai.should();
 chai.use(require('chai-http'));
 
-const wordlist = require('../../../../services/wordlist');
 const Comment = require('../../../../models/comment');
 const Asset = require('../../../../models/asset');
 const Action = require('../../../../models/action');
 const User = require('../../../../models/user');
 
 const Setting = require('../../../../models/setting');
-const settings = {id: '1', moderation: 'pre'};
+const settings = {id: '1', moderation: 'pre', wordlist: {banned: ['bad words'], suspect: ['suspect words']}};
 
 describe('/api/v1/comments', () => {
 
   // Ensure that the settings are always available.
-  beforeEach(() => Promise.all([
-    wordlist.insert({banned: ['bad words'], suspect: ['suspect words']}),
-    Setting.init(settings)
-  ]));
+  beforeEach(() => Setting.init(settings));
 
   describe('#get', () => {
     const comments = [{
diff --git a/tests/services/wordlist.js b/tests/services/wordlist.js
index c65be3b11..dd3e5257e 100644
--- a/tests/services/wordlist.js
+++ b/tests/services/wordlist.js
@@ -1,6 +1,6 @@
 const expect = require('chai').expect;
 
-const wordlist = require('../../services/wordlist');
+const Wordlist = require('../../services/wordlist');
 
 describe('wordlist: services', () => {
 
@@ -16,21 +16,22 @@ describe('wordlist: services', () => {
     ]
   };
 
+  let wordlist = new Wordlist();
+
   describe('#init', () => {
 
-    before(() => wordlist.insert(wordlists));
+    before(() => wordlist.upsert(wordlists));
 
     it('has entries', () => {
       expect(wordlist.lists.banned).to.not.be.empty;
       expect(wordlist.lists.suspect).to.not.be.empty;
-      expect(wordlist.enabled).to.be.true;
     });
 
   });
 
   describe('#match', () => {
 
-    const bannedList = wordlist.parseList(wordlists.banned);
+    const bannedList = Wordlist.parseList(wordlists.banned);
 
     it('does match on a bad word', () => {
       [
@@ -61,7 +62,7 @@ describe('wordlist: services', () => {
 
   describe('#filter', () => {
 
-    before(() => wordlist.insert(wordlists));
+    before(() => wordlist.upsert(wordlists));
 
     it('matches on bodies containing bad words', (done) => {
 
@@ -75,7 +76,7 @@ describe('wordlist: services', () => {
         expect(err).to.be.undefined;
         expect(req).to.have.property('wordlist');
         expect(req.wordlist).to.have.property('matched');
-        expect(req.wordlist.banned).to.be.equal(wordlist.ErrContainsProfanity);
+        expect(req.wordlist.banned).to.be.equal(Wordlist.ErrContainsProfanity);
 
         done();
       });

From 6db2361edb16b74a69d91cd42cc541ef2db8eba3 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 21 Dec 2016 16:19:19 -0700
Subject: [PATCH 44/54] Adjusted middleware

---
 services/wordlist.js       | 84 ++++++++++++++++++-----------------
 tests/services/wordlist.js | 91 ++++++++++++--------------------------
 2 files changed, 71 insertions(+), 104 deletions(-)

diff --git a/services/wordlist.js b/services/wordlist.js
index 49b646bcb..96e0c3b1f 100644
--- a/services/wordlist.js
+++ b/services/wordlist.js
@@ -117,53 +117,52 @@ class Wordlist {
     });
   }
 
-  filter(...fields) {
-    return (req, res, next) => {
+  /**
+   * Perform the filtering based on the loaded wordlists.
+   */
+  filter(body, ...fields) {
 
-      // Start with the sensible default that the content does not contain
-      // profanity.
-      req.wordlist = {
-        matched: false
-      };
+    // Start with the sensible default that the content does not contain
+    // profanity.
+    let errors = {};
 
-      // Loop over all the fields from the body that we want to check.
-      for (let i = 0; i < fields.length; i++) {
-        let field = fields[i];
+    // Loop over all the fields from the body that we want to check.
+    for (let i = 0; i < fields.length; i++) {
+      let field = fields[i];
 
-        let phrase = _.get(req.body, field, false);
+      let phrase = _.get(body, field, false);
 
-        // If the field doesn't exist in the body, then it can't be profane!
-        if (!phrase) {
+      // If the field doesn't exist in the body, then it can't be profane!
+      if (!phrase) {
 
-          // Return that there wasn't a profane word here.
-          continue;
-        }
-
-        // Check if the field contains a banned word.
-        if (this.match(this.lists.banned, phrase)) {
-          debug(`the field "${field}" contained a phrase "${phrase}" which contained a banned word/phrase`);
-
-          req.wordlist.banned = ErrContainsProfanity;
-
-          // Stop looping through the fields now, we discovered the worst possible
-          // situation (a banned word).
-          break;
-        }
-
-        // Check if the field contains a banned word.
-        if (this.match(this.lists.suspect, phrase)) {
-          debug(`the field "${field}" contained a phrase "${phrase}" which contained a suspected word/phrase`);
-
-          req.wordlist.suspect = ErrContainsProfanity;
-
-          // Continue looping through the fields now, we discovered a possible bad
-          // word (suspect).
-          continue;
-        }
+        // Return that there wasn't a profane word here.
+        continue;
       }
 
-      next();
-    };
+      // Check if the field contains a banned word.
+      if (this.match(this.lists.banned, phrase)) {
+        debug(`the field "${field}" contained a phrase "${phrase}" which contained a banned word/phrase`);
+
+        errors.banned = ErrContainsProfanity;
+
+        // Stop looping through the fields now, we discovered the worst possible
+        // situation (a banned word).
+        break;
+      }
+
+      // Check if the field contains a banned word.
+      if (this.match(this.lists.suspect, phrase)) {
+        debug(`the field "${field}" contained a phrase "${phrase}" which contained a suspected word/phrase`);
+
+        errors.suspect = ErrContainsProfanity;
+
+        // Continue looping through the fields now, we discovered a possible bad
+        // word (suspect).
+        continue;
+      }
+    }
+
+    return errors;
   }
 
   /**
@@ -186,7 +185,10 @@ class Wordlist {
 
           // Perform a filtering operation using the new instance of the
           // Wordlist.
-          wl.filter(...fields)(req, res, next);
+          req.wordlist = wl.filter(req.body, ...fields);
+
+          // Call the next piece of middleware.
+          next();
         });
     };
   }
diff --git a/tests/services/wordlist.js b/tests/services/wordlist.js
index dd3e5257e..4edfef0c7 100644
--- a/tests/services/wordlist.js
+++ b/tests/services/wordlist.js
@@ -6,13 +6,12 @@ describe('wordlist: services', () => {
 
   const wordlists = {
     banned: [
-      'BAD',
-      'bad',
-      'how to murder',
-      'how to kill'
+      'cookies',
+      'how to do bad things',
+      'how to do really bad things'
     ],
     suspect: [
-      'murder'
+      'do bad things'
     ]
   };
 
@@ -35,12 +34,12 @@ describe('wordlist: services', () => {
 
     it('does match on a bad word', () => {
       [
-        'how to kill',
-        'what is bad',
-        'bad',
-        'BAD.',
-        'how to murder',
-        'How To mUrDer'
+        'how to do really bad things',
+        'what is cookies',
+        'cookies',
+        'COOKIES.',
+        'how to do bad things',
+        'How To do bad things!'
       ].forEach((word) => {
         expect(wordlist.match(bannedList, word)).to.be.true;
       });
@@ -49,10 +48,9 @@ describe('wordlist: services', () => {
     it('does not match on a good word', () => {
       [
         'how to',
-        'kill',
-        'bads',
+        'cookie',
         'how to be a great person?',
-        'how to not kill?'
+        'how to not do really bad things?'
       ].forEach((word) => {
         expect(wordlist.match(bannedList, word)).to.be.false;
       });
@@ -64,62 +62,29 @@ describe('wordlist: services', () => {
 
     before(() => wordlist.upsert(wordlists));
 
-    it('matches on bodies containing bad words', (done) => {
-
-      let req = {
-        body: {
-          content: 'how to kill?'
-        }
-      };
-
-      wordlist.filter('content')(req, {}, (err) => {
-        expect(err).to.be.undefined;
-        expect(req).to.have.property('wordlist');
-        expect(req.wordlist).to.have.property('matched');
-        expect(req.wordlist.banned).to.be.equal(Wordlist.ErrContainsProfanity);
-
-        done();
-      });
+    it('matches on bodies containing bad words', () => {
+      let errors = wordlist.filter({
+        content: 'how to do really bad things?'
+      }, 'content');
 
+      expect(errors).to.have.property('banned', Wordlist.ErrContainsProfanity);
     });
 
-    it('does not match on bodies not containing bad words', (done) => {
-
-      let req = {
-        body: {
-          content: 'how to be a great person?'
-        }
-      };
-
-      wordlist.filter('content')(req, {}, (err) => {
-        expect(err).to.be.undefined;
-        expect(req).to.have.property('wordlist');
-        expect(req.wordlist).to.have.property('matched');
-        expect(req.wordlist.matched).to.be.false;
-
-        done();
-      });
+    it('does not match on bodies not containing bad words', () => {
+      let errors = wordlist.filter({
+        content: 'how to not do really bad things?'
+      }, 'content');
 
+      expect(errors).to.not.have.property('banned');
     });
 
-    it('does not match on bodies not containing the bad word field', (done) => {
-
-      let req = {
-        body: {
-          author: 'how to kill?',
-          content: 'how to be a great person?'
-        }
-      };
-
-      wordlist.filter('content')(req, {}, (err) => {
-        expect(err).to.be.undefined;
-        expect(req).to.have.property('wordlist');
-        expect(req.wordlist).to.have.property('matched');
-        expect(req.wordlist.matched).to.be.false;
-
-        done();
-      });
+    it('does not match on bodies not containing the bad word field', () => {
+      let errors = wordlist.filter({
+        author: 'how to do really bad things?',
+        content: 'how to be a great person?'
+      }, 'content');
 
+      expect(errors).to.not.have.property('banned');
     });
 
   });

From 81ff5420fe561146684889e12718109ca85ca13f Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Wed, 21 Dec 2016 15:26:47 -0800
Subject: [PATCH 45/54] Completing user endpoitn updates.

---
 docs/swagger.yaml | 179 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 136 insertions(+), 43 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index f45c86fe2..a3707c444 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -497,51 +497,103 @@ paths:
           description: An error occured.
           schema:
             $ref: '#/definitions/Error'
-    /users:
-      get:
-        value:
-          in: query
-          type: string
-          description: A term to search users' displayNames and email addresses.
-        sort:
-          in: query
-          type: string
-          enum:
-            asc
-            desc
-          description: Determines whether users sorted in are ascending or descending order.
-        field:
-          in: query
-          type: string
-          description: The field used to sort.
-        page:
-          in: query
-          type: number
-          description: The page of search results to return.
-        limit:
-          in: query
-          type: number
-          description: The number of search restults per page.
+  /users:
+    get:
+      value:
+        in: query
+        type: string
+        description: A term to search users' displayNames and email addresses.
+      sort:
+        in: query
+        type: string
+        enum:
+          asc
+          desc
+        description: Determines whether users sorted in are ascending or descending order.
+      field:
+        in: query
+        type: string
+        description: The field used to sort.
+      page:
+        in: query
+        type: number
+        description: The page of search results to return.
+      limit:
+        in: query
+        type: number
+        description: The number of search restults per page.
+    responses:
+      200:
+        parameters:
+          result:
+            type: array
+            description: Users matching search criteria.
+            items:
+              $ref: '#/definitions/User'
+          limit:
+            type: number
+            description: Results per page.
+          count:
+            type: number
+            description: Total number of results.
+          page:
+            type: number
+            description: The current page.
+          totalPages:
+            type: number
+            description: The total number of pages.
+      500:
+        description: An error occured.
+        schema:
+          $ref: '#/definitions/Error'
+    post:
+      body:
+        in: body
+        type: object
+        parameters:
+          email:
+            type: string
+            format: email
+          password:
+            type: string
+          displayName:
+            type: string
       responses:
-        200:
+        201:
+          description: The user that has been created.
+          schema:
+            $ref: '#/definitions/User'
+    /users/update-password:
+      post:
+        body:
+          in: body
+          type: object
           parameters:
-            result:
-              type: array
-              description: Users matching search criteria.
-              items:
-                $ref: '#/definitions/User'
-            limit:
-              type: number
-              description: Results per page.
-            count:
-              type: number
-              description: Total number of results.
-            page:
-              type: number
-              description: The current page.
-            totalPages:
-              type: number
-              description: The total number of pages.
+            token:
+              type: string
+              description: The token that was in the url of the email link.
+            password:
+              type: string
+              description: The new password.
+      response:
+        204:
+          description: Password update successful.
+        500:
+          description: An error occured.
+          schema:
+            $ref: '#/definitions/Error'
+    /request-password-reset:
+      post:
+        body:
+          in: body
+          type: object
+          parameters:
+            email:
+              type: string
+              description: The email address of the user whos password is being reset.
+      response:
+        204:
+          description: Returned regardless of whether the user was found in the DB.
         500:
           description: An error occured.
           schema:
@@ -600,6 +652,47 @@ paths:
           description: An error occured.
           schema:
             $ref: '#/definitions/Error'
+  /users/:user_id/bio:
+    put:
+      user_id:
+        in: path
+        type: string
+        format: uuid
+        description: The id of the user being updated.
+      bio:
+        in: body
+        type: string
+        description: The bio that should be set for this user.
+      responses:
+        200:
+          description: Status update successful.
+          schema:
+            $ref: '#/definitions/User'
+        500:
+          description: An error occured.
+          schema:
+            $ref: '#/definitions/Error'
+  /:user_id/actions:
+    post:
+      action_type:
+        in: body
+        type: string
+        enum:
+          flag
+        description: The type of action being taken on this user.
+      metadata:
+        in: body
+        type: object
+        description: Arbitrary data to be included with the action.
+      responses:
+        200:
+          description: The newly created action.
+          schema:
+            $ref: '#/definitions/Action'
+        500:
+          description: An error occured.
+          schema:
+            $ref: '#/definitions/Error'
 definitions:
   Error:
     type: object

From 7cbd06834f9cbc7f31cff74153fbde249414b57b Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Wed, 21 Dec 2016 16:39:29 -0700
Subject: [PATCH 46/54] set defaults on fetchAssets

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

diff --git a/client/coral-admin/src/actions/assets.js b/client/coral-admin/src/actions/assets.js
index 92f511d5f..930feba5e 100644
--- a/client/coral-admin/src/actions/assets.js
+++ b/client/coral-admin/src/actions/assets.js
@@ -14,9 +14,9 @@ import coralApi from '../../../coral-framework/helpers/response';
 
 // Fetch a page of assets
 // Get comments to fill each of the three lists on the mod queue
-export const fetchAssets = (skip, limit, search, sort, filter) => (dispatch) => {
+export const fetchAssets = (skip = '', limit = '', search = '', sort = '', filter = '') => (dispatch) => {
   dispatch({type: FETCH_ASSETS});
-  return coralApi(`/assets?skip=${skip || ''}&limit=${limit || ''}&sort=${sort || ''}&search=${search || ''}&filter=${filter || ''}`)
+  return coralApi(`/assets?skip=${skip}&limit=${limit}&sort=${sort}&search=${search}&filter=${filter}`)
   .then(({result, count}) =>
     dispatch({type: FETCH_ASSETS_SUCCESS,
       assets: result,

From 7fc3dffc77252413e1cfc90b53cde43182d29e74 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Wed, 21 Dec 2016 16:49:53 -0700
Subject: [PATCH 47/54] reload assets after updating state

---
 client/coral-admin/src/containers/Streams/Streams.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/client/coral-admin/src/containers/Streams/Streams.js b/client/coral-admin/src/containers/Streams/Streams.js
index 55fe10fc2..559621fc5 100644
--- a/client/coral-admin/src/containers/Streams/Streams.js
+++ b/client/coral-admin/src/containers/Streams/Streams.js
@@ -60,7 +60,11 @@ class Streams extends Component {
         prev.statusMenus[id] = false;
         return prev;
       });
-      this.props.updateAssetState(id, closeStream ? Date.now() : null);
+      this.props.updateAssetState(id, closeStream ? Date.now() : null)
+        .then(() => {
+          const {search, sort, filter, page} = this.state;
+          this.props.fetchAssets(page, limit, search, sort, filter);
+        });
     } else {
       this.setState(prev => {
         prev.statusMenus[id] = true;
@@ -169,9 +173,7 @@ const mapDispatchToProps = (dispatch) => {
     fetchAssets: (...args) => {
       dispatch(fetchAssets.apply(this, args));
     },
-    updateAssetState: (...args) => {
-      dispatch(updateAssetState.apply(this, args));
-    }
+    updateAssetState: (...args) => dispatch(updateAssetState.apply(this, args))
   };
 };
 

From b8b47e9c2c987382e27fe872e0e4f8b6e46cb7dc Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Wed, 21 Dec 2016 16:56:29 -0700
Subject: [PATCH 48/54] normalize constant names

---
 client/coral-admin/src/actions/assets.js    | 16 ++++++++--------
 client/coral-admin/src/constants/assets.js  |  8 ++++----
 client/coral-admin/src/reducers/assets.js   |  4 ++--
 tests/client/coral-admin/actions/assets.js  | 16 ++++++++--------
 tests/client/coral-admin/reducers/assets.js |  4 ++--
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/client/coral-admin/src/actions/assets.js b/client/coral-admin/src/actions/assets.js
index 930feba5e..f431f1ad6 100644
--- a/client/coral-admin/src/actions/assets.js
+++ b/client/coral-admin/src/actions/assets.js
@@ -1,10 +1,10 @@
 import {
-  FETCH_ASSETS,
+  FETCH_ASSETS_REQUEST,
   FETCH_ASSETS_SUCCESS,
-  FETCH_ASSETS_FAILED,
-  UPDATE_ASSET_STATE,
+  FETCH_ASSETS_FAILURE,
+  UPDATE_ASSET_STATE_REQUEST,
   UPDATE_ASSET_STATE_SUCCESS,
-  UPDATE_ASSET_STATE_FAILED
+  UPDATE_ASSET_STATE_FAILURE
 } from '../constants/assets';
 import coralApi from '../../../coral-framework/helpers/response';
 
@@ -15,22 +15,22 @@ import coralApi from '../../../coral-framework/helpers/response';
 // Fetch a page of assets
 // Get comments to fill each of the three lists on the mod queue
 export const fetchAssets = (skip = '', limit = '', search = '', sort = '', filter = '') => (dispatch) => {
-  dispatch({type: FETCH_ASSETS});
+  dispatch({type: FETCH_ASSETS_REQUEST});
   return coralApi(`/assets?skip=${skip}&limit=${limit}&sort=${sort}&search=${search}&filter=${filter}`)
   .then(({result, count}) =>
     dispatch({type: FETCH_ASSETS_SUCCESS,
       assets: result,
       count
     }))
-    .catch(error => dispatch({type: FETCH_ASSETS_FAILED, error}));
+    .catch(error => dispatch({type: FETCH_ASSETS_FAILURE, error}));
 };
 
 // Update an asset state
 // Get comments to fill each of the three lists on the mod queue
 export const updateAssetState = (id, closedAt) => (dispatch) => {
-  dispatch({type: UPDATE_ASSET_STATE});
+  dispatch({type: UPDATE_ASSET_STATE_REQUEST});
   return coralApi(`/assets/${id}/status`, {method: 'PUT', body: {closedAt}})
   .then(() =>
     dispatch({type: UPDATE_ASSET_STATE_SUCCESS}))
-    .catch(error => dispatch({type: UPDATE_ASSET_STATE_FAILED, error}));
+    .catch(error => dispatch({type: UPDATE_ASSET_STATE_FAILURE, error}));
 };
diff --git a/client/coral-admin/src/constants/assets.js b/client/coral-admin/src/constants/assets.js
index 8927b351d..0a2ecf73c 100644
--- a/client/coral-admin/src/constants/assets.js
+++ b/client/coral-admin/src/constants/assets.js
@@ -1,6 +1,6 @@
-export const FETCH_ASSETS = 'FETCH_ASSETS';
+export const FETCH_ASSETS_REQUEST = 'FETCH_ASSETS_REQUEST';
 export const FETCH_ASSETS_SUCCESS = 'FETCH_ASSETS_SUCCESS';
-export const FETCH_ASSETS_FAILED = 'FETCH_ASSETS_FAILED';
-export const UPDATE_ASSET_STATE = 'UPDATE_ASSET_STATE';
+export const FETCH_ASSETS_FAILURE = 'FETCH_ASSETS_FAILURE';
+export const UPDATE_ASSET_STATE_REQUEST = 'UPDATE_ASSET_STATE_REQUEST';
 export const UPDATE_ASSET_STATE_SUCCESS = 'UPDATE_ASSET_STATE_SUCCESS';
-export const UPDATE_ASSET_STATE_FAILED = 'UPDATE_ASSET_STATE_FAILED';
+export const UPDATE_ASSET_STATE_FAILURE = 'UPDATE_ASSET_STATE_FAILURE';
diff --git a/client/coral-admin/src/reducers/assets.js b/client/coral-admin/src/reducers/assets.js
index f18aaec33..77d0bf081 100644
--- a/client/coral-admin/src/reducers/assets.js
+++ b/client/coral-admin/src/reducers/assets.js
@@ -1,5 +1,5 @@
 import {Map, List, fromJS} from 'immutable';
-import {FETCH_ASSETS_SUCCESS, UPDATE_ASSET_STATE} from '../constants/assets';
+import {FETCH_ASSETS_SUCCESS, UPDATE_ASSET_STATE_REQUEST} from '../constants/assets';
 
 const initialState = Map({
   byId: Map(),
@@ -10,7 +10,7 @@ export default (state = initialState, action) => {
   switch (action.type) {
   case FETCH_ASSETS_SUCCESS:
     return replaceAssets(action, state);
-  case UPDATE_ASSET_STATE:
+  case UPDATE_ASSET_STATE_REQUEST:
     return state.setIn(['byId', action.id, 'closedAt'], action.closedAt);
   default: return state;
   }
diff --git a/tests/client/coral-admin/actions/assets.js b/tests/client/coral-admin/actions/assets.js
index 55addb805..24a28daef 100644
--- a/tests/client/coral-admin/actions/assets.js
+++ b/tests/client/coral-admin/actions/assets.js
@@ -30,7 +30,7 @@ describe('Asset actions', () => {
     fetchMock.restore();
   });
 
-  describe('FETCH_ASSETS', () => {
+  describe('FETCH_ASSETS_REQUEST', () => {
 
     it('should fetch a list of assets', () => {
 
@@ -41,7 +41,7 @@ describe('Asset actions', () => {
 
       return actions.fetchAssets(2, 20)(store.dispatch)
         .then(() => {
-          expect(store.getActions()[0]).to.have.property('type', 'FETCH_ASSETS');
+          expect(store.getActions()[0]).to.have.property('type', 'FETCH_ASSETS_REQUEST');
           expect(store.getActions()[1]).to.have.property('type', 'FETCH_ASSETS_SUCCESS');
           expect(store.getActions()[1]).to.have.property('count', 2);
           expect(store.getActions()[1]).to.have.property('assets').
@@ -55,13 +55,13 @@ describe('Asset actions', () => {
 
       return actions.fetchAssets(2, 20)(store.dispatch)
         .then(() => {
-          expect(store.getActions()[0]).to.have.property('type', 'FETCH_ASSETS');
-          expect(store.getActions()[1]).to.have.property('type', 'FETCH_ASSETS_FAILED');
+          expect(store.getActions()[0]).to.have.property('type', 'FETCH_ASSETS_REQUEST');
+          expect(store.getActions()[1]).to.have.property('type', 'FETCH_ASSETS_FAILURE');
         });
     });
   });
 
-  describe('UPDATE_ASSET_STATE', () => {
+  describe('UPDATE_ASSET_STATE_REQUEST', () => {
 
     it('should update an asset', () => {
 
@@ -69,7 +69,7 @@ describe('Asset actions', () => {
 
       return actions.updateAssetState('123', 'status', 'open')(store.dispatch)
         .then(() => {
-          expect(store.getActions()[0]).to.have.property('type', 'UPDATE_ASSET_STATE');
+          expect(store.getActions()[0]).to.have.property('type', 'UPDATE_ASSET_STATE_REQUEST');
           expect(store.getActions()[1]).to.have.property('type', 'UPDATE_ASSET_STATE_SUCCESS');
         });
 
@@ -81,8 +81,8 @@ describe('Asset actions', () => {
 
       return actions.updateAssetState('123', 'status', 'open')(store.dispatch)
         .then(() => {
-          expect(store.getActions()[0]).to.have.property('type', 'UPDATE_ASSET_STATE');
-          expect(store.getActions()[1]).to.have.property('type', 'UPDATE_ASSET_STATE_FAILED');
+          expect(store.getActions()[0]).to.have.property('type', 'UPDATE_ASSET_STATE_REQUEST');
+          expect(store.getActions()[1]).to.have.property('type', 'UPDATE_ASSET_STATE_FAILURE');
         });
     });
   });
diff --git a/tests/client/coral-admin/reducers/assets.js b/tests/client/coral-admin/reducers/assets.js
index 60972f47a..753061612 100644
--- a/tests/client/coral-admin/reducers/assets.js
+++ b/tests/client/coral-admin/reducers/assets.js
@@ -36,10 +36,10 @@ describe ('assetsReducer', () => {
     });
   });
 
-  describe('UPDATE_ASSET_STATE', () => {
+  describe('UPDATE_ASSET_STATE_REQUEST', () => {
     it('should update the state of a particular asset', () => {
       const action = {
-        type: 'UPDATE_ASSET_STATE',
+        type: 'UPDATE_ASSET_STATE_REQUEST',
         id: '123',
         closedAt: null
       };

From 510b3754aadad9cb776db85c853a2f0ab5b92b51 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Wed, 21 Dec 2016 17:43:06 -0800
Subject: [PATCH 49/54] Properly formatting swagger docs.

---
 docs/swagger.yaml | 130 +++++++++++++++++++++++-----------------------
 1 file changed, 65 insertions(+), 65 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index a3707c444..b3030fc3c 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -18,10 +18,6 @@ paths:
       tags:
         - Comments
       parameters:
-        - name: asset_id
-          in: query
-          description: Returns comments for a particular asset, if null returns all commets.
-          type: string
         - name: action_type
           in: query
           description: Performs a search based on the actions that have been added to it.
@@ -47,18 +43,20 @@ paths:
       parameters:
         - name: body
           in: body
-          type: string
-          description: The text of comment to create.
           schema:
-            $ref: '#/definitions/Comment'
-        - name: asset_id
-          in: body
-          type: string
-          description: The parent asset of this comment.
-        - name: parent_id
-          in: body
-          type: string
-          description: The parent comment of this comment (null if the comment is not a reply.)
+            body:
+              in: body
+              type: string
+              required: true
+              description: The text of the comment to create.
+            asset_id:
+              in: body
+              type: string
+              description: The parent asset of this comment.
+            parent_id:
+              in: body
+              type: string
+              description: The parent comment of this comment (null if the comment is not a reply.)
       responses:
         201:
           description: The comment that was created.
@@ -68,7 +66,8 @@ paths:
           description: An error occured.
           schema:
             $ref: '#/definitions/Error'
-  /comments/{comment_id}:
+
+  /comments/:comment_id:
     get:
       tags:
         - Comments
@@ -105,6 +104,7 @@ paths:
           description: An error occured.
           schema:
             $ref: '#/definitions/Error'
+
   /comments/{comment_id}/status:
     put:
       tags:
@@ -406,7 +406,7 @@ paths:
           schema:
             $ref: '#/definitions/Error'
 
-  /assets/{asset_id}/settings:
+  /assets/:asset_id/settings:
     put:
       parameters:
         asset_id:
@@ -415,22 +415,19 @@ paths:
           type: string
           format: uuid
           description: The id of the asset to be updated
-        body:
+        closedAt:
           in: body
-          type: object
-          parameters:
-            closedAt:
-              type: number
-              description: The Unix timestamp when the stream will be or was previously closed.
-            closedMessage:
-              type: string
-              description: The message to display to users when the stream is closed.
+          type: number
+          description: The Unix timestamp when the stream will be or was previously closed.
+        closedMessage:
+          type: string
+          in: body
+          description: The message to display to users when the stream is closed.
         responses:
           204:
             description: Status update successful.
           500:
             description: An error has occurred.
-
   /stream:
     get:
       tags:
@@ -598,23 +595,24 @@ paths:
           description: An error occured.
           schema:
             $ref: '#/definitions/Error'
-  /users/:user_id/role:
+  /users/{user_id}/role:
     post:
-      user_id:
-        in: path
-        type: string
-        format: uuid
-        description: ID of the user to be updated.
-      body:
-        in: body
-        type: object
-        parameters:
-          role:
-            type: string
-            description: Role to be added to the user.
-            enum:
-              admin
-              moderator
+      parameters:
+        user_id:
+          in: path
+          type: string
+          format: uuid
+          description: ID of the user to be updated.
+        body:
+          in: body
+          type: object
+          parameters:
+            role:
+              type: string
+              description: Role to be added to the user.
+              enum:
+                admin
+                moderator
       responses:
         204:
           description: Role update successful.
@@ -622,7 +620,7 @@ paths:
           description: An error occured.
           schema:
             $ref: '#/definitions/Error'
-  /users/:user_id/status:
+  /users/{user_id}/status:
     post:
       user_id:
         in: path
@@ -652,17 +650,18 @@ paths:
           description: An error occured.
           schema:
             $ref: '#/definitions/Error'
-  /users/:user_id/bio:
+  /users/{user_id}/bio:
     put:
-      user_id:
-        in: path
-        type: string
-        format: uuid
-        description: The id of the user being updated.
-      bio:
-        in: body
-        type: string
-        description: The bio that should be set for this user.
+      parameters:
+        user_id:
+          in: path
+          type: string
+          format: uuid
+          description: The id of the user being updated.
+        bio:
+          in: body
+          type: string
+          description: The bio that should be set for this user.
       responses:
         200:
           description: Status update successful.
@@ -672,18 +671,19 @@ paths:
           description: An error occured.
           schema:
             $ref: '#/definitions/Error'
-  /:user_id/actions:
+  /{user_id}/actions:
     post:
-      action_type:
-        in: body
-        type: string
-        enum:
-          flag
-        description: The type of action being taken on this user.
-      metadata:
-        in: body
-        type: object
-        description: Arbitrary data to be included with the action.
+      parameters:
+        - name: action_type
+          in: body
+          description: The type of action being taken on this user.
+          type: string
+          enum:
+            - flag
+        - name: metadata
+          in: body
+          type: object
+          description: Arbitrary data to be included with the action.
       responses:
         200:
           description: The newly created action.

From ec455c99af360616fc5ea3a288a63f40bc630545 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Wed, 21 Dec 2016 17:53:55 -0800
Subject: [PATCH 50/54] Making small corrections to swagger.

---
 docs/swagger.yaml | 385 ++++++++++++++++++++++++++--------------------
 1 file changed, 218 insertions(+), 167 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index b3030fc3c..8fe8627b0 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -32,7 +32,7 @@ paths:
           schema:
             type: array
             items:
-              - $ref: '#/definitions/Comment'
+              $ref: '#/definitions/Comment'
         500:
           description: An error occured.
           schema:
@@ -43,20 +43,19 @@ paths:
       parameters:
         - name: body
           in: body
+          required: true
           schema:
-            body:
-              in: body
-              type: string
-              required: true
-              description: The text of the comment to create.
-            asset_id:
-              in: body
-              type: string
-              description: The parent asset of this comment.
-            parent_id:
-              in: body
-              type: string
-              description: The parent comment of this comment (null if the comment is not a reply.)
+            type: object
+            properties:
+              body:
+                type: string
+                description: The text of the comment to create.
+              asset_id:
+                type: string
+                description: The parent asset of this comment.
+              parent_id:
+                type: string
+                description: The parent comment of this comment (null if the comment is not a reply.)
       responses:
         201:
           description: The comment that was created.
@@ -67,7 +66,7 @@ paths:
           schema:
             $ref: '#/definitions/Error'
 
-  /comments/:comment_id:
+  /comments/{comment_id}:
     get:
       tags:
         - Comments
@@ -115,6 +114,7 @@ paths:
           in: path
           description: The id of the comment to retrieve.
           type: string
+          format: uuid
           required: true
         - name: body
           in: body
@@ -126,6 +126,11 @@ paths:
               status:
                 type: string
                 description: The status to update to.
+                enum:
+                  - new
+                  - flagged
+                  - accepted
+                  - rejected
       responses:
         204:
           description: The comment status was updated.
@@ -133,7 +138,7 @@ paths:
           description: An error occured.
           schema:
             $ref: '#/definitions/Error'
-  /comments/{comment_id}/actions:
+  /comments/{item_id}/actions:
     post:
       tags:
         - Comments
@@ -154,6 +159,9 @@ paths:
               action_type:
                 type: string
                 description: The type of action to add
+                enum:
+                  - like
+                  - flag
               metadata:
                 type: object
                 description: An arbitrary object describing the action, should be consistent per action type.
@@ -278,17 +286,17 @@ paths:
                 type: array
                 description: The comments that have yet to be moderated.
                 items:
-                  - $ref: '#/definitions/Comment'
+                  $ref: '#/definitions/Comment'
               users:
                 type: array
                 description: The users authoring these comments.
                 items:
-                  - $ref: '#/definitions/User'
+                  $ref: '#/definitions/User'
               actions:
                 type: array
                 description: The actions which have taken place on these comments.
                 items:
-                  - $ref: '#/definitions/Actions'
+                  $ref: '#/definitions/Actions'
         500:
           description: An error occured.
           schema:
@@ -406,28 +414,34 @@ paths:
           schema:
             $ref: '#/definitions/Error'
 
-  /assets/:asset_id/settings:
+  /assets/{asset_id}/status:
     put:
       parameters:
-        asset_id:
-          in: path
+        - name: asset_id
           required: true
+          in: path
           type: string
           format: uuid
           description: The id of the asset to be updated
-        closedAt:
+        - name: body
           in: body
-          type: number
-          description: The Unix timestamp when the stream will be or was previously closed.
-        closedMessage:
-          type: string
-          in: body
-          description: The message to display to users when the stream is closed.
-        responses:
-          204:
-            description: Status update successful.
-          500:
-            description: An error has occurred.
+          required: true
+          schema:
+            type: object
+            properties:
+              closedAt:
+                type: number
+                description: The Unix timestamp when the stream will be or was previously closed.
+              closedMessage:
+                type: string
+                description: The message to display to users when the stream is closed.
+      responses:
+        204:
+          description: Status update successful.
+        500:
+          description: An error has occurred.
+          schema:
+            $ref: '#/definitions/Error'
   /stream:
     get:
       tags:
@@ -448,25 +462,22 @@ paths:
             type: object
             properties:
               asset:
-                type: object
-                description: The asset for the url passed to this endpoint.
-                items:
-                  - $ref: '#/definitions/Asset'
+                $ref: '#/definitions/Asset'
               comments:
                 type: array
                 description: All comments for this asset.
                 items:
-                  - $ref: '#/definitions/Comment'
+                  $ref: '#/definitions/Comment'
               users:
                 type: array
                 description: All authors of comments on this asset.
                 items:
-                  - $ref: '#/definitions/User'
+                  $ref: '#/definitions/User'
               actions:
                 type: array
                 description: All actions on comments on this asset and their authors.
                 items:
-                  - $ref: '#/definitions/Actions'
+                  $ref: '#/definitions/Actions'
         500:
           description: An error occured.
           schema:
@@ -483,11 +494,15 @@ paths:
           schema:
             $ref: '#/definitions/Error'
     put:
-      responses:
-        parameteters:
-          body:
+      parameters:
+        - name: body
+          in: body
+          required: true
+          description: Settings to be updated.
+          schema:
             type: object
-            description: Settings to be updated
+            description: Any allowed setting and value.
+      responses:
         204:
           description: The settings were updated.
         500:
@@ -496,99 +511,113 @@ paths:
             $ref: '#/definitions/Error'
   /users:
     get:
-      value:
-        in: query
-        type: string
-        description: A term to search users' displayNames and email addresses.
-      sort:
-        in: query
-        type: string
-        enum:
-          asc
-          desc
-        description: Determines whether users sorted in are ascending or descending order.
-      field:
-        in: query
-        type: string
-        description: The field used to sort.
-      page:
-        in: query
-        type: number
-        description: The page of search results to return.
-      limit:
-        in: query
-        type: number
-        description: The number of search restults per page.
-    responses:
-      200:
-        parameters:
-          result:
-            type: array
-            description: Users matching search criteria.
-            items:
-              $ref: '#/definitions/User'
-          limit:
-            type: number
-            description: Results per page.
-          count:
-            type: number
-            description: Total number of results.
-          page:
-            type: number
-            description: The current page.
-          totalPages:
-            type: number
-            description: The total number of pages.
-      500:
-        description: An error occured.
-        schema:
-          $ref: '#/definitions/Error'
+      parameters:
+       - name: value
+         in: query
+         type: string
+         description: A term to search users' displayNames and email addresses.
+       - name: sort
+         in: query
+         type: string
+         enum:
+          - asc
+          - desc
+         description: Determines whether users sorted in are ascending or descending order.
+       - name: field
+         in: query
+         type: string
+         description: The field used to sort.
+       - name: page
+         in: query
+         type: number
+         description: The page of search results to return.
+       - name: limit
+         in: query
+         type: number
+         description: The number of search restults per page.
+      responses:
+        200:
+          description: A paginated array of users matching search terms.
+          schema:
+            type: object
+            properties:
+              result:
+                type: array
+                description: Users matching search criteria.
+                items:
+                  $ref: '#/definitions/User'
+              limit:
+                type: number
+                description: Results per page.
+              count:
+                type: number
+                description: Total number of results.
+              page:
+                type: number
+                description: The current page.
+              totalPages:
+                type: number
+                description: The total number of pages.
+        500:
+          description: An error occured.
+          schema:
+            $ref: '#/definitions/Error'
     post:
-      body:
-        in: body
-        type: object
-        parameters:
-          email:
-            type: string
-            format: email
-          password:
-            type: string
-          displayName:
-            type: string
+      parameters:
+        - name: body
+          in: body
+          required: true
+          description: User to be created.
+          schema:
+            type: object
+            properties:
+              email:
+                type: string
+                format: email
+              password:
+                type: string
+              displayName:
+                type: string
       responses:
         201:
           description: The user that has been created.
           schema:
             $ref: '#/definitions/User'
-    /users/update-password:
-      post:
-        body:
+  /users/update-password:
+    post:
+      parameters:
+        - name: body
           in: body
-          type: object
-          parameters:
-            token:
-              type: string
-              description: The token that was in the url of the email link.
-            password:
-              type: string
-              description: The new password.
-      response:
+          required: true
+          schema:
+            type: object
+            properties:
+              token:
+                type: string
+                description: The token that was in the url of the email link.
+              password:
+               type: string
+               description: The new password.
+      responses:
         204:
           description: Password update successful.
         500:
           description: An error occured.
           schema:
             $ref: '#/definitions/Error'
-    /request-password-reset:
-      post:
-        body:
+  /request-password-reset:
+    post:
+      parameters:
+        - name: body
           in: body
-          type: object
-          parameters:
-            email:
-              type: string
-              description: The email address of the user whos password is being reset.
-      response:
+          required: true
+          schema:
+            type: object
+            properties:
+              email:
+                type: string
+                description: The email address of the user whos password is being reset.
+      responses:
         204:
           description: Returned regardless of whether the user was found in the DB.
         500:
@@ -598,21 +627,24 @@ paths:
   /users/{user_id}/role:
     post:
       parameters:
-        user_id:
+        - name: user_id
           in: path
+          required: true
           type: string
           format: uuid
           description: ID of the user to be updated.
-        body:
+        - name: body
           in: body
-          type: object
-          parameters:
-            role:
-              type: string
-              description: Role to be added to the user.
-              enum:
-                admin
-                moderator
+          required: true
+          schema:
+            type: object
+            properties:
+              role:
+                type: string
+                description: Role to be added to the user.
+                enum:
+                  - admin
+                  - moderator
       responses:
         204:
           description: Role update successful.
@@ -622,27 +654,29 @@ paths:
             $ref: '#/definitions/Error'
   /users/{user_id}/status:
     post:
-      user_id:
-        in: path
-        type: string
-        format: uuid
-        required: true
-        description: ID of the user to be updated.
-      body:
-        in: body
-        type: object
-        parameters:
-          status:
-            type: string
-            required: true
-            description: Status for the user to be set to.
-            enum:
-              active
-              banned
-          comment_id:
-            type: string
-            format: uuid
-            description: The id of the comment which triggered this status change.
+      parameters:
+        - name: user_id
+          in: path
+          type: string
+          format: uuid
+          required: true
+          description: ID of the user to be updated.
+        - name: body
+          in: body
+          required: true
+          schema:
+           type: object
+           properties:
+            status:
+              type: string
+              description: Status for the user to be set to.
+              enum:
+                - active
+                - banned
+            comment_id:
+              type: string
+              format: uuid
+              description: The id of the comment which triggered this status change.
       responses:
         200:
           description: Status update successful.
@@ -653,15 +687,21 @@ paths:
   /users/{user_id}/bio:
     put:
       parameters:
-        user_id:
+        - name: user_id
           in: path
+          required: true
           type: string
           format: uuid
           description: The id of the user being updated.
-        bio:
+        - name: body
           in: body
-          type: string
-          description: The bio that should be set for this user.
+          required: true
+          schema:
+            type: object
+            properties:
+              bio:
+                type: string
+                description: The bio that should be set for this user.
       responses:
         200:
           description: Status update successful.
@@ -674,16 +714,26 @@ paths:
   /{user_id}/actions:
     post:
       parameters:
-        - name: action_type
-          in: body
-          description: The type of action being taken on this user.
+        - name: user_id
+          in: path
+          required: true
           type: string
-          enum:
-            - flag
-        - name: metadata
+          format: uuid
+          description: The user on which this action is being taken.
+        - name: body
           in: body
-          type: object
-          description: Arbitrary data to be included with the action.
+          required: true
+          schema:
+            type: object
+            properties:
+              action_type:
+                description: The type of action being taken on this user.
+                type: string
+                enum:
+                  - flag
+              metadata:
+                type: object
+                description: Arbitrary data to be included with the action.
       responses:
         200:
           description: The newly created action.
@@ -693,6 +743,7 @@ paths:
           description: An error occured.
           schema:
             $ref: '#/definitions/Error'
+
 definitions:
   Error:
     type: object

From 0fc3e09c74cb7ba240a6f35387efdc89f83af98d Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Wed, 21 Dec 2016 18:08:57 -0800
Subject: [PATCH 51/54] Removing unused log statement and combining setState
 functions.

---
 client/coral-admin/src/containers/Streams/Streams.js | 6 ++----
 client/coral-ui/components/Pager.js                  | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/client/coral-admin/src/containers/Streams/Streams.js b/client/coral-admin/src/containers/Streams/Streams.js
index 55fe10fc2..49c0b49cc 100644
--- a/client/coral-admin/src/containers/Streams/Streams.js
+++ b/client/coral-admin/src/containers/Streams/Streams.js
@@ -38,12 +38,12 @@ class Streams extends Component {
   }
 
   onSearchChange = (e) => {
-    this.setState({search: e.target.value});
     this.setState((prevState) => {
+      prevState.search = e.target.value;
       clearTimeout(prevState.timer);
       const fetchAssets = this.props.fetchAssets;
       prevState.timer = setTimeout(() => {
-        fetchAssets(0, limit, this.state.search, this.state.sort, this.state.filter);
+        fetchAssets(0, limit, e.target.value, this.state.sort, this.state.filter);
       }, 350);
       return prevState;
     });
@@ -100,8 +100,6 @@ class Streams extends Component {
     const {search, sort, filter} = this.state;
     const {assets} = this.props;
 
-    console.log(assets);
-
     return <div className={styles.container}>
       <div className={styles.leftColumn}>
 
diff --git a/client/coral-ui/components/Pager.js b/client/coral-ui/components/Pager.js
index 3d96660ad..fca20b0db 100644
--- a/client/coral-ui/components/Pager.js
+++ b/client/coral-ui/components/Pager.js
@@ -12,7 +12,7 @@ const Pager = ({totalPages, page, onNewPageHandler}) => (
   <div className="pager">
     <ul>
       {
-        (totalPages > page && totalPages >= 1) ?
+        (totalPages > page && totalPages > 1) ?
           <li
             className={`mdl-button mdl-js-button ${styles.li}`}
             onClick={() => onNewPageHandler(page - 1)}>
@@ -23,7 +23,7 @@ const Pager = ({totalPages, page, onNewPageHandler}) => (
       }
       {Rows(page, totalPages, onNewPageHandler)}
       {
-        (page < totalPages && totalPages >= 1) ?
+        (page < totalPages && totalPages > 1) ?
         <li
           className={`mdl-button mdl-js-button ${styles.li}`}
           onClick={() => onNewPageHandler(page + 1)}>

From 5e01fe402505ece6c37cd3989b15c8547fec66c4 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Thu, 22 Dec 2016 11:01:59 -0800
Subject: [PATCH 52/54] Fixing bug in text box display.

---
 client/coral-embed-stream/style/default.css |  4 ++--
 client/coral-plugin-flags/FlagBio.js        |  2 +-
 client/coral-plugin-flags/FlagButton.js     | 15 +++++----------
 client/coral-plugin-flags/FlagComment.js    |  2 +-
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css
index 20a5e02ac..28b2066e6 100644
--- a/client/coral-embed-stream/style/default.css
+++ b/client/coral-embed-stream/style/default.css
@@ -240,7 +240,7 @@ hr {
 .coral-plugin-flags-popup-radio-label {
   margin:5px;
   font-weight: 700;
-  font-size: 1.16rem;
+  font-size: .9rem;
 }
 
 .coral-plugin-flags-popup-counter {
@@ -254,7 +254,7 @@ hr {
     margin-top: 10px;
 }
 
-.coral-plugin-flags-other-text {
+.coral-plugin-flags-reason-text {
   margin-left: 20px;
   margin-top: 5px;
   width: 75%;
diff --git a/client/coral-plugin-flags/FlagBio.js b/client/coral-plugin-flags/FlagBio.js
index 90cc11a7a..edc0a5286 100644
--- a/client/coral-plugin-flags/FlagBio.js
+++ b/client/coral-plugin-flags/FlagBio.js
@@ -18,7 +18,7 @@ const getPopupMenu = [
         {val: 'other', text: lang.t('other')}
       ],
       button: lang.t('continue'),
-      sets: 'detail'
+      sets: 'reason'
     };
   },
   () =>  {
diff --git a/client/coral-plugin-flags/FlagButton.js b/client/coral-plugin-flags/FlagButton.js
index 80a00a2d9..097ac9d5b 100644
--- a/client/coral-plugin-flags/FlagButton.js
+++ b/client/coral-plugin-flags/FlagButton.js
@@ -40,7 +40,7 @@ class FlagButton extends Component {
 
     // If itemType and reason are both set, post the action
     if (itemType && reason && !posted) {
-      
+
       // Set the text from the "other" field if it exists.
       let item_id;
       switch(itemType) {
@@ -71,11 +71,6 @@ class FlagButton extends Component {
 
   onPopupOptionClick = (sets) => (e) => {
 
-    // If the "other" option is clicked, show the other textbox
-    if(sets === 'reason' && e.target.value === 'other') {
-      this.setState({showOther: true});
-    }
-
     // If flagging a user, indicate that this is referencing the username rather than the bio
     if(sets === 'itemType' && e.target.value === 'user') {
       this.setState({field: 'username'});
@@ -93,7 +88,7 @@ class FlagButton extends Component {
     this.setState({[sets]: e.target.value});
   }
 
-  onOtherTextChange = (e) => {
+  onNoteTextChange = (e) => {
     this.setState({note: e.target.value});
   }
 
@@ -147,11 +142,11 @@ class FlagButton extends Component {
                   <label htmlFor={'note'} className={`${name}-popup-radio-label`}>
                     {lang.t('flag-reason')}
                   </label><br/>
-                <textarea
-                      className={`${name}-other-text`}
+                  <textarea
+                      className={`${name}-reason-text`}
                       id="note"
                       rows={4}
-                      onChange={this.onOtherTextChange}
+                      onChange={this.onNoteTextChange}
                       value={this.state.note}/>
                   </div>
                 }
diff --git a/client/coral-plugin-flags/FlagComment.js b/client/coral-plugin-flags/FlagComment.js
index 4a2634b6c..57d02f719 100644
--- a/client/coral-plugin-flags/FlagComment.js
+++ b/client/coral-plugin-flags/FlagComment.js
@@ -36,7 +36,7 @@ const getPopupMenu = [
       header: lang.t('step-2-header'),
       options,
       button: lang.t('continue'),
-      sets: 'detail'
+      sets: 'reason'
     };
   },
   () =>  {

From a9a9ebdfd9ab40cf1a5bbec14730a62cbd57ec98 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Thu, 22 Dec 2016 13:53:42 -0700
Subject: [PATCH 53/54] normalize constant names

---
 client/coral-admin/src/actions/comments.js   | 2 +-
 client/coral-admin/src/constants/comments.js | 2 +-
 client/coral-admin/src/reducers/comments.js  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/coral-admin/src/actions/comments.js b/client/coral-admin/src/actions/comments.js
index 66543ef36..5d2104560 100644
--- a/client/coral-admin/src/actions/comments.js
+++ b/client/coral-admin/src/actions/comments.js
@@ -5,7 +5,7 @@ import * as actionTypes from '../constants/actions';
 // Get comments to fill each of the three lists on the mod queue
 export const fetchModerationQueueComments = () => {
   return dispatch => {
-    dispatch({type: commentTypes.COMMENTS_MODERATION_QUEUE_FETCH});
+    dispatch({type: commentTypes.COMMENTS_MODERATION_QUEUE_FETCH_REQUEST});
     return Promise.all([
       coralApi('/queue/comments/pending'),
       coralApi('/comments?status=rejected'),
diff --git a/client/coral-admin/src/constants/comments.js b/client/coral-admin/src/constants/comments.js
index 628d85e11..35a915a1b 100644
--- a/client/coral-admin/src/constants/comments.js
+++ b/client/coral-admin/src/constants/comments.js
@@ -1,7 +1,7 @@
 export const SHOW_BANUSER_DIALOG = 'SHOW_BANUSER_DIALOG';
 export const HIDE_BANUSER_DIALOG = 'HIDE_BANUSER_DIALOG';
 export const USERS_MODERATION_QUEUE_FETCH_SUCCESS = 'USERS_MODERATION_QUEUE_FETCH_SUCCESS';
-export const COMMENTS_MODERATION_QUEUE_FETCH = 'COMMENTS_MODERATION_QUEUE_FETCH';
+export const COMMENTS_MODERATION_QUEUE_FETCH_REQUEST = 'COMMENTS_MODERATION_QUEUE_FETCH_REQUEST';
 export const COMMENTS_MODERATION_QUEUE_FETCH_SUCCESS = 'COMMENTS_MODERATION_QUEUE_FETCH_SUCCESS';
 export const COMMENT_CREATE_SUCCESS = 'COMMENT_CREATE_SUCCESS';
 export const COMMENT_CREATE_FAILED = 'COMMENT_CREATE_FAILED';
diff --git a/client/coral-admin/src/reducers/comments.js b/client/coral-admin/src/reducers/comments.js
index e1486781f..6876f91dc 100644
--- a/client/coral-admin/src/reducers/comments.js
+++ b/client/coral-admin/src/reducers/comments.js
@@ -24,7 +24,7 @@ const initialState = Map({
 // Handle the comment actions
 export default (state = initialState, action) => {
   switch (action.type) {
-  case actions.COMMENTS_MODERATION_QUEUE_FETCH: return state.set('loading', true);
+  case actions.COMMENTS_MODERATION_QUEUE_FETCH_REQUEST: return state.set('loading', true);
   case actions.COMMENTS_MODERATION_QUEUE_FETCH_SUCCESS: return replaceComments(action, state);
   case actions.COMMENTS_MODERATION_QUEUE_FAILED: return state.set('loading', false);
   case actions.COMMENT_STATUS_UPDATE_REQUEST: return updateStatus(state, action);

From 1239141eb967bc4b565a8afe0abbdd8682772ece Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Thu, 22 Dec 2016 14:11:04 -0700
Subject: [PATCH 54/54] use setIn to simplify

---
 client/coral-admin/src/reducers/settings.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/client/coral-admin/src/reducers/settings.js b/client/coral-admin/src/reducers/settings.js
index 87bfa6f07..b05418715 100644
--- a/client/coral-admin/src/reducers/settings.js
+++ b/client/coral-admin/src/reducers/settings.js
@@ -28,19 +28,16 @@ export default (state = initialState, action) => {
   }
 };
 
+// only for updating top-level settings
 const updateSettings = (state, action) => {
   const s = state.set('fetchingSettings', false).set('fetchSettingsError', null);
   const settings = s.get('settings').merge(action.settings);
   return s.set('settings', settings);
 };
 
+// any nested settings must have a specialized setter
 const updateWordlist = (state, action) => {
-  const wordlist = state
-    .get('settings')
-    .get('wordlist')
-    .merge({[action.listName]: action.list});
-  const settings = state.get('settings').merge({wordlist});
-  return state.set('settings', settings);
+  return state.setIn(['settings', 'wordlist', action.listName], action.wordlist);
 };
 
 const saveComplete = (state, action) => {