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

2
app/javascript/mastodon/features/ui/index.js
View file

@ -37,6 +37,7 @@ import {
FavouritedStatuses,
ListTimeline,
Blocks,
DomainBlocks,
Mutes,
PinnedStatuses,
Lists,
@ -158,6 +159,7 @@ class SwitchingColumnsArea extends React.PureComponent {
<WrappedRoute path='/follow_requests' component={FollowRequests} content={children} />
<WrappedRoute path='/blocks' component={Blocks} content={children} />
<WrappedRoute path='/domain_blocks' component={DomainBlocks} content={children} />
<WrappedRoute path='/mutes' component={Mutes} content={children} />
<WrappedRoute path='/lists' component={Lists} content={children} />

4
app/javascript/mastodon/features/ui/util/async-components.js
View file

@ -90,6 +90,10 @@ export function Blocks () {
return import(/* webpackChunkName: "features/blocks" */'../../blocks');
}
export function DomainBlocks () {
return import(/* webpackChunkName: "features/domain_blocks" */'../../domain_blocks');
}
export function Mutes () {
return import(/* webpackChunkName: "features/mutes" */'../../mutes');
}