f1ab70649b
* Add buttons to block and unblock domain * Relationship API now returns "domain_blocking" status for accounts, rename "block entire domain" to "hide entire domain", fix unblocking domain, do not block notifications from domain-blocked-but-followed people, do not send Salmons to domain blocked users * Add test * Personal domain blocks shouldn't affect Salmon after all, since in this direction of communication the control is very thin when it comes to public stuff. Best stay consistent and not affect federation in this way * Ignore followers and follow request from domain blocked folks, ensure account domain blocks are not created for empty domain, and avoid duplicates in validation * Purge followers when blocking domain (without soft-blocks, since they are useless here) * Add tests, fix local timeline being empty when having any domain blocks
46 lines
1.3 KiB
JavaScript
46 lines
1.3 KiB
JavaScript
import {
|
|
ACCOUNT_FOLLOW_SUCCESS,
|
|
ACCOUNT_UNFOLLOW_SUCCESS,
|
|
ACCOUNT_BLOCK_SUCCESS,
|
|
ACCOUNT_UNBLOCK_SUCCESS,
|
|
ACCOUNT_MUTE_SUCCESS,
|
|
ACCOUNT_UNMUTE_SUCCESS,
|
|
RELATIONSHIPS_FETCH_SUCCESS
|
|
} from '../actions/accounts';
|
|
import {
|
|
DOMAIN_BLOCK_SUCCESS,
|
|
DOMAIN_UNBLOCK_SUCCESS
|
|
} from '../actions/domain_blocks';
|
|
import Immutable from 'immutable';
|
|
|
|
const normalizeRelationship = (state, relationship) => state.set(relationship.id, Immutable.fromJS(relationship));
|
|
|
|
const normalizeRelationships = (state, relationships) => {
|
|
relationships.forEach(relationship => {
|
|
state = normalizeRelationship(state, relationship);
|
|
});
|
|
|
|
return state;
|
|
};
|
|
|
|
const initialState = Immutable.Map();
|
|
|
|
export default function relationships(state = initialState, action) {
|
|
switch(action.type) {
|
|
case ACCOUNT_FOLLOW_SUCCESS:
|
|
case ACCOUNT_UNFOLLOW_SUCCESS:
|
|
case ACCOUNT_BLOCK_SUCCESS:
|
|
case ACCOUNT_UNBLOCK_SUCCESS:
|
|
case ACCOUNT_MUTE_SUCCESS:
|
|
case ACCOUNT_UNMUTE_SUCCESS:
|
|
return normalizeRelationship(state, action.relationship);
|
|
case RELATIONSHIPS_FETCH_SUCCESS:
|
|
return normalizeRelationships(state, action.relationships);
|
|
case DOMAIN_BLOCK_SUCCESS:
|
|
return state.setIn([action.accountId, 'domain_blocking'], true);
|
|
case DOMAIN_UNBLOCK_SUCCESS:
|
|
return state.setIn([action.accountId, 'domain_blocking'], false);
|
|
default:
|
|
return state;
|
|
}
|
|
};
|