From 926335b2686af41d5b9c1119ce18c3f7e638174e Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 18 Jan 2021 15:27:35 -0600 Subject: [PATCH] Add "deactivate" and "delete" user modals to every status and account profile --- app/soapbox/actions/moderation.js | 4 ++-- app/soapbox/components/status_action_bar.js | 14 ++++++++++++++ app/soapbox/containers/status_container.js | 9 +++++++++ app/soapbox/features/account/components/header.js | 4 ++++ .../features/account_timeline/components/header.js | 10 ++++++++++ .../containers/header_container.js | 9 +++++++++ app/soapbox/features/admin/components/report.js | 4 ++-- .../features/status/components/action_bar.js | 14 ++++++++++++++ .../status/containers/detailed_status_container.js | 9 +++++++++ app/soapbox/features/status/index.js | 13 +++++++++++++ app/soapbox/locales/pl.json | 10 +++++----- 11 files changed, 91 insertions(+), 9 deletions(-) diff --git a/app/soapbox/actions/moderation.js b/app/soapbox/actions/moderation.js index 75de6cc9f..645589c51 100644 --- a/app/soapbox/actions/moderation.js +++ b/app/soapbox/actions/moderation.js @@ -6,10 +6,10 @@ import snackbar from 'soapbox/actions/snackbar'; const messages = defineMessages({ deactivateUserPrompt: { id: 'confirmations.admin.deactivate_user.message', defaultMessage: 'You are about to deactivate {acct}. Deactivating a user is a reversible action.' }, deactivateUserConfirm: { id: 'confirmations.admin.deactivate_user.confirm', defaultMessage: 'Deactivate {acct}' }, - userDeactivated: { id: 'admin.reports.user_deactivated_message', defaultMessage: '{acct} was deactivated' }, + userDeactivated: { id: 'admin.users.user_deactivated_message', defaultMessage: '{acct} was deactivated' }, deleteUserPrompt: { id: 'confirmations.admin.delete_user.message', defaultMessage: 'You are about to delete {acct}. THIS IS A DESTRUCTIVE ACTION THAT CANNOT BE UNDONE.' }, deleteUserConfirm: { id: 'confirmations.admin.delete_user.confirm', defaultMessage: 'Delete {acct}' }, - userDeleted: { id: 'admin.reports.user_deleted_message', defaultMessage: '{acct} was deleted' }, + userDeleted: { id: 'admin.users.user_deleted_message', defaultMessage: '{acct} was deleted' }, }); export function deactivateUserModal(intl, accountId, afterConfirm = () => {}) { diff --git a/app/soapbox/components/status_action_bar.js b/app/soapbox/components/status_action_bar.js index 1c2a9207b..aae4d3f86 100644 --- a/app/soapbox/components/status_action_bar.js +++ b/app/soapbox/components/status_action_bar.js @@ -45,6 +45,8 @@ const messages = defineMessages({ copy: { id: 'status.copy', defaultMessage: 'Copy link to post' }, group_remove_account: { id: 'status.remove_account_from_group', defaultMessage: 'Remove account from group' }, group_remove_post: { id: 'status.remove_post_from_group', defaultMessage: 'Remove post from group' }, + deactivateUser: { id: 'admin.users.actions.deactivate_user', defaultMessage: 'Deactivate {acct}' }, + deleteUser: { id: 'admin.users.actions.delete_user', defaultMessage: 'Delete {acct}' }, }); class StatusActionBar extends ImmutablePureComponent { @@ -67,6 +69,8 @@ class StatusActionBar extends ImmutablePureComponent { onBlock: PropTypes.func, onReport: PropTypes.func, onEmbed: PropTypes.func, + onDeactivateUser: PropTypes.func, + onDeleteUser: PropTypes.func, onMuteConversation: PropTypes.func, onPin: PropTypes.func, withDismiss: PropTypes.bool, @@ -242,6 +246,14 @@ class StatusActionBar extends ImmutablePureComponent { this.props.onGroupRemoveStatus(status.getIn(['group', 'id']), status.get('id')); } + handleDeactivateUser = () => { + this.props.onDeactivateUser(this.props.status); + } + + handleDeleteUser = () => { + this.props.onDeleteUser(this.props.status); + } + _makeMenu = (publicStatus) => { const { status, intl, withDismiss, withGroupAdmin, me, isStaff } = this.props; const mutingConversation = status.get('muted'); @@ -291,6 +303,8 @@ class StatusActionBar extends ImmutablePureComponent { menu.push(null); menu.push({ text: intl.formatMessage(messages.admin_account, { name: status.getIn(['account', 'username']) }), href: `/pleroma/admin/#/users/${status.getIn(['account', 'id'])}/` }); // menu.push({ text: intl.formatMessage(messages.admin_status), href: `/admin/accounts/${status.getIn(['account', 'id'])}/statuses/${status.get('id')}` }); + menu.push({ text: intl.formatMessage(messages.deactivateUser, { acct: `@${status.getIn(['account', 'acct'])}` }), action: this.handleDeactivateUser }); + menu.push({ text: intl.formatMessage(messages.deleteUser, { acct: `@${status.getIn(['account', 'acct'])}` }), action: this.handleDeleteUser }); } if (withGroupAdmin) { diff --git a/app/soapbox/containers/status_container.js b/app/soapbox/containers/status_container.js index 989b393c5..f3de638ff 100644 --- a/app/soapbox/containers/status_container.js +++ b/app/soapbox/containers/status_container.js @@ -36,6 +36,7 @@ import { } from '../actions/groups'; import { getSettings } from '../actions/settings'; import { getSoapboxConfig } from 'soapbox/actions/soapbox'; +import { deactivateUserModal, deleteUserModal } from 'soapbox/actions/moderation'; const messages = defineMessages({ deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' }, @@ -208,6 +209,14 @@ const mapDispatchToProps = (dispatch, { intl }) => ({ dispatch(groupRemoveStatus(groupId, statusId)); }, + onDeactivateUser(status) { + dispatch(deactivateUserModal(intl, status.getIn(['account', 'id']))); + }, + + onDeleteUser(status) { + dispatch(deleteUserModal(intl, status.getIn(['account', 'id']))); + }, + }); export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(Status)); diff --git a/app/soapbox/features/account/components/header.js b/app/soapbox/features/account/components/header.js index 116b43565..80bba5c6d 100644 --- a/app/soapbox/features/account/components/header.js +++ b/app/soapbox/features/account/components/header.js @@ -46,6 +46,8 @@ const messages = defineMessages({ unendorse: { id: 'account.unendorse', defaultMessage: 'Don\'t feature on profile' }, admin_account: { id: 'status.admin_account', defaultMessage: 'Open moderation interface for @{name}' }, add_or_remove_from_list: { id: 'account.add_or_remove_from_list', defaultMessage: 'Add or Remove from lists' }, + deactivateUser: { id: 'admin.users.actions.deactivate_user', defaultMessage: 'Deactivate {acct}' }, + deleteUser: { id: 'admin.users.actions.delete_user', defaultMessage: 'Delete {acct}' }, }); const mapStateToProps = state => { @@ -169,6 +171,8 @@ class Header extends ImmutablePureComponent { if (account.get('id') !== me && isStaff) { menu.push(null); menu.push({ text: intl.formatMessage(messages.admin_account, { name: account.get('username') }), href: `/pleroma/admin/#/users/${account.get('id')}/`, newTab: true }); + menu.push({ text: intl.formatMessage(messages.deactivateUser, { acct: `@${account.get('acct')}` }), action: this.props.onDeactivateUser }); + menu.push({ text: intl.formatMessage(messages.deleteUser, { acct: `@${account.get('acct')}` }), action: this.props.onDeleteUser }); } return menu; diff --git a/app/soapbox/features/account_timeline/components/header.js b/app/soapbox/features/account_timeline/components/header.js index 534a12dbc..86798d3ab 100644 --- a/app/soapbox/features/account_timeline/components/header.js +++ b/app/soapbox/features/account_timeline/components/header.js @@ -84,6 +84,14 @@ export default class Header extends ImmutablePureComponent { this.props.onAddToList(this.props.account); } + handleDeactivateUser = () => { + this.props.onDeactivateUser(this.props.account); + } + + handleDeleteUser = () => { + this.props.onDeleteUser(this.props.account); + } + render() { const { account, identity_proofs } = this.props; const moved = (account) ? account.get('moved') : false; @@ -107,6 +115,8 @@ export default class Header extends ImmutablePureComponent { onUnblockDomain={this.handleUnblockDomain} onEndorseToggle={this.handleEndorseToggle} onAddToList={this.handleAddToList} + onDeactivateUser={this.handleDeactivateUser} + onDeleteUser={this.handleDeleteUser} username={this.props.username} /> diff --git a/app/soapbox/features/account_timeline/containers/header_container.js b/app/soapbox/features/account_timeline/containers/header_container.js index 6eebe0772..8d6438894 100644 --- a/app/soapbox/features/account_timeline/containers/header_container.js +++ b/app/soapbox/features/account_timeline/containers/header_container.js @@ -24,6 +24,7 @@ import { List as ImmutableList } from 'immutable'; import { getSettings } from 'soapbox/actions/settings'; import { startChat, openChat } from 'soapbox/actions/chats'; import { isMobile } from 'soapbox/is_mobile'; +import { deactivateUserModal, deleteUserModal } from 'soapbox/actions/moderation'; const messages = defineMessages({ unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' }, @@ -145,6 +146,14 @@ const mapDispatchToProps = (dispatch, { intl }) => ({ } }).catch(() => {}); }, + + onDeactivateUser(account) { + dispatch(deactivateUserModal(intl, account.get('id'))); + }, + + onDeleteUser(account) { + dispatch(deleteUserModal(intl, account.get('id'))); + }, }); export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(Header)); diff --git a/app/soapbox/features/admin/components/report.js b/app/soapbox/features/admin/components/report.js index 4ade81a30..6c6b7face 100644 --- a/app/soapbox/features/admin/components/report.js +++ b/app/soapbox/features/admin/components/report.js @@ -15,8 +15,8 @@ import { deactivateUserModal, deleteUserModal } from 'soapbox/actions/moderation const messages = defineMessages({ reportClosed: { id: 'admin.reports.report_closed_message', defaultMessage: 'Report on {acct} was closed' }, - deactivateUser: { id: 'admin.reports.actions.deactivate_user', defaultMessage: 'Deactivate {acct}' }, - deleteUser: { id: 'admin.reports.actions.delete_user', defaultMessage: 'Delete {acct}' }, + deactivateUser: { id: 'admin.users.actions.deactivate_user', defaultMessage: 'Deactivate {acct}' }, + deleteUser: { id: 'admin.users.actions.delete_user', defaultMessage: 'Delete {acct}' }, }); export default @connect() diff --git a/app/soapbox/features/status/components/action_bar.js b/app/soapbox/features/status/components/action_bar.js index 6fb88fb86..e54e918cf 100644 --- a/app/soapbox/features/status/components/action_bar.js +++ b/app/soapbox/features/status/components/action_bar.js @@ -36,6 +36,8 @@ const messages = defineMessages({ copy: { id: 'status.copy', defaultMessage: 'Copy link to post' }, bookmark: { id: 'status.bookmark', defaultMessage: 'Bookmark' }, unbookmark: { id: 'status.unbookmark', defaultMessage: 'Remove bookmark' }, + deactivateUser: { id: 'admin.users.actions.deactivate_user', defaultMessage: 'Deactivate {acct}' }, + deleteUser: { id: 'admin.users.actions.delete_user', defaultMessage: 'Delete {acct}' }, }); const mapStateToProps = state => { @@ -74,6 +76,8 @@ class ActionBar extends React.PureComponent { onReport: PropTypes.func, onPin: PropTypes.func, onEmbed: PropTypes.func, + onDeactivateUser: PropTypes.func, + onDeleteUser: PropTypes.func, intl: PropTypes.object.isRequired, onOpenUnauthorizedModal: PropTypes.func.isRequired, me: SoapboxPropTypes.me, @@ -221,6 +225,14 @@ class ActionBar extends React.PureComponent { } } + handleDeactivateUser = () => { + this.props.onDeactivateUser(this.props.status); + } + + handleDeleteUser = () => { + this.props.onDeleteUser(this.props.status); + } + setRef = c => { this.node = c; } @@ -276,6 +288,8 @@ class ActionBar extends React.PureComponent { menu.push(null); menu.push({ text: intl.formatMessage(messages.admin_account, { name: status.getIn(['account', 'username']) }), href: `/pleroma/admin/#/users/${status.getIn(['account', 'id'])}/` }); // menu.push({ text: intl.formatMessage(messages.admin_status), href: `/admin/accounts/${status.getIn(['account', 'id'])}/statuses/${status.get('id')}` }); + menu.push({ text: intl.formatMessage(messages.deactivateUser, { acct: `@${status.getIn(['account', 'acct'])}` }), action: this.handleDeactivateUser }); + menu.push({ text: intl.formatMessage(messages.deleteUser, { acct: `@${status.getIn(['account', 'acct'])}` }), action: this.handleDeleteUser }); } } diff --git a/app/soapbox/features/status/containers/detailed_status_container.js b/app/soapbox/features/status/containers/detailed_status_container.js index 509587636..247960ac3 100644 --- a/app/soapbox/features/status/containers/detailed_status_container.js +++ b/app/soapbox/features/status/containers/detailed_status_container.js @@ -31,6 +31,7 @@ import { openModal } from '../../../actions/modal'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import { showAlertForError } from '../../../actions/alerts'; import { getSettings } from 'soapbox/actions/settings'; +import { deactivateUserModal, deleteUserModal } from 'soapbox/actions/moderation'; const messages = defineMessages({ deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' }, @@ -190,6 +191,14 @@ const mapDispatchToProps = (dispatch, { intl }) => ({ } }, + onDeactivateUser(status) { + dispatch(deactivateUserModal(intl, status.getIn(['account', 'id']))); + }, + + onDeleteUser(status) { + dispatch(deleteUserModal(intl, status.getIn(['account', 'id']))); + }, + }); export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(DetailedStatus)); diff --git a/app/soapbox/features/status/index.js b/app/soapbox/features/status/index.js index f64ac5f74..96157d4f8 100644 --- a/app/soapbox/features/status/index.js +++ b/app/soapbox/features/status/index.js @@ -47,6 +47,7 @@ import { textForScreenReader, defaultMediaVisibility } from '../../components/st import Icon from 'soapbox/components/icon'; import { getSettings } from 'soapbox/actions/settings'; import { getSoapboxConfig } from 'soapbox/actions/soapbox'; +import { deactivateUserModal, deleteUserModal } from 'soapbox/actions/moderation'; const messages = defineMessages({ deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' }, @@ -302,6 +303,16 @@ class Status extends ImmutablePureComponent { this.props.dispatch(openModal('EMBED', { url: status.get('url') })); } + handleDeactivateUser = (status) => { + const { dispatch, intl } = this.props; + dispatch(deactivateUserModal(intl, status.getIn(['account', 'id']))); + } + + handleDeleteUser = (status) => { + const { dispatch, intl } = this.props; + dispatch(deleteUserModal(intl, status.getIn(['account', 'id']))); + } + handleHotkeyMoveUp = () => { this.handleMoveUp(this.props.status.get('id')); } @@ -523,6 +534,8 @@ class Status extends ImmutablePureComponent { onPin={this.handlePin} onBookmark={this.handleBookmark} onEmbed={this.handleEmbed} + onDeactivateUser={this.handleDeactivateUser} + onDeleteUser={this.handleDeleteUser} allowedEmoji={this.props.allowedEmoji} /> diff --git a/app/soapbox/locales/pl.json b/app/soapbox/locales/pl.json index 7d36ac753..cde3d1e94 100644 --- a/app/soapbox/locales/pl.json +++ b/app/soapbox/locales/pl.json @@ -68,11 +68,11 @@ "admin.dashcounters.user_count_label": "użytkownicy", "admin.dashwidgets.software_header": "Oprogramowanie", "admin.moderation_log.empty_message": "Nie wykonałeś(-aś) jeszcze żadnych działań moderacyjnych. Kiedy jakieś zostaną wykonane, ich historia pojawi się tutaj.", - "admin.reports.actions.deactivate_user": "Dezaktywuj {acct}", - "admin.reports.actions.delete_user": "Usuń {acct}", - "admin.reports.actions.delete_sstatus": "Usuń wpis", - "admin.reports.actions.user_deactivated_message": "Zdezaktywowano {acct}", - "admin.reports.actions.user_deleted_message": "Usunięto {acct}", + "admin.users.actions.deactivate_user": "Dezaktywuj {acct}", + "admin.users.actions.delete_user": "Usuń {acct}", + "admin.statuses.actions.delete_status": "Usuń wpis", + "admin.users.actions.user_deactivated_message": "Zdezaktywowano {acct}", + "admin.users.actions.user_deleted_message": "Usunięto {acct}", "admin.reports.actions.view_status": "Wyświetl wpis", "admin.reports.empty_message": "Brak otwartych zgłoszeń. Gdy użytkownik zostanie zgłoszony, pojawi się on tutaj.", "admin.reports.report_closed_message": "Zamknięto zgłoszenie dotyczące {acct}",