fix(chat): Also use constants on incoming data detection

Signed-off-by: Joas Schilling <[email protected]>
nextcloud · Mar 27, 2024 · 89e49e4 · 89e49e4
1 parent 632b7df
commit 89e49e4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/lib/Chat/Parser/SystemMessage.php b/lib/Chat/Parser/SystemMessage.php
@@ -504,11 +504,11 @@ protected function parseMessage(Message $chatMessage): void {
 				$parsedMessage = '{file}';
 				$metaData = $parameters['metaData'] ?? [];
 				if (isset($metaData['messageType'])) {
-					if ($metaData['messageType'] === 'voice-message') {
+					if ($metaData['messageType'] === ChatManager::VERB_VOICE_MESSAGE) {
 						$chatMessage->setMessageType(ChatManager::VERB_VOICE_MESSAGE);
-					} elseif ($metaData['messageType'] === 'record-audio') {
+					} elseif ($metaData['messageType'] === ChatManager::VERB_RECORD_AUDIO) {
 						$chatMessage->setMessageType(ChatManager::VERB_RECORD_AUDIO);
-					} elseif ($metaData['messageType'] === 'record-video') {
+					} elseif ($metaData['messageType'] === ChatManager::VERB_RECORD_VIDEO) {
 						$chatMessage->setMessageType(ChatManager::VERB_RECORD_VIDEO);
 					} else {
 						$chatMessage->setMessageType(ChatManager::VERB_MESSAGE);

diff --git a/lib/Chat/SystemMessage/Listener.php b/lib/Chat/SystemMessage/Listener.php
@@ -413,7 +413,7 @@ protected function fixMimeTypeOfVoiceMessage(ShareCreatedEvent|BeforeDuplicateSh
 		$metaData = json_decode($metaData, true);
 		$metaData = is_array($metaData) ? $metaData : [];
 
-		if (isset($metaData['messageType']) && $metaData['messageType'] === 'voice-message') {
+		if (isset($metaData['messageType']) && $metaData['messageType'] === ChatManager::VERB_VOICE_MESSAGE) {
 			if ($share->getNode()->getMimeType() !== 'audio/mpeg'
 				&& $share->getNode()->getMimeType() !== 'audio/wav') {
 				unset($metaData['messageType']);

diff --git a/lib/Service/AttachmentService.php b/lib/Service/AttachmentService.php
@@ -26,6 +26,7 @@
 
 namespace OCA\Talk\Service;
 
+use OCA\Talk\Chat\ChatManager;
 use OCA\Talk\Model\Attachment;
 use OCA\Talk\Model\AttachmentMapper;
 use OCA\Talk\Room;
@@ -61,11 +62,11 @@ public function createAttachmentEntry(Room $room, IComment $comment, string $mes
 			$messageType = $parameters['metaData']['messageType'] ?? '';
 			$mimetype = $parameters['metaData']['mimeType'] ?? '';
 
-			if ($messageType === 'record-audio') {
+			if ($messageType === ChatManager::VERB_RECORD_AUDIO) {
 				$attachment->setObjectType(Attachment::TYPE_RECORDING);
-			} elseif ($messageType === 'record-video') {
+			} elseif ($messageType === ChatManager::VERB_RECORD_VIDEO) {
 				$attachment->setObjectType(Attachment::TYPE_RECORDING);
-			} elseif ($messageType === 'voice-message') {
+			} elseif ($messageType === ChatManager::VERB_VOICE_MESSAGE) {
 				$attachment->setObjectType(Attachment::TYPE_VOICE);
 			} elseif (str_starts_with($mimetype, 'audio/')) {
 				$attachment->setObjectType(Attachment::TYPE_AUDIO);

diff --git a/lib/Service/RecordingService.php b/lib/Service/RecordingService.php
@@ -356,9 +356,9 @@ public function notificationDismiss(Room $room, Participant $participant, int $t
 
 	private function getTypeOfShare(string $mimetype): string {
 		if (str_starts_with($mimetype, 'video/')) {
-			return 'record-video';
+			return ChatManager::VERB_RECORD_VIDEO;
 		}
-		return 'record-audio';
+		return ChatManager::VERB_RECORD_AUDIO;
 	}
 
 	public function shareToChat(Room $room, Participant $participant, int $fileId, int $timestamp): void {