Mastodon
/
Whalebird-desktop-client-mac-linux-windows
mirror of https://github.com/h3poteto/whalebird-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

refactor: Use invoke for ipc to get cache hashtags

This commit is contained in:
AkiraFukushima 2020-11-29 23:40:52 +09:00
parent 46a0087c78
commit d2ca00354b
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/index.ts
View File

@ -1025,9 +1025,9 @@ ipcMain.handle('update-unread-notification', async (_: IpcMainInvokeEvent, confi
}) })
// Cache // Cache
ipcMain.on('get-cache-hashtags', async (event: IpcMainEvent) => { ipcMain.handle('get-cache-hashtags', async (_: IpcMainInvokeEvent) => {
const tags = await hashtagCache.listTags() const tags = await hashtagCache.listTags()
event.sender.send('response-get-cache-hashtags', tags) return tags
}) })
ipcMain.on('insert-cache-hashtags', (event: IpcMainEvent, tags: Array<string>) => { ipcMain.on('insert-cache-hashtags', (event: IpcMainEvent, tags: Array<string>) => {

10
src/renderer/store/TimelineSpace/Modals/NewToot/Status.ts
View File

@ -197,10 +197,9 @@ const actions: ActionTree<StatusState, RootState> = {
commit(MUTATION_TYPES.CLEAR_FILTERED_HASHTAGS) commit(MUTATION_TYPES.CLEAR_FILTERED_HASHTAGS)
commit(MUTATION_TYPES.FILTERED_SUGGESTION_FROM_HASHTAGS) commit(MUTATION_TYPES.FILTERED_SUGGESTION_FROM_HASHTAGS)
const { word, start } = wordStart const { word, start } = wordStart
const searchCache = () => { const searchCache = async () => {
return new Promise(resolve => {
const target = word.replace('#', '') const target = word.replace('#', '')
win.ipcRenderer.once('response-get-cache-hashtags', (_, tags: Array<LocalTag>) => { const tags: Array<LocalTag> = await win.ipcRenderer.invoke('get-cache-hashtags')
const matched = tags.map(tag => tag.tagName).filter(tag => tag.includes(target)) const matched = tags.map(tag => tag.tagName).filter(tag => tag.includes(target))
if (matched.length === 0) throw new Error('Empty') if (matched.length === 0) throw new Error('Empty')
commit(MUTATION_TYPES.APPEND_FILTERED_HASHTAGS, matched) commit(MUTATION_TYPES.APPEND_FILTERED_HASHTAGS, matched)
@ -208,10 +207,7 @@ const actions: ActionTree<StatusState, RootState> = {
commit(MUTATION_TYPES.CHANGE_START_INDEX, start) commit(MUTATION_TYPES.CHANGE_START_INDEX, start)
commit(MUTATION_TYPES.CHANGE_MATCH_WORD, word) commit(MUTATION_TYPES.CHANGE_MATCH_WORD, word)
commit(MUTATION_TYPES.FILTERED_SUGGESTION_FROM_HASHTAGS) commit(MUTATION_TYPES.FILTERED_SUGGESTION_FROM_HASHTAGS)
resolve(matched) return matched
})
win.ipcRenderer.send('get-cache-hashtags')
})
} }
const searchAPI = async () => { const searchAPI = async () => {
const client = generator( const client = generator(