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

Don't write settings back to Redux after PATCH, prevents race conditions

This commit is contained in:
Alex Gleason 2020-08-26 00:37:55 -05:00
parent 5fc8b3ff3d
commit f52186bc01
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/soapbox/reducers/settings.js
View File

@ -3,7 +3,7 @@ import { NOTIFICATIONS_FILTER_SET } from '../actions/notifications';
import { STORE_HYDRATE } from '../actions/store'; import { STORE_HYDRATE } from '../actions/store';
import { EMOJI_USE } from '../actions/emojis'; import { EMOJI_USE } from '../actions/emojis';
import { LIST_DELETE_SUCCESS, LIST_FETCH_FAIL } from '../actions/lists'; import { LIST_DELETE_SUCCESS, LIST_FETCH_FAIL } from '../actions/lists';
import { ME_FETCH_SUCCESS, ME_PATCH_SUCCESS } from 'soapbox/actions/me'; import { ME_FETCH_SUCCESS } from 'soapbox/actions/me';
import { Map as ImmutableMap, fromJS } from 'immutable'; import { Map as ImmutableMap, fromJS } from 'immutable';
import uuid from '../uuid'; import uuid from '../uuid';
@ -32,13 +32,8 @@ export default function settings(state = initialState, action) {
case STORE_HYDRATE: case STORE_HYDRATE:
return hydrate(state, action.state.get('settings')); return hydrate(state, action.state.get('settings'));
case ME_FETCH_SUCCESS: case ME_FETCH_SUCCESS:
case ME_PATCH_SUCCESS:
const me = fromJS(action.me); const me = fromJS(action.me);
let fePrefs = me.getIn(['pleroma', 'settings_store', FE_NAME], ImmutableMap()); let fePrefs = me.getIn(['pleroma', 'settings_store', FE_NAME], ImmutableMap());
// Spinster migration hotfix
if (fePrefs.get('locale') === '') {
fePrefs = fePrefs.delete('locale');
}
return state.merge(fePrefs); return state.merge(fePrefs);
case NOTIFICATIONS_FILTER_SET: case NOTIFICATIONS_FILTER_SET:
case SETTING_CHANGE: case SETTING_CHANGE: