From 30cd16fd564c0407908507376239c64ea97d4693 Mon Sep 17 00:00:00 2001
From: Leandro <leeeandroo@gmail.com>
Date: Fri, 2 Feb 2018 10:22:16 +0100
Subject: [PATCH 01/13] make user details texts translatable and change email
 to identification

---
 .../coral-admin/src/components/UserDetail.js  | 39 ++++++++++++-------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js
index 71d2ed1a3..c5e9132b2 100644
--- a/client/coral-admin/src/components/UserDetail.js
+++ b/client/coral-admin/src/components/UserDetail.js
@@ -25,6 +25,7 @@ import {
 import ActionsMenu from 'coral-admin/src/components/ActionsMenu';
 import ActionsMenuItem from 'coral-admin/src/components/ActionsMenuItem';
 import UserInfoTooltip from './UserInfoTooltip';
+import t from 'coral-framework/services/i18n';
 
 class UserDetail extends React.Component {
   rejectThenReload = async info => {
@@ -152,27 +153,27 @@ class UserDetail extends React.Component {
             >
               {suspended ? (
                 <ActionsMenuItem onClick={() => unsuspendUser({ id: user.id })}>
-                  Remove Suspension
+                  {t('user_detail.remove_suspension')}
                 </ActionsMenuItem>
               ) : (
                 <ActionsMenuItem
                   disabled={me.id === user.id}
                   onClick={this.showSuspenUserDialog}
                 >
-                  Suspend User
+                  {t('user_detail.suspend')}
                 </ActionsMenuItem>
               )}
 
               {banned ? (
                 <ActionsMenuItem onClick={() => unbanUser({ id: user.id })}>
-                  Remove Ban
+                  {t('user_detail.remove_ban')}
                 </ActionsMenuItem>
               ) : (
                 <ActionsMenuItem
                   disabled={me.id === user.id}
                   onClick={this.showBanUserDialog}
                 >
-                  Ban User
+                  {t('user_detail.ban')}
                 </ActionsMenuItem>
               )}
             </ActionsMenu>
@@ -190,14 +191,18 @@ class UserDetail extends React.Component {
             <ul className={styles.userDetailList}>
               <li>
                 <Icon name="assignment_ind" />
-                <span className={styles.userDetailItem}>Member Since:</span>
+                <span className={styles.userDetailItem}>
+                  {t('user_detail.member_since')}:
+                </span>
                 {new Date(user.created_at).toLocaleString()}
               </li>
 
-              {user.profiles.map(({ id }) => (
+              {user.profiles.map(({ id, provider }) => (
                 <li key={id}>
-                  <Icon name="email" />
-                  <span className={styles.userDetailItem}>Email:</span>
+                  <Icon name="perm_identity" />
+                  <span className={styles.userDetailItem}>
+                    {t('user_detail.identification')} ({provider}):
+                  </span>
                   {id}{' '}
                   <ButtonCopyToClipboard
                     className={styles.copyButton}
@@ -210,17 +215,23 @@ class UserDetail extends React.Component {
 
             <ul className={styles.stats}>
               <li className={styles.stat}>
-                <span className={styles.statItem}>Total Comments</span>
+                <span className={styles.statItem}>
+                  {t('user_detail.total_comments')}
+                </span>
                 <span className={styles.statResult}>{totalComments}</span>
               </li>
               <li className={styles.stat}>
-                <span className={styles.statItem}>Reject Rate</span>
+                <span className={styles.statItem}>
+                  {t('user_detail.reject_rate')}
+                </span>
                 <span className={styles.statResult}>
                   {rejectedPercent.toFixed(1)}%
                 </span>
               </li>
               <li className={styles.stat}>
-                <span className={styles.statItem}>Reports</span>
+                <span className={styles.statItem}>
+                  {t('user_detail.reports')}
+                </span>
                 <span
                   className={cn(
                     styles.statReportResult,
@@ -259,13 +270,13 @@ class UserDetail extends React.Component {
                 'talk-admin-user-detail-all-tab'
               )}
             >
-              All
+              {t('user_detail.all')}
             </Tab>
             <Tab
               tabId={'rejected'}
               className={cn(styles.tab, 'talk-admin-user-detail-rejected-tab')}
             >
-              Rejected
+              {t('user_detail.rejected')}
             </Tab>
             <Tab
               tabId={'history'}
@@ -275,7 +286,7 @@ class UserDetail extends React.Component {
                 'talk-admin-user-detail-history-tab'
               )}
             >
-              Account History
+              {t('user_detail.account_history')}
             </Tab>
           </TabBar>
 

From 0966aa9463b02bfcfe4b228bd864b83f77036604 Mon Sep 17 00:00:00 2001
From: Leandro <leeeandroo@gmail.com>
Date: Fri, 2 Feb 2018 10:25:08 +0100
Subject: [PATCH 02/13] insert new admin keys about user details

---
 locales/en.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/locales/en.yml b/locales/en.yml
index 14c29e3f6..357a90239 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -418,6 +418,19 @@ en:
     bio_flags: "flags for this bio"
     user_bio: "User Bio"
     username_flags: "flags for this username"
+  user_detail:
+    remove_suspension: "Remove Suspension"
+    suspend: "Suspend User"
+    remove_ban: "Remove Ban"
+    ban: "Ban User"
+    member_since: "Member Since"
+    identification: "Identification"
+    total_comments: "Total Comments"
+    reject_rate: "Reject Rate"
+    reports: "Reports"
+    all: "All"
+    rejected: "Rejected"
+    account_history: "Account History"
   user_impersonating: "This user is impersonating"
   user_no_comment: "You've never left a comment. Join the conversation!"
   username_offensive: "This username is offensive"

From f75924e68385de48ce829c8e252e8f43b573be05 Mon Sep 17 00:00:00 2001
From: Leandro <leeeandroo@gmail.com>
Date: Fri, 2 Feb 2018 10:34:46 +0100
Subject: [PATCH 03/13] translate ViewOptions componenet

---
 .../src/routes/Moderation/components/ViewOptions.js           | 4 ++--
 locales/en.yml                                                | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/ViewOptions.js b/client/coral-admin/src/routes/Moderation/components/ViewOptions.js
index 3faa56d55..5735abc9e 100644
--- a/client/coral-admin/src/routes/Moderation/components/ViewOptions.js
+++ b/client/coral-admin/src/routes/Moderation/components/ViewOptions.js
@@ -19,12 +19,12 @@ class ViewOptions extends React.Component {
             'talk-admin-moderation-view-options-headline'
           )}
         >
-          View Options
+          {t('admin_sidebar.view_options')}
         </h2>
         <div className={styles.viewOptionsContent}>
           <ul className={styles.viewOptionsList}>
             <li className={styles.viewOptionsItem}>
-              Sort Comments
+              {t('admin_sidebar.sort_comments')}
               <Dropdown
                 containerClassName={styles.dropdownContainer}
                 toggleClassName={styles.dropdownToggle}
diff --git a/locales/en.yml b/locales/en.yml
index 357a90239..15707fd88 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -457,3 +457,6 @@ en:
       description: "Thanks for installing Talk! We sent an email to verify your email address. While you finish setting up the account, you can start engaging with your readers now."
       launch: "Launch Talk"
       close: "Close this Installer"
+  admin_sidebar:
+    view_options: "View Options"
+    sort_comments: "Sort Comments"

From 484ae2539b4497b14cd398d677c93afec77501ba Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 2 Feb 2018 15:00:47 -0700
Subject: [PATCH 04/13] added akismet support

---
 .eslintignore                                 |  46 +++---
 .gitignore                                    |   1 +
 graph/index.js                                |   2 +-
 plugins/talk-plugin-akismet/.eslintrc.json    |   3 +
 .../talk-plugin-akismet/client/.eslintrc.json |   3 +
 .../client/components/CheckSpamHook.js        |  54 +++++++
 .../client/components/SpamDetail.js           |  20 +++
 .../client/components/SpamLabel.js            |   9 ++
 .../client/containers/CheckSpamHook.js        |   8 +
 .../client/containers/SpamCommentDetail.js    |  12 ++
 .../containers/SpamCommentFlagDetail.js       |  12 ++
 .../client/containers/SpamDetail.js           |  21 +++
 .../client/containers/SpamLabel.js            |  22 +++
 plugins/talk-plugin-akismet/client/index.js   |  15 ++
 .../client/translations.yml                   |  15 ++
 plugins/talk-plugin-akismet/client/utils.js   |   6 +
 plugins/talk-plugin-akismet/config.js         |  12 ++
 plugins/talk-plugin-akismet/errors.js         |  13 ++
 plugins/talk-plugin-akismet/index.js          | 123 +++++++++++++++
 plugins/talk-plugin-akismet/package.json      |  12 ++
 plugins/talk-plugin-akismet/yarn.lock         | 141 ++++++++++++++++++
 21 files changed, 527 insertions(+), 23 deletions(-)
 create mode 100644 plugins/talk-plugin-akismet/.eslintrc.json
 create mode 100644 plugins/talk-plugin-akismet/client/.eslintrc.json
 create mode 100644 plugins/talk-plugin-akismet/client/components/CheckSpamHook.js
 create mode 100644 plugins/talk-plugin-akismet/client/components/SpamDetail.js
 create mode 100644 plugins/talk-plugin-akismet/client/components/SpamLabel.js
 create mode 100644 plugins/talk-plugin-akismet/client/containers/CheckSpamHook.js
 create mode 100644 plugins/talk-plugin-akismet/client/containers/SpamCommentDetail.js
 create mode 100644 plugins/talk-plugin-akismet/client/containers/SpamCommentFlagDetail.js
 create mode 100644 plugins/talk-plugin-akismet/client/containers/SpamDetail.js
 create mode 100644 plugins/talk-plugin-akismet/client/containers/SpamLabel.js
 create mode 100644 plugins/talk-plugin-akismet/client/index.js
 create mode 100644 plugins/talk-plugin-akismet/client/translations.yml
 create mode 100644 plugins/talk-plugin-akismet/client/utils.js
 create mode 100644 plugins/talk-plugin-akismet/config.js
 create mode 100644 plugins/talk-plugin-akismet/errors.js
 create mode 100644 plugins/talk-plugin-akismet/index.js
 create mode 100644 plugins/talk-plugin-akismet/package.json
 create mode 100644 plugins/talk-plugin-akismet/yarn.lock

diff --git a/.eslintignore b/.eslintignore
index 7ee579147..50d3f7109 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,32 +1,34 @@
+**/*.html
 dist
 docs
-**/*.html
+node_modules
 plugins/*
-!plugins/talk-plugin-facebook-auth
+public
+
+!plugins/talk-plugin-akismet
 !plugins/talk-plugin-auth
-!plugins/talk-plugin-respect
-!plugins/talk-plugin-offtopic
-!plugins/talk-plugin-like
-!plugins/talk-plugin-mod
-!plugins/talk-plugin-love
-!plugins/talk-plugin-viewing-options
+!plugins/talk-plugin-author-menu
 !plugins/talk-plugin-comment-content
-!plugins/talk-plugin-permalink
+!plugins/talk-plugin-deep-reply-count
+!plugins/talk-plugin-facebook-auth
 !plugins/talk-plugin-featured-comments
-!plugins/talk-plugin-sort-newest
-!plugins/talk-plugin-sort-oldest
-!plugins/talk-plugin-sort-most-replied
+!plugins/talk-plugin-flag-details
+!plugins/talk-plugin-ignore-user
+!plugins/talk-plugin-like
+!plugins/talk-plugin-love
+!plugins/talk-plugin-member-since
+!plugins/talk-plugin-mod
+!plugins/talk-plugin-moderation-actions
+!plugins/talk-plugin-offtopic
+!plugins/talk-plugin-permalink
+!plugins/talk-plugin-remember-sort
+!plugins/talk-plugin-respect
 !plugins/talk-plugin-sort-most-liked
 !plugins/talk-plugin-sort-most-loved
+!plugins/talk-plugin-sort-most-replied
 !plugins/talk-plugin-sort-most-respected
-!plugins/talk-plugin-author-menu
-!plugins/talk-plugin-member-since
-!plugins/talk-plugin-ignore-user
-!plugins/talk-plugin-moderation-actions
-!plugins/talk-plugin-toxic-comments
-!plugins/talk-plugin-remember-sort
-!plugins/talk-plugin-deep-reply-count
+!plugins/talk-plugin-sort-newest
+!plugins/talk-plugin-sort-oldest
 !plugins/talk-plugin-subscriber
-!plugins/talk-plugin-flag-details
-public
-node_modules
+!plugins/talk-plugin-toxic-comments
+!plugins/talk-plugin-viewing-options
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 70b6d482e..a27a08f15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@ browserstack.err
 
 plugins.json
 plugins/*
+!plugins/talk-plugin-akismet
 !plugins/talk-plugin-facebook-auth
 !plugins/talk-plugin-auth
 !plugins/talk-plugin-respect
diff --git a/graph/index.js b/graph/index.js
index 2ccaaea11..c05d878e6 100644
--- a/graph/index.js
+++ b/graph/index.js
@@ -8,7 +8,7 @@ module.exports = {
     // Schema is created already, so just include it.
     schema,
 
-    // Load in the new context here, this'll create the loaders + mutators for
+    // Load in the new context here, this will create the loaders + mutators for
     // the lifespan of this request.
     context: new Context(req),
 
diff --git a/plugins/talk-plugin-akismet/.eslintrc.json b/plugins/talk-plugin-akismet/.eslintrc.json
new file mode 100644
index 000000000..64e91163f
--- /dev/null
+++ b/plugins/talk-plugin-akismet/.eslintrc.json
@@ -0,0 +1,3 @@
+{
+  "extends": "@coralproject/eslint-config-talk"
+}
\ No newline at end of file
diff --git a/plugins/talk-plugin-akismet/client/.eslintrc.json b/plugins/talk-plugin-akismet/client/.eslintrc.json
new file mode 100644
index 000000000..c8a6db18a
--- /dev/null
+++ b/plugins/talk-plugin-akismet/client/.eslintrc.json
@@ -0,0 +1,3 @@
+{
+  "extends": "@coralproject/eslint-config-talk/client"
+}
diff --git a/plugins/talk-plugin-akismet/client/components/CheckSpamHook.js b/plugins/talk-plugin-akismet/client/components/CheckSpamHook.js
new file mode 100644
index 000000000..58eeac11f
--- /dev/null
+++ b/plugins/talk-plugin-akismet/client/components/CheckSpamHook.js
@@ -0,0 +1,54 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { t } from 'plugin-api/beta/client/services';
+
+/**
+ * CheckSpamHook adds hooks to the `commentBox`
+ * that handles checking a comment for spam.
+ */
+export default class CheckSpamHook extends React.Component {
+  // checked signifies if we already sent a request with the `checkSpam` set to true.
+  checked = false;
+
+  componentDidMount() {
+    this.spamPreHook = this.props.registerHook('preSubmit', input => {
+      // If we haven't check the spam yet, make sure to include `checkSpam=true` in the mutation.
+      // Otherwise post comment without checking the spam.
+      if (!this.checked) {
+        input.checkSpam = true;
+        this.checked = true;
+      }
+    });
+
+    this.spamPostHook = this.props.registerHook('postSubmit', result => {
+      const actions = result.createComment.actions;
+      if (
+        actions &&
+        actions.some(
+          ({ __typename, reason }) =>
+            __typename === 'FlagAction' && reason === 'SPAM_COMMENT'
+        )
+      ) {
+        this.props.notify('error', t('talk-plugin-akismet.still_spam'));
+      }
+
+      // Reset `checked` after comment was successfully posted.
+      this.checked = false;
+    });
+  }
+
+  componentWillUnmount() {
+    this.props.unregisterHook(this.spamPreHook);
+    this.props.unregisterHook(this.spamPostHook);
+  }
+
+  render() {
+    return null;
+  }
+}
+
+CheckSpamHook.propTypes = {
+  notify: PropTypes.func.isRequired,
+  registerHook: PropTypes.func.isRequired,
+  unregisterHook: PropTypes.func.isRequired,
+};
diff --git a/plugins/talk-plugin-akismet/client/components/SpamDetail.js b/plugins/talk-plugin-akismet/client/components/SpamDetail.js
new file mode 100644
index 000000000..554ffb849
--- /dev/null
+++ b/plugins/talk-plugin-akismet/client/components/SpamDetail.js
@@ -0,0 +1,20 @@
+import React from 'react';
+import { CommentDetail } from 'plugin-api/beta/client/components';
+import PropTypes from 'prop-types';
+import { t } from 'plugin-api/beta/client/services';
+
+const SpamLabel = () => (
+  <CommentDetail
+    icon={'add_box'}
+    header={t('talk-plugin-akismet.spam_comment')}
+  />
+);
+
+SpamLabel.propTypes = {
+  comment: PropTypes.shape({
+    actions: PropTypes.array,
+    spam: PropTypes.spam,
+  }),
+};
+
+export default SpamLabel;
diff --git a/plugins/talk-plugin-akismet/client/components/SpamLabel.js b/plugins/talk-plugin-akismet/client/components/SpamLabel.js
new file mode 100644
index 000000000..c2033ff39
--- /dev/null
+++ b/plugins/talk-plugin-akismet/client/components/SpamLabel.js
@@ -0,0 +1,9 @@
+import React from 'react';
+import { FlagLabel } from 'plugin-api/beta/client/components/ui';
+import { t } from 'plugin-api/beta/client/services';
+
+const SpamLabel = () => (
+  <FlagLabel iconName="add_box">{t('talk-plugin-akismet.spam')}</FlagLabel>
+);
+
+export default SpamLabel;
diff --git a/plugins/talk-plugin-akismet/client/containers/CheckSpamHook.js b/plugins/talk-plugin-akismet/client/containers/CheckSpamHook.js
new file mode 100644
index 000000000..f580b9632
--- /dev/null
+++ b/plugins/talk-plugin-akismet/client/containers/CheckSpamHook.js
@@ -0,0 +1,8 @@
+import { bindActionCreators } from 'redux';
+import { connect } from 'plugin-api/beta/client/hocs';
+import { notify } from 'plugin-api/beta/client/actions/notification';
+import CheckSpamHook from '../components/CheckSpamHook';
+
+const mapDispatchToProps = dispatch => bindActionCreators({ notify }, dispatch);
+
+export default connect(null, mapDispatchToProps)(CheckSpamHook);
diff --git a/plugins/talk-plugin-akismet/client/containers/SpamCommentDetail.js b/plugins/talk-plugin-akismet/client/containers/SpamCommentDetail.js
new file mode 100644
index 000000000..a133be062
--- /dev/null
+++ b/plugins/talk-plugin-akismet/client/containers/SpamCommentDetail.js
@@ -0,0 +1,12 @@
+import { compose } from 'react-apollo';
+import { excludeIf } from 'plugin-api/beta/client/hocs';
+import SpamDetail from './SpamDetail';
+import { isSpam } from '../utils';
+
+const enhance = compose(
+  excludeIf(
+    ({ comment: { spam, actions } }) => spam === null || isSpam(actions)
+  )
+);
+
+export default enhance(SpamDetail);
diff --git a/plugins/talk-plugin-akismet/client/containers/SpamCommentFlagDetail.js b/plugins/talk-plugin-akismet/client/containers/SpamCommentFlagDetail.js
new file mode 100644
index 000000000..a49fd89ca
--- /dev/null
+++ b/plugins/talk-plugin-akismet/client/containers/SpamCommentFlagDetail.js
@@ -0,0 +1,12 @@
+import { compose } from 'react-apollo';
+import { excludeIf } from 'plugin-api/beta/client/hocs';
+import SpamDetail from './SpamDetail';
+import { isSpam } from '../utils';
+
+const enhance = compose(
+  excludeIf(
+    ({ comment: { spam, actions } }) => spam === null || !isSpam(actions)
+  )
+);
+
+export default enhance(SpamDetail);
diff --git a/plugins/talk-plugin-akismet/client/containers/SpamDetail.js b/plugins/talk-plugin-akismet/client/containers/SpamDetail.js
new file mode 100644
index 000000000..419a3c7eb
--- /dev/null
+++ b/plugins/talk-plugin-akismet/client/containers/SpamDetail.js
@@ -0,0 +1,21 @@
+import { compose, gql } from 'react-apollo';
+import { withFragments } from 'plugin-api/beta/client/hocs';
+import SpamDetail from '../components/SpamDetail';
+
+const enhance = compose(
+  withFragments({
+    comment: gql`
+      fragment TalkSpamComments_SpamDetail_Comment on Comment {
+        spam
+        actions {
+          __typename
+          ... on FlagAction {
+            reason
+          }
+        }
+      }
+    `,
+  })
+);
+
+export default enhance(SpamDetail);
diff --git a/plugins/talk-plugin-akismet/client/containers/SpamLabel.js b/plugins/talk-plugin-akismet/client/containers/SpamLabel.js
new file mode 100644
index 000000000..7af7f9f49
--- /dev/null
+++ b/plugins/talk-plugin-akismet/client/containers/SpamLabel.js
@@ -0,0 +1,22 @@
+import { compose, gql } from 'react-apollo';
+import { withFragments, excludeIf } from 'plugin-api/beta/client/hocs';
+import SpamLabel from '../components/SpamLabel';
+import { isSpam } from '../utils';
+
+const enhance = compose(
+  withFragments({
+    comment: gql`
+      fragment TalkSpamComments_SpamLabel_Comment on Comment {
+        actions {
+          __typename
+          ... on FlagAction {
+            reason
+          }
+        }
+      }
+    `,
+  }),
+  excludeIf(({ comment: { actions } }) => !isSpam(actions))
+);
+
+export default enhance(SpamLabel);
diff --git a/plugins/talk-plugin-akismet/client/index.js b/plugins/talk-plugin-akismet/client/index.js
new file mode 100644
index 000000000..0eca7ab85
--- /dev/null
+++ b/plugins/talk-plugin-akismet/client/index.js
@@ -0,0 +1,15 @@
+import translations from './translations.yml';
+import CheckSpamHook from './containers/CheckSpamHook';
+import SpamLabel from './containers/SpamLabel';
+import SpamCommentDetail from './containers/SpamCommentDetail';
+import SpamCommentFlagDetail from './containers/SpamCommentFlagDetail';
+
+export default {
+  translations,
+  slots: {
+    commentInputDetailArea: [CheckSpamHook],
+    adminCommentLabels: [SpamLabel],
+    adminCommentMoreDetails: [SpamCommentDetail],
+    adminCommentMoreFlagDetails: [SpamCommentFlagDetail],
+  },
+};
diff --git a/plugins/talk-plugin-akismet/client/translations.yml b/plugins/talk-plugin-akismet/client/translations.yml
new file mode 100644
index 000000000..a9a209139
--- /dev/null
+++ b/plugins/talk-plugin-akismet/client/translations.yml
@@ -0,0 +1,15 @@
+en:
+  error:
+    COMMENT_IS_SPAM: |
+      Are you sure? The language in this comment matches looks like spam.
+      You can edit the comment or submit it for moderator review.
+  talk-plugin-akismet:
+    spam: "Spam"
+    spam_comment: "Detected Spam"
+    still_spam: |
+      This edited comment might still violate our community guidelines.
+      Our moderation team will review your comment shortly.
+  flags:
+    reasons:
+      comment:
+        spam_comment: "Detected Spam"
\ No newline at end of file
diff --git a/plugins/talk-plugin-akismet/client/utils.js b/plugins/talk-plugin-akismet/client/utils.js
new file mode 100644
index 000000000..1fcee5d3d
--- /dev/null
+++ b/plugins/talk-plugin-akismet/client/utils.js
@@ -0,0 +1,6 @@
+export function isSpam(actions) {
+  return actions.some(
+    action =>
+      action.__typename === 'FlagAction' && action.reason === 'SPAM_COMMENT'
+  );
+}
diff --git a/plugins/talk-plugin-akismet/config.js b/plugins/talk-plugin-akismet/config.js
new file mode 100644
index 000000000..dfe528b5f
--- /dev/null
+++ b/plugins/talk-plugin-akismet/config.js
@@ -0,0 +1,12 @@
+const config = {
+  KEY: process.env.TALK_AKISMET_API_KEY,
+  SITE: process.env.TALK_AKISMET_SITE,
+};
+
+if (process.env.NODE_ENV !== 'test' && (!config.KEY || !config.SITE)) {
+  throw new Error(
+    'Please set the TALK_AKISMET_API_KEY and TALK_AKISMET_SITE environment variable to use talk-plugin-akismet-comments. Visit https://akismet.com/ to get started.'
+  );
+}
+
+module.exports = config;
diff --git a/plugins/talk-plugin-akismet/errors.js b/plugins/talk-plugin-akismet/errors.js
new file mode 100644
index 000000000..b93d178b9
--- /dev/null
+++ b/plugins/talk-plugin-akismet/errors.js
@@ -0,0 +1,13 @@
+const { APIError } = require('errors');
+
+// ErrSpam is sent during a `CreateComment` mutation where
+// `input.checkSpam` is set to true and the comment contains
+// detected spam as determined by the akismet service.
+const ErrSpam = new APIError('Comment is spam', {
+  status: 400,
+  translation_key: 'COMMENT_IS_SPAM',
+});
+
+module.exports = {
+  ErrSpam,
+};
diff --git a/plugins/talk-plugin-akismet/index.js b/plugins/talk-plugin-akismet/index.js
new file mode 100644
index 000000000..a368da505
--- /dev/null
+++ b/plugins/talk-plugin-akismet/index.js
@@ -0,0 +1,123 @@
+const debug = require('debug')('talk:plugin:akismet');
+const { ErrSpam } = require('./errors');
+const akismet = require('akismet-api');
+const { get, merge } = require('lodash');
+const { KEY, SITE } = require('./config');
+const client = akismet.client({
+  key: KEY,
+  blog: SITE,
+});
+
+let enabled = true;
+// let enabled = false;
+// client.verifyKey((err, valid) => {
+//   if (err) {
+//     throw err;
+//   }
+
+//   if (valid) {
+//     enabled = true;
+//   } else {
+//     throw new Error('Akismet key is invalid');
+//   }
+// });
+
+module.exports = {
+  typeDefs: `
+  input CreateCommentInput {
+
+    # If true, the mutation will fail when the
+    # body contains detected spam.
+    checkSpam: Boolean
+  }
+
+  type Comment {
+    spam: Boolean
+  }
+  `,
+  hooks: {
+    RootMutation: {
+      createComment: {
+        async pre(_, { input }, { loaders, parent: req }) {
+          // If the key validation failed, then we can't run with the client.
+          if (!enabled) {
+            debug('not enabled, passing');
+            return;
+          }
+
+          let spam = false;
+          try {
+            const user_ip = get(req, 'ip', false);
+            if (!user_ip) {
+              debug('no ip on request');
+              return;
+            }
+
+            // Get some headers from the request.
+            const user_agent = req.get('User-Agent');
+            if (!user_agent || user_agent.length === 0) {
+              debug('no user agent on request');
+              return;
+            }
+
+            const referrer = req.get('Referrer');
+            if (!referrer || referrer.length === 0) {
+              debug('no referrer on request');
+              return;
+            }
+
+            // Get the Asset that the comment is being made against.
+            const asset = await loaders.Assets.getByID.load(input.asset_id);
+            if (!asset) {
+              debug('asset not found for new comment');
+              return;
+            }
+
+            // Send off the comment to Akismet to check to see what they say.
+            spam = await client.checkSpam({
+              user_ip,
+              user_agent,
+              referrer,
+              permalink: asset.url,
+              comment_type: 'comment',
+              comment_content: input.body,
+              is_test: true,
+            });
+
+            debug(`comment analyzed as ${spam ? 'being' : 'not being'} spam`);
+          } catch (err) {
+            console.trace(err);
+            return;
+          }
+
+          // Attach scores to metadata.
+          input.metadata = merge({}, input.metadata || {}, {
+            akismet: spam,
+          });
+
+          if (spam) {
+            if (input.checkSpam) {
+              throw ErrSpam;
+            }
+
+            // Attach reason information for the flag being added.
+            input.status = 'SYSTEM_WITHHELD';
+            input.actions =
+              input.actions && input.actions.length >= 0 ? input.actions : [];
+            input.actions.push({
+              action_type: 'FLAG',
+              user_id: null,
+              group_id: 'SPAM_COMMENT',
+              metadata: {},
+            });
+          }
+        },
+      },
+    },
+  },
+  resolvers: {
+    Comment: {
+      spam: comment => get(comment, 'metadata.akismet', null),
+    },
+  },
+};
diff --git a/plugins/talk-plugin-akismet/package.json b/plugins/talk-plugin-akismet/package.json
new file mode 100644
index 000000000..04df3c8eb
--- /dev/null
+++ b/plugins/talk-plugin-akismet/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "@coralproject/talk-plugin-akismet",
+  "pluginName": "talk-plugin-akismet",
+  "version": "0.0.1",
+  "description": "Provides support for preventing spam with the Akismet API",
+  "main": "index.js",
+  "author": "The Coral Project Team <coral@mozillafoundation.org>",
+  "license": "Apache-2.0",
+  "dependencies": {
+    "akismet-api": "^4.0.1"
+  }
+}
diff --git a/plugins/talk-plugin-akismet/yarn.lock b/plugins/talk-plugin-akismet/yarn.lock
new file mode 100644
index 000000000..ac97e590f
--- /dev/null
+++ b/plugins/talk-plugin-akismet/yarn.lock
@@ -0,0 +1,141 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+akismet-api@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/akismet-api/-/akismet-api-4.0.1.tgz#1c771442f09316847132aa16171bb4fb708b6519"
+  dependencies:
+    bluebird "^3.1.1"
+    superagent "^3.8.0"
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+
+bluebird@^3.1.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
+
+combined-stream@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
+  dependencies:
+    delayed-stream "~1.0.0"
+
+component-emitter@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+
+cookiejar@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.1.tgz#41ad57b1b555951ec171412a81942b1e8200d34a"
+
+core-util-is@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+
+debug@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  dependencies:
+    ms "2.0.0"
+
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+
+extend@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
+
+form-data@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.1.tgz#6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.5"
+    mime-types "^2.1.12"
+
+formidable@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.1.1.tgz#96b8886f7c3c3508b932d6bd70c4d3a88f35f1a9"
+
+inherits@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+
+isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+
+methods@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+
+mime-db@~1.30.0:
+  version "1.30.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
+
+mime-types@^2.1.12:
+  version "2.1.17"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
+  dependencies:
+    mime-db "~1.30.0"
+
+mime@^1.4.1:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+
+process-nextick-args@~1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
+
+qs@^6.5.1:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
+
+readable-stream@^2.0.5:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~1.0.6"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.0.3"
+    util-deprecate "~1.0.1"
+
+safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
+
+string_decoder@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
+  dependencies:
+    safe-buffer "~5.1.0"
+
+superagent@^3.8.0:
+  version "3.8.2"
+  resolved "https://registry.yarnpkg.com/superagent/-/superagent-3.8.2.tgz#e4a11b9d047f7d3efeb3bbe536d9ec0021d16403"
+  dependencies:
+    component-emitter "^1.2.0"
+    cookiejar "^2.1.0"
+    debug "^3.1.0"
+    extend "^3.0.0"
+    form-data "^2.3.1"
+    formidable "^1.1.1"
+    methods "^1.1.1"
+    mime "^1.4.1"
+    qs "^6.5.1"
+    readable-stream "^2.0.5"
+
+util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"

From c289ed149f9b4710ada4fd7c39fd42b732e11474 Mon Sep 17 00:00:00 2001
From: Matt Montgomery <mmontgomery@deseretdigital.com>
Date: Mon, 5 Feb 2018 17:17:51 -0700
Subject: [PATCH 05/13] Adds logout for non-admin users

---
 client/coral-admin/src/containers/Layout.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/coral-admin/src/containers/Layout.js b/client/coral-admin/src/containers/Layout.js
index c06e0739b..52cb442bd 100644
--- a/client/coral-admin/src/containers/Layout.js
+++ b/client/coral-admin/src/containers/Layout.js
@@ -75,7 +75,10 @@ class LayoutContainer extends React.Component {
       );
     } else if (loggedIn) {
       return (
-        <Layout {...this.props}>
+        <Layout
+          handleLogout={logout}
+          {...this.props}
+        >
           <p>
             This page is for team use only. Please contact an administrator if
             you want to join this team.

From 9c139eb7032948225c9b0b79a37b701a26f824c9 Mon Sep 17 00:00:00 2001
From: Matt Montgomery <mmontgomery@deseretdigital.com>
Date: Mon, 5 Feb 2018 17:46:10 -0700
Subject: [PATCH 06/13] Fixes prettier/prettier linting error

---
 client/coral-admin/src/containers/Layout.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/client/coral-admin/src/containers/Layout.js b/client/coral-admin/src/containers/Layout.js
index 52cb442bd..07e780e3e 100644
--- a/client/coral-admin/src/containers/Layout.js
+++ b/client/coral-admin/src/containers/Layout.js
@@ -75,10 +75,7 @@ class LayoutContainer extends React.Component {
       );
     } else if (loggedIn) {
       return (
-        <Layout
-          handleLogout={logout}
-          {...this.props}
-        >
+        <Layout handleLogout={logout} {...this.props}>
           <p>
             This page is for team use only. Please contact an administrator if
             you want to join this team.

From db322d192f69883f42770b927758a86435314593 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Tue, 6 Feb 2018 09:58:02 -0700
Subject: [PATCH 07/13] added note

---
 plugins/talk-plugin-akismet/index.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/talk-plugin-akismet/index.js b/plugins/talk-plugin-akismet/index.js
index a368da505..4b0e7f997 100644
--- a/plugins/talk-plugin-akismet/index.js
+++ b/plugins/talk-plugin-akismet/index.js
@@ -9,6 +9,9 @@ const client = akismet.client({
 });
 
 let enabled = true;
+
+// TODO: when using a developer key, this is possible, the plus plan does not
+// allow us to check the key.
 // let enabled = false;
 // client.verifyKey((err, valid) => {
 //   if (err) {

From 6cb3fc7be8d8a42880ea6db1c73f7ed2a4cfc7fe Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Tue, 6 Feb 2018 10:23:26 -0700
Subject: [PATCH 08/13] added docs for akismet

---
 docs/_docs/04-03-additional-plugins.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/_docs/04-03-additional-plugins.md b/docs/_docs/04-03-additional-plugins.md
index b9f4d4067..8fe72dd01 100644
--- a/docs/_docs/04-03-additional-plugins.md
+++ b/docs/_docs/04-03-additional-plugins.md
@@ -103,3 +103,16 @@ Source: [plugins/talk-plugin-subscriber](https://github.com/coralproject/talk/tr
 Enables a `Subscriber` badge to be added to comments where the author has the
 `SUBSCRIBER` tag. This must match with a custom auth integration that adds the
 tag to the users that are subscribed to the service.
+
+## talk-plugin-akismet
+
+Source: [plugins/talk-plugin-akismet](https://github.com/coralproject/talk/tree/master/plugins/talk-plugin-akismet){:target="_blank"}
+
+Enables spam detection from [Akismet](https://akismet.com/). Comments will be passed to the Akismet API for spam detection. If a comment
+is determined to be spam, it will prompt the user, indicating that the comment might be considered spam. If the user continues after this
+point with the still spam-like comment, the comment will be reported as containing spam, and sent for moderator approval.
+
+Configuration:
+
+- `TALK_AKISMET_API_KEY` (**required**) - The Akismet API key located on your account page
+- `TALK_AKISMET_SITE` (**required**) - The URL for your site that the comment are appearing on (not the root url, the url for the articles)
\ No newline at end of file

From f4d520fbaacc5b679ec7dd4bb136248ed90492c2 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Tue, 6 Feb 2018 13:44:28 -0700
Subject: [PATCH 09/13] adjusted translations

---
 .../client/components/SpamDetail.js                    |  1 +
 plugins/talk-plugin-akismet/client/translations.yml    | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/plugins/talk-plugin-akismet/client/components/SpamDetail.js b/plugins/talk-plugin-akismet/client/components/SpamDetail.js
index 554ffb849..dafdb5a86 100644
--- a/plugins/talk-plugin-akismet/client/components/SpamDetail.js
+++ b/plugins/talk-plugin-akismet/client/components/SpamDetail.js
@@ -7,6 +7,7 @@ const SpamLabel = () => (
   <CommentDetail
     icon={'add_box'}
     header={t('talk-plugin-akismet.spam_comment')}
+    info={t('talk-plugin-akismet.detected')}
   />
 );
 
diff --git a/plugins/talk-plugin-akismet/client/translations.yml b/plugins/talk-plugin-akismet/client/translations.yml
index a9a209139..af7217831 100644
--- a/plugins/talk-plugin-akismet/client/translations.yml
+++ b/plugins/talk-plugin-akismet/client/translations.yml
@@ -1,14 +1,14 @@
 en:
   error:
     COMMENT_IS_SPAM: |
-      Are you sure? The language in this comment matches looks like spam.
-      You can edit the comment or submit it for moderator review.
+      The language in this comment looks like spam. You can
+      edit the comment or submit it anyway for moderator review.
   talk-plugin-akismet:
     spam: "Spam"
-    spam_comment: "Detected Spam"
+    spam_comment: "Spam"
+    detected: "Detected by Akismet"
     still_spam: |
-      This edited comment might still violate our community guidelines.
-      Our moderation team will review your comment shortly.
+      Thank you. Our moderation team will review your comment shortly.
   flags:
     reasons:
       comment:

From 17fefcb4bdee784fea255ddad4b17450cc609775 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Tue, 6 Feb 2018 13:47:57 -0700
Subject: [PATCH 10/13] adjusted docs

---
 docs/_docs/04-03-additional-plugins.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/_docs/04-03-additional-plugins.md b/docs/_docs/04-03-additional-plugins.md
index 8fe72dd01..3d342fad7 100644
--- a/docs/_docs/04-03-additional-plugins.md
+++ b/docs/_docs/04-03-additional-plugins.md
@@ -112,6 +112,8 @@ Enables spam detection from [Akismet](https://akismet.com/). Comments will be pa
 is determined to be spam, it will prompt the user, indicating that the comment might be considered spam. If the user continues after this
 point with the still spam-like comment, the comment will be reported as containing spam, and sent for moderator approval.
 
+**Note: [Akismet](https://akismet.com/) is a premium service, charges may apply.**
+
 Configuration:
 
 - `TALK_AKISMET_API_KEY` (**required**) - The Akismet API key located on your account page

From 3c664015464e0e421cbcf1aa453140becf31887c Mon Sep 17 00:00:00 2001
From: Matt Montgomery <mmontgomery@deseretdigital.com>
Date: Tue, 6 Feb 2018 16:29:25 -0700
Subject: [PATCH 11/13] Providers username for subscription fields

---
 client/coral-admin/src/routes/Moderation/graphql.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/coral-admin/src/routes/Moderation/graphql.js b/client/coral-admin/src/routes/Moderation/graphql.js
index aa6267880..8bb6349d8 100644
--- a/client/coral-admin/src/routes/Moderation/graphql.js
+++ b/client/coral-admin/src/routes/Moderation/graphql.js
@@ -407,6 +407,7 @@ export const subscriptionFields = `
     type
     assigned_by {
       id
+      username
     }
     created_at
   }

From 44913864eb590cc7aed40c86c6d486a145d77093 Mon Sep 17 00:00:00 2001
From: Leandro <leeeandroo@gmail.com>
Date: Wed, 7 Feb 2018 09:12:39 +0100
Subject: [PATCH 12/13] remove identification changes on UserDetails

---
 client/coral-admin/src/components/UserDetail.js | 6 +++---
 locales/en.yml                                  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js
index c5e9132b2..b1f68bac2 100644
--- a/client/coral-admin/src/components/UserDetail.js
+++ b/client/coral-admin/src/components/UserDetail.js
@@ -197,11 +197,11 @@ class UserDetail extends React.Component {
                 {new Date(user.created_at).toLocaleString()}
               </li>
 
-              {user.profiles.map(({ id, provider }) => (
+              {user.profiles.map(({ id }) => (
                 <li key={id}>
-                  <Icon name="perm_identity" />
+                  <Icon name="email" />
                   <span className={styles.userDetailItem}>
-                    {t('user_detail.identification')} ({provider}):
+                    {t('user_detail.email')}:
                   </span>
                   {id}{' '}
                   <ButtonCopyToClipboard
diff --git a/locales/en.yml b/locales/en.yml
index 15707fd88..a4b668825 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -424,7 +424,7 @@ en:
     remove_ban: "Remove Ban"
     ban: "Ban User"
     member_since: "Member Since"
-    identification: "Identification"
+    email: "Email"
     total_comments: "Total Comments"
     reject_rate: "Reject Rate"
     reports: "Reports"

From 18cc8b9389a41fc5f3d23e839d2a5361815cac66 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Thu, 8 Feb 2018 11:28:21 -0500
Subject: [PATCH 13/13] Update stream.comment_not_found text

---
 locales/da.yml    | 2 +-
 locales/en.yml    | 2 +-
 locales/es.yml    | 2 +-
 locales/fr.yml    | 1 +
 locales/nl_NL.yml | 2 +-
 locales/pt_BR.yml | 1 +
 locales/zh_CN.yml | 2 +-
 locales/zh_TW.yml | 2 +-
 8 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/locales/da.yml b/locales/da.yml
index b3cf32ea4..fb8ed1350 100644
--- a/locales/da.yml
+++ b/locales/da.yml
@@ -306,7 +306,7 @@ da:
   stream:
     all_comments: "Alle kommentarer"
     temporarily_suspended: "I overensstemmelse med {0}'s retningslinjer for fællesskabet er din konto midlertidigt suspenderet. Venligst tilslut dig samtalen {1}."
-    comment_not_found: "Kommentar blev ikke fundet"
+    comment_not_found: "Denne kommentar er blevet fjernet eller findes ikke."
   step_1_header: "Rapportér et problem"
   step_2_header: "Hjælp os med at forstå"
   step_3_header: "Tak for din indsats"
diff --git a/locales/en.yml b/locales/en.yml
index 14c29e3f6..fc70e2c3b 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -366,7 +366,7 @@ en:
   stream:
     all_comments: "All Comments"
     temporarily_suspended: "In accordance with {0}'s community guidelines, your account has been temporarily suspended. Please rejoin the conversation {1}."
-    comment_not_found: "Comment was not found"
+    comment_not_found: "This comment has been removed or does not exist."
     no_comments: "There are no comments yet, why don’t you write one?"
     no_comments_and_closed: "There were no comments on this article."
   step_1_header: "Report an issue"
diff --git a/locales/es.yml b/locales/es.yml
index 6b695851e..17f028dfa 100644
--- a/locales/es.yml
+++ b/locales/es.yml
@@ -357,7 +357,7 @@ es:
   stream:
     all_comments: "Todos los comentarios"
     temporarily_suspended: "De acuerdo con la guía de la comunidad de {0}, su cuenta ha sido temporalmente suspendida. Por favor unirse a la conversación {1}."
-    comment_not_found: "Comentario no encontrado"
+    comment_not_found: "Este comentario ha sido eliminado o no existe."
     no_comments: "Todavía no hay comentarios. ¿Por qué no escribes uno?"
     no_comments_and_closed: "No hubo comentarios en este artículo."
   streams:
diff --git a/locales/fr.yml b/locales/fr.yml
index 890582f7a..6583662ea 100644
--- a/locales/fr.yml
+++ b/locales/fr.yml
@@ -259,6 +259,7 @@ fr:
   stream:
     all_comments: "Tous les commentaires"
     temporarily_suspended: "Conformément à la charte d'utilisation des commentaires de {0}, votre compte a été temporairement suspendu. Merci de revenir dans la conversation {1}."
+    comment_not_found: "Ce commentaire a été supprimé ou n'existe pas."
   step_1_header: "Signaler un problème"
   step_2_header: "Aidez-nous à comprendre"
   step_3_header: "Merci pour votre participation"
diff --git a/locales/nl_NL.yml b/locales/nl_NL.yml
index be8888600..5e72ed278 100644
--- a/locales/nl_NL.yml
+++ b/locales/nl_NL.yml
@@ -358,7 +358,7 @@ nl_NL:
   stream:
     all_comments: "Alle reacties"
     temporarily_suspended: "In overeenstemming met de community richtlijnen van {0} is je account tijdelijk geschorst. Keer terug naar de conversaties {1}."
-    comment_not_found: "Reactie niet gevonden"
+    comment_not_found: "Deze opmerking is verwijderd of bestaat niet."
     no_comments: "Er zijn nog geen reacties. Schrijf er zelf eentje!"
     no_comments_and_closed: "Er waren geen reacties op dit artikel."
   step_1_header: "Rapporteer een issue"
diff --git a/locales/pt_BR.yml b/locales/pt_BR.yml
index bc36409cc..aaabb11a4 100644
--- a/locales/pt_BR.yml
+++ b/locales/pt_BR.yml
@@ -309,6 +309,7 @@ pt_BR:
   stream:
     all_comments: "Todos os comentários"
     temporarily_suspended: "De acordo com as diretrizes da comunidade de {0}, sua conta foi temporariamente suspensa. Por favor, volte para a conversa {1}."
+    comment_not_found: "Este comentário foi removido ou não existe."
   step_1_header: "Relatar um problema"
   step_2_header: "Ajude-nos a entender"
   step_3_header: "Obrigdo por sua contribuição"
diff --git a/locales/zh_CN.yml b/locales/zh_CN.yml
index 1b1709a38..b13343fcf 100644
--- a/locales/zh_CN.yml
+++ b/locales/zh_CN.yml
@@ -323,7 +323,7 @@ zh_CN:
   stream:
     all_comments: "所有评论"
     temporarily_suspended: "根据 {0} 的社群指引方针，您的帐号已被暂时停用。请稍后加入对话 {1}。"
-    comment_not_found: "未找到评论"
+    comment_not_found: "此评论已被删除或不存在。"
     no_comments: "还没有评论，不如你写个？"
     no_comments_and_closed: "该文章没有评论。"
   step_1_header: "报告问题"
diff --git a/locales/zh_TW.yml b/locales/zh_TW.yml
index 0edceedb4..8bcf50db5 100644
--- a/locales/zh_TW.yml
+++ b/locales/zh_TW.yml
@@ -323,7 +323,7 @@ zh_TW:
   stream:
     all_comments: "全部評論"
     temporarily_suspended: "根據{0}的社區規定，您的帳戶已被暫時停用。請重新加入對話{1}。"
-    comment_not_found: "未發現評論"
+    comment_not_found: "此評論已被刪除或不存在。"
     no_comments: "暫時還沒有評論，何不寫條評論呢？"
     no_comments_and_closed: "這篇文章沒有評論。"
   step_1_header: "舉報問題"