Mirrors
/
nextcloud-spreed
mirror of https://github.com/nextcloud/spreed
3
0
Fork 0
Code Releases Activity
Browse Source

Merge pull request #11863 from nextcloud/bugfix/noid/fix-duplicate-share-message 

fix(recording): Fix duplicate share message when sharing a recording …
pull/11877/head
Joas Schilling 2 years ago
committed by GitHub
parent
cecbdac1b4 2dc6f2a785
commit
fbeec6258c
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      lib/Chat/SystemMessage/Listener.php
  2. 6
      tests/integration/features/bootstrap/FeatureContext.php
  3. 13
      tests/integration/features/callapi/recording.feature

2
lib/Chat/SystemMessage/Listener.php
View File

@ -397,7 +397,7 @@ class Listener implements IEventListener {
return; return;
} }
if ($this->request->getParam('_route') === 'ocs.spreed.Recording.shareToChat') {
if (strtolower($this->request->getParam('_route')) === 'ocs.spreed.recording.sharetochat') {
return; return;
} }
$room = $this->manager->getRoomByToken($share->getSharedWith()); $room = $this->manager->getRoomByToken($share->getSharedWith());

6
tests/integration/features/bootstrap/FeatureContext.php
View File

@ -2650,6 +2650,7 @@ class FeatureContext implements Context, SnippetAcceptingContext {
$includeReactions = in_array('reactions', $formData->getRow(0), true); $includeReactions = in_array('reactions', $formData->getRow(0), true);
$includeReactionsSelf = in_array('reactionsSelf', $formData->getRow(0), true); $includeReactionsSelf = in_array('reactionsSelf', $formData->getRow(0), true);
$includeLastEdit = in_array('lastEditActorId', $formData->getRow(0), true); $includeLastEdit = in_array('lastEditActorId', $formData->getRow(0), true);
$includeMessageType = in_array('messageType', $formData->getRow(0), true);
$expected = $formData->getHash(); $expected = $formData->getHash();
$count = count($expected); $count = count($expected);
@ -2712,7 +2713,7 @@ class FeatureContext implements Context, SnippetAcceptingContext {
} }
} }
Assert::assertEquals($expected, array_map(function ($message, $expected) use ($includeParents, $includeReferenceId, $includeReactions, $includeReactionsSelf, $includeLastEdit) {
Assert::assertEquals($expected, array_map(function ($message, $expected) use ($includeParents, $includeReferenceId, $includeReactions, $includeReactionsSelf, $includeLastEdit, $includeMessageType) {
$data = [ $data = [
'room' => self::$tokenToIdentifier[$message['token']], 'room' => self::$tokenToIdentifier[$message['token']],
'actorType' => $message['actorType'], 'actorType' => $message['actorType'],
@ -2730,6 +2731,9 @@ class FeatureContext implements Context, SnippetAcceptingContext {
if ($includeReferenceId) { if ($includeReferenceId) {
$data['referenceId'] = $message['referenceId']; $data['referenceId'] = $message['referenceId'];
} }
if ($includeMessageType) {
$data['messageType'] = $message['messageType'];
}
if (isset($expected['silent'])) { if (isset($expected['silent'])) {
$data['silent'] = isset($message['silent']) ? json_encode($message['silent']) : '!ISSET'; $data['silent'] = isset($message['silent']) ? json_encode($message['silent']) : '!ISSET';
} }

13
tests/integration/features/callapi/recording.feature
View File

@ -467,12 +467,25 @@ Feature: callapi/recording
| spreed | recording | room1 | Transcript now available | The transcript for the call in room1 was uploaded to /Talk/Recording/ROOM(room1)/join_call.txt. | | spreed | recording | room1 | Transcript now available | The transcript for the call in room1 was uploaded to /Talk/Recording/ROOM(room1)/join_call.txt. |
| spreed | recording | room1 | Call recording now available | The recording for the call in room1 was uploaded to /Talk/Recording/ROOM(room1)/join_call.ogg. | | spreed | recording | room1 | Call recording now available | The recording for the call in room1 was uploaded to /Talk/Recording/ROOM(room1)/join_call.ogg. |
When user "participant1" shares file from the last notification to room "room1" with 200 (v1) When user "participant1" shares file from the last notification to room "room1" with 200 (v1)
Then user "participant1" sees the following system messages in room "room1" with 200 (v1)
| room | actorType | actorId | actorDisplayName | systemMessage |
| room1 | users | participant1 | participant1-displayname | conversation_created |
And user "participant1" sees the following messages in room "room1" with 200 (v1)
| room | actorType | actorId | actorDisplayName | messageType | message | messageParameters |
| room1 | users | participant1 | participant1-displayname | record-audio | {file} | "IGNORE" |
Then user "participant1" has the following notifications Then user "participant1" has the following notifications
| app | object_type | object_id | subject | message | | app | object_type | object_id | subject | message |
| spreed | recording | room1 | Transcript now available | The transcript for the call in room1 was uploaded to /Talk/Recording/ROOM(room1)/join_call.txt. | | spreed | recording | room1 | Transcript now available | The transcript for the call in room1 was uploaded to /Talk/Recording/ROOM(room1)/join_call.txt. |
When user "participant1" shares file from the first notification to room "room1" with 200 (v1) When user "participant1" shares file from the first notification to room "room1" with 200 (v1)
Then user "participant1" has the following notifications Then user "participant1" has the following notifications
| app | object_type | object_id | subject | message | | app | object_type | object_id | subject | message |
Then user "participant1" sees the following system messages in room "room1" with 200 (v1)
| room | actorType | actorId | actorDisplayName | systemMessage |
| room1 | users | participant1 | participant1-displayname | conversation_created |
And user "participant1" sees the following messages in room "room1" with 200 (v1)
| room | actorType | actorId | actorDisplayName | messageType | message | messageParameters |
| room1 | users | participant1 | participant1-displayname | record-audio | {file} | "IGNORE" |
| room1 | users | participant1 | participant1-displayname | record-audio | {file} | "IGNORE" |
Scenario: Store recording with success but fail to transcript Scenario: Store recording with success but fail to transcript
Given the following spreed app config is set Given the following spreed app config is set

Write Preview
Loading…
Cancel
Save