fixup! feat(audioPlayer): Auto play voice messages which are grouped …

…together Signed-off-by: Maksim Sukharev <[email protected]>
nextcloud · Sep 25, 2024 · 4ef10eb · 4ef10eb
1 parent f775929
commit 4ef10eb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 16 deletions.
diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.vue b/src/components/MessagesList/MessagesGroup/Message/Message.vue
@@ -276,11 +276,11 @@ export default {
 						component: FilePreview,
 						props: {
 							token: this.message.token,
-							messageId: Number(this.message.id),
+							messageId: this.message.id,
+							nextMessageId: this.nextMessageId,
 							itemType,
 							referenceId: this.message.referenceId,
 							file: this.message.messageParameters[p],
-							nextMessageId: this.nextMessageId,
 						},
 					}
 				} else if (type === 'deck-card') {

diff --git a/src/components/MessagesList/MessagesGroup/Message/MessagePart/AudioPlayer.vue b/src/components/MessagesList/MessagesGroup/Message/MessagePart/AudioPlayer.vue
@@ -99,7 +99,6 @@ export default {
 		t,
 
 		handleEnded() {
-			// Return early if next message ID not found
 			if (!this.nextMessageId) {
 				return
 			}
@@ -108,19 +107,16 @@ export default {
 		},
 
 		/**
-		 * Auto-paly the audio if the previous message was played.
+		 * Autoplay the audio message as soon as previous one was played
 		 *
 		 * @param {number} messageId Message ID to play.
-		 *
-		 * @return {boolean} true if the audio was played, false otherwise
 		 */
 		autoPlay(messageId) {
-			if (!this.$refs.audioPlayer || messageId !== this.messageId) {
-				return false
+			if (messageId !== this.messageId) {
+				return
 			}
 
-			this.$refs.audioPlayer.play()
-			return true
+			this.$refs.audioPlayer?.play()
 		},
 	},
 }

diff --git a/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue b/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue
@@ -116,7 +116,12 @@ export default {
 		},
 
 		messageId: {
-			type: Number,
+			type: [String, Number],
+			default: 0,
+		},
+
+		nextMessageId: {
+			type: [String, Number],
 			default: 0,
 		},
 
@@ -168,11 +173,6 @@ export default {
 			type: String,
 			default: '',
 		},
-
-		nextMessageId: {
-			type: [String, Number],
-			default: 0,
-		},
 	},
 
 	emits: ['remove-file'],