HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix: add await to new getAccounts() call

Browse source
This commit is contained in:
tamaina 2021-06-30 00:18:52 +09:00
parent a1c45e85cf
commit a3ef6d9bf2
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/client/pages/settings/accounts.vue
View file

@ -48,10 +48,10 @@ export default defineComponent({
title: this.$ts.accounts, title: this.$ts.accounts,
icon: 'fas fa-users', icon: 'fas fa-users',
}, },
storedAccounts: getAccounts().filter(x => x.id !== this.$i.id), storedAccounts: getAccounts().then(accounts => accounts.filter(x => x.id !== this.$i.id)),
accounts: null, accounts: null,
init: () => os.api('users/show', { init: async () => os.api('users/show', {
userIds: this.storedAccounts.map(x => x.id) userIds: (await this.storedAccounts).map(x => x.id)
}).then(accounts => { }).then(accounts => {
this.accounts = accounts; this.accounts = accounts;
}), }),
@ -104,8 +104,8 @@ export default defineComponent({
}, 'closed'); }, 'closed');
}, },
switchAccount(account: any) { async switchAccount(account: any) {
const storedAccounts = getAccounts(); const storedAccounts = await getAccounts();
const token = storedAccounts.find(x => x.id === account.id).token; const token = storedAccounts.find(x => x.id === account.id).token;
this.switchAccountWithToken(token); this.switchAccountWithToken(token);
}, },

6
src/client/ui/default.sidebar.vue
View file

@ -121,7 +121,7 @@ export default defineComponent({
}, },
async openAccountMenu(ev) { async openAccountMenu(ev) {
const storedAccounts = getAccounts().filter(x => x.id !== this.$i.id); const storedAccounts = (await getAccounts()).filter(x => x.id !== this.$i.id);
const accountsPromise = os.api('users/show', { userIds: storedAccounts.map(x => x.id) }); const accountsPromise = os.api('users/show', { userIds: storedAccounts.map(x => x.id) });
const accountItemPromises = storedAccounts.map(a => new Promise(res => { const accountItemPromises = storedAccounts.map(a => new Promise(res => {
@ -181,8 +181,8 @@ export default defineComponent({
}, 'closed'); }, 'closed');
}, },
switchAccount(account: any) { async switchAccount(account: any) {
const storedAccounts = getAccounts(); const storedAccounts = await getAccounts();
const token = storedAccounts.find(x => x.id === account.id).token; const token = storedAccounts.find(x => x.id === account.id).token;
this.switchAccountWithToken(token); this.switchAccountWithToken(token);
}, },