Skip to content

Commit 528f7e4

Browse files
committed
fixup! feat(mentions): allow teams to be mentioned
1 parent 21bde6d commit 528f7e4

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Diff for: lib/Chat/Notifier.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ private function getMentionedGroupMembers(Room $chat, IComment $comment, array $
537537
* @param Room $chat
538538
* @param IComment $comment
539539
* @param array $list
540-
* @psalm-param array<int, array{id: string, type: string, reason: string}> $list
540+
* @psalm-param array<int, array{type: string, id: string, reason: string, sourceId?: string}> $list
541541
* @return array[]
542542
* @psalm-return array<int, array{type: string, id: string, reason: string, sourceId?: string}>
543543
*/

Diff for: tests/integration/features/chat-2/mentions.feature

+5-5
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ Feature: chat/mentions
8181
| roomName | room |
8282
And user "participant1" adds user "participant2" to room "group room" with 200 (v4)
8383
And user "participant1" adds user "participant3" to room "group room" with 200 (v4)
84-
And user "participant1" adds circle "1234" to room "group room" with 200 (v4)
85-
# And user "participant1" sees the following attendees in room "group room" with 200 (v4)
86-
# | actorType | actorId |
87-
# | users | participant2 |
88-
# | federated_users | participant2@{$REMOTE_URL} |
84+
And user "participant1" adds circle "1" to room "group room" with 200 (v4)
85+
And user "participant1" sees the following attendees in room "group room" with 200 (v4)
86+
| actorType | actorId |
87+
| users | participant2 |
88+
| federated_users | participant2@{$REMOTE_URL} |
8989
Then user "participant1" gets the following candidate mentions in room "group room" for "part" with 200
9090
| id | label | source | mentionId |
9191
| participant2 | participant2-displayname | users | participant2 |

0 commit comments

Comments
 (0)