diff --git a/app/javascript/gabsocial/actions/domain_blocks.js b/app/javascript/gabsocial/actions/domain_blocks.js deleted file mode 100644 index 6075a53f..00000000 --- a/app/javascript/gabsocial/actions/domain_blocks.js +++ /dev/null @@ -1,174 +0,0 @@ -import api, { getLinks } from '../api'; -import { me } from '../initial_state'; - -export const DOMAIN_BLOCK_REQUEST = 'DOMAIN_BLOCK_REQUEST'; -export const DOMAIN_BLOCK_SUCCESS = 'DOMAIN_BLOCK_SUCCESS'; -export const DOMAIN_BLOCK_FAIL = 'DOMAIN_BLOCK_FAIL'; - -export const DOMAIN_UNBLOCK_REQUEST = 'DOMAIN_UNBLOCK_REQUEST'; -export const DOMAIN_UNBLOCK_SUCCESS = 'DOMAIN_UNBLOCK_SUCCESS'; -export const DOMAIN_UNBLOCK_FAIL = 'DOMAIN_UNBLOCK_FAIL'; - -export const DOMAIN_BLOCKS_FETCH_REQUEST = 'DOMAIN_BLOCKS_FETCH_REQUEST'; -export const DOMAIN_BLOCKS_FETCH_SUCCESS = 'DOMAIN_BLOCKS_FETCH_SUCCESS'; -export const DOMAIN_BLOCKS_FETCH_FAIL = 'DOMAIN_BLOCKS_FETCH_FAIL'; - -export const DOMAIN_BLOCKS_EXPAND_REQUEST = 'DOMAIN_BLOCKS_EXPAND_REQUEST'; -export const DOMAIN_BLOCKS_EXPAND_SUCCESS = 'DOMAIN_BLOCKS_EXPAND_SUCCESS'; -export const DOMAIN_BLOCKS_EXPAND_FAIL = 'DOMAIN_BLOCKS_EXPAND_FAIL'; - -export function blockDomain(domain) { - return (dispatch, getState) => { - if (!me) return; - - dispatch(blockDomainRequest(domain)); - - api(getState).post('/api/v1/domain_blocks', { domain }).then(() => { - const at_domain = '@' + domain; - const accounts = getState().get('accounts').filter(item => item.get('acct').endsWith(at_domain)).valueSeq().map(item => item.get('id')); - dispatch(blockDomainSuccess(domain, accounts)); - }).catch(err => { - dispatch(blockDomainFail(domain, err)); - }); - }; -}; - -export function blockDomainRequest(domain) { - return { - type: DOMAIN_BLOCK_REQUEST, - domain, - }; -}; - -export function blockDomainSuccess(domain, accounts) { - return { - type: DOMAIN_BLOCK_SUCCESS, - domain, - accounts, - }; -}; - -export function blockDomainFail(domain, error) { - return { - type: DOMAIN_BLOCK_FAIL, - domain, - error, - }; -}; - -export function unblockDomain(domain) { - return (dispatch, getState) => { - if (!me) return; - - dispatch(unblockDomainRequest(domain)); - - api(getState).delete('/api/v1/domain_blocks', { params: { domain } }).then(() => { - const at_domain = '@' + domain; - const accounts = getState().get('accounts').filter(item => item.get('acct').endsWith(at_domain)).valueSeq().map(item => item.get('id')); - dispatch(unblockDomainSuccess(domain, accounts)); - }).catch(err => { - dispatch(unblockDomainFail(domain, err)); - }); - }; -}; - -export function unblockDomainRequest(domain) { - return { - type: DOMAIN_UNBLOCK_REQUEST, - domain, - }; -}; - -export function unblockDomainSuccess(domain, accounts) { - return { - type: DOMAIN_UNBLOCK_SUCCESS, - domain, - accounts, - }; -}; - -export function unblockDomainFail(domain, error) { - return { - type: DOMAIN_UNBLOCK_FAIL, - domain, - error, - }; -}; - -export function fetchDomainBlocks() { - return (dispatch, getState) => { - if (!me) return; - - dispatch(fetchDomainBlocksRequest()); - - api(getState).get('/api/v1/domain_blocks').then(response => { - const next = getLinks(response).refs.find(link => link.rel === 'next'); - dispatch(fetchDomainBlocksSuccess(response.data, next ? next.uri : null)); - }).catch(err => { - dispatch(fetchDomainBlocksFail(err)); - }); - }; -}; - -export function fetchDomainBlocksRequest() { - return { - type: DOMAIN_BLOCKS_FETCH_REQUEST, - }; -}; - -export function fetchDomainBlocksSuccess(domains, next) { - return { - type: DOMAIN_BLOCKS_FETCH_SUCCESS, - domains, - next, - }; -}; - -export function fetchDomainBlocksFail(error) { - return { - type: DOMAIN_BLOCKS_FETCH_FAIL, - error, - }; -}; - -export function expandDomainBlocks() { - return (dispatch, getState) => { - if (!me) return; - - const url = getState().getIn(['domain_lists', 'blocks', 'next']); - - if (!url) { - return; - } - - dispatch(expandDomainBlocksRequest()); - - api(getState).get(url).then(response => { - const next = getLinks(response).refs.find(link => link.rel === 'next'); - dispatch(expandDomainBlocksSuccess(response.data, next ? next.uri : null)); - }).catch(err => { - dispatch(expandDomainBlocksFail(err)); - }); - }; -}; - -export function expandDomainBlocksRequest() { - return { - type: DOMAIN_BLOCKS_EXPAND_REQUEST, - }; -}; - -export function expandDomainBlocksSuccess(domains, next) { - return { - type: DOMAIN_BLOCKS_EXPAND_SUCCESS, - domains, - next, - }; -}; - -export function expandDomainBlocksFail(error) { - return { - type: DOMAIN_BLOCKS_EXPAND_FAIL, - error, - }; -}; diff --git a/app/javascript/gabsocial/components/modal/block_domain_modal.js b/app/javascript/gabsocial/components/modal/block_domain_modal.js deleted file mode 100644 index 0eb9e425..00000000 --- a/app/javascript/gabsocial/components/modal/block_domain_modal.js +++ /dev/null @@ -1,46 +0,0 @@ -import { injectIntl, defineMessages } from 'react-intl' -import { blockDomain } from '../../actions/domain_blocks' -import ConfirmationModal from './confirmation_modal' - -const messages = defineMessages({ - blockDomain: { id: 'block_domain', defaultMessage: 'Block {domain}' }, - blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Block entire domain' }, - blockDomainMessage: { id: 'confirmations.domain_block.message', defaultMessage: 'Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.' }, - cancel: { id: 'confirmation_modal.cancel', defaultMessage: 'Cancel' }, -}) - -const mapDispatchToProps = (dispatch) => ({ - onConfirm: (domain) => dispatch(blockDomain(domain)), -}) - -export default -@connect(null, mapDispatchToProps) -@injectIntl -class BlockDomainModal extends PureComponent { - - static propTypes = { - domain: PropTypes.string.isRequired, - intl: PropTypes.object.isRequired, - onConfirm: PropTypes.func.isRequired, - onClose: PropTypes.func.isRequired, - } - - handleClick = () => { - this.props.onConfirm(this.props.domain) - } - - render() { - const { onClose, domain, intl } = this.props - - return ( - - ) - } - -} diff --git a/app/javascript/gabsocial/components/modal/modal_root.js b/app/javascript/gabsocial/components/modal/modal_root.js index 5e5334d0..d0b3a8aa 100644 --- a/app/javascript/gabsocial/components/modal/modal_root.js +++ b/app/javascript/gabsocial/components/modal/modal_root.js @@ -7,7 +7,6 @@ import BundleModalError from '../bundle_modal_error' import { MODAL_ACTIONS, MODAL_BLOCK_ACCOUNT, - MODAL_BLOCK_DOMAIN, MODAL_BOOST, MODAL_COMMUNITY_TIMELINE_SETTINGS, MODAL_COMPOSE, @@ -41,7 +40,6 @@ import { import { ActionsModal, BlockAccountModal, - BlockDomainModal, BoostModal, CommunityTimelineSettingsModal, ComposeModal, @@ -76,7 +74,6 @@ import { const MODAL_COMPONENTS = {} MODAL_COMPONENTS[MODAL_ACTIONS] = ActionsModal MODAL_COMPONENTS[MODAL_BLOCK_ACCOUNT] = BlockAccountModal -MODAL_COMPONENTS[MODAL_BLOCK_DOMAIN] = BlockDomainModal MODAL_COMPONENTS[MODAL_BOOST] = BoostModal MODAL_COMPONENTS[MODAL_COMMUNITY_TIMELINE_SETTINGS] = CommunityTimelineSettingsModal MODAL_COMPONENTS[MODAL_COMPOSE] = ComposeModal @@ -109,7 +106,6 @@ MODAL_COMPONENTS[MODAL_VIDEO] = VideoModal const CENTERED_XS_MODALS = [ MODAL_BLOCK_ACCOUNT, - MODAL_BLOCK_DOMAIN, MODAL_CONFIRM, MODAL_GROUP_DELETE, MODAL_LIST_DELETE, diff --git a/app/javascript/gabsocial/components/popover/profile_options_popover.js b/app/javascript/gabsocial/components/popover/profile_options_popover.js index d5bde662..776b9c71 100644 --- a/app/javascript/gabsocial/components/popover/profile_options_popover.js +++ b/app/javascript/gabsocial/components/popover/profile_options_popover.js @@ -15,7 +15,6 @@ import { muteAccount } from '../../actions/accounts' import { initReport } from '../../actions/reports' import { openModal } from '../../actions/modal' import { closePopover } from '../../actions/popover' -import { blockDomain, unblockDomain } from '../../actions/domain_blocks' import { unfollowModal, autoPlayGif, me, isStaff } from '../../initial_state' import { makeGetAccount } from '../../selectors' import PopoverLayout from './popover_layout' @@ -24,7 +23,6 @@ import List from '../list' const messages = defineMessages({ unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' }, - blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Block entire domain' }, blockAndReport: { id: 'confirmations.block.block_and_report', defaultMessage: 'Block & Report' }, unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' }, follow: { id: 'account.follow', defaultMessage: 'Follow' }, @@ -40,20 +38,16 @@ const messages = defineMessages({ report: { id: 'account.report', defaultMessage: 'Report @{name}' }, share: { id: 'account.share', defaultMessage: 'Share @{name}\'s profile' }, media: { id: 'account.media', defaultMessage: 'Media' }, - blockDomain: { id: 'account.block_domain', defaultMessage: 'Block domain {domain}' }, - unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' }, hideReposts: { id: 'account.hide_reblogs', defaultMessage: 'Hide reposts from @{name}' }, showReposts: { id: 'account.show_reblogs', defaultMessage: 'Show reposts from @{name}' }, preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' }, blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' }, - domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Blocked domains' }, mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' }, admin_account: { id: 'admin_account', defaultMessage: 'Open moderation interface' }, add_or_remove_from_list: { id: 'account.add_or_remove_from_list', defaultMessage: 'Add or Remove from lists' }, add_or_remove_from_shortcuts: { id: 'account.add_or_remove_from_shortcuts', defaultMessage: 'Add or Remove from shortcuts' }, accountBlocked: { id: 'account.blocked', defaultMessage: 'Blocked' }, accountMuted: { id: 'account.muted', defaultMessage: 'Muted' }, - domainBlocked: { id: 'account.domain_blocked', defaultMessage: 'Domain hidden' }, }); const makeMapStateToProps = () => { @@ -61,7 +55,6 @@ const makeMapStateToProps = () => { const mapStateToProps = (state, { account }) => ({ account: getAccount(state, !!account ? account.get('id') : -1), - domain: state.getIn(['meta', 'domain']), }); return mapStateToProps; @@ -125,18 +118,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({ } }, - onBlockDomain(domain) { - dispatch(closePopover()) - dispatch(openModal('BLOCK_DOMAIN', { - domain, - })); - }, - - onUnblockDomain(domain) { - dispatch(closePopover()) - dispatch(unblockDomain(domain)); - }, - onAddToList(account) { dispatch(closePopover()) dispatch(openModal('LIST_ADDER', { @@ -157,7 +138,7 @@ class ProfileOptionsPopover extends PureComponent { } makeMenu() { - const { account, intl, domain } = this.props; + const { account, intl } = this.props; let menu = []; @@ -219,20 +200,6 @@ class ProfileOptionsPopover extends PureComponent { onClick: this.handleReport }) - if (account.get('acct') !== account.get('username')) { - const domain = account.get('acct').split('@')[1]; - - const isBlockingDomain = account.getIn(['relationship', 'domain_blocking']) - menu.push({ - hideArrow: true, - icon: 'block', - title: intl.formatMessage(isBlockingDomain ? messages.unblockDomain : messages.blockDomain, { - domain, - }), - onClick: isBlockingDomain ? this.handleUnblockDomain : this.handleBlockDomain, - }) - } - menu.push({ hideArrow: true, icon: 'list', @@ -287,24 +254,6 @@ class ProfileOptionsPopover extends PureComponent { this.props.onMute(this.props.account); } - handleBlockDomain = () => { - const domain = this.props.account.get('acct').split('@')[1] - - // : todo : alert - if (!domain) return - - this.props.onBlockDomain(domain) - } - - handleUnblockDomain = () => { - const domain = this.props.account.get('acct').split('@')[1]; - - // : todo : alert - if (!domain) return; - - this.props.onUnblockDomain(domain); - } - handleAddToList = () => { this.props.onAddToList(this.props.account); } diff --git a/app/javascript/gabsocial/components/sidebar.js b/app/javascript/gabsocial/components/sidebar.js index bf590e84..0552f7b4 100644 --- a/app/javascript/gabsocial/components/sidebar.js +++ b/app/javascript/gabsocial/components/sidebar.js @@ -22,7 +22,6 @@ const messages = defineMessages({ preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' }, follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' }, blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' }, - domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Blocked domains' }, mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' }, filters: { id: 'navigation_bar.filters', defaultMessage: 'Muted words' }, logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' }, diff --git a/app/javascript/gabsocial/components/sidebar_xs.js b/app/javascript/gabsocial/components/sidebar_xs.js index 0bd5dc00..52e22f88 100644 --- a/app/javascript/gabsocial/components/sidebar_xs.js +++ b/app/javascript/gabsocial/components/sidebar_xs.js @@ -26,7 +26,6 @@ const messages = defineMessages({ preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' }, follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' }, blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' }, - domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Hidden domains' }, mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' }, filters: { id: 'navigation_bar.filters', defaultMessage: 'Muted words' }, logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' }, @@ -156,12 +155,6 @@ class SidebarXS extends ImmutablePureComponent { // title: intl.formatMessage(messages.blocks), // }, // { - // icon: 'website', - // to: '/settings/domain_blocks', - // onClick: this.handleSidebarClose, - // title: intl.formatMessage(messages.domain_blocks), - // }, - // { // icon: 'audio-mute', // to: '/mutes', // onClick: this.handleSidebarClose, diff --git a/app/javascript/gabsocial/constants.js b/app/javascript/gabsocial/constants.js index b3841bc3..9602a472 100644 --- a/app/javascript/gabsocial/constants.js +++ b/app/javascript/gabsocial/constants.js @@ -33,7 +33,6 @@ export const POPOVER_USER_INFO = 'USER_INFO' export const MODAL_ACTIONS = 'ACTIONS' export const MODAL_BLOCK_ACCOUNT = 'BLOCK_ACCOUNT' -export const MODAL_BLOCK_DOMAIN = 'BLOCK_DOMAIN' export const MODAL_BOOST = 'BOOST' export const MODAL_COMMUNITY_TIMELINE_SETTINGS = 'COMMUNITY_TIMELINE_SETTINGS' export const MODAL_COMPOSE = 'COMPOSE' diff --git a/app/javascript/gabsocial/features/blocked_domains.js b/app/javascript/gabsocial/features/blocked_domains.js deleted file mode 100644 index 9409c212..00000000 --- a/app/javascript/gabsocial/features/blocked_domains.js +++ /dev/null @@ -1,86 +0,0 @@ -import { defineMessages, injectIntl } from 'react-intl' -import ImmutablePureComponent from 'react-immutable-pure-component' -import ImmutablePropTypes from 'react-immutable-proptypes' -import debounce from 'lodash.debounce' -import { unblockDomain, fetchDomainBlocks, expandDomainBlocks } from '../actions/domain_blocks' -import ColumnIndicator from '../components/column_indicator' -import List from '../components/list' - -const messages = defineMessages({ - heading: { id: 'column.domain_blocks', defaultMessage: 'Blocked domains' }, - unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' }, - emptyMessage: { id: 'empty_column.domain_blocks', defaultMessage: 'There are no blocked domains yet.' }, -}); - -const mapDispatchToProps = (dispatch) => ({ - onExpandDomainBlocks() { - dispatch(expandDomainBlocks()) - }, - - onFetchDomainBlocks() { - dispatch(fetchDomainBlocks()) - }, - - onUnblockDomain (domain) { - dispatch(unblockDomain(domain)) - }, -}) - -const mapStateToProps = (state) => ({ - domains: state.getIn(['domain_lists', 'blocks', 'items']), - hasMore: !!state.getIn(['domain_lists', 'blocks', 'next']), -}) - -export default -@injectIntl -@connect(mapStateToProps, mapDispatchToProps) -class Blocks extends ImmutablePureComponent { - - static propTypes = { - intl: PropTypes.object.isRequired, - hasMore: PropTypes.bool, - domains: ImmutablePropTypes.orderedSet, - onUnblockDomain: PropTypes.func.isRequired, - onFetchDomainBlocks: PropTypes.func.isRequired, - onExpandDomainBlocks: PropTypes.func.isRequired, - } - - componentWillMount() { - this.props.onFetchDomainBlocks() - } - - handleUnblockDomain = (domain) => { - this.props.onUnblockDomain(domain) - } - - handleLoadMore = debounce(() => { - this.props.onExpandDomainBlocks() - }, 300, { leading: true }) - - render() { - const { intl, domains, hasMore } = this.props - - if (!domains) { - return - } - - const items = domains.map((domain) => { - return { - title: intl.formatMessage(messages.unblockDomain, { domain }), - onClick: () => this.handleUnblockDomain(domain), - hideArrow: true, - } - }) - - return ( - - ) - } - -} diff --git a/app/javascript/gabsocial/features/ui/util/async_components.js b/app/javascript/gabsocial/features/ui/util/async_components.js index 2029e378..d045738a 100644 --- a/app/javascript/gabsocial/features/ui/util/async_components.js +++ b/app/javascript/gabsocial/features/ui/util/async_components.js @@ -2,9 +2,7 @@ export function AccountTimeline() { return import(/* webpackChunkName: "features export function AccountGallery() { return import(/* webpackChunkName: "features/account_gallery" */'../../account_gallery') } export function ActionsModal() { return import(/* webpackChunkName: "components/actions_modal" */'../../../components/modal/actions_modal') } export function BlockAccountModal() { return import(/* webpackChunkName: "components/block_account_modal" */'../../../components/modal/block_account_modal') } -export function BlockDomainModal() { return import(/* webpackChunkName: "components/block_domain_modal" */'../../../components/modal/block_domain_modal') } export function BlockedAccounts() { return import(/* webpackChunkName: "features/blocked_accounts" */'../../blocked_accounts') } -export function BlockedDomains() { return import(/* webpackChunkName: "features/blocked_domains" */'../../blocked_domains') } export function BoostModal() { return import(/* webpackChunkName: "components/boost_modal" */'../../../components/modal/boost_modal') } export function CommentSortingOptionsPopover() { return import(/* webpackChunkName: "components/comment_sorting_options_popover" */'../../../components/popover/comment_sorting_options_popover') } export function CommunityTimeline() { return import(/* webpackChunkName: "features/community_timeline" */'../../community_timeline') } diff --git a/app/javascript/gabsocial/reducers/domain_lists.js b/app/javascript/gabsocial/reducers/domain_lists.js deleted file mode 100644 index eff97fbd..00000000 --- a/app/javascript/gabsocial/reducers/domain_lists.js +++ /dev/null @@ -1,25 +0,0 @@ -import { - DOMAIN_BLOCKS_FETCH_SUCCESS, - DOMAIN_BLOCKS_EXPAND_SUCCESS, - DOMAIN_UNBLOCK_SUCCESS, -} from '../actions/domain_blocks'; -import { Map as ImmutableMap, OrderedSet as ImmutableOrderedSet } from 'immutable'; - -const initialState = ImmutableMap({ - blocks: ImmutableMap({ - items: ImmutableOrderedSet(), - }), -}); - -export default function domainLists(state = initialState, action) { - switch(action.type) { - case DOMAIN_BLOCKS_FETCH_SUCCESS: - return state.setIn(['blocks', 'items'], ImmutableOrderedSet(action.domains)).setIn(['blocks', 'next'], action.next); - case DOMAIN_BLOCKS_EXPAND_SUCCESS: - return state.updateIn(['blocks', 'items'], set => set.union(action.domains)).setIn(['blocks', 'next'], action.next); - case DOMAIN_UNBLOCK_SUCCESS: - return state.updateIn(['blocks', 'items'], set => set.delete(action.domain)); - default: - return state; - } -}; diff --git a/app/javascript/gabsocial/reducers/index.js b/app/javascript/gabsocial/reducers/index.js index cb146af4..86c6c4aa 100644 --- a/app/javascript/gabsocial/reducers/index.js +++ b/app/javascript/gabsocial/reducers/index.js @@ -6,7 +6,6 @@ import compose from './compose' import contexts from './contexts' import conversations from './conversations' import custom_emojis from './custom_emojis' -import domain_lists from './domain_lists' import filters from './filters' import gab_trends from './gab_trends' import groups from './groups' @@ -47,7 +46,6 @@ const reducers = { contexts, conversations, custom_emojis, - domain_lists, filters, gab_trends, groups, diff --git a/app/javascript/gabsocial/reducers/relationships.js b/app/javascript/gabsocial/reducers/relationships.js index 8322780d..1777d3f8 100644 --- a/app/javascript/gabsocial/reducers/relationships.js +++ b/app/javascript/gabsocial/reducers/relationships.js @@ -13,10 +13,6 @@ import { ACCOUNT_UNPIN_SUCCESS, RELATIONSHIPS_FETCH_SUCCESS, } from '../actions/accounts'; -import { - DOMAIN_BLOCK_SUCCESS, - DOMAIN_UNBLOCK_SUCCESS, -} from '../actions/domain_blocks'; import { Map as ImmutableMap, fromJS } from 'immutable'; const normalizeRelationship = (state, relationship) => state.set(relationship.id, fromJS(relationship)); @@ -29,14 +25,6 @@ const normalizeRelationships = (state, relationships) => { return state; }; -const setDomainBlocking = (state, accounts, blocking) => { - return state.withMutations(map => { - accounts.forEach(id => { - map.setIn([id, 'domain_blocking'], blocking); - }); - }); -}; - const initialState = ImmutableMap(); export default function relationships(state = initialState, action) { @@ -60,10 +48,6 @@ export default function relationships(state = initialState, action) { return normalizeRelationship(state, action.relationship); case RELATIONSHIPS_FETCH_SUCCESS: return normalizeRelationships(state, action.relationships); - case DOMAIN_BLOCK_SUCCESS: - return setDomainBlocking(state, action.accounts, true); - case DOMAIN_UNBLOCK_SUCCESS: - return setDomainBlocking(state, action.accounts, false); default: return state; }