Merge branch 'account-lookup' into 'develop'

Use account lookup in fetchAccountByUsername

See merge request soapbox-pub/soapbox-fe!941
merge-requests/947/merge
marcin mikołajczak 2022-01-01 23:05:52 +00:00
commit 6174c1553b
1 zmienionych plików z 9 dodań i 1 usunięć

Wyświetl plik

@ -148,8 +148,16 @@ export function fetchAccountByUsername(username) {
const instance = state.get('instance');
const features = getFeatures(instance);
const me = state.get('me');
if (features.accountByUsername) {
if (!me && features.accountLookup) {
dispatch(accountLookup(username)).then(account => {
dispatch(fetchAccountSuccess(account));
}).catch(error => {
dispatch(fetchAccountFail(null, error));
dispatch(importErrorWhileFetchingAccountByUsername(username));
});
} else if (features.accountByUsername) {
api(getState).get(`/api/v1/accounts/${username}`).then(response => {
dispatch(fetchRelationships([response.data.id]));
dispatch(importFetchedAccount(response.data));