diff --git a/app/soapbox/features/import_data/index.js b/app/soapbox/features/import_data/index.js index c1d788ff7..fea4cbba5 100644 --- a/app/soapbox/features/import_data/index.js +++ b/app/soapbox/features/import_data/index.js @@ -1,4 +1,5 @@ import React from 'react'; +import { connect } from 'react-redux'; import { defineMessages, injectIntl } from 'react-intl'; import ImmutablePureComponent from 'react-immutable-pure-component'; import PropTypes from 'prop-types'; @@ -6,9 +7,10 @@ import Column from '../ui/components/column'; import { importFollows, importBlocks, - // importMutes, + importMutes, } from 'soapbox/actions/import_data'; import CSVImporter from './components/csv_importer'; +import { getFeatures } from 'soapbox/utils/features'; const messages = defineMessages({ heading: { id: 'column.import_data', defaultMessage: 'Import data' }, @@ -27,28 +29,33 @@ const blockMessages = defineMessages({ submit: { id: 'import_data.actions.import_blocks', defaultMessage: 'Import blocks' }, }); -// Not yet supported by Pleroma stable, in develop branch -// const muteMessages = defineMessages({ -// input_label: { id: 'import_data.mutes_label', defaultMessage: 'Mutes' }, -// input_hint: { id: 'import_data.hints.mutes', defaultMessage: 'CSV file containing a list of muted accounts' }, -// submit: { id: 'import_data.actions.import_mutes', defaultMessage: 'Import mutes' }, -// }); +const muteMessages = defineMessages({ + input_label: { id: 'import_data.mutes_label', defaultMessage: 'Mutes' }, + input_hint: { id: 'import_data.hints.mutes', defaultMessage: 'CSV file containing a list of muted accounts' }, + submit: { id: 'import_data.actions.import_mutes', defaultMessage: 'Import mutes' }, +}); -export default @injectIntl +const mapStateToProps = state => ({ + features: getFeatures(state.get('instance')), +}); + +export default @connect(mapStateToProps) +@injectIntl class ImportData extends ImmutablePureComponent { static propTypes = { intl: PropTypes.object.isRequired, + features: PropTypes.object, }; render() { - const { intl } = this.props; + const { intl, features } = this.props; return ( - {/* */} + {features.importMutes && } ); } diff --git a/app/soapbox/utils/features.js b/app/soapbox/utils/features.js index 213b4cad9..4c3b10744 100644 --- a/app/soapbox/utils/features.js +++ b/app/soapbox/utils/features.js @@ -9,6 +9,7 @@ export const getFeatures = instance => { emojiReacts: v.software === 'Pleroma' && gte(v.version, '2.0.0'), attachmentLimit: v.software === 'Pleroma' ? Infinity : 4, focalPoint: v.software === 'Mastodon' && gte(v.compatVersion, '2.3.0'), + importMutes: v.software === 'Pleroma' && gte(v.version, '2.2.0'), }; };