Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions src/components/MessagesList/MessagesList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ export default {
loadingOldMessages: false,

destroying: false,

expirationInterval: null,
}
},

Expand Down Expand Up @@ -247,8 +249,16 @@ export default {
this.$store.dispatch('cancelLookForNewMessages', { requestId: oldValue })
}
this.handleStartGettingMessagesPreconditions()

// Remove expired messages when joining a room
this.removeExpiredMessagesFromStore()
},
},

token(newToken, oldToken) {
// Expire older messages when navigating to another conversation
this.$store.dispatch('easeMessageList', { token: oldToken })
},
},

mounted() {
Expand All @@ -261,6 +271,13 @@ export default {
subscribe('networkOffline', this.handleNetworkOffline)
subscribe('networkOnline', this.handleNetworkOnline)
window.addEventListener('focus', this.onWindowFocus)

/**
* Every 30 seconds we remove expired messages from the store
*/
this.expirationInterval = window.setInterval(() => {
this.removeExpiredMessagesFromStore()
}, 30000)
},

beforeDestroy() {
Expand All @@ -275,9 +292,20 @@ export default {

unsubscribe('networkOffline', this.handleNetworkOffline)
unsubscribe('networkOnline', this.handleNetworkOnline)

if (this.expirationInterval) {
clearInterval(this.expirationInterval)
this.expirationInterval = null
}
},

methods: {
removeExpiredMessagesFromStore() {
this.$store.dispatch('removeExpiredMessages', {
token: this.token,
})
},

/**
* Compare two messages to decide if they should be grouped
*
Expand Down
45 changes: 45 additions & 0 deletions src/store/messagesStore.js
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,43 @@ const mutations = {
}
}
},

removeExpiredMessages(state, { token }) {
if (!state.messages[token]) {
return
}

const timestamp = (new Date()) / 1000
const messageIds = Object.keys(state.messages[token])
messageIds.forEach((messageId) => {
if (state.messages[token][messageId].expirationTimestamp
&& timestamp > state.messages[token][messageId].expirationTimestamp) {
Vue.delete(state.messages[token], messageId)
}
})
},

easeMessageList(state, { token }) {
if (!state.messages[token]) {
return
}

const messageIds = Object.keys(state.messages[token])
if (messageIds.length < 300) {
return
}

const messagesToRemove = messageIds.sort().reverse().slice(199)
const newFirstKnown = messagesToRemove.shift()

messagesToRemove.forEach((messageId) => {
Vue.delete(state.messages[token], messageId)
})

if (state.firstKnown[token] && messagesToRemove.includes(state.firstKnown[token])) {
Vue.set(state.firstKnown, token, newFirstKnown)
}
},
}

const actions = {
Expand Down Expand Up @@ -1079,6 +1116,14 @@ const actions = {
showError(t('spreed', 'Failed to remove reaction'))
}
},

async removeExpiredMessages(context, { token }) {
context.commit('removeExpiredMessages', { token })
},

async easeMessageList(context, { token }) {
context.commit('easeMessageList', { token })
},
}

export default { state, mutations, getters, actions }