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

Use ipcRenderer through window to mock ipc method in Modals

This commit is contained in:
AkiraFukushima 2019-12-04 22:56:38 +09:00
parent 8950459bd5
commit 9a3ed1fe43
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/renderer/store/TimelineSpace/Modals/NewToot.ts
View File

@ -1,5 +1,4 @@
import Mastodon, { Status, Attachment, Tag, Response, Account } from 'megalodon'
import { ipcRenderer } from 'electron'
import Visibility, { VisibilityType } from '~/src/constants/visibility'
import TootStatus, { StatusState } from './NewToot/Status'
import { Module, MutationTree, ActionTree, GetterTree } from 'vuex'
@ -15,6 +14,9 @@ import {
NewTootUnknownType,
AuthenticationError
} from '@/errors/validations'
import { MyWindow } from '~/src/types/global'
const win = window as MyWindow
type MediaDescription = {
id: string
@ -267,7 +269,7 @@ const actions: ActionTree<NewTootState, RootState> = {
return client
.post<Status>('/statuses', form)
.then((res: Response<Status>) => {
ipcRenderer.send('toot-action-sound')
win.ipcRenderer.send('toot-action-sound')
return res.data
})
.finally(() => {

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

@ -1,4 +1,3 @@
import { ipcRenderer } from 'electron'
import emojilib from 'emojilib'
import Mastodon, { Account, Response, Results } from 'megalodon'
import { Module, MutationTree, ActionTree, GetterTree } from 'vuex'
@ -6,6 +5,9 @@ import { RootState } from '@/store/index'
import { LocalTag } from '~/src/types/localTag'
import { InsertAccountCache } from '~/src/types/insertAccountCache'
import { CachedAccount } from '~/src/types/cachedAccount'
import { MyWindow } from '~/src/types/global'
const win = window as MyWindow
type Suggest = {
name: string
@ -151,7 +153,7 @@ const actions: ActionTree<StatusState, RootState> = {
const searchCache = () => {
return new Promise(resolve => {
const target = word.replace('@', '')
ipcRenderer.once('response-get-cache-accounts', (_, accounts: Array<CachedAccount>) => {
win.ipcRenderer.once('response-get-cache-accounts', (_, accounts: Array<CachedAccount>) => {
const matched = accounts.map(account => account.acct).filter(acct => acct.includes(target))
if (matched.length === 0) throw new Error('Empty')
commit(MUTATION_TYPES.APPEND_FILTERED_ACCOUNTS, matched)
@ -161,7 +163,7 @@ const actions: ActionTree<StatusState, RootState> = {
commit(MUTATION_TYPES.FILTERED_SUGGESTION_FROM_ACCOUNTS)
resolve(matched)
})
ipcRenderer.send('get-cache-accounts', rootState.TimelineSpace.account._id)
win.ipcRenderer.send('get-cache-accounts', rootState.TimelineSpace.account._id)
})
}
const searchAPI = async () => {
@ -174,8 +176,11 @@ const actions: ActionTree<StatusState, RootState> = {
commit(MUTATION_TYPES.SET_CLIENT, client)
const res: Response<Array<Account>> = await client.get<Array<Account>>('/accounts/search', { q: word, resolve: false })
if (res.data.length === 0) throw new Error('Empty')
commit(MUTATION_TYPES.APPEND_FILTERED_ACCOUNTS, res.data.map(account => account.acct))
ipcRenderer.send('insert-cache-accounts', {
commit(
MUTATION_TYPES.APPEND_FILTERED_ACCOUNTS,
res.data.map(account => account.acct)
)
win.ipcRenderer.send('insert-cache-accounts', {
ownerID: rootState.TimelineSpace.account._id!,
accts: res.data.map(a => a.acct)
} as InsertAccountCache)
@ -195,7 +200,7 @@ const actions: ActionTree<StatusState, RootState> = {
const searchCache = () => {
return new Promise(resolve => {
const target = word.replace('#', '')
ipcRenderer.once('response-get-cache-hashtags', (_, tags: Array<LocalTag>) => {
win.ipcRenderer.once('response-get-cache-hashtags', (_, tags: Array<LocalTag>) => {
const matched = tags.map(tag => tag.tagName).filter(tag => tag.includes(target))
if (matched.length === 0) throw new Error('Empty')
commit(MUTATION_TYPES.APPEND_FILTERED_HASHTAGS, matched)
@ -205,7 +210,7 @@ const actions: ActionTree<StatusState, RootState> = {
commit(MUTATION_TYPES.FILTERED_SUGGESTION_FROM_HASHTAGS)
resolve(matched)
})
ipcRenderer.send('get-cache-hashtags')
win.ipcRenderer.send('get-cache-hashtags')
})
}
const searchAPI = async () => {
@ -218,8 +223,14 @@ const actions: ActionTree<StatusState, RootState> = {
commit(MUTATION_TYPES.SET_CLIENT, client)
const res: Response<Results> = await client.get<Results>('/search', { q: word })
if (res.data.hashtags.length === 0) throw new Error('Empty')
commit(MUTATION_TYPES.APPEND_FILTERED_HASHTAGS, res.data.hashtags.map(tag => tag.name))
ipcRenderer.send('insert-cache-hashtags', res.data.hashtags.map(tag => tag.name))
commit(
MUTATION_TYPES.APPEND_FILTERED_HASHTAGS,
res.data.hashtags.map(tag => tag.name)
)
win.ipcRenderer.send(
'insert-cache-hashtags',
res.data.hashtags.map(tag => tag.name)
)
commit(MUTATION_TYPES.CHANGE_OPEN_SUGGEST, true)
commit(MUTATION_TYPES.CHANGE_START_INDEX, start)
commit(MUTATION_TYPES.CHANGE_MATCH_WORD, word)