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

Revert lazy type changes to actions/instance.ts

This commit is contained in:
Alex Gleason 2022-03-24 11:09:30 -05:00
parent a773c245e8
commit 161cd3d1fc
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/soapbox/actions/instance.ts
View File

@ -59,7 +59,7 @@ export function fetchInstance() {
return api(getState).get('/api/v1/instance').then(({ data: instance }: { data: Record<string, any> }) => { return api(getState).get('/api/v1/instance').then(({ data: instance }: { data: Record<string, any> }) => {
dispatch({ type: INSTANCE_FETCH_SUCCESS, instance }); dispatch({ type: INSTANCE_FETCH_SUCCESS, instance });
if (needsNodeinfo(instance)) { if (needsNodeinfo(instance)) {
dispatch(fetchNodeinfo() as any); // Pleroma < 2.1 backwards compatibility dispatch(fetchNodeinfo()); // Pleroma < 2.1 backwards compatibility
} }
}).catch(error => { }).catch(error => {
console.error(error); console.error(error);
@ -73,10 +73,8 @@ export function loadInstance() {
return (dispatch: AppDispatch, getState: () => RootState) => { return (dispatch: AppDispatch, getState: () => RootState) => {
const host = getHost(getState()); const host = getHost(getState());
if (!host) return new Promise(r => r(null)); return dispatch(rememberInstance(host)).finally(() => {
return dispatch(fetchInstance());
return dispatch(rememberInstance(host) as any).finally(() => {
return dispatch(fetchInstance() as any);
}); });
}; };
} }