From 5f9240f201d2ff298cfb7fa44466df2cdb68d393 Mon Sep 17 00:00:00 2001 From: Riley Davis Date: Thu, 4 May 2017 16:32:07 -0600 Subject: [PATCH 01/11] open the comment in context when clicked --- .../src/containers/ModerationQueue/components/Comment.js | 5 +++-- .../src/containers/ModerationQueue/components/styles.css | 8 ++++++++ .../coral-admin/src/graphql/fragments/commentView.graphql | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js index e5afd9726..ac16082d2 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js +++ b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js @@ -57,7 +57,7 @@ const Comment = ({actions = [], comment, ...props}) => { Moderate → )} -
+

{ })}

- + { flagActions && flagActions.length @@ -106,6 +106,7 @@ Comment.propTypes = { }), asset: PropTypes.shape({ title: PropTypes.string, + url: PropTypes.string, id: PropTypes.string }) }) diff --git a/client/coral-admin/src/containers/ModerationQueue/components/styles.css b/client/coral-admin/src/containers/ModerationQueue/components/styles.css index a22fbbc64..074bc34f1 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/styles.css +++ b/client/coral-admin/src/containers/ModerationQueue/components/styles.css @@ -231,6 +231,14 @@ span { font-size: 14px; line-height: 1.5; font-weight: 300; + cursor: pointer; + text-decoration: none; + background-color: white; + transition: background-color .3s; + + &:hover { + background-color: #eee; + } } .avatar { diff --git a/client/coral-admin/src/graphql/fragments/commentView.graphql b/client/coral-admin/src/graphql/fragments/commentView.graphql index 51b0a3f44..1f3b8b1d3 100644 --- a/client/coral-admin/src/graphql/fragments/commentView.graphql +++ b/client/coral-admin/src/graphql/fragments/commentView.graphql @@ -11,6 +11,7 @@ fragment commentView on Comment { asset { id title + url } action_summaries { count From 5db48e8c0f96ba2b73fde2c111e132ae47e1efa3 Mon Sep 17 00:00:00 2001 From: Riley Davis Date: Fri, 5 May 2017 11:35:18 -0600 Subject: [PATCH 02/11] make it a blue link instead of the whole thing --- .../ModerationQueue/components/Comment.js | 6 +++--- .../ModerationQueue/components/styles.css | 21 +++++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js index ac16082d2..b3813bbc8 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js +++ b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js @@ -57,11 +57,11 @@ const Comment = ({actions = [], comment, ...props}) => { Moderate → )} - +

+ textToHighlight={comment.body} /> View context

{links ? Contains Link : null} @@ -79,7 +79,7 @@ const Comment = ({actions = [], comment, ...props}) => { })}
- + { flagActions && flagActions.length diff --git a/client/coral-admin/src/containers/ModerationQueue/components/styles.css b/client/coral-admin/src/containers/ModerationQueue/components/styles.css index 074bc34f1..6d09b2d36 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/styles.css +++ b/client/coral-admin/src/containers/ModerationQueue/components/styles.css @@ -431,3 +431,24 @@ span { position: relative; top: 7px; } + +.external { + font-size: .7em; + text-decoration: none; + color: #063b9a; + cursor: pointer; + font-weight: normal; + margin-left: 10px; + white-space: nowrap; + + &:hover { + text-decoration: underline; + opacity: .9; + } + + i { + font-size: 12px; + top: 2px; + position: relative; + } +} From 519ca7beb51fa6f66b3ab59b3db58e1ee76e354a Mon Sep 17 00:00:00 2001 From: Riley Davis Date: Fri, 5 May 2017 11:55:28 -0600 Subject: [PATCH 03/11] =?UTF-8?q?en=20espa=C3=B1ol?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/containers/ModerationQueue/components/Comment.js | 2 +- client/coral-admin/src/translations.json | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js index b3813bbc8..afe0c967f 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js +++ b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js @@ -61,7 +61,7 @@ const Comment = ({actions = [], comment, ...props}) => {

View context + textToHighlight={comment.body} /> {lang.t('comment.view_context')}

{links ? Contains Link : null} diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json index 3f9392656..68a3b93d5 100644 --- a/client/coral-admin/src/translations.json +++ b/client/coral-admin/src/translations.json @@ -72,6 +72,7 @@ "flagged": "flagged", "anon": "Anonymous", "ban_user": "Ban User", + "view_context": "View context", "banned_user": "Banned User" }, "user": { @@ -259,6 +260,7 @@ "comment": { "flagged": "marcado", "anon": "Anónimo", + "view_context": "Ver contexto", "ban_user": "Suspender Usuario", "banned_user": "Usuario Suspendido" }, From dc81a59908029cd3825595bea7176dc05936490d Mon Sep 17 00:00:00 2001 From: Kim Gardner Date: Fri, 5 May 2017 16:40:17 -0400 Subject: [PATCH 04/11] Supported Browsers --- README.md | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ef621b59c..3d8b3bf3a 100644 --- a/README.md +++ b/README.md @@ -42,9 +42,43 @@ available in the format: `://` without the path. Refer to the wiki page on [Configuration Loading](https://github.com/coralproject/talk/wiki/Configuration-Loading) for alternative methods of loading configuration during development. +## Supported Browsers + +### Web + +- Chrome: latest 2 versions +- Firefox: latest 2 versions, and most recent extended support version, if any +- Safari: latest 2 versions +- Internet Explorer: IE Edge, 11 + +### iOS Devices + +- iPad +- iPad Pro +- iPhone 6 Plus +- iPhone 6 +- iPhone 5 + +### iOS Browsers + +- Chrome for iOS: latest version +- Firefox for iOS: latest version +- Safari for iOS: latest version + +### Android Devices + +- Galaxy S5 +- Nexus 5X +- Nexus 6P + +### Android Browsers + +- Chrome for Android: latest version +- Firefox for Android: latest version + ### License - Copyright 2016 Mozilla Foundation + Copyright 2017 Mozilla Foundation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From 4ff42385e330db5a242b11c69336a1c24162ad13 Mon Sep 17 00:00:00 2001 From: Riley Davis Date: Fri, 5 May 2017 14:41:19 -0600 Subject: [PATCH 05/11] remove dead code --- .../src/containers/ModerationQueue/components/styles.css | 8 -------- 1 file changed, 8 deletions(-) diff --git a/client/coral-admin/src/containers/ModerationQueue/components/styles.css b/client/coral-admin/src/containers/ModerationQueue/components/styles.css index 6d09b2d36..966a37526 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/styles.css +++ b/client/coral-admin/src/containers/ModerationQueue/components/styles.css @@ -231,14 +231,6 @@ span { font-size: 14px; line-height: 1.5; font-weight: 300; - cursor: pointer; - text-decoration: none; - background-color: white; - transition: background-color .3s; - - &:hover { - background-color: #eee; - } } .avatar { From b15a2af38c68b24290a5845b623659c29426cdc5 Mon Sep 17 00:00:00 2001 From: Kim Gardner Date: Fri, 5 May 2017 16:45:15 -0400 Subject: [PATCH 06/11] Update formatting of License info --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3d8b3bf3a..74097d48c 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ alternative methods of loading configuration during development. - Chrome for Android: latest version - Firefox for Android: latest version -### License +## License Copyright 2017 Mozilla Foundation From bc3c73a992e0dfb9a873cc01d442110af4830ec8 Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Mon, 8 May 2017 13:26:07 -0600 Subject: [PATCH 07/11] Fix for incorrect options passed to pubsub --- graph/pubsub.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graph/pubsub.js b/graph/pubsub.js index a5ee95b80..704f83725 100644 --- a/graph/pubsub.js +++ b/graph/pubsub.js @@ -2,4 +2,4 @@ const {RedisPubSub} = require('graphql-redis-subscriptions'); const {connectionOptions} = require('../services/redis'); -module.exports = new RedisPubSub(connectionOptions); +module.exports = new RedisPubSub({connection: connectionOptions}); From c00e6c1ecebc7643b54824bc84b27a8fcae5e33f Mon Sep 17 00:00:00 2001 From: Riley Davis Date: Mon, 8 May 2017 13:40:24 -0600 Subject: [PATCH 08/11] default view is moderate > all --- client/coral-admin/src/AppRouter.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/coral-admin/src/AppRouter.js b/client/coral-admin/src/AppRouter.js index af3423acc..989316dd9 100644 --- a/client/coral-admin/src/AppRouter.js +++ b/client/coral-admin/src/AppRouter.js @@ -1,5 +1,5 @@ import React from 'react'; -import {Router, Route, IndexRoute, IndexRedirect, browserHistory} from 'react-router'; +import {Router, Route, IndexRedirect, browserHistory} from 'react-router'; import Stories from 'containers/Stories/Stories'; import Configure from 'containers/Configure/Configure'; @@ -18,7 +18,7 @@ const routes = (
- + From 3e258b17873c0d56799cbea7bdef1614ba2591fe Mon Sep 17 00:00:00 2001 From: Riley Davis Date: Mon, 8 May 2017 14:59:23 -0600 Subject: [PATCH 09/11] move approved tab --- .../ModerationQueue/components/ModerationMenu.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js index 39594274e..7a50e6270 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js +++ b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js @@ -28,12 +28,6 @@ const ModerationMenu = ( activeClassName={styles.active}> {lang.t('modqueue.all')} - - {lang.t('modqueue.approved')} - {lang.t('modqueue.flagged')} + + {lang.t('modqueue.approved')} + Date: Mon, 8 May 2017 17:01:36 -0600 Subject: [PATCH 10/11] do not highlight partial word matches in admin since this is not how the backend works --- .../containers/ModerationQueue/components/Comment.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js index e5afd9726..fedb72d45 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js +++ b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js @@ -18,7 +18,7 @@ import I18n from 'coral-framework/modules/i18n/i18n'; import translations from 'coral-admin/src/translations.json'; const lang = new I18n(translations); -const Comment = ({actions = [], comment, ...props}) => { +const Comment = ({actions = [], comment, suspectWords, bannedWords, ...props}) => { const links = linkify.getMatches(comment.body); const linkText = links ? links.map(link => link.raw) : []; const flagActionSummaries = getActionSummary('FlagActionSummary', comment); @@ -30,6 +30,13 @@ const Comment = ({actions = [], comment, ...props}) => { commentType = 'flagged'; } + // since words are checked against word boundaries on the backend, + // this should be the behavior on the front end as well. + // currently the highlighter plugin does not support this out of the box. + const searchWords = [...suspectWords, ...bannedWords].filter(w => { + return new RegExp(`(^|\\s)${w}(\\s|$)`).test(comment.body); + }).concat(linkText); + return (
  • @@ -60,7 +67,7 @@ const Comment = ({actions = [], comment, ...props}) => {

    From 2490e6598162df2ed422bc45b1f6d0255c7f6e94 Mon Sep 17 00:00:00 2001 From: Riley Davis Date: Mon, 8 May 2017 17:09:23 -0600 Subject: [PATCH 11/11] merge master --- client/coral-admin/src/AppRouter.js | 4 ++-- .../ModerationQueue/components/Comment.js | 3 ++- .../components/ModerationMenu.js | 12 +++++------ .../ModerationQueue/components/styles.css | 21 +++++++++++++++++++ .../src/graphql/fragments/commentView.graphql | 1 + client/coral-admin/src/translations.json | 2 ++ graph/pubsub.js | 2 +- 7 files changed, 35 insertions(+), 10 deletions(-) diff --git a/client/coral-admin/src/AppRouter.js b/client/coral-admin/src/AppRouter.js index af3423acc..989316dd9 100644 --- a/client/coral-admin/src/AppRouter.js +++ b/client/coral-admin/src/AppRouter.js @@ -1,5 +1,5 @@ import React from 'react'; -import {Router, Route, IndexRoute, IndexRedirect, browserHistory} from 'react-router'; +import {Router, Route, IndexRedirect, browserHistory} from 'react-router'; import Stories from 'containers/Stories/Stories'; import Configure from 'containers/Configure/Configure'; @@ -18,7 +18,7 @@ const routes = (
    - + diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js index fedb72d45..a5647fd92 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js +++ b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js @@ -68,7 +68,7 @@ const Comment = ({actions = [], comment, suspectWords, bannedWords, ...props}) =

    + textToHighlight={comment.body} /> {lang.t('comment.view_context')}

    {links ? Contains Link : null} @@ -113,6 +113,7 @@ Comment.propTypes = { }), asset: PropTypes.shape({ title: PropTypes.string, + url: PropTypes.string, id: PropTypes.string }) }) diff --git a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js index 39594274e..7a50e6270 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js +++ b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js @@ -28,12 +28,6 @@ const ModerationMenu = ( activeClassName={styles.active}> {lang.t('modqueue.all')} - - {lang.t('modqueue.approved')} - {lang.t('modqueue.flagged')} + + {lang.t('modqueue.approved')} +