add voice messages to the sharedItemsStore

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
nextcloud · Sep 21, 2023 · def4a3a · def4a3a
1 parent 6158ad7
commit def4a3a
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 38 deletions.
diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.vue b/src/components/MessagesList/MessagesGroup/Message/Message.vue
@@ -281,6 +281,7 @@ import { ATTENDEE, CONVERSATION, PARTICIPANT } from '../../../../constants.js'
 import participant from '../../../../mixins/participant.js'
 import { EventBus } from '../../../../services/EventBus.js'
 import { useGuestNameStore } from '../../../../stores/guestName.js'
+import { getItemTypeFromMessage } from '../../../../utils/getItemTypeFromMessage.js'
 
 const isTranslationAvailable = getCapabilities()?.spreed?.config?.chat?.translations?.length > 0
 
@@ -581,19 +582,19 @@ export default {
 			Object.keys(this.messageParameters).forEach(function(p) {
 				const type = this.messageParameters[p].type
 				const mimetype = this.messageParameters[p].mimetype
+				const itemType = getItemTypeFromMessage(this.messageObject)
 				if (type === 'user' || type === 'call' || type === 'guest' || type === 'user-group' || type === 'group') {
 					richParameters[p] = {
 						component: Mention,
 						props: this.messageParameters[p],
 					}
 				} else if (type === 'file' && mimetype !== 'text/vcard') {
-					const parameters = this.messageParameters[p]
-					parameters['is-voice-message'] = this.messageType === 'voice-message'
 					richParameters[p] = {
 						component: FilePreview,
 						props: Object.assign({
 							token: this.token,
-						}, parameters),
+							itemType,
+						}, this.messageParameters[p]),
 					}
 				} else if (type === 'deck-card') {
 					richParameters[p] = {

diff --git a/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue b/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue
@@ -224,11 +224,6 @@ export default {
 			default: '',
 		},
 
-		isVoiceMessage: {
-			type: Boolean,
-			default: false,
-		},
-
 		rowLayout: {
 			type: Boolean,
 			default: false,
@@ -304,7 +299,7 @@ export default {
 				return {
 					is: 'div',
 				}
-			} else if (this.isVoiceMessage) {
+			} else if (this.isVoiceMessage && !this.isSharedItems) {
 				return {
 					is: AudioPlayer,
 					name: this.name,
@@ -417,6 +412,10 @@ export default {
 			return false
 		},
 
+		isVoiceMessage() {
+			return this.itemType === SHARED_ITEM.TYPES.VOICE
+		},
+
 		isPlayable() {
 			// don't show play button for direct renders
 			if (this.failed || !this.isViewerAvailable || this.previewType !== PREVIEW_TYPE.PREVIEW) {

diff --git a/src/store/messagesStore.js b/src/store/messagesStore.js
@@ -552,6 +552,7 @@ const actions = {
 		context.commit('addMessage', message)
 
 		 if ((message.messageType === 'comment' && message.message === '{file}' && message.messageParameters?.file)
+			|| (message.messageType === 'voice-message' && message.message === '{file}' && message.messageParameters?.file)
 			|| (message.messageType === 'comment' && message.message === '{object}' && message.messageParameters?.object)) {
 			context.dispatch('addSharedItemMessage', {
 				message,

diff --git a/src/store/sharedItemsStore.js b/src/store/sharedItemsStore.js
@@ -22,36 +22,8 @@
 
 import Vue from 'vue'
 
-import { SHARED_ITEM } from '../constants.js'
 import { getSharedItemsOverview, getSharedItems } from '../services/sharedItemsService.js'
-
-const getItemTypeFromMessage = function(message) {
-	if (message.message === '{object}') {
-		if (message.messageParameters.object.type === 'geo-location') {
-			return SHARED_ITEM.TYPES.LOCATION
-		} else if (message.messageParameters.object.type === 'deck-card') {
-			return SHARED_ITEM.TYPES.DECK_CARD
-		} else if (message.messageParameters.object.type === 'talk-poll') {
-			return SHARED_ITEM.TYPES.POLL
-		} else {
-			return SHARED_ITEM.TYPES.OTHER
-		}
-	} else {
-		const messageType = message.messageType || ''
-		const mimetype = message.messageParameters.file?.mimetype || ''
-		if (messageType === 'record-audio' || messageType === 'record-video') {
-			return SHARED_ITEM.TYPES.RECORDING
-		} else if (messageType === 'voice-message') {
-			return SHARED_ITEM.TYPES.VOICE
-		} else if (mimetype.startsWith('audio/')) {
-			return SHARED_ITEM.TYPES.AUDIO
-		} else if (mimetype.startsWith('image/') || mimetype.startsWith('video/')) {
-			return SHARED_ITEM.TYPES.MEDIA
-		} else {
-			return SHARED_ITEM.TYPES.FILE
-		}
-	}
-}
+import { getItemTypeFromMessage } from '../utils/getItemTypeFromMessage.js'
 
 // sharedItemsByConversationAndType structure
 // token: {

diff --git a/src/utils/getItemTypeFromMessage.js b/src/utils/getItemTypeFromMessage.js
@@ -0,0 +1,31 @@
+import { SHARED_ITEM } from '../constants.js'
+
+export const getItemTypeFromMessage = function(message) {
+	if (message.message === '{object}') {
+		if (message.messageParameters.object.type === 'geo-location') {
+			return SHARED_ITEM.TYPES.LOCATION
+		} else if (message.messageParameters.object.type === 'deck-card') {
+			return SHARED_ITEM.TYPES.DECK_CARD
+		} else if (message.messageParameters.object.type === 'talk-poll') {
+			return SHARED_ITEM.TYPES.POLL
+		} else {
+			return SHARED_ITEM.TYPES.OTHER
+		}
+	} else if (message.message === '{file}') {
+		const messageType = message.messageType || ''
+		const mimetype = message.messageParameters.file?.mimetype || ''
+		if (messageType === 'record-audio' || messageType === 'record-video') {
+			return SHARED_ITEM.TYPES.RECORDING
+		} else if (messageType === 'voice-message') {
+			return SHARED_ITEM.TYPES.VOICE
+		} else if (mimetype.startsWith('audio/')) {
+			return SHARED_ITEM.TYPES.AUDIO
+		} else if (mimetype.startsWith('image/') || mimetype.startsWith('video/')) {
+			return SHARED_ITEM.TYPES.MEDIA
+		} else {
+			return SHARED_ITEM.TYPES.FILE
+		}
+	} else {
+		return SHARED_ITEM.TYPES.OTHER
+	}
+}