From 4bb2b3d731dc8bf4c41d9cfa850f0fc473525a77 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 16 Feb 2018 14:34:04 -0700
Subject: [PATCH] fixes to spam plugin

---
 .../src/routes/Moderation/components/Comment.css     |  1 -
 client/coral-ui/components/Label.css                 |  1 +
 .../client/components/SpamDetail.js                  |  2 +-
 .../client/components/SpamLabel.js                   |  2 +-
 .../client/containers/SpamCommentDetail.js           |  2 +-
 .../client/containers/SpamCommentFlagDetail.js       | 12 ------------
 plugins/talk-plugin-akismet/client/index.js          |  2 --
 .../client/components/ToxicDetail.js                 |  2 +-
 .../client/components/ToxicLabel.js                  |  2 +-
 9 files changed, 6 insertions(+), 20 deletions(-)
 delete mode 100644 plugins/talk-plugin-akismet/client/containers/SpamCommentFlagDetail.js

diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.css b/client/coral-admin/src/routes/Moderation/components/Comment.css
index 119688b73..b0d989c54 100644
--- a/client/coral-admin/src/routes/Moderation/components/Comment.css
+++ b/client/coral-admin/src/routes/Moderation/components/Comment.css
@@ -143,7 +143,6 @@
 
   i {
     font-size: 12px;
-    top: 2px;
     position: relative;
   }
 }
diff --git a/client/coral-ui/components/Label.css b/client/coral-ui/components/Label.css
index 5e7f656ee..18723fa2f 100644
--- a/client/coral-ui/components/Label.css
+++ b/client/coral-ui/components/Label.css
@@ -10,6 +10,7 @@
   line-height: 22px;
   min-width: 80px;
   text-align: center;
+  vertical-align: text-top;
 }
 
 .icon {
diff --git a/plugins/talk-plugin-akismet/client/components/SpamDetail.js b/plugins/talk-plugin-akismet/client/components/SpamDetail.js
index dafdb5a86..951622e34 100644
--- a/plugins/talk-plugin-akismet/client/components/SpamDetail.js
+++ b/plugins/talk-plugin-akismet/client/components/SpamDetail.js
@@ -5,7 +5,7 @@ import { t } from 'plugin-api/beta/client/services';
 
 const SpamLabel = () => (
   <CommentDetail
-    icon={'add_box'}
+    icon={'bug_report'}
     header={t('talk-plugin-akismet.spam_comment')}
     info={t('talk-plugin-akismet.detected')}
   />
diff --git a/plugins/talk-plugin-akismet/client/components/SpamLabel.js b/plugins/talk-plugin-akismet/client/components/SpamLabel.js
index c2033ff39..17c9b53ef 100644
--- a/plugins/talk-plugin-akismet/client/components/SpamLabel.js
+++ b/plugins/talk-plugin-akismet/client/components/SpamLabel.js
@@ -3,7 +3,7 @@ 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>
+  <FlagLabel iconName="bug_report">{t('talk-plugin-akismet.spam')}</FlagLabel>
 );
 
 export default SpamLabel;
diff --git a/plugins/talk-plugin-akismet/client/containers/SpamCommentDetail.js b/plugins/talk-plugin-akismet/client/containers/SpamCommentDetail.js
index a133be062..a49fd89ca 100644
--- a/plugins/talk-plugin-akismet/client/containers/SpamCommentDetail.js
+++ b/plugins/talk-plugin-akismet/client/containers/SpamCommentDetail.js
@@ -5,7 +5,7 @@ import { isSpam } from '../utils';
 
 const enhance = compose(
   excludeIf(
-    ({ comment: { spam, actions } }) => spam === null || isSpam(actions)
+    ({ comment: { spam, actions } }) => spam === null || !isSpam(actions)
   )
 );
 
diff --git a/plugins/talk-plugin-akismet/client/containers/SpamCommentFlagDetail.js b/plugins/talk-plugin-akismet/client/containers/SpamCommentFlagDetail.js
deleted file mode 100644
index a49fd89ca..000000000
--- a/plugins/talk-plugin-akismet/client/containers/SpamCommentFlagDetail.js
+++ /dev/null
@@ -1,12 +0,0 @@
-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/index.js b/plugins/talk-plugin-akismet/client/index.js
index 0eca7ab85..7170e14fb 100644
--- a/plugins/talk-plugin-akismet/client/index.js
+++ b/plugins/talk-plugin-akismet/client/index.js
@@ -2,7 +2,6 @@ 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,
@@ -10,6 +9,5 @@ export default {
     commentInputDetailArea: [CheckSpamHook],
     adminCommentLabels: [SpamLabel],
     adminCommentMoreDetails: [SpamCommentDetail],
-    adminCommentMoreFlagDetails: [SpamCommentFlagDetail],
   },
 };
diff --git a/plugins/talk-plugin-toxic-comments/client/components/ToxicDetail.js b/plugins/talk-plugin-toxic-comments/client/components/ToxicDetail.js
index 6a278b63b..9530188f2 100644
--- a/plugins/talk-plugin-toxic-comments/client/components/ToxicDetail.js
+++ b/plugins/talk-plugin-toxic-comments/client/components/ToxicDetail.js
@@ -29,7 +29,7 @@ const getInfo = (toxicity, actions) => {
 
 const ToxicLabel = ({ comment: { actions, toxicity } }) => (
   <CommentDetail
-    icon={'add_box'}
+    icon={'error'}
     header={t('talk-plugin-toxic-comments.toxic_comment')}
     info={getInfo(toxicity, actions)}
   />
diff --git a/plugins/talk-plugin-toxic-comments/client/components/ToxicLabel.js b/plugins/talk-plugin-toxic-comments/client/components/ToxicLabel.js
index cb9bca87e..d0f5bbe29 100644
--- a/plugins/talk-plugin-toxic-comments/client/components/ToxicLabel.js
+++ b/plugins/talk-plugin-toxic-comments/client/components/ToxicLabel.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { FlagLabel } from 'plugin-api/beta/client/components/ui';
 
-const ToxicLabel = () => <FlagLabel iconName="add_box">Toxic</FlagLabel>;
+const ToxicLabel = () => <FlagLabel iconName="error">Toxic</FlagLabel>;
 
 export default ToxicLabel;