Rework conversationStore to trigger UNREAD_COUNT_UPDATED

Signed-off-by: Markus Stoll <[email protected]>

Author: markusstoll

src/App.vue

@@ -21,6 +21,7 @@
 <script>
 import debounce from 'debounce'
 import { provide } from 'vue'
+import { mapGetters } from 'vuex'
 
 import { getCurrentUser } from '@nextcloud/auth'
 import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
@@ -44,7 +45,7 @@ import { useDocumentTitle } from './composables/useDocumentTitle.ts'
 import { useHashCheck } from './composables/useHashCheck.js'
 import { useIsInCall } from './composables/useIsInCall.js'
 import { useSessionIssueHandler } from './composables/useSessionIssueHandler.js'
-import { CONVERSATION, PARTICIPANT } from './constants.ts'
+import { CONVERSATION, EVENTS, PARTICIPANT } from './constants.ts'
 import Router from './router/router.ts'
 import BrowserStorage from './services/BrowserStorage.js'
 import { EventBus } from './services/EventBus.ts'
@@ -95,6 +96,30 @@ export default {
 	},
 
 	computed: {
+		// Computed properties for unread counts
+		getTotalUnreadMessages() {
+			if (!this.$store.state.conversationsStore?.conversations) {
+				return 0;
+			}
+			return Object.values(this.$store.state.conversationsStore.conversations).reduce((total, conv) => {
+				return total + (conv.unreadMessages || 0);
+			}, 0);
+		},
+		
+		getTotalUnreadMentions() {
+			if (!this.$store.state.conversationsStore?.conversations) {
+				return 0;
+			}
+			return Object.values(this.$store.state.conversationsStore.conversations).filter(conv => conv.unreadMention).length;
+		},
+		
+		getTotalUnreadMentionsDirect() {
+			if (!this.$store.state.conversationsStore?.conversations) {
+				return 0;
+			}
+			return Object.values(this.$store.state.conversationsStore.conversations).filter(conv => conv.unreadMentionDirect).length;
+		},
+
 		getUserId() {
 			return this.$store.getters.getUserId()
 		},
@@ -163,6 +188,17 @@ export default {
 				}
 			}
 		},
+
+		// Watch for changes in unread counters and emit events
+		getTotalUnreadMessages() {
+			this.emitUnreadCountUpdated()
+		},
+		getTotalUnreadMentions() {
+			this.emitUnreadCountUpdated()
+		},
+		getTotalUnreadMentionsDirect() {
+			this.emitUnreadCountUpdated()
+		},
 	},
 
 	beforeCreate() {
@@ -314,6 +350,9 @@ export default {
 					this.$store.dispatch('updateToken', '')
 				}
 			}
+			
+			// Update unread counts after receiving conversations
+			this.emitUnreadCountUpdated()
 		})
 
 		EventBus.on('forbidden-route', (params) => {
@@ -409,6 +448,9 @@ export default {
 			})
 		}
 
+		// Initialize unread counts emission
+		this.emitUnreadCountUpdated()
+
 		subscribe('notifications:action:execute', this.interceptNotificationActions)
 		subscribe('notifications:notification:received', this.interceptNotificationReceived)
 	},
@@ -619,6 +661,19 @@ export default {
 				this.$router.push({ name: 'root' })
 			}
 		},
+
+		/**
+		 * Emits the UNREAD_COUNT_UPDATED event with the current counter values
+		 */
+		emitUnreadCountUpdated() {
+			const eventData = {
+				totalUnreadMessages: this.getTotalUnreadMessages,
+				totalUnreadMentions: this.getTotalUnreadMentions,
+				totalUnreadMentionsDirect: this.getTotalUnreadMentionsDirect
+			}
+
+			emit(EVENTS.UNREAD_COUNT_UPDATED, eventData)
+		},
 	},
 }
 </script>

src/constants.ts

@@ -358,3 +358,7 @@ export const TASK_PROCESSING = {
 		UNKNOWN: 'STATUS_UNKNOWN',
 	},
 }
+
+export const EVENTS = {
+	UNREAD_COUNT_UPDATED: 'talk:unread:updated',
+} as const

src/store/conversationsStore.js

@@ -177,6 +177,64 @@ const getters = {
 		return (userId) => getters.conversationsList
 			.find((conversation) => conversation.type === CONVERSATION.TYPE.ONE_TO_ONE && conversation.name === userId)
 	},
+	/**
+	 * Gibt eine Map aller ungelesenen Nachrichten pro Konversation zurück
+	 * @param {object} state Der aktuelle Store-State
+	 * @return {object} Map mit Token als Schlüssel und Unread-Informationen als Werte
+	 */
+	getUnreadMessagesMap: (state) => {
+		const unreadMap = {}
+
+		// Nur nicht-archivierte Konversationen berücksichtigen
+		Object.keys(state.conversations).forEach(token => {
+			const conversation = state.conversations[token]
+			if (conversation.status !== CONVERSATION.STATUS.ARCHIVED) {
+				unreadMap[token] = {
+					unreadMessages: conversation.unreadMessages || 0,
+					unreadMention: conversation.unreadMention || false,
+					unreadMentionDirect: conversation.unreadMentionDirect || false
+				}
+			}
+		})
+		
+		return unreadMap
+	},
+	
+	/**
+	 * Berechnet die Gesamtzahl ungelesener Nachrichten
+	 * @param {object} state Der aktuelle Store-State
+	 * @param {object} getters Die Store-Getter
+	 * @return {number} Gesamtzahl ungelesener Nachrichten
+	 */
+	getTotalUnreadMessages: (state, getters) => {
+		const unreadMap = getters.getUnreadMessagesMap
+
+		return Object.values(unreadMap).reduce((total, entry) => {
+			return total + entry.unreadMessages
+		}, 0)
+	},
+	
+	/**
+	 * Berechnet die Gesamtzahl ungelesener Erwähnungen
+	 * @param {object} state Der aktuelle Store-State
+	 * @param {object} getters Die Store-Getter
+	 * @return {number} Gesamtzahl ungelesener Erwähnungen
+	 */
+	getTotalUnreadMentions: (state, getters) => {
+		const unreadMap = getters.getUnreadMessagesMap
+		return Object.values(unreadMap).filter(entry => entry.unreadMention).length
+	},
+	
+	/**
+	 * Berechnet die Gesamtzahl ungelesener direkter Erwähnungen
+	 * @param {object} state Der aktuelle Store-State
+	 * @param {object} getters Die Store-Getter
+	 * @return {number} Gesamtzahl ungelesener direkter Erwähnungen
+	 */
+	getTotalUnreadMentionsDirect: (state, getters) => {
+		const unreadMap = getters.getUnreadMessagesMap
+		return Object.values(unreadMap).filter(entry => entry.unreadMentionDirect).length
+	}
 }
 
 const mutations = {