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] 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