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

fix(chat)!: Remove threads v1 API changes 

Signed-off-by: Joas Schilling <coding@schilljs.com>
pull/9978/head
Joas Schilling 2 years ago
parent
feaf6cfb63
commit
d5adfdf856
No known key found for this signature in database GPG Key ID: 74434EFE0D2E2205
6 changed files with 76 additions and 88 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      docs/capabilities.md
  2. 1
      docs/chat.md
  3. 1
      lib/Capabilities.php
  4. 1
      lib/Model/Message.php
  5. 10
      tests/integration/features/bootstrap/FeatureContext.php
  6. 150
      tests/integration/features/chat-2/reply.feature

1
docs/capabilities.md
View File

@ -123,4 +123,3 @@
* `typing-privacy` - Support toggle typing privacy
## 18
* `threads` - Chat messages have a thread ID exposed which allows clients to only list chat messages of a dedicated messages stream

1
docs/chat.md
View File

@ -46,7 +46,6 @@ Base endpoint is: `/ocs/v2.php/apps/spreed/api/v1`: since Nextcloud 13
| field | type | Description |
|-----------------------|----------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| `id` | int | ID of the comment |
| `threadId` | int | ID of the top most parent comment, indicating the thread of this message (`0` for the messages without a parent) (only available with `threads` capability) |
| `token` | string | Conversation token |
| `actorType` | string | See [Constants - Actor types of chat messages](constants.md#actor-types-of-chat-messages) |
| `actorId` | string | Actor id of the message author |

1
lib/Capabilities.php
View File

@ -119,7 +119,6 @@ class Capabilities implements IPublicCapability {
'single-conversation-status',
'chat-keep-notifications',
'typing-privacy',
// FIXME Publish once the API is approved by the clients 'threads',
],
'config' => [
'attachments' => [

1
lib/Model/Message.php
View File

@ -168,7 +168,6 @@ class Message {
$data = [
'id' => (int) $this->getComment()->getId(),
'threadId' => (int) $this->getComment()->getTopmostParentId(),
'token' => $this->getRoom()->getToken(),
'actorType' => $this->getActorType(),
'actorId' => $this->getActorId(),

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

@ -2233,7 +2233,6 @@ class FeatureContext implements Context, SnippetAcceptingContext {
$includeReferenceId = in_array('referenceId', $formData->getRow(0), true);
$includeReactions = in_array('reactions', $formData->getRow(0), true);
$includeReactionsSelf = in_array('reactionsSelf', $formData->getRow(0), true);
$includeThreadId = in_array('threadId', $formData->getRow(0), true);
$expected = $formData->getHash();
$count = count($expected);
@ -2243,10 +2242,6 @@ class FeatureContext implements Context, SnippetAcceptingContext {
$messages[$i]['messageParameters'] = 'IGNORE';
}
if ($includeThreadId && !is_numeric($expected[$i]['threadId'])) {
$expected[$i]['threadId'] = self::$textToMessageId[$expected[$i]['threadId']];
}
$result = preg_match('/POLL_ID\(([^)]+)\)/', $expected[$i]['messageParameters'], $matches);
if ($result) {
$expected[$i]['messageParameters'] = str_replace($matches[0], '"' . self::$questionToPollId[$matches[1]] . '"', $expected[$i]['messageParameters']);
@ -2260,7 +2255,7 @@ class FeatureContext implements Context, SnippetAcceptingContext {
}
}
Assert::assertEquals($expected, array_map(function ($message) use ($includeParents, $includeReferenceId, $includeReactions, $includeReactionsSelf, $includeThreadId) {
Assert::assertEquals($expected, array_map(function ($message) use ($includeParents, $includeReferenceId, $includeReactions, $includeReactionsSelf) {
$data = [
'room' => self::$tokenToIdentifier[$message['token']],
'actorType' => $message['actorType'],
@ -2287,9 +2282,6 @@ class FeatureContext implements Context, SnippetAcceptingContext {
$data['reactionsSelf'] = null;
}
}
if ($includeThreadId) {
$data['threadId'] = $message['threadId'];
}
return $data;
}, $messages));
}

150
tests/integration/features/chat-2/reply.feature
View File

@ -13,13 +13,13 @@ Feature: chat-2/reply
And user "participant1" sends message "Message 1" to room "group room" with 201
When user "participant1" sends reply "Message 1-1" on message "Message 1" to room "group room" with 201
Then user "participant1" sees the following messages in room "group room" with 200
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage | threadId |
| group room | users | participant1 | participant1-displayname | Message 1-1 | [] | Message 1 | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1 | [] | | 0 |
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage |
| group room | users | participant1 | participant1-displayname | Message 1-1 | [] | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1 | [] | |
And user "participant2" sees the following messages in room "group room" with 200
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage | threadId |
| group room | users | participant1 | participant1-displayname | Message 1-1 | [] | Message 1 | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1 | [] | | 0 |
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage |
| group room | users | participant1 | participant1-displayname | Message 1-1 | [] | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1 | [] | |
Scenario: user can reply to other's messages
Given user "participant1" creates room "group room" (v4)
@ -28,13 +28,13 @@ Feature: chat-2/reply
And user "participant1" sends message "Message 1" to room "group room" with 201
When user "participant2" sends reply "Message 1-1" on message "Message 1" to room "group room" with 201
Then user "participant1" sees the following messages in room "group room" with 200
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage | threadId |
| group room | users | participant2 | participant2-displayname | Message 1-1 | [] | Message 1 | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1 | [] | | 0 |
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage |
| group room | users | participant2 | participant2-displayname | Message 1-1 | [] | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1 | [] | |
And user "participant2" sees the following messages in room "group room" with 200
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage | threadId |
| group room | users | participant2 | participant2-displayname | Message 1-1 | [] | Message 1 | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1 | [] | | 0 |
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage |
| group room | users | participant2 | participant2-displayname | Message 1-1 | [] | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1 | [] | |
Scenario: several users can reply to the same message several times
Given user "participant1" creates room "group room" (v4)
@ -46,19 +46,19 @@ Feature: chat-2/reply
And user "participant1" sends reply "Message 1-3" on message "Message 1" to room "group room" with 201
And user "participant2" sends reply "Message 1-4" on message "Message 1" to room "group room" with 201
Then user "participant1" sees the following messages in room "group room" with 200
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage | threadId |
| group room | users | participant2 | participant2-displayname | Message 1-4 | [] | Message 1 | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1-3 | [] | Message 1 | Message 1 |
| group room | users | participant2 | participant2-displayname | Message 1-2 | [] | Message 1 | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1-1 | [] | Message 1 | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1 | [] | | 0 |
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage |
| group room | users | participant2 | participant2-displayname | Message 1-4 | [] | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1-3 | [] | Message 1 |
| group room | users | participant2 | participant2-displayname | Message 1-2 | [] | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1-1 | [] | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1 | [] | |
And user "participant2" sees the following messages in room "group room" with 200
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage | threadId |
| group room | users | participant2 | participant2-displayname | Message 1-4 | [] | Message 1 | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1-3 | [] | Message 1 | Message 1 |
| group room | users | participant2 | participant2-displayname | Message 1-2 | [] | Message 1 | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1-1 | [] | Message 1 | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1 | [] | | 0 |
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage |
| group room | users | participant2 | participant2-displayname | Message 1-4 | [] | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1-3 | [] | Message 1 |
| group room | users | participant2 | participant2-displayname | Message 1-2 | [] | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1-1 | [] | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1 | [] | |
@ -72,23 +72,23 @@ Feature: chat-2/reply
# The file message parameters are not relevant for this test and are quite
# large, so they are simply ignored.
And user "participant1" sees the following messages in room "group room" with 200
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage | threadId |
| group room | users | participant1 | participant1-displayname | {file} | "IGNORE" | | 0 |
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage |
| group room | users | participant1 | participant1-displayname | {file} | "IGNORE" | |
And user "participant2" sees the following messages in room "group room" with 200
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage | threadId |
| group room | users | participant1 | participant1-displayname | {file} | "IGNORE" | | 0 |
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage |
| group room | users | participant1 | participant1-displayname | {file} | "IGNORE" | |
When user "participant1" sends reply "Message X-1" on message "{file}" to room "group room" with 201
And user "participant2" sends reply "Message X-2" on message "{file}" to room "group room" with 201
Then user "participant1" sees the following messages in room "group room" with 200
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage | threadId |
| group room | users | participant2 | participant2-displayname | Message X-2 | [] | {file} | {file} |
| group room | users | participant1 | participant1-displayname | Message X-1 | [] | {file} | {file} |
| group room | users | participant1 | participant1-displayname | {file} | "IGNORE" | | 0 |
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage |
| group room | users | participant2 | participant2-displayname | Message X-2 | [] | {file} |
| group room | users | participant1 | participant1-displayname | Message X-1 | [] | {file} |
| group room | users | participant1 | participant1-displayname | {file} | "IGNORE" | |
And user "participant2" sees the following messages in room "group room" with 200
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage | threadId |
| group room | users | participant2 | participant2-displayname | Message X-2 | [] | {file} | {file} |
| group room | users | participant1 | participant1-displayname | Message X-1 | [] | {file} | {file} |
| group room | users | participant1 | participant1-displayname | {file} | "IGNORE" | | 0 |
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage |
| group room | users | participant2 | participant2-displayname | Message X-2 | [] | {file} |
| group room | users | participant1 | participant1-displayname | Message X-1 | [] | {file} |
| group room | users | participant1 | participant1-displayname | {file} | "IGNORE" | |
Scenario: user can not reply to commands
Given user "participant1" creates room "group room" (v4)
@ -128,15 +128,15 @@ Feature: chat-2/reply
And user "participant1" sends reply "Message 1-1" on message "Message 1" to room "group room" with 201
When user "participant1" sends reply "Message 1-1-1" on message "Message 1-1" to room "group room" with 201
Then user "participant1" sees the following messages in room "group room" with 200
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage | threadId |
| group room | users | participant1 | participant1-displayname | Message 1-1-1 | [] | Message 1-1 | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1-1 | [] | Message 1 | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1 | [] | | 0 |
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage |
| group room | users | participant1 | participant1-displayname | Message 1-1-1 | [] | Message 1-1 |
| group room | users | participant1 | participant1-displayname | Message 1-1 | [] | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1 | [] | |
And user "participant2" sees the following messages in room "group room" with 200
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage | threadId |
| group room | users | participant1 | participant1-displayname | Message 1-1-1 | [] | Message 1-1 | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1-1 | [] | Message 1 | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1 | [] | | 0 |
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage |
| group room | users | participant1 | participant1-displayname | Message 1-1-1 | [] | Message 1-1 |
| group room | users | participant1 | participant1-displayname | Message 1-1 | [] | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1 | [] | |
Scenario: user can reply to other's replies
Given user "participant1" creates room "group room" (v4)
@ -147,17 +147,17 @@ Feature: chat-2/reply
When user "participant1" sends reply "Message 1-1-1" on message "Message 1-1" to room "group room" with 201
And user "participant2" sends reply "Message 1-1-1-1" on message "Message 1-1-1" to room "group room" with 201
Then user "participant1" sees the following messages in room "group room" with 200
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage | threadId |
| group room | users | participant2 | participant2-displayname | Message 1-1-1-1 | [] | Message 1-1-1 | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1-1-1 | [] | Message 1-1 | Message 1 |
| group room | users | participant2 | participant2-displayname | Message 1-1 | [] | Message 1 | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1 | [] | | 0 |
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage |
| group room | users | participant2 | participant2-displayname | Message 1-1-1-1 | [] | Message 1-1-1 |
| group room | users | participant1 | participant1-displayname | Message 1-1-1 | [] | Message 1-1 |
| group room | users | participant2 | participant2-displayname | Message 1-1 | [] | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1 | [] | |
And user "participant2" sees the following messages in room "group room" with 200
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage | threadId |
| group room | users | participant2 | participant2-displayname | Message 1-1-1-1 | [] | Message 1-1-1 | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1-1-1 | [] | Message 1-1 | Message 1 |
| group room | users | participant2 | participant2-displayname | Message 1-1 | [] | Message 1 | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1 | [] | | 0 |
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage |
| group room | users | participant2 | participant2-displayname | Message 1-1-1-1 | [] | Message 1-1-1 |
| group room | users | participant1 | participant1-displayname | Message 1-1-1 | [] | Message 1-1 |
| group room | users | participant2 | participant2-displayname | Message 1-1 | [] | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1 | [] | |
Scenario: several users can reply to the same reply several times
Given user "participant1" creates room "group room" (v4)
@ -170,21 +170,21 @@ Feature: chat-2/reply
And user "participant1" sends reply "Message 1-1-3" on message "Message 1-1" to room "group room" with 201
And user "participant2" sends reply "Message 1-1-4" on message "Message 1-1" to room "group room" with 201
Then user "participant1" sees the following messages in room "group room" with 200
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage | threadId |
| group room | users | participant2 | participant2-displayname | Message 1-1-4 | [] | Message 1-1 | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1-1-3 | [] | Message 1-1 | Message 1 |
| group room | users | participant2 | participant2-displayname | Message 1-1-2 | [] | Message 1-1 | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1-1-1 | [] | Message 1-1 | Message 1 |
| group room | users | participant2 | participant2-displayname | Message 1-1 | [] | Message 1 | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1 | [] | | 0 |
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage |
| group room | users | participant2 | participant2-displayname | Message 1-1-4 | [] | Message 1-1 |
| group room | users | participant1 | participant1-displayname | Message 1-1-3 | [] | Message 1-1 |
| group room | users | participant2 | participant2-displayname | Message 1-1-2 | [] | Message 1-1 |
| group room | users | participant1 | participant1-displayname | Message 1-1-1 | [] | Message 1-1 |
| group room | users | participant2 | participant2-displayname | Message 1-1 | [] | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1 | [] | |
And user "participant2" sees the following messages in room "group room" with 200
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage | threadId |
| group room | users | participant2 | participant2-displayname | Message 1-1-4 | [] | Message 1-1 | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1-1-3 | [] | Message 1-1 | Message 1 |
| group room | users | participant2 | participant2-displayname | Message 1-1-2 | [] | Message 1-1 | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1-1-1 | [] | Message 1-1 | Message 1 |
| group room | users | participant2 | participant2-displayname | Message 1-1 | [] | Message 1 | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1 | [] | | 0 |
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage |
| group room | users | participant2 | participant2-displayname | Message 1-1-4 | [] | Message 1-1 |
| group room | users | participant1 | participant1-displayname | Message 1-1-3 | [] | Message 1-1 |
| group room | users | participant2 | participant2-displayname | Message 1-1-2 | [] | Message 1-1 |
| group room | users | participant1 | participant1-displayname | Message 1-1-1 | [] | Message 1-1 |
| group room | users | participant2 | participant2-displayname | Message 1-1 | [] | Message 1 |
| group room | users | participant1 | participant1-displayname | Message 1 | [] | |
Scenario: getting parent and quote works
Given user "participant1" creates room "group room" (v4)
@ -194,14 +194,14 @@ Feature: chat-2/reply
And user "participant1" sends message "Message 2" to room "group room" with 201
And user "participant2" sends reply "Message 2-1" on message "Message 2" to room "group room" with 201
Then user "participant1" sees the following messages in room "group room" starting with "Message 1" with 200
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage | threadId |
| group room | users | participant1 | participant1-displayname | Message 1 | [] | | 0 |
| group room | users | participant1 | participant1-displayname | Message 2 | [] | | 0 |
| group room | users | participant2 | participant2-displayname | Message 2-1 | [] | Message 2 | Message 2 |
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage |
| group room | users | participant1 | participant1-displayname | Message 1 | [] | |
| group room | users | participant1 | participant1-displayname | Message 2 | [] | |
| group room | users | participant2 | participant2-displayname | Message 2-1 | [] | Message 2 |
Then user "participant1" sees the following messages in room "group room" starting with "Message 2" with 200
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage | threadId |
| group room | users | participant1 | participant1-displayname | Message 2 | [] | | 0 |
| group room | users | participant2 | participant2-displayname | Message 2-1 | [] | Message 2 | Message 2 |
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage |
| group room | users | participant1 | participant1-displayname | Message 2 | [] | |
| group room | users | participant2 | participant2-displayname | Message 2-1 | [] | Message 2 |

Write Preview
Loading…
Cancel
Save