Continuing updating the reformatting of propTypes and set redux, intl functions to end of component

• Removing:
- the reformatting of propTypes and set redux, intl functions to end of component

app/javascript/gabsocial/components/comment.js

@@ -25,99 +25,12 @@ import StatusMedia from './status_media'
 import { defaultMediaVisibility } from './status'
 import Text from './text'
 
-const messages = defineMessages({
-  reply: { id: 'status.reply', defaultMessage: 'Reply' },
-  like: { id: 'status.like', defaultMessage: 'Like' },
-  unlike: { id: 'status.unlike', defaultMessage: 'Unlike' },
-})
-
-const makeMapStateToProps = (state, props) => ({
-  status: makeGetStatus()(state, props)
-})
-
-const mapDispatchToProps = (dispatch) => ({
-  onReply(status, router) {
-    if (!me) return dispatch(openModal('UNAUTHORIZED'))
-
-    dispatch((_, getState) => {
-      const state = getState();
-      if (state.getIn(['compose', 'text']).trim().length !== 0) {
-        dispatch(openModal('CONFIRM', {
-          message: <FormattedMessage id='confirmations.reply.message' defaultMessage='Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' />,
-          confirm: <FormattedMessage id='confirmations.reply.confirm' defaultMessage='Reply' />,
-          onConfirm: () => dispatch(replyCompose(status, router)),
-        }))
-      } else {
-        dispatch(replyCompose(status, router, true))
-      }
-    })
-  },
-  onFavorite(status) {
-    if (!me) return dispatch(openModal('UNAUTHORIZED'))
-
-    if (status.get('favourited')) {
-      dispatch(unfavorite(status))
-    } else {
-      dispatch(favorite(status))
-    }
-  },
-  onOpenStatusOptions(targetRef, status) {
-    dispatch(openPopover('STATUS_OPTIONS', {
-      targetRef,
-      status,
-      position: 'top',
-    }))
-  },
-  onOpenLikes(status) {
-    dispatch(openModal('STATUS_LIKES', { status }))
-  },
-  onOpenReposts(status) {
-    dispatch(openModal('STATUS_REPOSTS', { status }))
-  },
-  onOpenStatusRevisionsPopover(status) {
-    dispatch(openModal('STATUS_REVISIONS', {
-      status,
-    }))
-  },
-  onOpenMedia (media, index) {
-    dispatch(openModal('MEDIA', { media, index }));
-  },
-})
-
-export default
-@injectIntl
-@connect(makeMapStateToProps, mapDispatchToProps)
 class Comment extends ImmutablePureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
   }
 
-  static propTypes = {
-    indent: PropTypes.number,
-    intl: PropTypes.object.isRequired,
-    ancestorAccountId: PropTypes.string.isRequired,
-    status: ImmutablePropTypes.map.isRequired,
-    isHidden: PropTypes.bool,
-    isIntersecting: PropTypes.bool,
-    isHighlighted: PropTypes.bool,
-    onReply: PropTypes.func.isRequired,
-    onFavorite: PropTypes.func.isRequired,
-    onOpenStatusOptions: PropTypes.func.isRequired,
-    onOpenLikes: PropTypes.func.isRequired,
-    onOpenReposts: PropTypes.func.isRequired,
-    onOpenStatusRevisionsPopover: PropTypes.func.isRequired,
-    onOpenMedia: PropTypes.func.isRequired
-  }
-
-  updateOnProps = [
-    'status',
-    'indent',
-    'isHidden',
-    'isIntersecting',
-    'isHighlighted',
-  ]
-
   state = {
     showMedia: defaultMediaVisibility(this.props.status),
     statusId: undefined,
@@ -276,4 +189,82 @@ class CommentButton extends React.PureComponent {
     )
   }
 
-}
+}
+
+const messages = defineMessages({
+  reply: { id: 'status.reply', defaultMessage: 'Reply' },
+  like: { id: 'status.like', defaultMessage: 'Like' },
+  unlike: { id: 'status.unlike', defaultMessage: 'Unlike' },
+})
+
+const makeMapStateToProps = (state, props) => ({
+  status: makeGetStatus()(state, props)
+})
+
+const mapDispatchToProps = (dispatch) => ({
+  onReply(status, router) {
+    if (!me) return dispatch(openModal('UNAUTHORIZED'))
+
+    dispatch((_, getState) => {
+      const state = getState();
+      if (state.getIn(['compose', 'text']).trim().length !== 0) {
+        dispatch(openModal('CONFIRM', {
+          message: <FormattedMessage id='confirmations.reply.message' defaultMessage='Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' />,
+          confirm: <FormattedMessage id='confirmations.reply.confirm' defaultMessage='Reply' />,
+          onConfirm: () => dispatch(replyCompose(status, router)),
+        }))
+      } else {
+        dispatch(replyCompose(status, router, true))
+      }
+    })
+  },
+  onFavorite(status) {
+    if (!me) return dispatch(openModal('UNAUTHORIZED'))
+
+    if (status.get('favourited')) {
+      dispatch(unfavorite(status))
+    } else {
+      dispatch(favorite(status))
+    }
+  },
+  onOpenStatusOptions(targetRef, status) {
+    dispatch(openPopover('STATUS_OPTIONS', {
+      targetRef,
+      status,
+      position: 'top',
+    }))
+  },
+  onOpenLikes(status) {
+    dispatch(openModal('STATUS_LIKES', { status }))
+  },
+  onOpenReposts(status) {
+    dispatch(openModal('STATUS_REPOSTS', { status }))
+  },
+  onOpenStatusRevisionsPopover(status) {
+    dispatch(openModal('STATUS_REVISIONS', {
+      status,
+    }))
+  },
+  onOpenMedia (media, index) {
+    dispatch(openModal('MEDIA', { media, index }));
+  },
+})
+
+Comment.propTypes = {
+  indent: PropTypes.number,
+  intl: PropTypes.object.isRequired,
+  ancestorAccountId: PropTypes.string.isRequired,
+  status: ImmutablePropTypes.map.isRequired,
+  isHidden: PropTypes.bool,
+  isIntersecting: PropTypes.bool,
+  isHighlighted: PropTypes.bool,
+  onReply: PropTypes.func.isRequired,
+  onFavorite: PropTypes.func.isRequired,
+  onOpenStatusOptions: PropTypes.func.isRequired,
+  onOpenLikes: PropTypes.func.isRequired,
+  onOpenReposts: PropTypes.func.isRequired,
+  onOpenStatusRevisionsPopover: PropTypes.func.isRequired,
+  onOpenMedia: PropTypes.func.isRequired
+}
+
+export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(Comment))