diff --git a/app/soapbox/features/ui/components/pending_status.js b/app/soapbox/features/ui/components/pending_status.js index f21bfe010..847869457 100644 --- a/app/soapbox/features/ui/components/pending_status.js +++ b/app/soapbox/features/ui/components/pending_status.js @@ -1,7 +1,6 @@ import classNames from 'classnames'; import React from 'react'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import { FormattedMessage, injectIntl } from 'react-intl'; import { connect } from 'react-redux'; import { Link, NavLink } from 'react-router-dom'; @@ -30,7 +29,6 @@ const mapStateToProps = (state, props) => { }; export default @connect(mapStateToProps) -@injectIntl class PendingStatus extends ImmutablePureComponent { renderMedia = () => { @@ -49,56 +47,6 @@ class PendingStatus extends ImmutablePureComponent { } } - renderReplyMentions = () => { - const { status } = this.props; - - if (!status.get('in_reply_to_id')) { - return null; - } - - const to = status.get('mentions', []); - - if (to.size === 0) { - if (status.get('in_reply_to_account_id') === status.getIn(['account', 'id'])) { - return ( -
- @{status.getIn(['account', 'username'])}, - more: false, - }} - /> -
- ); - } else { - return ( -
- -
- ); - } - } - - - return ( -
- (<> - @{account.username} - {' '} - )), - more: to.size > 2 && , - }} - /> -
- ); - } - render() { const { status, className } = this.props; if (!status) return null; @@ -136,8 +84,6 @@ class PendingStatus extends ImmutablePureComponent { - {this.renderReplyMentions()} - { const getAccount = makeGetAccount(); - const getStatus = makeGetStatus(); const me = state.get('me'); const account = getAccount(state, me); - let replyToSelf = false; - if (pendingStatus.get('in_reply_to_id')) { - const inReplyTo = getStatus(state, { id: pendingStatus.get('in_reply_to_id') }); - - if (inReplyTo.getIn(['account', 'id']) === me) - replyToSelf = true; - } - const status = normalizeStatus({ account, application: null, @@ -34,13 +24,7 @@ export const buildStatus = (state, pendingStatus, idempotencyKey) => { in_reply_to_id: pendingStatus.get('in_reply_to_id'), language: null, media_attachments: pendingStatus.get('media_ids').map(id => ({ id })), - mentions: ( - replyToSelf - ? ImmutableOrderedSet([account.get('acct')]).union(pendingStatus.get('to')) - : pendingStatus.get('to') - ).map(mention => ({ - username: mention.split('@')[0], - })), + mentions: [], muted: false, pinned: false, poll: pendingStatus.get('poll', null),