Port plugins

plugins/talk-plugin-featured-comments/client/components/TabPane.js

@@ -1,7 +1,6 @@
 import React from 'react';
 import Comment from '../containers/Comment';
 import LoadMore from './LoadMore';
-import { getErrorMessages } from 'plugin-api/beta/client/utils';
 
 class TabPane extends React.Component {
   state = {
@@ -15,9 +14,8 @@ class TabPane extends React.Component {
       .then(() => {
         this.setState({ loadingState: 'success' });
       })
-      .catch(error => {
+      .catch(() => {
         this.setState({ loadingState: 'error' });
-        this.props.notify('error', getErrorMessages(error));
       });
   };
 

plugins/talk-plugin-featured-comments/client/containers/ModActionButton.js

@@ -3,18 +3,20 @@ import { bindActionCreators } from 'redux';
 import ModActionButton from '../components/ModActionButton';
 import { withTags, connect } from 'plugin-api/beta/client/hocs';
 import { closeMenu } from 'plugins/talk-plugin-moderation-actions/client/actions';
+import { notify } from 'plugin-api/beta/client/actions/notification';
 
 const mapDispatchToProps = dispatch =>
   bindActionCreators(
     {
+      notify,
       closeMenu,
     },
     dispatch
   );
 
 const enhance = compose(
-  withTags('featured'),
-  connect(null, mapDispatchToProps)
+  connect(null, mapDispatchToProps),
+  withTags('featured')
 );
 
 export default enhance(ModActionButton);

plugins/talk-plugin-featured-comments/client/containers/ModTag.js

@@ -24,8 +24,8 @@ const fragments = {
   `,
 };
 const enhance = compose(
-  withTags('featured', { fragments }),
-  connect(null, mapDispatchToProps)
+  connect(null, mapDispatchToProps),
+  withTags('featured', { fragments })
 );
 
 export default enhance(ModTag);

plugins/talk-plugin-ignore-user/client/containers/IgnoreUserConfirmation.js

@@ -10,21 +10,16 @@ import { bindActionCreators } from 'redux';
 import { closeMenu } from 'plugins/talk-plugin-author-menu/client/actions';
 import { notify } from 'plugin-api/beta/client/actions/notification';
 import { t } from 'plugin-api/beta/client/services';
-import { getErrorMessages } from 'plugin-api/beta/client/utils';
 
 class IgnoreUserConfirmationContainer extends React.Component {
   ignoreUser = () => {
     const { ignoreUser, notify, comment, closeMenu } = this.props;
-    ignoreUser(comment.user.id)
-      .then(() => {
-        notify(
-          'success',
-          t('talk-plugin-ignore-user.notify_success', comment.user.username)
-        );
-      })
-      .catch(err => {
-        notify('error', getErrorMessages(err));
-      });
+    ignoreUser(comment.user.id).then(() => {
+      notify(
+        'success',
+        t('talk-plugin-ignore-user.notify_success', comment.user.username)
+      );
+    });
     closeMenu();
   };
 

plugins/talk-plugin-moderation-actions/client/containers/ApproveCommentAction.js

@@ -1,23 +1,18 @@
 import React from 'react';
 import { compose } from 'react-apollo';
 import { bindActionCreators } from 'redux';
-import { getErrorMessages } from 'plugin-api/beta/client/utils';
 import { notify } from 'plugin-api/beta/client/actions/notification';
 import ApproveCommentAction from '../components/ApproveCommentAction';
 import { connect, withSetCommentStatus } from 'plugin-api/beta/client/hocs';
 
 class ApproveCommentActionContainer extends React.Component {
   approveComment = async () => {
-    const { setCommentStatus, comment, hideMenu, notify } = this.props;
+    const { setCommentStatus, comment, hideMenu } = this.props;
 
-    try {
-      await setCommentStatus({
-        commentId: comment.id,
-        status: 'ACCEPTED',
-      });
-    } catch (err) {
-      notify('error', getErrorMessages(err));
-    }
+    await setCommentStatus({
+      commentId: comment.id,
+      status: 'ACCEPTED',
+    });
 
     hideMenu();
   };

plugins/talk-plugin-moderation-actions/client/containers/BanUserDialog.js

@@ -9,13 +9,11 @@ import {
   withSetCommentStatus,
   withBanUser,
 } from 'plugin-api/beta/client/hocs';
-import { getErrorMessages } from 'plugin-api/beta/client/utils';
 import BanUserDialog from '../components/BanUserDialog';
 
 class BanUserDialogContainer extends React.Component {
   banUser = async () => {
     const {
-      notify,
       authorId,
       commentId,
       commentStatus,
@@ -25,23 +23,19 @@ class BanUserDialogContainer extends React.Component {
       banUser,
     } = this.props;
 
-    try {
-      await banUser({
-        id: authorId,
-        message: '',
+    await banUser({
+      id: authorId,
+      message: '',
+    });
+
+    closeMenu();
+    closeBanDialog();
+
+    if (commentStatus !== 'REJECTED') {
+      await setCommentStatus({
+        commentId: commentId,
+        status: 'REJECTED',
       });
-
-      closeMenu();
-      closeBanDialog();
-
-      if (commentStatus !== 'REJECTED') {
-        await setCommentStatus({
-          commentId: commentId,
-          status: 'REJECTED',
-        });
-      }
-    } catch (err) {
-      notify('error', getErrorMessages(err));
     }
   };
 

plugins/talk-plugin-moderation-actions/client/containers/RejectCommentAction.js

@@ -1,23 +1,18 @@
 import React from 'react';
 import { compose } from 'react-apollo';
 import { bindActionCreators } from 'redux';
-import { getErrorMessages } from 'plugin-api/beta/client/utils';
 import { notify } from 'plugin-api/beta/client/actions/notification';
 import RejectCommentAction from '../components/RejectCommentAction';
 import { connect, withSetCommentStatus } from 'plugin-api/beta/client/hocs';
 
 class RejectCommentActionContainer extends React.Component {
   rejectComment = async () => {
-    const { setCommentStatus, comment, hideMenu, notify } = this.props;
+    const { setCommentStatus, comment, hideMenu } = this.props;
 
-    try {
-      await setCommentStatus({
-        commentId: comment.id,
-        status: 'REJECTED',
-      });
-    } catch (err) {
-      notify('error', getErrorMessages(err));
-    }
+    await setCommentStatus({
+      commentId: comment.id,
+      status: 'REJECTED',
+    });
 
     hideMenu();
   };