moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Suggestions: consolidate reducers

This commit is contained in:
Alex Gleason 2021-09-17 15:21:27 -05:00
parent 8cfc2f9d2d
commit c92de334e8
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
5 changed files with 53 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/soapbox/features/follow_recommendations/index.js
View File

@ -10,8 +10,8 @@ import Account from './components/account';
import Button from 'soapbox/components/button';
const mapStateToProps = state => ({
suggestions: state.getIn(['suggestions_v2', 'items']),
isLoading: state.getIn(['suggestions_v2', 'isLoading']),
suggestions: state.getIn(['suggestions', 'items']),
isLoading: state.getIn(['suggestions', 'isLoading']),
});
export default @connect(mapStateToProps)

6
app/soapbox/features/ui/components/who_to_follow_panel.js
View File

@ -43,10 +43,10 @@ class WhoToFollowPanel extends ImmutablePureComponent {
</div>
<div className='wtf-panel__content'>
<div className='wtf-panel__list'>
{suggestions && suggestions.map(accountId => (
{suggestions && suggestions.map(suggestion => (
<AccountContainer
key={accountId}
id={accountId}
key={suggestion.get('account')}
id={suggestion.get('account')}
actionIcon='times'
actionTitle={intl.formatMessage(messages.dismissSuggestion)}
onActionClick={dismissSuggestion}

2
app/soapbox/reducers/index.js
View File

@ -31,7 +31,6 @@ import listAdder from './list_adder';
import filters from './filters';
import conversations from './conversations';
import suggestions from './suggestions';
import suggestions_v2 from './suggestions_v2';
import polls from './polls';
import identity_proofs from './identity_proofs';
import trends from './trends';
@ -89,7 +88,6 @@ const appReducer = combineReducers({
filters,
conversations,
suggestions,
suggestions_v2,
polls,
trends,
groups,

53
app/soapbox/reducers/suggestions.js
View File

@ -4,6 +4,13 @@ import {
SUGGESTIONS_FETCH_FAIL,
SUGGESTIONS_DISMISS,
} from '../actions/suggestions';
import {
SUGGESTIONS_V2_FETCH_REQUEST,
SUGGESTIONS_V2_FETCH_SUCCESS,
SUGGESTIONS_V2_FETCH_FAIL,
} from '../actions/suggestions_v2';
import { ACCOUNT_BLOCK_SUCCESS, ACCOUNT_MUTE_SUCCESS } from 'soapbox/actions/accounts';
import { DOMAIN_BLOCK_SUCCESS } from 'soapbox/actions/domain_blocks';
import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
const initialState = ImmutableMap({
@ -11,19 +18,55 @@ const initialState = ImmutableMap({
isLoading: false,
});
// Convert a v1 account into a v2 suggestion
const accountToSuggestion = account => {
return {
source: 'past_interactions',
account: account.id,
};
};
const importAccounts = (state, accounts) => {
return state.withMutations(state => {
state.set('items', fromJS(accounts.map(accountToSuggestion)));
state.set('isLoading', false);
});
};
const importSuggestions = (state, suggestions) => {
return state.withMutations(state => {
state.set('items', fromJS(suggestions.map(x => ({ ...x, account: x.account.id }))));
state.set('isLoading', false);
});
};
const dismissAccount = (state, accountId) => {
return state.update('items', list => list.filterNot(x => x.account === accountId));
};
const dismissAccounts = (state, accountIds) => {
return state.update('items', list => list.filterNot(x => accountIds.includes(x.account)));
};
export default function suggestionsReducer(state = initialState, action) {
switch(action.type) {
case SUGGESTIONS_FETCH_REQUEST:
case SUGGESTIONS_V2_FETCH_REQUEST:
return state.set('isLoading', true);
case SUGGESTIONS_FETCH_SUCCESS:
return state.withMutations(map => {
map.set('items', fromJS(action.accounts.map(x => x.id)));
map.set('isLoading', false);
});
return importAccounts(state, action.accounts);
case SUGGESTIONS_V2_FETCH_SUCCESS:
return importSuggestions(state, action.suggestions);
case SUGGESTIONS_FETCH_FAIL:
case SUGGESTIONS_V2_FETCH_FAIL:
return state.set('isLoading', false);
case SUGGESTIONS_DISMISS:
return state.update('items', list => list.filterNot(id => id === action.id));
return dismissAccount(state, action.id);
case ACCOUNT_BLOCK_SUCCESS:
case ACCOUNT_MUTE_SUCCESS:
return dismissAccount(state, action.relationship.id);
case DOMAIN_BLOCK_SUCCESS:
return dismissAccounts(state, action.accounts);
default:
return state;
}

37
app/soapbox/reducers/suggestions_v2.js
View File

@ -1,37 +0,0 @@
import {
SUGGESTIONS_V2_FETCH_REQUEST,
SUGGESTIONS_V2_FETCH_SUCCESS,
SUGGESTIONS_V2_FETCH_FAIL,
} from '../actions/suggestions_v2';
import { SUGGESTIONS_DISMISS } from '../actions/suggestions';
import { ACCOUNT_BLOCK_SUCCESS, ACCOUNT_MUTE_SUCCESS } from 'soapbox/actions/accounts';
import { DOMAIN_BLOCK_SUCCESS } from 'soapbox/actions/domain_blocks';
import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
const initialState = ImmutableMap({
items: ImmutableList(),
isLoading: false,
});
export default function suggestionsReducer(state = initialState, action) {
switch(action.type) {
case SUGGESTIONS_V2_FETCH_REQUEST:
return state.set('isLoading', true);
case SUGGESTIONS_V2_FETCH_SUCCESS:
return state.withMutations(map => {
map.set('items', fromJS(action.suggestions.map(x => ({ ...x, account: x.account.id }))));
map.set('isLoading', false);
});
case SUGGESTIONS_V2_FETCH_FAIL:
return state.set('isLoading', false);
case SUGGESTIONS_DISMISS:
return state.update('items', list => list.filterNot(x => x.account === action.id));
case ACCOUNT_BLOCK_SUCCESS:
case ACCOUNT_MUTE_SUCCESS:
return state.update('items', list => list.filterNot(x => x.account === action.relationship.id));
case DOMAIN_BLOCK_SUCCESS:
return state.update('items', list => list.filterNot(x => action.accounts.includes(x.account)));
default:
return state;
}
}