refs #850 Replace hashtag with typescript

spec/renderer/integration/store/TimelineSpace/SideMenu.spec.ts

@@ -4,7 +4,7 @@ import { createLocalVue } from '@vue/test-utils'
 import Vuex from 'vuex'
 import { ipcMain } from '~/spec/mock/electron'
 import SideMenu, { SideMenuState } from '~/src/renderer/store/TimelineSpace/SideMenu'
-import Hashtag from '~/src/types/hashtag'
+import LocalTag from '~/src/types/localTag'
 
 jest.mock('megalodon')
 
@@ -116,10 +116,10 @@ describe('SideMenu', () => {
 
   describe('listTags', () => {
     it('should be listed', async () => {
-      const tag1: Hashtag = {
+      const tag1: LocalTag = {
         tagName: 'tag1'
       }
-      const tag2: Hashtag = {
+      const tag2: LocalTag = {
         tagName: 'tag2'
       }
       ipcMain.once('list-hashtags', (event: any, _) => {

spec/renderer/unit/store/TimelineSpace/Modals/Jump.spec.ts

@@ -1,6 +1,6 @@
 import i18n from '~/src/config/i18n'
 import Jump, { JumpState, MUTATION_TYPES, Channel } from '@/store/TimelineSpace/Modals/Jump'
-import Hashtag from '~/src/types/hashtag'
+import LocalTag from '~/src/types/localTag'
 import { List } from 'megalodon'
 
 describe('TimelineSpace/Modals/Jump', () => {
@@ -87,10 +87,10 @@ describe('TimelineSpace/Modals/Jump', () => {
 
     describe('updateTagChannel', () => {
       it('should be updated', () => {
-        const whalebird: Hashtag = {
+        const whalebird: LocalTag = {
           tagName: 'whalebird'
         }
-        const tqrk: Hashtag = {
+        const tqrk: LocalTag = {
           tagName: 'tqrk'
         }
         const channelList = [whalebird, tqrk]

src/main/hashtags.ts

@@ -1,19 +1,24 @@
+import Datastore from 'nedb'
+import LocalTag from '~/src/types/localTag'
+
 export default class Hashtags {
-  constructor (db) {
+  private db: Datastore
+
+  constructor (db: Datastore) {
     this.db = db
     this.db.ensureIndex({ fieldName: 'tagName', unique: true }, (_) => {})
   }
 
-  listTags () {
+  listTags (): Promise<Array<LocalTag>> {
     return new Promise((resolve, reject) => {
-      this.db.find({}, (err, docs) => {
+      this.db.find<LocalTag>({}, (err, docs) => {
         if (err) return reject(err)
         resolve(docs)
       })
     })
   }
 
-  insertTag (tag) {
+  insertTag (tag: string): Promise<LocalTag> {
     return new Promise((resolve, reject) => {
       this.db.insert({ tagName: tag }, (err, doc) => {
         if (err) return reject(err)
@@ -22,11 +27,11 @@ export default class Hashtags {
     })
   }
 
-  removeTag (tag) {
+  removeTag (localTag: LocalTag): Promise<number> {
     return new Promise((resolve, reject) => {
       this.db.remove(
         {
-          tagName: tag.tagName
+          tagName: localTag.tagName
         },
         { multi: true },
         (err, numRemoved) => {

src/main/index.ts

@@ -21,6 +21,7 @@ import UnreadNotification from './unread_notification'
 import i18n from '../config/i18n'
 import Language from '../constants/language'
 import LocalAccount from '~src/types/localAccount'
+import LocalTag from '~src/types/localTag'
 
 /**
  * Context menu
@@ -767,7 +768,7 @@ ipcMain.on('change-language', (event, value) => {
 })
 
 // hashtag
-ipcMain.on('save-hashtag', (event, tag) => {
+ipcMain.on('save-hashtag', (event: Event, tag: string) => {
   const hashtags = new Hashtags(hashtagsDB)
   hashtags.insertTag(tag)
     .then(() => {
@@ -778,7 +779,7 @@ ipcMain.on('save-hashtag', (event, tag) => {
     })
 })
 
-ipcMain.on('list-hashtags', (event, _) => {
+ipcMain.on('list-hashtags', (event: Event, _) => {
   const hashtags = new Hashtags(hashtagsDB)
   hashtags.listTags()
     .then((tags) => {
@@ -789,7 +790,7 @@ ipcMain.on('list-hashtags', (event, _) => {
     })
 })
 
-ipcMain.on('remove-hashtag', (event, tag) => {
+ipcMain.on('remove-hashtag', (event: Event, tag: LocalTag) => {
   const hashtags = new Hashtags(hashtagsDB)
   hashtags.removeTag(tag)
     .then(() => {

src/renderer/store/TimelineSpace/Contents/Hashtag/List.ts

@@ -1,10 +1,10 @@
 import { ipcRenderer } from 'electron'
-import Hashtag from '~/src/types/hashtag'
+import LocalTag from '~/src/types/localTag'
 import { Module, MutationTree, ActionTree } from 'vuex'
 import { RootState } from '@/store'
 
 export interface ListState {
-  tags: Array<Hashtag>
+  tags: Array<LocalTag>
 }
 
 const state = (): ListState => ({
@@ -16,7 +16,7 @@ export const MUTATION_TYPES = {
 }
 
 const mutations: MutationTree<ListState> = {
-  [MUTATION_TYPES.UPDATE_TAGS]: (state, tags: Array<Hashtag>) => {
+  [MUTATION_TYPES.UPDATE_TAGS]: (state, tags: Array<LocalTag>) => {
     state.tags = tags
   }
 }
@@ -24,7 +24,7 @@ const mutations: MutationTree<ListState> = {
 const actions: ActionTree<ListState, RootState> = {
   listTags: ({ commit }) => {
     return new Promise((resolve, reject) => {
-      ipcRenderer.once('response-list-hashtags', (_, tags: Array<Hashtag>) => {
+      ipcRenderer.once('response-list-hashtags', (_, tags: Array<LocalTag>) => {
         ipcRenderer.removeAllListeners('error-list-hashtags')
         commit(MUTATION_TYPES.UPDATE_TAGS, tags)
         resolve(tags)
@@ -36,7 +36,7 @@ const actions: ActionTree<ListState, RootState> = {
       ipcRenderer.send('list-hashtags')
     })
   },
-  removeTag: ({ dispatch }, tag: Hashtag) => {
+  removeTag: ({ dispatch }, tag: LocalTag) => {
     return new Promise((resolve, reject) => {
       ipcRenderer.once('response-remove-hashtag', () => {
         ipcRenderer.removeAllListeners('error-remove-hashtag')

src/renderer/store/TimelineSpace/Modals/Jump.ts

@@ -2,7 +2,7 @@ import router from '@/router'
 import i18n from '~/src/config/i18n'
 import { Module, MutationTree, ActionTree } from 'vuex'
 import { List } from 'megalodon'
-import Hashtag from '~/src/types/hashtag'
+import LocalTag from '~/src/types/localTag'
 import { RootState } from '@/store'
 
 export interface Channel {
@@ -95,7 +95,7 @@ const mutations: MutationTree<JumpState> = {
       return channel
     })
   },
-  [MUTATION_TYPES.UPDATE_TAG_CHANNEL]: (state, tags: Array<Hashtag>) => {
+  [MUTATION_TYPES.UPDATE_TAG_CHANNEL]: (state, tags: Array<LocalTag>) => {
     state.tagChannelList = tags.map(t => {
       const channel: Channel = {
         name: `#${t.tagName}`,

src/renderer/store/TimelineSpace/SideMenu.ts

@@ -1,7 +1,7 @@
 import Mastodon, { List, Response } from 'megalodon'
 import { ipcRenderer } from 'electron'
 import { Module, MutationTree, ActionTree } from 'vuex'
-import Hashtag from '~/src/types/hashtag'
+import LocalTag from '~/src/types/localTag'
 import LocalAccount from '~/src/types/localAccount'
 import { RootState } from '@/store'
 
@@ -13,7 +13,7 @@ export interface SideMenuState {
   unreadDirectMessagesTimeline: boolean,
   unreadPublicTimeline: boolean,
   lists: Array<List>,
-  tags: Array<Hashtag>,
+  tags: Array<LocalTag>,
   collapse: boolean
 }
 
@@ -66,7 +66,7 @@ const mutations: MutationTree<SideMenuState> = {
   [MUTATION_TYPES.CHANGE_COLLAPSE]: (state, collapse: boolean) => {
     state.collapse = collapse
   },
-  [MUTATION_TYPES.UPDATE_TAGS]: (state, tags: Array<Hashtag>) => {
+  [MUTATION_TYPES.UPDATE_TAGS]: (state, tags: Array<LocalTag>) => {
     state.tags = tags
   }
 }
@@ -105,7 +105,7 @@ const actions: ActionTree<SideMenuState, RootState> = {
   },
   listTags: ({ commit }) => {
     return new Promise((resolve, reject) => {
-      ipcRenderer.once('response-list-hashtags', (_, tags: Array<Hashtag>) => {
+      ipcRenderer.once('response-list-hashtags', (_, tags: Array<LocalTag>) => {
         ipcRenderer.removeAllListeners('error-list-hashtags')
         commit(MUTATION_TYPES.UPDATE_TAGS, tags)
         resolve(tags)

src/types/localTag.ts

@@ -1,4 +1,4 @@
-export default interface Hasthag {
+export default interface LocalTag {
   tagName: string,
   _id?: string
 }