Merge branch 'master' into story-138187767-mod-flag-names

client/coral-admin/src/containers/Configure/StreamSettings.js

@@ -32,6 +32,11 @@ const updateInfoBoxEnable = (updateSettings, infoBox) => () => {
   updateSettings({infoBoxEnable});
 };
 
+const updatePremodLinksEnable = (updateSettings, premodLinks) => () => {
+  const premodLinksEnable = !premodLinks;
+  updateSettings({premodLinksEnable});
+};
+
 const updateInfoBoxContent = (updateSettings) => (event) => {
   const infoBoxContent =  event.target.value;
   updateSettings({infoBoxContent});
@@ -94,6 +99,19 @@ const StreamSettings = ({updateSettings, settingsError, settings, errors}) => {
           </p>
         </div>
       </Card>
+      <Card className={`${styles.configSetting} ${settings.premodLinksEnable ? on : off}`}>
+        <div className={styles.action}>
+          <Checkbox
+            onChange={updatePremodLinksEnable(updateSettings, settings.premodLinksEnable)}
+            checked={settings.premodLinksEnable} />
+        </div>
+        <div className={styles.content}>
+          <div className={styles.settingsHeader}>{lang.t('configure.enable-premod-links')}</div>
+          <p>
+            {lang.t('configure.enable-premod-links-text')}
+          </p>
+        </div>
+      </Card>
       <Card className={`${styles.configSetting} ${styles.configSettingInfoBox} ${settings.infoBoxEnable ? on : off}`}>
         <div className={styles.action}>
           <Checkbox

client/coral-admin/src/translations.json

@@ -80,6 +80,8 @@
       "include-comment-stream": "Include Comment Stream Description for Readers",
       "include-comment-stream-desc": "Write a message to be added to the top of your comment stream. Pose a topic, include community guidelines, etc.",
       "include-text": "Include your text here.",
+      "enable-premod-links": "Pre-Moderate Comments Containing Links",
+      "enable-premod-links-text": "Moderators must approve any comment containing a link before its published.",
       "comment-settings": "Settings",
       "embed-comment-stream": "Embed 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.",
@@ -236,6 +238,8 @@
       "include-text": "Incluir tu texto aqui.",
       "comment-settings": "Configuración de Comentarios",
       "embed-comment-stream": "Colocar Hilo de Comentarios",
+      "enable-premod-links": "Pre-Moderar Commentarios que contienen Links",
+      "enable-premod-links-text": "Los y las Moderadoras deben probar cualquier comentario que contengan links antes de su publicación.",
       "wordlist": "Palabras Suspendidas y Suspechosas",
       "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-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.",

client/coral-configure/components/ConfigureCommentStream.js

@@ -34,6 +34,18 @@ export default ({handleChange, handleApply, changed, updateQuestionBoxContent, .
               description: lang.t('configureCommentStream.enablePremodDescription')
             }} />
         </li>
+        <li>
+          <Checkbox
+            className={styles.checkbox}
+            cStyle={changed ? 'green' : 'darkGrey'}
+            name="premodLinks"
+            onChange={handleChange}
+            defaultChecked={props.premodLinks}
+            info={{
+              title: lang.t('configureCommentStream.enablePremodLinks'),
+              description: lang.t('configureCommentStream.enablePremodLinksDescription')
+            }} />
+        </li>
         <li>
           <Checkbox
             className={styles.checkbox}

client/coral-configure/containers/ConfigureStreamContainer.js

@@ -31,13 +31,14 @@ class ConfigureStreamContainer extends Component {
     const questionBoxEnable = elements.qboxenable.checked;
     const questionBoxContent = elements.qboxcontent.value;
 
-    // const premodLinks = elements.premodLinks.checked;
+    const premodLinksEnable = elements.premodLinks.checked;
     const {changed} = this.state;
 
     const newConfig = {
       moderation: premod ? 'PRE' : 'POST',
       questionBoxEnable,
-      questionBoxContent
+      questionBoxContent,
+      premodLinksEnable
     };
 
     if (changed) {
@@ -77,10 +78,9 @@ class ConfigureStreamContainer extends Component {
   }
 
   render () {
-    const status = this.props.asset.closedAt === null ? 'open' : 'closed';
-    const premod = this.props.asset.settings.moderation === 'PRE';
-    const questionBoxEnable = this.props.asset.settings.questionBoxEnable;
-    const questionBoxContent = this.props.asset.settings.questionBoxContent;
+    const {settings, closedAt} = this.props.asset;
+    const status = closedAt === null ? 'open' : 'closed';
+    const premod = settings.moderation === 'PRE';
 
     return (
       <div>
@@ -88,11 +88,11 @@ class ConfigureStreamContainer extends Component {
           handleChange={this.handleChange}
           handleApply={this.handleApply}
           changed={this.state.changed}
-          premodLinks={false}
+          premodLinks={settings.premodLinks}
           premod={premod}
           updateQuestionBoxContent={this.updateQuestionBoxContent}
-          questionBoxEnable={questionBoxEnable}
-          questionBoxContent={questionBoxContent}
+          questionBoxEnable={settings.questionBoxEnable}
+          questionBoxContent={settings.questionBoxContent}
         />
         <hr />
         <h3>{status === 'open' ? 'Close' : 'Open'} Comment Stream</h3>

client/coral-framework/graphql/mutations/index.js

@@ -42,7 +42,7 @@ export const postComment = graphql(POST_COMMENT, {
         updateQueries: {
           AssetQuery: (oldData, {mutationResult:{data:{createComment:{comment}}}}) => {
 
-            if (oldData.asset.settings.moderation === 'PRE') {
+            if (oldData.asset.settings.moderation === 'PRE' || comment.status === 'PREMOD' || comment.status === 'REJECTED') {
               return oldData;
             }
 

graph/mutators/comment.js

@@ -3,6 +3,7 @@ const errors = require('../../errors');
 const AssetsService = require('../../services/assets');
 const ActionsService = require('../../services/actions');
 const CommentsService = require('../../services/comments');
+const linkify = require('linkify-it')();
 
 const Wordlist = require('../../services/wordlist');
 
@@ -54,13 +55,16 @@ const createComment = ({user, loaders: {Comments}}, {body, asset_id, parent_id =
  * @param  {String} body    body of a comment
  * @return {Object}         resolves to the wordlist results
  */
-const filterNewComment = (context, {body}) => {
+const filterNewComment = (context, {body, asset_id}) => {
 
   // Create a new instance of the Wordlist.
   const wl = new Wordlist();
 
   // Load the wordlist and filter the comment content.
-  return wl.load().then(() => wl.scan('body', body));
+  return Promise.all([
+    wl.load().then(() => wl.scan('body', body)),
+    AssetsService.rectifySettings(AssetsService.findById(asset_id))
+  ]);
 };
 
 /**
@@ -72,7 +76,7 @@ const filterNewComment = (context, {body}) => {
  * @param  {Object} [wordlist={}] the results of the wordlist scan
  * @return {Promise}              resolves to the comment's status
  */
-const resolveNewCommentStatus = (context, {asset_id, body}, wordlist = {}) => {
+const resolveNewCommentStatus = (context, {asset_id, body}, wordlist = {}, settings) => {
 
   // Decide the status based on whether or not the current asset/settings
   // has pre-mod enabled or not. If the comment was rejected based on the
@@ -82,6 +86,8 @@ const resolveNewCommentStatus = (context, {asset_id, body}, wordlist = {}) => {
 
   if (wordlist.banned) {
     status = Promise.resolve('REJECTED');
+  } else if (settings.premodLinksEnable && linkify.test(body)) {
+    status = Promise.resolve('PREMOD');
   } else {
     status = AssetsService
       .rectifySettings(AssetsService.findById(asset_id).then((asset) => {
@@ -131,13 +137,13 @@ const createPublicComment = (context, commentInput) => {
     // We then take the wordlist and the comment into consideration when
     // considering what status to assign the new comment, and resolve the new
     // status to set the comment to.
-    .then((wordlist) => resolveNewCommentStatus(context, commentInput, wordlist)
+    .then(([wordlist, settings]) => resolveNewCommentStatus(context, commentInput, wordlist, settings)
 
       // Then we actually create the comment with the new status.
       .then((status) => createComment(context, commentInput, status))
       .then((comment) => {
 
-        // If the comment was flagged as being suspect, we need to add a
+        // If the comment has a suspect word or a link, we need to add a
         // flag to it to indicate that it needs to be looked at.
         // Otherwise just return the new comment.
 

graph/typeDefs.graphql

@@ -387,6 +387,7 @@ type Settings {
 
   infoBoxEnable: Boolean
   infoBoxContent: String
+  premodLinksEnable: Boolean
   questionBoxEnable: Boolean
   questionBoxContent: String
   closeTimeout: Int

models/setting.js

@@ -40,6 +40,10 @@ const SettingSchema = new Schema({
     type: String,
     default: ''
   },
+  premodLinksEnable: {
+    type: Boolean,
+    default: false
+  },
   organizationName: {
     type: String
   },

package.json

@@ -70,6 +70,7 @@
     "inquirer": "^3.0.1",
     "jsonwebtoken": "^7.1.9",
     "kue": "^0.11.5",
+    "linkify-it": "^2.0.3",
     "lodash": "^4.16.6",
     "metascraper": "^1.0.6",
     "minimist": "^1.2.0",