fix(conversation): overwrite hasCall param by system messages

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
nextcloud · Jan 10, 2024 · 11b5cf4 · 11b5cf4
1 parent db95ebb
commit 11b5cf4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 29 deletions.
diff --git a/src/components/MediaSettings/MediaSettings.vue b/src/components/MediaSettings/MediaSettings.vue
@@ -387,7 +387,7 @@ export default {
 		},
 
 		hasCall() {
-			return this.conversation.hasCall || this.conversation.hasCallOverwrittenByChat
+			return this.conversation.hasCall
 		},
 
 		isCurrentlyRecording() {

diff --git a/src/components/TopBar/CallButton.vue b/src/components/TopBar/CallButton.vue
@@ -226,7 +226,7 @@ export default {
 		},
 
 		hasCall() {
-			return this.conversation.hasCall || this.conversation.hasCallOverwrittenByChat
+			return this.conversation.hasCall
 		},
 
 		startCallButtonDisabled() {

diff --git a/src/store/conversationsStore.js b/src/store/conversationsStore.js
@@ -215,14 +215,6 @@ const mutations = {
 		}
 	},
 
-	overwriteHasCallByChat(state, { token, hasCall }) {
-		if (hasCall) {
-			Vue.set(state.conversations[token], 'hasCallOverwrittenByChat', hasCall)
-		} else {
-			Vue.delete(state.conversations[token], 'hasCallOverwrittenByChat')
-		}
-	},
-
 	setNotificationLevel(state, { token, notificationLevel }) {
 		Vue.set(state.conversations[token], 'notificationLevel', notificationLevel)
 	},
@@ -792,8 +784,16 @@ const actions = {
 		commit('updateConversationLastReadMessage', { token, lastReadMessage })
 	},
 
-	async overwriteHasCallByChat({ commit }, { token, hasCall }) {
-		commit('overwriteHasCallByChat', { token, hasCall })
+	async overwriteHasCallByChat({ commit, dispatch }, { token, hasCall, lastActivity }) {
+		dispatch('setConversationProperties', {
+			token,
+			properties: {
+				hasCall,
+				callFlag: hasCall ? PARTICIPANT.CALL_FLAG.IN_CALL : PARTICIPANT.CALL_FLAG.DISCONNECTED,
+				lastActivity,
+				callStartTime: hasCall ? lastActivity : 0,
+			}
+		})
 	},
 
 	async fetchConversation({ dispatch }, { token }) {

diff --git a/src/store/messagesStore.js b/src/store/messagesStore.js
@@ -1090,25 +1090,11 @@ const actions = {
 			// Overwrite the conversation.hasCall property so people can join
 			// after seeing the message in the chat.
 			if (conversation && conversation.lastMessage && message.id > conversation.lastMessage.id) {
-				if (message.systemMessage === 'call_started') {
+				if (['call_started', 'call_ended', 'call_ended_everyone', 'call_missed'].includes(message.systemMessage)) {
 					context.dispatch('overwriteHasCallByChat', {
 						token,
-						hasCall: true,
-					})
-					context.dispatch('setConversationProperties', {
-						token: message.token,
-						properties: { callStartTime: message.timestamp },
-					})
-				} else if (message.systemMessage === 'call_ended'
-					|| message.systemMessage === 'call_ended_everyone'
-					|| message.systemMessage === 'call_missed') {
-					context.dispatch('overwriteHasCallByChat', {
-						token,
-						hasCall: false,
-					})
-					context.dispatch('setConversationProperties', {
-						token: message.token,
-						properties: { callStartTime: 0 },
+						hasCall: message.systemMessage === 'call_started',
+						lastActivity: message.timestamp,
 					})
 				}
 			}