refs #574 Save marker in local db every time receive a new status in notifications

src/main/index.ts

@@ -147,6 +147,7 @@ const markerDB = new Datastore({
   filename: markerDBPath,
   autoload: true
 })
+const markerRepo = new Marker(markerDB)
 
 /**
  * Cache path
@@ -1147,8 +1148,7 @@ ipcMain.handle('update-spellchecker-languages', async (_: IpcMainInvokeEvent, la
 
 // marker
 ipcMain.handle('save-marker', async (_: IpcMainInvokeEvent, marker: LocalMarker) => {
-  const repo = new Marker(markerDB)
+  await markerRepo.save(marker)
-  await repo.save(marker)
 })
 
 // hashtag

src/main/marker.ts

@@ -25,39 +25,39 @@ export default class Marker {
       // eslint-disable-line no-unused-vars
       this.db.update(
         {
-          acct: marker.acct,
+          owner_id: marker.owner_id,
           timeline: marker.timeline
         },
         { $set: marker },
         { multi: false },
         err => {
           if (err) return reject(err)
-          return this.get(marker.acct, marker.timeline)
+          return this.get(marker.owner_id, marker.timeline)
         }
       )
     })
   }
 
   public async save(marker: LocalMarker): Promise<LocalMarker> {
-    return this.get(marker.acct, marker.timeline).then(l => {
+    return this.get(marker.owner_id, marker.timeline).then(l => {
       if (isEmpty(l)) return this.insert(marker)
       return this.update(marker)
     })
   }
 
-  public async get(acct: string, timeline: 'home' | 'notifications'): Promise<LocalMarker> {
+  public async get(owner_id: string, timeline: 'home' | 'notifications'): Promise<LocalMarker> {
     return new Promise((resolve, reject) => {
-      this.db.findOne<LocalMarker>({ acct: acct, timeline: timeline }, (err, doc) => {
+      this.db.findOne<LocalMarker>({ owner_id: owner_id, timeline: timeline }, (err, doc) => {
         if (err) return reject(err)
         resolve(doc)
       })
     })
   }
 
-  public async list(acct: string): Promise<Array<LocalMarker>> {
+  public async list(owner_id: string): Promise<Array<LocalMarker>> {
     return new Promise((resolve, reject) => {
       this.db
-        .find<LocalMarker>({ acct: acct })
+        .find<LocalMarker>({ owner_id: owner_id })
         .exec((err, docs) => {
           if (err) return reject(err)
           resolve(docs)

src/renderer/components/TimelineSpace/Contents/Home.vue

@@ -94,6 +94,10 @@ export default {
         this.focusedId = previousFocusedId
       })
     })
+
+    if (this.heading && this.timeline.length > 0) {
+      this.$store.dispatch('TimelineSpace/Contents/Home/saveMarker', this.timeline[0].id)
+    }
   },
   beforeUpdate() {
     if (this.$store.state.TimelineSpace.SideMenu.unreadHomeTimeline && this.heading) {

src/renderer/components/TimelineSpace/Contents/Notifications.vue

@@ -47,10 +47,12 @@ export default {
     ...mapState({
       openSideBar: state => state.TimelineSpace.Contents.SideBar.openSideBar,
       startReload: state => state.TimelineSpace.HeaderMenu.reload,
-      backgroundColor: state => state.App.theme.background_color,
+      backgroundColor: state => state.App.theme.background_color
-      lazyLoading: state => state.TimelineSpace.Contents.Notifications.lazyLoading,
+    }),
-      heading: state => state.TimelineSpace.Contents.Notifications.heading,
+    ...mapState('TimelineSpace/Contents/Notifications', {
-      unread: state => state.TimelineSpace.Contents.Notifications.unreadNotifications
+      lazyLoading: state => state.lazyLoading,
+      heading: state => state.heading,
+      unread: state => state.unreadNotifications
     }),
     ...mapGetters('TimelineSpace/Contents/Notifications', ['handledNotifications', 'filters']),
     ...mapGetters('TimelineSpace/Modals', ['modalOpened']),
@@ -79,6 +81,10 @@ export default {
         this.focusedId = previousFocusedId
       })
     })
+
+    if (this.heading && this.handledNotifications.length > 0) {
+      this.$store.dispatch('TimelineSpace/Contents/Notifications/saveMarker', this.handledNotifications[0].id)
+    }
   },
   beforeUpdate() {
     if (this.$store.state.TimelineSpace.SideMenu.unreadNotifications) {
@@ -113,6 +119,11 @@ export default {
         this.$store.commit('TimelineSpace/Contents/Notifications/mergeNotifications')
         this.$store.dispatch('TimelineSpace/Contents/Notifications/resetBadge')
       }
+    },
+    handledNotifications: function (newState, _oldState) {
+      if (this.heading && newState.length > 0) {
+        this.$store.dispatch('TimelineSpace/Contents/Notifications/saveMarker', newState[0].id)
+      }
     }
   },
   methods: {

src/renderer/store/TimelineSpace/Contents/Home.ts

@@ -141,11 +141,10 @@ const actions: ActionTree<HomeState, RootState> = {
       })
   },
   saveMarker: async ({ rootState }, id: string) => {
-    const acct = `@${rootState.TimelineSpace.account.username}@${rootState.TimelineSpace.account.domain}`
     await win.ipcRenderer.invoke('save-marker', {
-      acct: acct,
+      owner_id: rootState.TimelineSpace.account._id,
       timeline: 'home',
-      lastReadID: id
+      last_read_id: id
     } as LocalMarker)
   }
 }

src/renderer/store/TimelineSpace/Contents/Notifications.ts

@@ -1,6 +1,7 @@
 import generator, { Entity, FilterContext, NotificationType } from 'megalodon'
 import { Module, MutationTree, ActionTree, GetterTree } from 'vuex'
 import { RootState } from '@/store'
+import { LocalMarker } from '~/src/types/localMarker'
 import { MyWindow } from '~/src/types/global'
 
 const win = (window as any) as MyWindow
@@ -135,6 +136,13 @@ const actions: ActionTree<NotificationsState, RootState> = {
   },
   resetBadge: () => {
     win.ipcRenderer.send('reset-badge')
+  },
+  saveMarker: async ({ rootState }, id: string) => {
+    await win.ipcRenderer.invoke('save-marker', {
+      owner_id: rootState.TimelineSpace.account._id,
+      timeline: 'notifications',
+      last_read_id: id
+    } as LocalMarker)
   }
 }
 

src/types/localMarker.ts

@@ -1,5 +1,5 @@
 export type LocalMarker = {
-  acct: string
+  owner_id: string
   timeline: 'home' | 'notifications'
-  lastReadID: string
+  last_read_id: string
 }