From b3c03b140631f22cd4ab783caaa14b0558e8f64d Mon Sep 17 00:00:00 2001
From: AkiraFukushima <h3.poteto@gmail.com>
Date: Sun, 29 Nov 2020 22:49:10 +0900
Subject: [PATCH] refactor: Use invoke for ipc to save hashtag

---
 src/main/index.ts                                    | 11 ++---------
 src/renderer/store/TimelineSpace/Contents/Hashtag.ts |  8 +++-----
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/main/index.ts b/src/main/index.ts
index 616026d2..047630f5 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -989,16 +989,9 @@ ipcMain.handle('change-language', async (_: IpcMainInvokeEvent, value: string) =
 })
 
 // hashtag
-ipcMain.on('save-hashtag', (event: IpcMainEvent, tag: string) => {
+ipcMain.handle('save-hashtag', async (_: IpcMainInvokeEvent, tag: string) => {
   const hashtags = new Hashtags(hashtagsDB)
-  hashtags
-    .insertTag(tag)
-    .then(() => {
-      event.sender.send('response-save-hashtag')
-    })
-    .catch(err => {
-      log.error(err)
-    })
+  await hashtags.insertTag(tag)
 })
 
 ipcMain.on('list-hashtags', (event: IpcMainEvent) => {
diff --git a/src/renderer/store/TimelineSpace/Contents/Hashtag.ts b/src/renderer/store/TimelineSpace/Contents/Hashtag.ts
index a73f0a3a..f62fe8a2 100644
--- a/src/renderer/store/TimelineSpace/Contents/Hashtag.ts
+++ b/src/renderer/store/TimelineSpace/Contents/Hashtag.ts
@@ -18,11 +18,9 @@ export type HashtagModuleState = HashtagModule & HashtagState
 const state = (): HashtagState => ({})
 
 const actions: ActionTree<HashtagState, RootState> = {
-  saveTag: ({ dispatch }, tag: string) => {
-    win.ipcRenderer.once('response-save-hashtag', () => {
-      dispatch('TimelineSpace/SideMenu/listTags', {}, { root: true })
-    })
-    win.ipcRenderer.send('save-hashtag', tag)
+  saveTag: async ({ dispatch }, tag: string) => {
+    await win.ipcRenderer.invoke('save-hashtag', tag)
+    dispatch('TimelineSpace/SideMenu/listTags', {}, { root: true })
   }
 }