treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Update all known users' domain_blocking relationship instead of just one's

lolsob-rspec
Thibaut Girka 2018-03-04 23:38:00 +01:00
parent 876cc5c02b
commit e47593cac8
4 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/javascript/flavours/glitch/actions/domain_blocks.js
View File

@ -12,12 +12,14 @@ 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 function blockDomain(domain, accountId) {
export function blockDomain(domain) {
return (dispatch, getState) => {
dispatch(blockDomainRequest(domain));
api(getState).post('/api/v1/domain_blocks', { domain }).then(() => {
dispatch(blockDomainSuccess(domain, accountId));
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));
});
@ -31,11 +33,11 @@ export function blockDomainRequest(domain) {
};
};
export function blockDomainSuccess(domain, accountId) {
export function blockDomainSuccess(domain, accounts) {
return {
type: DOMAIN_BLOCK_SUCCESS,
domain,
accountId,
accounts,
};
};
@ -47,12 +49,14 @@ export function blockDomainFail(domain, error) {
};
};
export function unblockDomain(domain, accountId) {
export function unblockDomain(domain) {
return (dispatch, getState) => {
dispatch(unblockDomainRequest(domain));
api(getState).delete('/api/v1/domain_blocks', { params: { domain } }).then(() => {
dispatch(unblockDomainSuccess(domain, accountId));
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));
});
@ -66,11 +70,11 @@ export function unblockDomainRequest(domain) {
};
};
export function unblockDomainSuccess(domain, accountId) {
export function unblockDomainSuccess(domain, accounts) {
return {
type: DOMAIN_UNBLOCK_SUCCESS,
domain,
accountId,
accounts,
};
};

4
app/javascript/flavours/glitch/features/account_timeline/components/header.js
View File

@ -57,7 +57,7 @@ export default class Header extends ImmutablePureComponent {
if (!domain) return;
this.props.onBlockDomain(domain, this.props.account.get('id'));
this.props.onBlockDomain(domain);
}
handleUnblockDomain = () => {
@ -65,7 +65,7 @@ export default class Header extends ImmutablePureComponent {
if (!domain) return;
this.props.onUnblockDomain(domain, this.props.account.get('id'));
this.props.onUnblockDomain(domain);
}
render () {

8
app/javascript/flavours/glitch/features/account_timeline/containers/header_container.js
View File

@ -87,16 +87,16 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
}
},
onBlockDomain (domain, accountId) {
onBlockDomain (domain) {
dispatch(openModal('CONFIRM', {
message: <FormattedMessage 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.' values={{ domain: <strong>{domain}</strong> }} />,
confirm: intl.formatMessage(messages.blockDomainConfirm),
onConfirm: () => dispatch(blockDomain(domain, accountId)),
onConfirm: () => dispatch(blockDomain(domain)),
}));
},
onUnblockDomain (domain, accountId) {
dispatch(unblockDomain(domain, accountId));
onUnblockDomain (domain) {
dispatch(unblockDomain(domain));
},
});

12
app/javascript/flavours/glitch/reducers/relationships.js
View File

@ -23,6 +23,14 @@ 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) {
@ -37,9 +45,9 @@ export default function relationships(state = initialState, action) {
case RELATIONSHIPS_FETCH_SUCCESS:
return normalizeRelationships(state, action.relationships);
case DOMAIN_BLOCK_SUCCESS:
return state.setIn([action.accountId, 'domain_blocking'], true);
return setDomainBlocking(state, action.accounts, true);
case DOMAIN_UNBLOCK_SUCCESS:
return state.setIn([action.accountId, 'domain_blocking'], false);
return setDomainBlocking(state, action.accounts, false);
default:
return state;
}