bf3cb42da7
Cherry-picked d2528b26b6
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
Upstream changed stuff, we had extra attributes.
Applied upstream changes while keeping our extra attributes.
- `app/serializers/rest/instance_serializer.rb`:
Upstream actually moved that to `app/serializers/rest/v1/instance_serializer.rb`,
so updated that file by keeping our extra attributes, and took upstream's
version of `app/serializers/rest/instance_serializer.rb`.
- `spec/views/about/show.html.haml_spec.rb`:
Took upstream's version.
19 lines
571 B
JavaScript
19 lines
571 B
JavaScript
import { SERVER_FETCH_REQUEST, SERVER_FETCH_SUCCESS, SERVER_FETCH_FAIL } from 'mastodon/actions/server';
|
|
import { Map as ImmutableMap, fromJS } from 'immutable';
|
|
|
|
const initialState = ImmutableMap({
|
|
isLoading: true,
|
|
});
|
|
|
|
export default function server(state = initialState, action) {
|
|
switch (action.type) {
|
|
case SERVER_FETCH_REQUEST:
|
|
return state.set('isLoading', true);
|
|
case SERVER_FETCH_SUCCESS:
|
|
return fromJS(action.server).set('isLoading', false);
|
|
case SERVER_FETCH_FAIL:
|
|
return state.set('isLoading', false);
|
|
default:
|
|
return state;
|
|
}
|
|
}
|