From ea27483f2728b5c2f1dd57228b8bf1ab9ae223ff Mon Sep 17 00:00:00 2001
From: jasper <jasper92341@hotmail.com>
Date: Wed, 3 Apr 2019 09:04:46 -0700
Subject: Fix notification bugs

---
 src/modules/statuses.js | 43 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

(limited to 'src/modules/statuses.js')

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 8e0203e3..660d5c26 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -20,20 +20,22 @@ const emptyTl = (userId = 0) => ({
   flushMarker: 0
 })
 
+const emptyNotifications = () => ({
+  desktopNotificationSilence: true,
+  maxId: 0,
+  minId: Number.POSITIVE_INFINITY,
+  data: [],
+  idStore: {},
+  loading: false,
+  error: false,
+  fetcherId: null
+})
+
 export const defaultState = () => ({
   allStatuses: [],
   allStatusesObject: {},
   maxId: 0,
-  notifications: {
-    desktopNotificationSilence: true,
-    maxId: 0,
-    minId: Number.POSITIVE_INFINITY,
-    data: [],
-    idStore: {},
-    loading: false,
-    error: false,
-    fetcherId: null
-  },
+  notifications: emptyNotifications(),
   favorites: new Set(),
   error: false,
   timelines: {
@@ -340,9 +342,9 @@ export const mutations = {
     oldTimeline.visibleStatusesObject = {}
     each(oldTimeline.visibleStatuses, (status) => { oldTimeline.visibleStatusesObject[status.id] = status })
   },
-  setNotificationFetcher (state, { fetcherId }) {
-    state.notifications.fetcherId = fetcherId
-  },
+  // setNotificationFetcher (state, { fetcherId }) {
+  //   state.notifications.fetcherId = fetcherId
+  // },
   resetStatuses (state) {
     const emptyState = defaultState()
     Object.entries(emptyState).forEach(([key, value]) => {
@@ -352,6 +354,9 @@ export const mutations = {
   clearTimeline (state, { timeline }) {
     state.timelines[timeline] = emptyTl(state.timelines[timeline].userId)
   },
+  clearNotifications (state) {
+    state.notifications = emptyNotifications()
+  },
   setFavorited (state, { status, value }) {
     const newStatus = state.allStatusesObject[status.id]
     newStatus.favorited = value
@@ -428,12 +433,12 @@ const statuses = {
     setNotificationsSilence ({ rootState, commit }, { value }) {
       commit('setNotificationsSilence', { value })
     },
-    stopFetchingNotifications ({ rootState, commit }) {
-      if (rootState.statuses.notifications.fetcherId) {
-        window.clearInterval(rootState.statuses.notifications.fetcherId)
-      }
-      commit('setNotificationFetcher', { fetcherId: null })
-    },
+    // stopFetchingNotifications ({ rootState, commit }) {
+    //   if (rootState.statuses.notifications.fetcherId) {
+    //     window.clearInterval(rootState.statuses.notifications.fetcherId)
+    //   }
+    //   commit('setNotificationFetcher', { fetcherId: null })
+    // },
     deleteStatus ({ rootState, commit }, status) {
       commit('setDeleted', { status })
       apiService.deleteStatus({ id: status.id, credentials: rootState.users.currentUser.credentials })
-- 
cgit v1.2.3-70-g09d2


From 7c2b65e9a3645d0c6f8bd88abe6f10ff6b016a9c Mon Sep 17 00:00:00 2001
From: jasper <jasper92341@hotmail.com>
Date: Wed, 3 Apr 2019 09:08:23 -0700
Subject: Remove useless codes

---
 src/modules/statuses.js | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'src/modules/statuses.js')

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 660d5c26..8e58d673 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -27,8 +27,7 @@ const emptyNotifications = () => ({
   data: [],
   idStore: {},
   loading: false,
-  error: false,
-  fetcherId: null
+  error: false
 })
 
 export const defaultState = () => ({
@@ -342,9 +341,6 @@ export const mutations = {
     oldTimeline.visibleStatusesObject = {}
     each(oldTimeline.visibleStatuses, (status) => { oldTimeline.visibleStatusesObject[status.id] = status })
   },
-  // setNotificationFetcher (state, { fetcherId }) {
-  //   state.notifications.fetcherId = fetcherId
-  // },
   resetStatuses (state) {
     const emptyState = defaultState()
     Object.entries(emptyState).forEach(([key, value]) => {
@@ -433,12 +429,6 @@ const statuses = {
     setNotificationsSilence ({ rootState, commit }, { value }) {
       commit('setNotificationsSilence', { value })
     },
-    // stopFetchingNotifications ({ rootState, commit }) {
-    //   if (rootState.statuses.notifications.fetcherId) {
-    //     window.clearInterval(rootState.statuses.notifications.fetcherId)
-    //   }
-    //   commit('setNotificationFetcher', { fetcherId: null })
-    // },
     deleteStatus ({ rootState, commit }, status) {
       commit('setDeleted', { status })
       apiService.deleteStatus({ id: status.id, credentials: rootState.users.currentUser.credentials })
-- 
cgit v1.2.3-70-g09d2