Fix Mastodon startup issues

stable/1.0.x
Alex Gleason 2020-04-23 11:42:56 -05:00
rodzic d151ac9b35
commit 85a68e0715
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 7211D1F99744FBB7
3 zmienionych plików z 6 dodań i 4 usunięć

Wyświetl plik

@ -64,7 +64,6 @@ export function fetchMeFail(error) {
return { return {
type: ME_FETCH_FAIL, type: ME_FETCH_FAIL,
error, error,
skipAlert: true,
}; };
}; };

Wyświetl plik

@ -15,7 +15,7 @@ const initialState = ImmutableMap({
export default function instance(state = initialState, action) { export default function instance(state = initialState, action) {
switch(action.type) { switch(action.type) {
case INSTANCE_IMPORT: case INSTANCE_IMPORT:
return ImmutableMap(fromJS(action.instance)); return initialState.merge(fromJS(action.instance));
default: default:
return state; return state;
} }

Wyświetl plik

@ -12,8 +12,11 @@ export default function meta(state = initialState, action) {
return state.merge(action.state.get('meta')); return state.merge(action.state.get('meta'));
case ME_FETCH_SUCCESS: case ME_FETCH_SUCCESS:
const me = fromJS(action.me); const me = fromJS(action.me);
if (me.has('pleroma')) {
const pleroPrefs = me.get('pleroma').delete('settings_store'); const pleroPrefs = me.get('pleroma').delete('settings_store');
return state.mergeIn(['pleroma'], pleroPrefs); return state.mergeIn(['pleroma'], pleroPrefs);
}
return state;
default: default:
return state; return state;
} }