tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Glitch] Fix instance api account merging

Browse Source 
Port 0688e64a0b2839ee3bcfcaa16aedf5f6cd0d33ab to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
Echo 2026-01-30 10:30:22 +01:00 committed by Claire
parent 0e154b859f
commit fcd00902d1
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/javascript/flavours/glitch/actions/server.js
View File

@ -27,7 +27,15 @@ export const fetchServer = () => (dispatch, getState) => {
api() api()
.get('/api/v2/instance').then(({ data }) => { .get('/api/v2/instance').then(({ data }) => {
if (data.contact.account) dispatch(importFetchedAccount(data.contact.account)); // Only import the account if it doesn't already exist,
// because the API is cached even for logged in users.
const account = data.contact.account;
if (account) {
const existingAccount = getState().getIn(['accounts', account.id]);
if (!existingAccount) {
dispatch(importFetchedAccount(account));
}
}
dispatch(fetchServerSuccess(data)); dispatch(fetchServerSuccess(data));
}).catch(err => dispatch(fetchServerFail(err))); }).catch(err => dispatch(fetchServerFail(err)));
}; };