diff --git a/app/soapbox/actions/admin.ts b/app/soapbox/actions/admin.ts index ee4fae92c..50d389d2c 100644 --- a/app/soapbox/actions/admin.ts +++ b/app/soapbox/actions/admin.ts @@ -442,14 +442,6 @@ const unverifyUser = (accountId: string) => (dispatch: AppDispatch) => dispatch(untagUsers([accountId], ['verified'])); -const setDonor = (accountId: string) => - (dispatch: AppDispatch) => - dispatch(tagUsers([accountId], ['donor'])); - -const removeDonor = (accountId: string) => - (dispatch: AppDispatch) => - dispatch(untagUsers([accountId], ['donor'])); - const addPermission = (accountIds: string[], permissionGroup: string) => (dispatch: AppDispatch, getState: () => RootState) => { const nicknames = nicknamesFromIds(getState, accountIds); @@ -604,8 +596,6 @@ export { setBadges, verifyUser, unverifyUser, - setDonor, - removeDonor, addPermission, removePermission, promoteToAdmin, diff --git a/app/soapbox/components/badge.tsx b/app/soapbox/components/badge.tsx index 7ba2d5408..01b792bd0 100644 --- a/app/soapbox/components/badge.tsx +++ b/app/soapbox/components/badge.tsx @@ -7,14 +7,14 @@ interface IBadge { } /** Badge to display on a user's profile. */ const Badge: React.FC = ({ title, slug }) => { - const fallback = !['patron', 'admin', 'moderator', 'opaque', 'donor', 'badge:donor'].includes(slug); + const fallback = !['patron', 'admin', 'moderator', 'opaque', 'badge:donor'].includes(slug); return ( { badges.push(); } - if (account.donor) { - badges.push(); - } - return badges; }; diff --git a/app/soapbox/features/ui/components/modals/account-moderation-modal/account-moderation-modal.tsx b/app/soapbox/features/ui/components/modals/account-moderation-modal/account-moderation-modal.tsx index d9d104b84..8f91e1d3c 100644 --- a/app/soapbox/features/ui/components/modals/account-moderation-modal/account-moderation-modal.tsx +++ b/app/soapbox/features/ui/components/modals/account-moderation-modal/account-moderation-modal.tsx @@ -4,8 +4,6 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import { verifyUser, unverifyUser, - setDonor, - removeDonor, suggestUsers, unsuggestUsers, setBadges as saveBadges, @@ -80,17 +78,6 @@ const AccountModerationModal: React.FC = ({ onClose, ac .catch(() => {}); }; - const handleDonorChange: ChangeEventHandler = (e) => { - const { checked } = e.target; - - const message = checked ? messages.setDonorSuccess : messages.removeDonorSuccess; - const action = checked ? setDonor : removeDonor; - - dispatch(action(account.id)) - .then(() => dispatch(snackbar.success(intl.formatMessage(message, { acct: account.acct })))) - .catch(() => {}); - }; - const handleSuggestedChange: ChangeEventHandler = (e) => { const { checked } = e.target; @@ -147,13 +134,6 @@ const AccountModerationModal: React.FC = ({ onClose, ac /> - }> - - - {features.suggestionsV2 && ( }> ) => { }); }; -/** Get donor status from tags. */ +/** Upgrade legacy donor tag to a badge. */ const normalizeDonor = (account: ImmutableMap) => { - return account.set('donor', getTags(account).includes('donor')); + const tags = getTags(account); + const updated = tags.includes('donor') ? tags.push('badge:donor') : tags; + return account.setIn(['pleroma', 'tags'], updated); }; /** Normalize Fedibird/Truth Social/Pleroma location */