* Eliminate extra accounts select query from FollowService * Optimistically update follow state in web UI and hide loading bar Fix #6205 * Asynchronize NotifyService in FollowService And fix failing test * Skip Webfinger resolve routine when called from FollowService if possible If an account is ActivityPub, then webfinger re-resolving is not necessary when called from FollowService. Improve options of ResolveAccountService
		
			
				
	
	
		
			70 lines
		
	
	
	
		
			2.1 KiB
		
	
	
	
		
			JavaScript
		
	
	
	
	
	
			
		
		
	
	
			70 lines
		
	
	
	
		
			2.1 KiB
		
	
	
	
		
			JavaScript
		
	
	
	
	
	
| import {
 | |
|   ACCOUNT_FOLLOW_SUCCESS,
 | |
|   ACCOUNT_FOLLOW_REQUEST,
 | |
|   ACCOUNT_FOLLOW_FAIL,
 | |
|   ACCOUNT_UNFOLLOW_SUCCESS,
 | |
|   ACCOUNT_UNFOLLOW_REQUEST,
 | |
|   ACCOUNT_UNFOLLOW_FAIL,
 | |
|   ACCOUNT_BLOCK_SUCCESS,
 | |
|   ACCOUNT_UNBLOCK_SUCCESS,
 | |
|   ACCOUNT_MUTE_SUCCESS,
 | |
|   ACCOUNT_UNMUTE_SUCCESS,
 | |
|   ACCOUNT_PIN_SUCCESS,
 | |
|   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));
 | |
| 
 | |
| const normalizeRelationships = (state, relationships) => {
 | |
|   relationships.forEach(relationship => {
 | |
|     state = normalizeRelationship(state, relationship);
 | |
|   });
 | |
| 
 | |
|   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) {
 | |
|   switch(action.type) {
 | |
|   case ACCOUNT_FOLLOW_REQUEST:
 | |
|     return state.setIn([action.id, action.locked ? 'requested' : 'following'], true);
 | |
|   case ACCOUNT_FOLLOW_FAIL:
 | |
|     return state.setIn([action.id, action.locked ? 'requested' : 'following'], false);
 | |
|   case ACCOUNT_UNFOLLOW_REQUEST:
 | |
|     return state.setIn([action.id, 'following'], false);
 | |
|   case ACCOUNT_UNFOLLOW_FAIL:
 | |
|     return state.setIn([action.id, 'following'], true);
 | |
|   case ACCOUNT_FOLLOW_SUCCESS:
 | |
|   case ACCOUNT_UNFOLLOW_SUCCESS:
 | |
|   case ACCOUNT_BLOCK_SUCCESS:
 | |
|   case ACCOUNT_UNBLOCK_SUCCESS:
 | |
|   case ACCOUNT_MUTE_SUCCESS:
 | |
|   case ACCOUNT_UNMUTE_SUCCESS:
 | |
|   case ACCOUNT_PIN_SUCCESS:
 | |
|   case ACCOUNT_UNPIN_SUCCESS:
 | |
|     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;
 | |
|   }
 | |
| };
 |