5 files changed, 45 insertions, 17 deletions
diff --git a/src/modules/chat.js b/src/modules/chat.js
index c798549d..ffeb272b 100644
--- a/src/modules/chat.js
+++ b/src/modules/chat.js
@@ -18,6 +18,7 @@ const chat = {
   actions: {
     initializeChat (store, socket) {
       const channel = socket.channel('chat:public')
+
       channel.on('new_msg', (msg) => {
         store.commit('addMessage', msg)
       })
diff --git a/src/modules/chats.js b/src/modules/chats.js
index 0a373d88..69d683bd 100644
--- a/src/modules/chats.js
+++ b/src/modules/chats.js
@@ -115,6 +115,9 @@ const chats = {
     },
     handleMessageError ({ commit }, value) {
       commit('handleMessageError', { commit, ...value })
+    },
+    cullOlderMessages ({ commit }, chatId) {
+      commit('cullOlderMessages', chatId)
     }
   },
   mutations: {
@@ -227,6 +230,9 @@ const chats = {
     handleMessageError (state, { chatId, fakeId, isRetry }) {
       const chatMessageService = state.openedChatMessageServices[chatId]
       chatService.handleMessageError(chatMessageService, fakeId, isRetry)
+    },
+    cullOlderMessages (state, chatId) {
+      chatService.cullOlderMessages(state.openedChatMessageServices[chatId])
     }
   }
 }
diff --git a/src/modules/config.js b/src/modules/config.js
index cd088737..eca58c12 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -67,7 +67,8 @@ export const defaultState = {
   greentext: undefined, // instance default
   hidePostStats: undefined, // instance default
   hideUserStats: undefined, // instance default
-  virtualScrolling: undefined // instance default
+  virtualScrolling: undefined, // instance default
+  sensitiveByDefault: undefined // instance default
 }
 
 // caching the instance default properties
@@ -76,18 +77,22 @@ export const instanceDefaultProperties = Object.entries(defaultState)
   .map(([key, value]) => key)
 
 const config = {
-  state: defaultState,
+  state: { ...defaultState },
   getters: {
-    mergedConfig (state, getters, rootState, rootGetters) {
+    defaultConfig (state, getters, rootState, rootGetters) {
       const { instance } = rootState
       return {
-        ...state,
-        ...instanceDefaultProperties
-          .map(key => [key, state[key] === undefined
-            ? instance[key]
-            : state[key]
-          ])
-          .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {})
+        ...defaultState,
+        ...Object.fromEntries(
+          instanceDefaultProperties.map(key => [key, instance[key]])
+        )
+      }
+    },
+    mergedConfig (state, getters, rootState, rootGetters) {
+      const { defaultConfig } = rootGetters
+      return {
+        ...defaultConfig,
+        ...state
       }
     }
   },
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 411b1caa..96de73ca 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -43,6 +43,7 @@ const defaultState = {
   subjectLineBehavior: 'email',
   theme: 'pleroma-dark',
   virtualScrolling: true,
+  sensitiveByDefault: false,
 
   // Nasty stuff
   customEmoji: [],
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 33c68c57..ac5d25c4 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -13,7 +13,11 @@ import {
   omitBy
 } from 'lodash'
 import { set } from 'vue'
-import { isStatusNotification, maybeShowNotification } from '../services/notification_utils/notification_utils.js'
+import {
+  isStatusNotification,
+  isValidNotification,
+  maybeShowNotification
+} from '../services/notification_utils/notification_utils.js'
 import apiService from '../services/api/api.service.js'
 
 const emptyTl = (userId = 0) => ({
@@ -310,8 +314,24 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
   }
 }
 
+const updateNotificationsMinMaxId = (state, notification) => {
+  state.notifications.maxId = notification.id > state.notifications.maxId
+    ? notification.id
+    : state.notifications.maxId
+  state.notifications.minId = notification.id < state.notifications.minId
+    ? notification.id
+    : state.notifications.minId
+}
+
 const addNewNotifications = (state, { dispatch, notifications, older, visibleNotificationTypes, rootGetters, newNotificationSideEffects }) => {
   each(notifications, (notification) => {
+    // If invalid notification, update ids but don't add it to store
+    if (!isValidNotification(notification)) {
+      console.error('Invalid notification:', notification)
+      updateNotificationsMinMaxId(state, notification)
+      return
+    }
+
     if (isStatusNotification(notification.type)) {
       notification.action = addStatusToGlobalStorage(state, notification.action).item
       notification.status = notification.status && addStatusToGlobalStorage(state, notification.status).item
@@ -323,12 +343,7 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
 
     // Only add a new notification if we don't have one for the same action
     if (!state.notifications.idStore.hasOwnProperty(notification.id)) {
-      state.notifications.maxId = notification.id > state.notifications.maxId
-        ? notification.id
-        : state.notifications.maxId
-      state.notifications.minId = notification.id < state.notifications.minId
-        ? notification.id
-        : state.notifications.minId
+      updateNotificationsMinMaxId(state, notification)
 
       state.notifications.data.push(notification)
       state.notifications.idStore[notification.id] = notification