diff --git a/README.md b/README.md index 4bec86d07..57562fc1a 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,14 @@ Online comments are broken. Our open-source Talk tool rethinks how moderation, c Third party licenses are available via the `/client/3rdpartylicenses.txt` endpoint when the server is running with built assets. -## Important Links +## Try Talk! -- Developer Documentation & Setup Guides: https://coralproject.github.io/talk/ +- Developer Documentation & Setup Guides: https://coralproject.github.io/talk/ (includes Installation Guide, Quickstart, Plugin Guide, API Docs, and more) + +## Roadmap and Release Schedule + +- Talk Roadmap: https://www.pivotaltracker.com/n/projects/1863625 -- Pivotal Tracker Backlog & Release Schedule: https://www.pivotaltracker.com/n/projects/1863625 ## Learn More about Coral diff --git a/client/coral-admin/src/components/CommentAnimatedEdit.css b/client/coral-admin/src/components/CommentAnimatedEdit.css index 83be36c11..a03f66fc5 100644 --- a/client/coral-admin/src/components/CommentAnimatedEdit.css +++ b/client/coral-admin/src/components/CommentAnimatedEdit.css @@ -1,3 +1,7 @@ +.root { + position: relative; +} + .bodyLeave { position: absolute; width: 100%; diff --git a/client/coral-admin/src/components/CommentAnimatedEdit.js b/client/coral-admin/src/components/CommentAnimatedEdit.js index 141dc12cc..2515d7d94 100644 --- a/client/coral-admin/src/components/CommentAnimatedEdit.js +++ b/client/coral-admin/src/components/CommentAnimatedEdit.js @@ -7,6 +7,7 @@ export default ({children, body}) => { return ( + phrase.split(/\s+/) + .map((word) => escapeRegExp(word)) + .join('[\\s"?!.]+') + ).join('|'); + + return new RegExp(`(^|[^\\w])(${inner})(?=[^\\w]|$)`, 'iu'); +} + +// Generate a regular expression detecting `suspectWords` and `bannedWords` phrases. +function getPhrasesRegexp(suspectWords, bannedWords) { + return generateRegExp([...suspectWords, ...bannedWords]); +} + +// Memoized version as arguments rarely change. +const getPhrasesRegexpMemoized = memoize(getPhrasesRegexp); + +// markPhrases looks for `supsectWords` and `bannedWords` inside `body` and highlights them by returning +// an array of React Elements. +function markPhrases(body, suspectWords, bannedWords, keyPrefix) { + const regexp = getPhrasesRegexpMemoized(suspectWords, bannedWords); + const tokens = body.split(regexp); + return tokens.map((token, i) => + i % 3 === 2 + ? {token} + : token + ); +} + +// markLinks looks for links inside `body` and highlights them by returning +// an array of React Elements. +function markLinks(body) { + const matches = matchLinks(body); + const content = []; + let index = 0; + if (matches) { + matches + .forEach((match, i) => { + content.push(body.substring(index, match.index)); + content.push({match.text}); + index = match.lastIndex; + }); + } + content.push(body.substring(index)); + return content; +} export default ({suspectWords, bannedWords, body, ...rest}) => { - const links = linkify.getMatches(body); - const linkText = links ? links.map((link) => link.raw) : []; + // First highlight links. + const content = markLinks(body) + .map((element, index) => { - const searchWords = [ - ...suspectWords, - ...bannedWords, - ...linkText - ]; + // Keep highlighted links. + if (typeof element !== 'string') { + return element; + } + // Highlight suspect and banned phrase inside this part of text. + return markPhrases(element, suspectWords, bannedWords, index); + }); return ( - +
+ {content} +
); }; diff --git a/client/coral-admin/src/components/IfHasLink.js b/client/coral-admin/src/components/IfHasLink.js index cd37ea951..73b335815 100644 --- a/client/coral-admin/src/components/IfHasLink.js +++ b/client/coral-admin/src/components/IfHasLink.js @@ -1,9 +1,8 @@ import React from 'react'; -import Linkify from 'react-linkify'; -const linkify = new Linkify(); +import {matchLinks} from '../utils'; export default ({text, children}) => { - const hasLinks = !!linkify.getMatches(text); + const hasLinks = !!matchLinks(text); if (!hasLinks) { return null; diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.js b/client/coral-admin/src/routes/Moderation/components/Comment.js index 9d9428bc4..a3edb4196 100644 --- a/client/coral-admin/src/routes/Moderation/components/Comment.js +++ b/client/coral-admin/src/routes/Moderation/components/Comment.js @@ -127,7 +127,7 @@ class Comment extends React.Component {
-

+

{t('comment.view_context')} -

+
mod === 'PRE'; export const getModPath = (type = 'all', assetId) => assetId ? `/admin/moderate/${type}/${assetId}` : `/admin/moderate/${type}`; + diff --git a/client/coral-embed-stream/src/containers/StreamTabPanel.js b/client/coral-embed-stream/src/containers/StreamTabPanel.js index fde6e3be4..9a154512d 100644 --- a/client/coral-embed-stream/src/containers/StreamTabPanel.js +++ b/client/coral-embed-stream/src/containers/StreamTabPanel.js @@ -26,9 +26,9 @@ class StreamTabPanelContainer extends React.Component { // it does not result in a change of slot children. const changes = getShallowChanges(this.props, next); if (changes.length === 1 && changes[0] === 'reduxState') { - const prevUuid = this.getSlotComponents(this.props.tabSlot, this.props).map((cmp) => cmp.talkUuid); - const nextUuid = this.getSlotComponents(next.tabSlot, next).map((cmp) => cmp.talkUuid); - return !isEqual(prevUuid, nextUuid); + const prevKeys = this.getSlotElements(this.props.tabSlot, this.props).map((el) => el.key); + const nextKeys = this.getSlotElements(next.tabSlot, next).map((el) => el.key); + return !isEqual(prevKeys, nextKeys); } // Prevent Slot from rerendering when no props has shallowly changed. @@ -37,42 +37,33 @@ class StreamTabPanelContainer extends React.Component { fallbackAllTab(props = this.props) { if (props.activeTab !== props.fallbackTab) { - const slotPlugins = this.getSlotComponents(props.tabSlot, props).map((c) => c.talkPluginName); + const slotPlugins = this.getSlotElements(props.tabSlot, props).map((el) => el.type.talkPluginName); if (slotPlugins.indexOf(props.activeTab) === -1) { props.setActiveTab(props.fallbackTab); } } } - getSlotComponents(slot, props = this.props) { + getSlotElements(slot, props = this.props) { const {plugins} = this.context; - return plugins.getSlotComponents(slot, props.reduxState, props.slotProps, props.queryData); + return plugins.getSlotElements(slot, props.reduxState, props.slotProps, props.queryData); } getPluginTabElements(props = this.props) { - const {plugins} = this.context; - return this.getSlotComponents(props.tabSlot).map((PluginComponent) => { - const pluginProps = plugins.getSlotComponentProps(PluginComponent, props.reduxState, props.slotProps, props.queryData); + return this.getSlotElements(props.tabSlot).map((el) => { return ( - - + + {React.cloneElement(el, {active: this.props.activeTab === el.type.talkPluginName})} ); }); } getPluginTabPaneElements(props = this.props) { - const {plugins} = this.context; - return this.getSlotComponents(props.tabPaneSlot).map((PluginComponent) => { - const pluginProps = plugins.getSlotComponentProps(PluginComponent, props.reduxState, props.slotProps, props.queryData); + return this.getSlotElements(props.tabPaneSlot).map((el) => { return ( - - + + {el} ); }); diff --git a/client/coral-framework/components/Slot.js b/client/coral-framework/components/Slot.js index 06f1d4cb7..0fe0d8896 100644 --- a/client/coral-framework/components/Slot.js +++ b/client/coral-framework/components/Slot.js @@ -20,9 +20,9 @@ class Slot extends React.Component { // it does not result in a change of slot children. const changes = getShallowChanges(this.props, next); if (changes.length === 1 && changes[0] === 'reduxState') { - const prevChildrenUuid = this.getChildren(this.props).map((child) => child.type.talkUuid); - const nextChildrenUuid = this.getChildren(next).map((child) => child.type.talkUuid); - return !isEqual(prevChildrenUuid, nextChildrenUuid); + const prevChildrenKeys = this.getChildren(this.props).map((child) => child.key); + const nextChildrenKeys = this.getChildren(next).map((child) => child.key); + return !isEqual(prevChildrenKeys, nextChildrenKeys); } // Prevent Slot from rerendering when no props has shallowly changed. diff --git a/client/coral-framework/services/plugins.js b/client/coral-framework/services/plugins.js index dbda672ba..c8eb737fd 100644 --- a/client/coral-framework/services/plugins.js +++ b/client/coral-framework/services/plugins.js @@ -8,7 +8,6 @@ import flatten from 'lodash/flatten'; import mapValues from 'lodash/mapValues'; import {getDisplayName} from 'coral-framework/helpers/hoc'; import camelize from '../helpers/camelize'; -import uuid from 'uuid/v4'; // This is returned for pluginConfig when it is empty. const emptyConfig = {}; @@ -63,9 +62,6 @@ function addMetaDataToSlotComponents(plugins) { // Attach plugin name to the component component.talkPluginName = plugin.name; - - // Attach uuid to the component - component.talkUuid = uuid(); }); }); }); @@ -77,30 +73,8 @@ class PluginsService { addMetaDataToSlotComponents(plugins); } - getSlotComponents(slot, reduxState, props = {}, queryData = {}) { - const pluginConfig = reduxState.config.plugin_config || emptyConfig; - return flatten(this.plugins - - // Filter out components that have slots and have been disabled in `plugin_config` - .filter((o) => o.module.slots && (!pluginConfig || !pluginConfig[o.name] || !pluginConfig[o.name].disable_components)) - - .filter((o) => o.module.slots[slot]) - .map((o) => o.module.slots[slot]) - ) - .filter((component) => { - if(!component.isExcluded) { - return true; - } - let resolvedProps = this.getSlotComponentProps(component, reduxState, props, queryData); - if (component.mapStateToProps) { - resolvedProps = {...resolvedProps, ...component.mapStateToProps(reduxState)}; - } - return !component.isExcluded(resolvedProps); - }); - } - isSlotEmpty(slot, reduxState, props = {}, queryData = {}) { - return this.getSlotComponents(slot, reduxState, props, queryData).length === 0; + return this.getSlotElements(slot, reduxState, props, queryData).length === 0; } /** @@ -124,10 +98,42 @@ class PluginsService { * Returns React Elements for given slot. */ getSlotElements(slot, reduxState, props = {}, queryData = {}) { - return this.getSlotComponents(slot, reduxState, props, queryData) - .map((component, i) => { - return React.createElement(component, {key: i, ...this.getSlotComponentProps(component, reduxState, props, queryData)}); - }); + const pluginConfig = reduxState.config.plugin_config || emptyConfig; + + const isDisabled = (component) => { + if ( + pluginConfig && + pluginConfig[component.talkPluginName] && + pluginConfig[component.talkPluginName].disable_components + ) { + return true; + } + + // Check if component is excluded. + if(component.isExcluded) { + let resolvedProps = this.getSlotComponentProps(component, reduxState, props, queryData); + if (component.mapStateToProps) { + resolvedProps = {...resolvedProps, ...component.mapStateToProps(reduxState)}; + } + return component.isExcluded(resolvedProps); + } + + return false; + }; + + return flatten(this.plugins + .filter((o) => o.module.slots && o.module.slots[slot]) + .map((o) => o.module.slots[slot]) + ) + .map((component, i) => ({ + component, + disabled: isDisabled(component), + key: i, + })) + .filter((o) => !o.disabled) + .map(({component, key}) => + React.createElement(component, {key, ...this.getSlotComponentProps(component, reduxState, props, queryData)}) + ); } getSlotFragments(slot, part) { diff --git a/docs/_docs/01-03-install-source.md b/docs/_docs/01-03-install-source.md index da6fa120d..443d233c4 100644 --- a/docs/_docs/01-03-install-source.md +++ b/docs/_docs/01-03-install-source.md @@ -56,7 +56,7 @@ yarn build ## Running -Refer to the `README.md` file for required configuration variables to add to the +Refer to the [configuration](https://coralproject.github.io/talk/docs/running/configuration/) page for required configuration variables to add to the environment. You can start the server after configuring the server using the command: diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js index 16a736d36..c79634c99 100644 --- a/graph/mutators/comment.js +++ b/graph/mutators/comment.js @@ -6,7 +6,9 @@ const ActionsService = require('../../services/actions'); const TagsService = require('../../services/tags'); const CommentsService = require('../../services/comments'); const KarmaService = require('../../services/karma'); -const linkify = require('linkify-it')(); +const tlds = require('tlds'); +const linkify = require('linkify-it')() + .tlds(tlds); const Wordlist = require('../../services/wordlist'); const { CREATE_COMMENT, diff --git a/locales/en.yml b/locales/en.yml index 703de4b28..6d94393b2 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -322,7 +322,7 @@ en: to_access: "to access Profile" user_no_comment: "You've never left a comment. Join the conversation!" stream: - temporarily_suspended: "In accordance with {0}'s community guidlines, your account has been temporarily suspended. Please rejoin the conversation {1}." + temporarily_suspended: "In accordance with {0}'s community guidelines, your account has been temporarily suspended. Please rejoin the conversation {1}." step_1_header: "Report an issue" step_2_header: "Help us understand" step_3_header: "Thank you for your input" diff --git a/package.json b/package.json index 29ba80ae8..3db0f8d7a 100644 --- a/package.json +++ b/package.json @@ -136,7 +136,6 @@ "morgan": "^1.8.2", "ms": "^2.0.0", "murmurhash-js": "^1.0.0", - "natural": "^0.5.4", "node-emoji": "^1.8.1", "node-fetch": "^1.7.2", "nodemailer": "^2.6.4", @@ -154,9 +153,7 @@ "react": "^15.4.2", "react-apollo": "^1.4.12", "react-dom": "^15.4.2", - "react-highlight-words": "^0.6.0", "react-input-autosize": "^1.1.4", - "react-linkify": "^0.1.3", "react-mdl": "^1.7.2", "react-mdl-selectfield": "^0.2.0", "react-recaptcha": "^2.2.6", @@ -177,6 +174,7 @@ "subscriptions-transport-ws": "^0.7.2", "timeago.js": "^2.0.3", "timekeeper": "^1.0.0", + "tlds": "^1.196.0", "url-loader": "^0.5.9", "url-search-params": "^0.9.0", "uuid": "^3.1.0", diff --git a/plugins/talk-plugin-comment-content/client/containers/CommentContent.js b/plugins/talk-plugin-comment-content/client/containers/CommentContent.js new file mode 100644 index 000000000..2c9b36aa9 --- /dev/null +++ b/plugins/talk-plugin-comment-content/client/containers/CommentContent.js @@ -0,0 +1,10 @@ +import {gql} from 'react-apollo'; +import {withFragments} from 'plugin-api/beta/client/hocs'; +import CommentContent from '../components/CommentContent'; + +export default withFragments({ + comment: gql` + fragment TalkPluginCommentContent_comment on Comment { + body + }` +})(CommentContent); diff --git a/plugins/talk-plugin-comment-content/client/index.js b/plugins/talk-plugin-comment-content/client/index.js index e61cb51f4..06b6dee84 100644 --- a/plugins/talk-plugin-comment-content/client/index.js +++ b/plugins/talk-plugin-comment-content/client/index.js @@ -1,4 +1,4 @@ -import CommentContent from './components/CommentContent'; +import CommentContent from './containers/CommentContent'; export default { slots: { diff --git a/plugins/talk-plugin-featured-comments/client/components/Comment.js b/plugins/talk-plugin-featured-comments/client/components/Comment.js index 1c2045110..779844177 100644 --- a/plugins/talk-plugin-featured-comments/client/components/Comment.js +++ b/plugins/talk-plugin-featured-comments/client/components/Comment.js @@ -5,7 +5,7 @@ import {t, timeago} from 'plugin-api/beta/client/services'; import {Slot, CommentAuthorName} from 'plugin-api/beta/client/components'; import {Icon} from 'plugin-api/beta/client/components/ui'; import {pluginName} from '../../package.json'; -import Button from './Button'; +import FeaturedButton from '../containers/FeaturedButton'; class Comment extends React.Component { @@ -50,7 +50,7 @@ class Comment extends React.Component { inline /> - + isApproved(status) ? ( + + + {t('talk-plugin-moderation-actions.approved_comment')} + + ) : ( + + ) ); diff --git a/plugins/talk-plugin-moderation-actions/client/components/Tooltip.css b/plugins/talk-plugin-moderation-actions/client/components/Menu.css similarity index 95% rename from plugins/talk-plugin-moderation-actions/client/components/Tooltip.css rename to plugins/talk-plugin-moderation-actions/client/components/Menu.css index def7cac82..3ef43d82e 100644 --- a/plugins/talk-plugin-moderation-actions/client/components/Tooltip.css +++ b/plugins/talk-plugin-moderation-actions/client/components/Menu.css @@ -1,4 +1,4 @@ -.tooltip { +.menu { background-color: white; border: solid 1px #999; border-radius: 3px; @@ -14,7 +14,7 @@ color: #616161; } -.tooltip::before{ +.menu::before{ content: ''; border: 10px solid transparent; border-top-color: #999; @@ -24,7 +24,7 @@ transform: rotate(180deg); } -.tooltip::after{ +.menu::after{ content: ''; border: 10px solid transparent; border-top-color: white; diff --git a/plugins/talk-plugin-moderation-actions/client/components/Tooltip.js b/plugins/talk-plugin-moderation-actions/client/components/Menu.js similarity index 77% rename from plugins/talk-plugin-moderation-actions/client/components/Tooltip.js rename to plugins/talk-plugin-moderation-actions/client/components/Menu.js index db7e56c1e..470349b69 100644 --- a/plugins/talk-plugin-moderation-actions/client/components/Tooltip.js +++ b/plugins/talk-plugin-moderation-actions/client/components/Menu.js @@ -1,10 +1,10 @@ import React from 'react'; import cn from 'classnames'; -import styles from './Tooltip.css'; +import styles from './Menu.css'; import {t} from 'plugin-api/beta/client/services'; export default ({className = '', children}) => ( -
+

{t('talk-plugin-moderation-actions.moderation_actions')}

diff --git a/plugins/talk-plugin-moderation-actions/client/components/ModerationActions.js b/plugins/talk-plugin-moderation-actions/client/components/ModerationActions.js index 3a3b54156..a4a753d60 100644 --- a/plugins/talk-plugin-moderation-actions/client/components/ModerationActions.js +++ b/plugins/talk-plugin-moderation-actions/client/components/ModerationActions.js @@ -1,6 +1,6 @@ import React from 'react'; import cn from 'classnames'; -import Tooltip from './Tooltip'; +import Menu from './Menu'; import styles from './ModerationActions.css'; import {Icon} from 'plugin-api/beta/client/components/ui'; import ClickOutside from 'coral-framework/components/ClickOutside'; @@ -9,51 +9,27 @@ import ApproveCommentAction from '../containers/ApproveCommentAction'; import {Slot} from 'plugin-api/beta/client/components'; export default class ModerationActions extends React.Component { - constructor() { - super(); - - this.state = { - tooltip: false - }; - } - - toogleTooltip = () => { - const {tooltip} = this.state; - this.setState({ - tooltip: !tooltip - }); - } - - hideTooltip = () => { - this.setState({ - tooltip: false - }); - } - render() { - const {tooltip} = this.state; - const {comment, asset, data} = this.props; + const {comment, asset, data, menuVisible, toogleMenu, hideMenu} = this.props; return( - +
- - {tooltip ? : + + {menuVisible ? : } - {tooltip && ( - - + {menuVisible && ( + - - - - + + + )}
diff --git a/plugins/talk-plugin-moderation-actions/client/components/styles.css b/plugins/talk-plugin-moderation-actions/client/components/styles.css index 12ae4bad5..d5278a462 100644 --- a/plugins/talk-plugin-moderation-actions/client/components/styles.css +++ b/plugins/talk-plugin-moderation-actions/client/components/styles.css @@ -12,10 +12,10 @@ width: 100%; text-align: left; letter-spacing: 0.3px; +} - &:hover { - background-color: #D8D8D8; - } +.button:not(.approved):hover { + background-color: #D8D8D8; } .icon { @@ -24,6 +24,8 @@ } .approved { + display: inline-block; color: #519954; font-weight: bold; + padding: 6px; } \ No newline at end of file diff --git a/plugins/talk-plugin-moderation-actions/client/constants.js b/plugins/talk-plugin-moderation-actions/client/constants.js new file mode 100644 index 000000000..de3d5c909 --- /dev/null +++ b/plugins/talk-plugin-moderation-actions/client/constants.js @@ -0,0 +1,4 @@ +const prefix = 'TALK_MODERATION_ACTIONS'; + +export const OPEN_MENU = `${prefix}_OPEN_MENU`; +export const CLOSE_MENU = `${prefix}_CLOSE_MENU`; diff --git a/plugins/talk-plugin-moderation-actions/client/containers/ApproveCommentAction.js b/plugins/talk-plugin-moderation-actions/client/containers/ApproveCommentAction.js index c75711a56..4c4a457a2 100644 --- a/plugins/talk-plugin-moderation-actions/client/containers/ApproveCommentAction.js +++ b/plugins/talk-plugin-moderation-actions/client/containers/ApproveCommentAction.js @@ -1,28 +1,27 @@ import React from 'react'; +import {compose} from 'react-apollo'; +import {bindActionCreators} from 'redux'; import {getErrorMessages} from 'plugin-api/beta/client/utils'; -import {withSetCommentStatus} from 'plugin-api/beta/client/hocs'; import {notify} from 'plugin-api/beta/client/actions/notification'; import ApproveCommentAction from '../components/ApproveCommentAction'; -import isNil from 'lodash/isNil'; +import {connect, withSetCommentStatus} from 'plugin-api/beta/client/hocs'; class ApproveCommentActionContainer extends React.Component { approveComment = async () => { - const {setCommentStatus, comment} = this.props; + const {setCommentStatus, comment, hideMenu, notify} = this.props; try { - const result = await setCommentStatus({ + await setCommentStatus({ commentId: comment.id, status: 'ACCEPTED' }); - - if (!isNil(result.data.setCommentStatus)) { - throw result.data.setCommentStatus.errors; - } - - } catch (err) { + } + catch(err) { notify('error', getErrorMessages(err)); } + + hideMenu(); } render() { @@ -30,4 +29,14 @@ class ApproveCommentActionContainer extends React.Component { } } -export default withSetCommentStatus(ApproveCommentActionContainer); +const mapDispatchToProps = (dispatch) => + bindActionCreators({ + notify + }, dispatch); + +const enhance = compose( + connect(null, mapDispatchToProps), + withSetCommentStatus +); + +export default enhance(ApproveCommentActionContainer); diff --git a/plugins/talk-plugin-moderation-actions/client/containers/ModerationActions.js b/plugins/talk-plugin-moderation-actions/client/containers/ModerationActions.js index ffb711e18..984c7f57a 100644 --- a/plugins/talk-plugin-moderation-actions/client/containers/ModerationActions.js +++ b/plugins/talk-plugin-moderation-actions/client/containers/ModerationActions.js @@ -1,14 +1,72 @@ +import React from 'react'; +import {bindActionCreators} from 'redux'; import {gql, compose} from 'react-apollo'; +import {openMenu, closeMenu} from '../actions'; import {can} from 'plugin-api/beta/client/services'; +import {getShallowChanges} from 'plugin-api/beta/client/utils'; import ModerationActions from '../components/ModerationActions'; import {connect, excludeIf, withFragments} from 'plugin-api/beta/client/hocs'; -const mapStateToProps = ({auth}) => ({ - user: auth.user +class ModerationActionsContainer extends React.Component { + + shouldComponentUpdate(nextProps) { + + // Specifically handle `showMenuForComment` if it is the only change. + const changes = getShallowChanges(this.props, nextProps); + if (changes.length === 1 && changes[0] === 'showMenuForComment') { + const commentId = this.props.comment.id; + if ( + commentId !== this.props.showMenuForComment && + commentId !== nextProps.showMenuForComment + ) { + return false; + } + } + + // Prevent Slot from rerendering when no props has shallowly changed. + return changes.length !== 0; + } + + toogleMenu = () => { + if (this.props.showMenuForComment === this.props.comment.id) { + this.props.closeMenu(); + } else { + this.props.openMenu(this.props.comment.id); + } + } + + hideMenu = () => { + if (this.props.showMenuForComment === this.props.comment.id) { + this.props.closeMenu(); + } + } + + render() { + return ; + } +} + +const mapStateToProps = ({auth, talkPluginModerationActions: state}) => ({ + user: auth.user, + showMenuForComment: state.showMenuForComment, }); +const mapDispatchToProps = (dispatch) => + bindActionCreators({ + openMenu, + closeMenu, + }, dispatch); + const enhance = compose( - connect(mapStateToProps), + connect(mapStateToProps, mapDispatchToProps), withFragments({ asset: gql` fragment TalkModerationActions_asset on Asset { @@ -29,4 +87,4 @@ const enhance = compose( excludeIf((props) => !can(props.user, 'MODERATE_COMMENTS')), ); -export default enhance(ModerationActions); +export default enhance(ModerationActionsContainer); diff --git a/plugins/talk-plugin-moderation-actions/client/containers/RejectCommentAction.js b/plugins/talk-plugin-moderation-actions/client/containers/RejectCommentAction.js index 5497d0e8e..e744eb1d7 100644 --- a/plugins/talk-plugin-moderation-actions/client/containers/RejectCommentAction.js +++ b/plugins/talk-plugin-moderation-actions/client/containers/RejectCommentAction.js @@ -1,28 +1,27 @@ import React from 'react'; +import {compose} from 'react-apollo'; +import {bindActionCreators} from 'redux'; import {getErrorMessages} from 'plugin-api/beta/client/utils'; -import {withSetCommentStatus} from 'plugin-api/beta/client/hocs'; import {notify} from 'plugin-api/beta/client/actions/notification'; import RejectCommentAction from '../components/RejectCommentAction'; -import isNil from 'lodash/isNil'; +import {connect, withSetCommentStatus} from 'plugin-api/beta/client/hocs'; class RejectCommentActionContainer extends React.Component { rejectComment = async () => { - const {setCommentStatus, comment} = this.props; + const {setCommentStatus, comment, hideMenu, notify} = this.props; try { - const result = await setCommentStatus({ + await setCommentStatus({ commentId: comment.id, status: 'REJECTED' }); - - if (!isNil(result.data.setCommentStatus)) { - throw result.data.setCommentStatus.errors; - } - - } catch (err) { + } + catch(err) { notify('error', getErrorMessages(err)); } + + hideMenu(); } render() { @@ -30,4 +29,14 @@ class RejectCommentActionContainer extends React.Component { } } -export default withSetCommentStatus(RejectCommentActionContainer); +const mapDispatchToProps = (dispatch) => + bindActionCreators({ + notify + }, dispatch); + +const enhance = compose( + connect(null, mapDispatchToProps), + withSetCommentStatus +); + +export default enhance(RejectCommentActionContainer); diff --git a/plugins/talk-plugin-moderation-actions/client/index.js b/plugins/talk-plugin-moderation-actions/client/index.js index 3343505f3..fefcac710 100644 --- a/plugins/talk-plugin-moderation-actions/client/index.js +++ b/plugins/talk-plugin-moderation-actions/client/index.js @@ -1,9 +1,11 @@ import ModerationActions from './containers/ModerationActions'; import translations from './translations.yml'; +import reducer from './reducer'; export default { slots: { commentInfoBar: [ModerationActions], }, + reducer, translations }; diff --git a/plugins/talk-plugin-moderation-actions/client/reducer.js b/plugins/talk-plugin-moderation-actions/client/reducer.js new file mode 100644 index 000000000..d8531708b --- /dev/null +++ b/plugins/talk-plugin-moderation-actions/client/reducer.js @@ -0,0 +1,22 @@ +import {OPEN_MENU, CLOSE_MENU} from './constants'; + +const initialState = { + showMenuForComment: null, +}; + +export default function reducer(state = initialState, action) { + switch (action.type) { + case OPEN_MENU: + return { + ...state, + showMenuForComment: action.id + }; + case CLOSE_MENU: + return { + ...state, + showMenuForComment: null + }; + default : + return state; + } +} diff --git a/routes/api/assets/index.js b/routes/api/assets/index.js index 87014b86e..1b2b0c7a9 100644 --- a/routes/api/assets/index.js +++ b/routes/api/assets/index.js @@ -1,5 +1,6 @@ const express = require('express'); const router = express.Router(); +const authorization = require('../../../middleware/authorization'); const errors = require('../../../errors'); const AssetsService = require('../../../services/assets'); @@ -33,7 +34,7 @@ const FilterOpenAssets = (query, filter) => { }; // List assets. -router.get('/', async (req, res, next) => { +router.get('/', authorization.needed('ADMIN', 'MODERATOR'), async (req, res, next) => { const { limit = 20, @@ -72,7 +73,7 @@ router.get('/', async (req, res, next) => { }); // Get an asset by id. -router.get('/:asset_id', async (req, res, next) => { +router.get('/:asset_id', authorization.needed('ADMIN', 'MODERATOR'), async (req, res, next) => { try { // Send back the asset. @@ -87,7 +88,7 @@ router.get('/:asset_id', async (req, res, next) => { } }); -router.put('/:asset_id/settings', async (req, res, next) => { +router.put('/:asset_id/settings', authorization.needed('ADMIN'), async (req, res, next) => { try { await AssetsService.overrideSettings(req.params.asset_id, req.body); res.status(204).end(); @@ -96,7 +97,7 @@ router.put('/:asset_id/settings', async (req, res, next) => { } }); -router.put('/:asset_id/status', async (req, res, next) => { +router.put('/:asset_id/status', authorization.needed('ADMIN'), async (req, res, next) => { const { closedAt, closedMessage diff --git a/routes/api/index.js b/routes/api/index.js index eccd8d435..e44f1e7e5 100644 --- a/routes/api/index.js +++ b/routes/api/index.js @@ -1,5 +1,4 @@ const express = require('express'); -const authorization = require('../../middleware/authorization'); const pkg = require('../../package.json'); const router = express.Router(); @@ -8,8 +7,8 @@ router.get('/', (req, res) => { res.json({version: pkg.version}); }); -router.use('/assets', authorization.needed('ADMIN'), require('./assets')); -router.use('/settings', authorization.needed('ADMIN'), require('./settings')); +router.use('/assets', require('./assets')); +router.use('/settings', require('./settings')); router.use('/auth', require('./auth')); router.use('/users', require('./users')); router.use('/account', require('./account')); diff --git a/routes/api/settings/index.js b/routes/api/settings/index.js index fb54494d1..5202f9a56 100644 --- a/routes/api/settings/index.js +++ b/routes/api/settings/index.js @@ -1,9 +1,10 @@ const express = require('express'); const SettingsService = require('../../../services/settings'); +const authorization = require('../../../middleware/authorization'); const router = express.Router(); -router.get('/', async (req, res, next) => { +router.get('/', authorization.needed('ADMIN', 'MODERATOR'), async (req, res, next) => { try { let settings = await SettingsService.retrieve(); res.json(settings); @@ -12,7 +13,7 @@ router.get('/', async (req, res, next) => { } }); -router.put('/', async (req, res, next) => { +router.put('/', authorization.needed('ADMIN'), async (req, res, next) => { try { await SettingsService.update(req.body); res.status(204).end(); diff --git a/services/wordlist.js b/services/wordlist.js index 3a0cc2c71..e3aad5789 100644 --- a/services/wordlist.js +++ b/services/wordlist.js @@ -1,13 +1,39 @@ const debug = require('debug')('talk:services:wordlist'); const _ = require('lodash'); -const {RegexpTokenizer} = require('natural'); -const tokenizer = new RegexpTokenizer({pattern: /[.\s'"?!]/}); -const nameTokenizer = new RegexpTokenizer({pattern: /_/}); const SettingsService = require('./settings'); const Errors = require('../errors'); +const memoize = require('lodash/memoize'); -// REGEX to prevent emoji's from entering the wordlist. -const EMOJI_REGEX = /(?:[\u2700-\u27bf]|(?:\ud83c[\udde6-\uddff]){2}|[\ud800-\udbff][\udc00-\udfff])[\ufe0e\ufe0f]?(?:[\u0300-\u036f\ufe20-\ufe23\u20d0-\u20f0]|\ud83c[\udffb-\udfff])?(?:\u200d(?:[^\ud800-\udfff]|(?:\ud83c[\udde6-\uddff]){2}|[\ud800-\udbff][\udc00-\udfff])[\ufe0e\ufe0f]?(?:[\u0300-\u036f\ufe20-\ufe23\u20d0-\u20f0]|\ud83c[\udffb-\udfff])?)*/; +/** + * Escape string for special regular expression characters. + */ +function escapeRegExp(string) { + return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string +} + +/** + * Generate a regulare expression that catches the `phrases`. + */ +function generateRegExp(phrases) { + const inner = phrases + .map((phrase) => + phrase.split(/\s+/) + .map((word) => escapeRegExp(word)) + .join('[\\s"?!.]+') + ).join('|'); + + return new RegExp(`(^|[^\\w])(${inner})(?=[^\\w]|$)`, 'iu'); +} + +/** + * Memoized version of generateRegExp. + */ +const generateRegExpMemoized = memoize(generateRegExp, (phrases) => phrases.join(',')); + +/** + * Never matching regexp that exits immediately. + */ +const neverMatch = /(?!)/; /** * The root wordlist object. @@ -16,9 +42,9 @@ const EMOJI_REGEX = /(?:[\u2700-\u27bf]|(?:\ud83c[\udde6-\uddff]){2}|[\ud800-\ud class Wordlist { constructor() { - this.lists = { - banned: [], - suspect: [] + this.regexp = { + banned: neverMatch, + suspect: neverMatch, }; } @@ -48,7 +74,9 @@ class Wordlist { return; } - this.lists[k] = Wordlist.parseList(lists[k]); + this.regexp[k] = lists[k] && lists[k].length > 0 + ? generateRegExpMemoized(lists[k]) + : neverMatch; debug(`Added ${lists[k].length} words to the ${k} wordlist.`); }); @@ -56,92 +84,6 @@ class Wordlist { return Promise.resolve(this); } - /** - * 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.filter((word) => { - if (EMOJI_REGEX.test(word)) { - return false; - } - - return true; - }) - .map((word) => { - if (word.length === 1) { - return [word]; - } - - return tokenizer.tokenize(word.toLowerCase()); - }) - .filter((tokens) => { - if (tokens.length === 0) { - return false; - } - - return true; - })); - } - - /** - * 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, tk = tokenizer) { - - // Lowercase the word to ensure that we don't miss a match due to - // capitalization. - let lowerPhraseWords = tk.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]) { - 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; - }); - } - /** * Scans a specific field for wordlist violations. */ @@ -156,7 +98,7 @@ class Wordlist { } // Check if the field contains a banned word. - if (this.match(this.lists.banned, phrase)) { + if (this.regexp.banned.test(phrase)) { debug(`the field "${fieldName}" contained a phrase "${phrase}" which contained a banned word/phrase`); errors.banned = Errors.ErrContainsProfanity; @@ -166,8 +108,8 @@ class Wordlist { return errors; } - // Check if the field contains a banned word. - if (this.match(this.lists.suspect, phrase)) { + // Check if the field contains a suspected word. + if (this.regexp.suspect.test(phrase)) { debug(`the field "${fieldName}" contained a phrase "${phrase}" which contained a suspected word/phrase`); errors.suspect = Errors.ErrContainsProfanity; @@ -231,16 +173,12 @@ class Wordlist { return wl .load() .then(() => { - if (!wl.checkName(wl.lists.banned, username)) { + if (wl.regexp.banned.test(username)) { return Errors.ErrContainsProfanity; } }); } - checkName(list, name) { - return !this.match(list, name, nameTokenizer); - } - /** * Connect middleware for scanning request bodies for wordlisted words and * attaching a ErrContainsProfanity to the req.wordlisted parameter, otherwise diff --git a/test/server/routes/api/assets/index.js b/test/server/routes/api/assets/index.js index 855b30271..a07b154d4 100644 --- a/test/server/routes/api/assets/index.js +++ b/test/server/routes/api/assets/index.js @@ -37,78 +37,88 @@ describe('/api/v1/assets', () => { describe('#get', () => { it('should return all assets without a search query', async () => { - const res = await chai.request(app) - .get('/api/v1/assets') - .set(passport.inject({roles: ['ADMIN']})); + for (const role of ['ADMIN', 'MODERATOR']) { + const res = await chai.request(app) + .get('/api/v1/assets') + .set(passport.inject({roles: [role]})); - const body = res.body; + const body = res.body; - expect(body).to.have.property('count', 2); - expect(body).to.have.property('result'); + expect(body).to.have.property('count', 2); + expect(body).to.have.property('result'); - const assets = body.result; + const assets = body.result; - expect(assets).to.have.length(2); + expect(assets).to.have.length(2); + } }); it('should return assets that we search for', async () => { - const res = await chai.request(app) - .get('/api/v1/assets?search=term2') - .set(passport.inject({roles: ['ADMIN']})); + for (const role of ['ADMIN', 'MODERATOR']) { + const res = await chai.request(app) + .get('/api/v1/assets?search=term2') + .set(passport.inject({roles: [role]})); - const body = res.body; + const body = res.body; - expect(body).to.have.property('count', 1); - expect(body).to.have.property('result'); + expect(body).to.have.property('count', 1); + expect(body).to.have.property('result'); - const assets = body.result; + const assets = body.result; - expect(assets).to.have.length(1); + expect(assets).to.have.length(1); - const asset = assets[0]; + const asset = assets[0]; - expect(asset).to.have.property('url', 'https://coralproject.net/news/asset2'); - expect(asset).to.have.property('title', 'Asset 2'); + expect(asset).to.have.property('url', 'https://coralproject.net/news/asset2'); + expect(asset).to.have.property('title', 'Asset 2'); + } }); it('should not return assets that we do not search for', async () => { - const res = await chai.request(app) - .get('/api/v1/assets?search=term3') - .set(passport.inject({roles: ['ADMIN']})); - const body = res.body; + for (const role of ['ADMIN', 'MODERATOR']) { + const res = await chai.request(app) + .get('/api/v1/assets?search=term3') + .set(passport.inject({roles: [role]})); + const body = res.body; - expect(body).to.have.property('count', 0); - expect(body).to.have.property('result'); + expect(body).to.have.property('count', 0); + expect(body).to.have.property('result'); - expect(body.result).to.be.empty; + expect(body.result).to.be.empty; + } }); it('should return only closed assets', async () => { - const res = await chai.request(app) - .get('/api/v1/assets?filter=closed') - .set(passport.inject({roles: ['ADMIN']})); - const body = res.body; + for (const role of ['ADMIN', 'MODERATOR']) { + const res = await chai.request(app) + .get('/api/v1/assets?filter=closed') + .set(passport.inject({roles: [role]})); + const body = res.body; - expect(body).to.have.property('count', 1); - expect(body).to.have.property('result'); + expect(body).to.have.property('count', 1); + expect(body).to.have.property('result'); - const assets = body.result; + const assets = body.result; - expect(assets[0]).to.have.property('title', 'Asset 1'); + expect(assets[0]).to.have.property('title', 'Asset 1'); + } }); it('should return only opened assets', async () => { - const res = await chai.request(app) - .get('/api/v1/assets?filter=open') - .set(passport.inject({roles: ['ADMIN']})); - const body = res.body; + for (const role of ['ADMIN', 'MODERATOR']) { + const res = await chai.request(app) + .get('/api/v1/assets?filter=open') + .set(passport.inject({roles: [role]})); + const body = res.body; - expect(body).to.have.property('count', 1); - expect(body).to.have.property('result'); + expect(body).to.have.property('count', 1); + expect(body).to.have.property('result'); - const assets = body.result; + const assets = body.result; - expect(assets[0]).to.have.property('title', 'Asset 2'); + expect(assets[0]).to.have.property('title', 'Asset 2'); + } }); }); @@ -133,6 +143,20 @@ describe('/api/v1/assets', () => { expect(closedAsset).to.have.property('isClosed', true); expect(closedAsset).to.have.property('closedAt').and.to.not.equal(null); }); + + it('should require ADMIN role', async () => { + const today = Date.now(); + + const asset = await AssetsService.findOrCreateByUrl('http://test.com'); + expect(asset).to.have.property('isClosed', false); + expect(asset).to.have.property('closedAt', null); + + const promise = chai.request(app) + .put(`/api/v1/assets/${asset.id}/status`) + .set(passport.inject({roles: ['MODERATOR']})) + .send({closedAt: today}); + await expect(promise).to.eventually.be.rejected; + }); }); }); diff --git a/test/server/routes/api/settings/index.js b/test/server/routes/api/settings/index.js index c7704fc7e..d3728ff2c 100644 --- a/test/server/routes/api/settings/index.js +++ b/test/server/routes/api/settings/index.js @@ -16,17 +16,17 @@ describe('/api/v1/settings', () => { describe('#get', () => { - it('should return a settings object', () => { - return chai.request(app) - .get('/api/v1/settings') - .set(passport.inject({ - roles: ['ADMIN'] - })) - .then((res) => { - expect(res).to.have.status(200); - expect(res).to.be.json; - expect(res.body).to.have.property('moderation', 'PRE'); - }); + it('should return a settings object', async () => { + for (let role of ['ADMIN', 'MODERATOR']) { + const res = await chai.request(app) + .get('/api/v1/settings') + .set(passport.inject({ + roles: [role] + })); + expect(res).to.have.status(200); + expect(res).to.be.json; + expect(res.body).to.have.property('moderation', 'PRE'); + } }); }); @@ -46,6 +46,14 @@ describe('/api/v1/settings', () => { expect(settings).to.have.property('moderation', 'POST'); }); }); + + it('should require ADMIN role', () => { + const promise = chai.request(app) + .put('/api/v1/settings') + .set(passport.inject({roles: ['MODERATOR']})) + .send({moderation: 'POST'}); + return expect(promise).to.eventually.be.rejected; + }); }); }); diff --git a/test/server/services/wordlist.js b/test/server/services/wordlist.js index 27460f049..b43dd2bec 100644 --- a/test/server/services/wordlist.js +++ b/test/server/services/wordlist.js @@ -27,44 +27,10 @@ describe('services.Wordlist', () => { beforeEach(() => SettingsService.init(settings)); - describe('#init', () => { + describe('#regexp', () => { before(() => wordlist.upsert(wordlists)); - it('parses the wordlists correctly', () => { - expect(wordlist.lists.banned).to.deep.equal([ - [ 'cookies' ], - [ 'how', 'to', 'do', 'bad', 'things' ], - [ 'how', 'to', 'do', 'really', 'bad', 'things' ], - [ 's', 'h', 'i', 't' ], - [ '$hit' ], - [ 'p**ch' ], - [ 'p*ch' ], - ]); - expect(wordlist.lists.suspect).to.deep.equal([ - [ 'do', 'bad', 'things' ], - ]); - }); - - }); - - describe('#parseList', () => { - it('does not include emojis in the wordlist', () => { - let list = Wordlist.parseList([ - '🖕', - '🖕 asdf', - 'asd🖕asdf', - 'asd🖕', - ]); - - expect(list).to.have.length(0); - }); - }); - - const bannedList = Wordlist.parseList(wordlists.banned); - - describe('#match', () => { - it('does match on a bad word', () => { [ 'how to do really bad things', @@ -76,7 +42,7 @@ describe('services.Wordlist', () => { 'This stuff is $hit!', 'That\'s a p**ch!', ].forEach((word) => { - expect(wordlist.match(bannedList, word)).to.be.true; + expect(wordlist.regexp.banned.test(word)).to.be.true; }); }); @@ -90,7 +56,7 @@ describe('services.Wordlist', () => { 'I have bad $ hit lling', 'That\'s a p***ch!', ].forEach((word) => { - expect(wordlist.match(bannedList, word)).to.be.false; + expect(wordlist.regexp.banned.test(word)).to.be.false; }); }); @@ -129,26 +95,6 @@ describe('services.Wordlist', () => { }); - describe('#checkName', () => { - [ - 'flowers', - 'joy', - 'lots_of_candy' - ].forEach((username) => { - it(`does not match on list=banned name=${username}`, () => { - expect(wordlist.checkName(bannedList, username)).to.be.true; - }); - }); - - [ - 'cookies' - ].forEach((username) => { - it(`does match on list=banned name=${username}`, () => { - expect(wordlist.checkName(bannedList, username)).to.be.false; - }); - }); - }); - describe('#filter', () => { before(() => wordlist.upsert(wordlists)); diff --git a/yarn.lock b/yarn.lock index 1ca8acdbb..585b0a4b6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -922,7 +922,7 @@ babel-register@^6.26.0: mkdirp "^0.5.1" source-map-support "^0.4.15" -babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0, babel-runtime@^6.6.1: +babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0, babel-runtime@^6.6.1: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" dependencies: @@ -1016,10 +1016,6 @@ binary-extensions@^1.0.0: version "1.8.0" resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.8.0.tgz#48ec8d16df4377eae5fa5884682480af4d95c774" -bindings@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.2.1.tgz#14ad6113812d2d37d72e67b4cacb4bb726505f11" - block-stream@*: version "0.0.9" resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" @@ -3396,12 +3392,6 @@ hide-powered-by@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/hide-powered-by/-/hide-powered-by-1.0.0.tgz#4a85ad65881f62857fc70af7174a1184dccce32b" -highlight-words-core@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/highlight-words-core/-/highlight-words-core-1.0.3.tgz#0886d0e757c8ca3928cbc873042bd544f8f6b2e5" - dependencies: - babel-runtime "^6.11.6" - history@^3.0.0: version "3.3.0" resolved "https://registry.yarnpkg.com/history/-/history-3.3.0.tgz#fcedcce8f12975371545d735461033579a6dae9c" @@ -4395,12 +4385,6 @@ license-webpack-plugin@^1.0.0: dependencies: ejs "^2.5.7" -linkify-it@^1.2.0: - version "1.2.4" - resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-1.2.4.tgz#0773526c317c8fd13bd534ee1d180ff88abf881a" - dependencies: - uc.micro "^1.0.1" - linkify-it@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.0.3.tgz#d94a4648f9b1c179d64fa97291268bdb6ce9434f" @@ -4982,7 +4966,7 @@ mute-stream@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" -nan@^2.3.0, nan@^2.4.0: +nan@^2.3.0: version "2.5.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.0.tgz#aa8f1e34531d807e9e27755b234b4a6ec0c152a8" @@ -5002,16 +4986,6 @@ natural@^0.2.0: sylvester ">= 0.0.12" underscore ">=1.3.1" -natural@^0.5.4: - version "0.5.4" - resolved "https://registry.yarnpkg.com/natural/-/natural-0.5.4.tgz#ace41c1655daca2912dfbf99ad7b05314e205f54" - dependencies: - apparatus ">= 0.0.9" - sylvester ">= 0.0.12" - underscore ">=1.3.1" - optionalDependencies: - webworker-threads ">=0.6.2" - negotiator@0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" @@ -6379,12 +6353,6 @@ react-dom@^15.3.1, react-dom@^15.4.2: object-assign "^4.1.0" prop-types "~15.5.7" -react-highlight-words@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/react-highlight-words/-/react-highlight-words-0.6.0.tgz#e12e9fedda4333e410ea408cdedffc77122020aa" - dependencies: - highlight-words-core "^1.0.2" - react-input-autosize@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-1.1.4.tgz#cbc45072d4084ddc57806db8e3b34e644b8366ac" @@ -6392,13 +6360,6 @@ react-input-autosize@^1.1.4: create-react-class "^15.5.2" prop-types "^15.5.8" -react-linkify@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/react-linkify/-/react-linkify-0.1.3.tgz#6e886180bda6c8fdc5f9f8a7ebe82fc0f48db7ad" - dependencies: - linkify-it "^1.2.0" - tlds "^1.57.0" - react-mdl-selectfield@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/react-mdl-selectfield/-/react-mdl-selectfield-0.2.0.tgz#36e1a97233036c057ab2bdb31ec09ad8d9988411" @@ -7456,9 +7417,9 @@ title-case-minors@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/title-case-minors/-/title-case-minors-1.0.0.tgz#51f17037c294747a1d1cda424b5004c86d8eb115" -tlds@^1.57.0: - version "1.185.0" - resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.185.0.tgz#9d5ddaae379778a98e3edc3a131d46a40cbc3ba4" +tlds@^1.196.0: + version "1.196.0" + resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.196.0.tgz#49d74ddbd1f9df30238b3bfef4df82862b5bbb48" tmp@^0.0.31: version "0.0.31" @@ -7819,13 +7780,6 @@ webpack@^2.3.1: webpack-sources "^0.2.3" yargs "^6.0.0" -webworker-threads@>=0.6.2: - version "0.7.11" - resolved "https://registry.yarnpkg.com/webworker-threads/-/webworker-threads-0.7.11.tgz#9d54dfaa8d5ea3308833084680636b584a8aacaa" - dependencies: - bindings "^1.2.1" - nan "^2.4.0" - whatwg-fetch@>=0.10.0, whatwg-fetch@^2.0.0: version "2.0.3" resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84"