From 5c94bc5cb7db44ad0f2bf67895b8454904913759 Mon Sep 17 00:00:00 2001
From: AkiraFukushima <h3.poteto@gmail.com>
Date: Sat, 28 Nov 2020 23:10:24 +0900
Subject: [PATCH] refactor: Use invoke for ipc to update account

---
 src/main/index.ts                   | 12 +++---------
 src/renderer/store/TimelineSpace.ts | 15 +++------------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/src/main/index.ts b/src/main/index.ts
index 8eea7938..1a61b2c2 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -437,16 +437,10 @@ ipcMain.handle('get-local-account', async (_: IpcMainInvokeEvent, id: string) =>
   return account
 })
 
-ipcMain.on('update-account', async (event: IpcMainEvent, acct: LocalAccount) => {
+ipcMain.handle('update-account', async (_: IpcMainInvokeEvent, acct: LocalAccount) => {
   const proxy = await proxyConfiguration.forMastodon()
-  accountManager
-    .refresh(acct, proxy)
-    .then(ac => {
-      event.sender.send('response-update-account', ac)
-    })
-    .catch(err => {
-      event.sender.send('error-update-account', err)
-    })
+  const ac: LocalAccount = await accountManager.refresh(acct, proxy)
+  return ac
 })
 
 ipcMain.on('remove-account', (event: IpcMainEvent, id: string) => {
diff --git a/src/renderer/store/TimelineSpace.ts b/src/renderer/store/TimelineSpace.ts
index 2618fbff..774582ec 100644
--- a/src/renderer/store/TimelineSpace.ts
+++ b/src/renderer/store/TimelineSpace.ts
@@ -132,18 +132,9 @@ const actions: ActionTree<TimelineSpaceState, RootState> = {
       return account
     }
   },
-  fetchAccount: (_, account: LocalAccount): Promise<LocalAccount> => {
-    return new Promise((resolve, reject) => {
-      win.ipcRenderer.send('update-account', account)
-      win.ipcRenderer.once('error-update-account', (_, err: Error) => {
-        win.ipcRenderer.removeAllListeners('response-update-account')
-        reject(err)
-      })
-      win.ipcRenderer.once('response-update-account', (_, account: LocalAccount) => {
-        win.ipcRenderer.removeAllListeners('error-update-account')
-        resolve(account)
-      })
-    })
+  fetchAccount: async (_, account: LocalAccount): Promise<LocalAccount> => {
+    const acct: LocalAccount = await win.ipcRenderer.invoke('update-account', account)
+    return acct
   },
   clearAccount: async ({ commit }) => {
     commit(MUTATION_TYPES.UPDATE_ACCOUNT, blankAccount)