diff --git a/lib/Chat/ChatManager.php b/lib/Chat/ChatManager.php index 8ee9a12ddd4..7988aa9f31a 100644 --- a/lib/Chat/ChatManager.php +++ b/lib/Chat/ChatManager.php @@ -87,6 +87,9 @@ class ChatManager { public const VERB_MESSAGE_DELETED = 'comment_deleted'; public const VERB_REACTION = 'reaction'; public const VERB_REACTION_DELETED = 'reaction_deleted'; + public const VERB_VOICE_MESSAGE = 'voice-message'; + public const VERB_RECORD_AUDIO = 'record-audio'; + public const VERB_RECORD_VIDEO = 'record-video'; protected ICache $cache; protected ICache $unreadCountCache; diff --git a/lib/Chat/Parser/SystemMessage.php b/lib/Chat/Parser/SystemMessage.php index 55818a123c2..564b83951a8 100644 --- a/lib/Chat/Parser/SystemMessage.php +++ b/lib/Chat/Parser/SystemMessage.php @@ -504,12 +504,12 @@ protected function parseMessage(Message $chatMessage): void { $parsedMessage = '{file}'; $metaData = $parameters['metaData'] ?? []; if (isset($metaData['messageType'])) { - if ($metaData['messageType'] === 'voice-message') { - $chatMessage->setMessageType('voice-message'); - } elseif ($metaData['messageType'] === 'record-audio') { - $chatMessage->setMessageType('record-audio'); - } elseif ($metaData['messageType'] === 'record-video') { - $chatMessage->setMessageType('record-video'); + if ($metaData['messageType'] === ChatManager::VERB_VOICE_MESSAGE) { + $chatMessage->setMessageType(ChatManager::VERB_VOICE_MESSAGE); + } elseif ($metaData['messageType'] === ChatManager::VERB_RECORD_AUDIO) { + $chatMessage->setMessageType(ChatManager::VERB_RECORD_AUDIO); + } 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 index 75ee319e6b9..229b67e0c1a 100644 --- 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 index 0a935d7914b..632f776bd7b 100644 --- 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 index dd6f528589a..886bd0e1088 100644 --- 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 {