Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(ChatManager): Add missing verbs #11716

Merged
merged 2 commits into from
Mar 27, 2024
Merged

fix(ChatManager): Add missing verbs #11716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
632b7df
fix(ChatManager): Add missing verbs
provokateurin Mar 3, 2024
89e49e4
fix(chat): Also use constants on incoming data detection
nickvergessen Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lib/Chat/ChatManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions lib/Chat/Parser/SystemMessage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/Chat/SystemMessage/Listener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']);
Expand Down
7 changes: 4 additions & 3 deletions lib/Service/AttachmentService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions lib/Service/RecordingService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading