streamlined WS flow, reduced spam amount related to WS reconnections

3 files changed, 16 insertions, 17 deletions

diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index d3d5c68d..436b8b0a 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -1184,7 +1184,10 @@ export const handleMastoWS = (wsEvent) => {
 export const WSConnectionStatus = Object.freeze({
   'JOINED': 1,
   'CLOSED': 2,
-  'ERROR': 3
+  'ERROR': 3,
+  'DISABLED': 4,
+  'STARTING': 5,
+  'STARTING_INITIAL': 6
 })
 
 const chats = ({ credentials }) => {
diff --git a/src/services/notifications_fetcher/notifications_fetcher.service.js b/src/services/notifications_fetcher/notifications_fetcher.service.js
index fc5e76ba..f83f871e 100644
--- a/src/services/notifications_fetcher/notifications_fetcher.service.js
+++ b/src/services/notifications_fetcher/notifications_fetcher.service.js
@@ -57,14 +57,12 @@ const fetchNotifications = ({ store, args, older }) => {
       return notifications
     })
     .catch((error) => {
-      if (!store.rootState.api.connectionBroken) {
-        store.dispatch('pushGlobalNotice', {
-          level: 'error',
-          messageKey: 'notifications.error',
-          messageArgs: [error.message],
-          timeout: 5000
-        })
-      }
+      store.dispatch('pushGlobalNotice', {
+        level: 'error',
+        messageKey: 'notifications.error',
+        messageArgs: [error.message],
+        timeout: 5000
+      })
     })
 }
 
diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js
index eb4a3e0d..46bba41a 100644
--- a/src/services/timeline_fetcher/timeline_fetcher.service.js
+++ b/src/services/timeline_fetcher/timeline_fetcher.service.js
@@ -66,14 +66,12 @@ const fetchAndUpdate = ({
       return { statuses, pagination }
     })
     .catch((error) => {
-      if (!store.rootState.api.connectionBroken) {
-        store.dispatch('pushGlobalNotice', {
-          level: 'error',
-          messageKey: 'timeline.error',
-          messageArgs: [error.message],
-          timeout: 5000
-        })
-      }
+      store.dispatch('pushGlobalNotice', {
+        level: 'error',
+        messageKey: 'timeline.error',
+        messageArgs: [error.message],
+        timeout: 5000
+      })
     })
 }