Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add some UI for user-defined domain blocks (#6628)

Browse source 
* Keep list of blocked domains

Might be overkill, but I'm trying to follow the same logic as for blocked users

* Add basic domain block UI

* Add the domain blocks UI to Getting Started

* Fix undefined URL in `fetchDomainBlocks`

* Update all known users' domain_blocking relationship instead of just one's
This commit is contained in:
ThibG 2018-03-30 12:38:00 +02:00 • committed by Eugen Rochko
parent 47cee7cc8e
commit a6c129ddbd
13 changed files with 271 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/javascript/mastodon/features/account_timeline/containers/header_container.js
View file

@ -94,16 +94,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));
},
});