Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
edc54ea
Add support for public shares to file rooms
danxuliu Jul 18, 2018
8de6a11
Add integration tests for files shared by link
danxuliu Aug 14, 2019
3d89459
Add integration tests for self-joined users in files shared by link
danxuliu Aug 14, 2019
b10313c
Add self-joined users and guests to the candidate mentions in file rooms
danxuliu Aug 14, 2019
6bb86a4
Add integration tests for mentions in a file shared by link
danxuliu Aug 14, 2019
ca62f9d
Fix avatar container height during calls
danxuliu Sep 16, 2019
1ba0f4f
Add support for Talk sidebar in public share pages
danxuliu Aug 15, 2019
255ac5d
Add basic acceptance tests for the Talk sidebar in the public share page
danxuliu Aug 16, 2019
83b5469
Add acceptance tests for Talk sidebar in public share page to Drone
danxuliu Aug 16, 2019
aaa8b84
Add acceptance tests for registered users in the public share page
danxuliu Aug 16, 2019
cd17e48
Add acceptance tests for mentioning users in the Files app
danxuliu Aug 16, 2019
c03ab40
Add acceptance tests for mentions in the public share page
danxuliu Aug 16, 2019
7f731bd
Add acceptance tests for chats in a file shared by link
danxuliu Aug 16, 2019
b4a2907
Add acceptance tests for chats in a file shared by link with a password
danxuliu Aug 16, 2019
41a1556
Correctly check if the share has a password and if it was entered cor…
nickvergessen Aug 16, 2019
b77d4b2
Add integration tests for getting the room for link share with password
danxuliu Aug 17, 2019
7fdcb46
Do not add system message for self joined users to file rooms
danxuliu Aug 19, 2019
6f8ac51
Add integration tests for the "user_added" system message
danxuliu Aug 19, 2019
129a3c1
Add wrapper around "OC.getCurrentUser()" to be able to override the user
danxuliu Sep 25, 2019
c1e6687
Override the current user when getting the room for a public share page
danxuliu Sep 25, 2019
891a73f
Fix guest avatars in public share page
danxuliu Sep 25, 2019
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
Prev Previous commit
Next Next commit
Do not add system message for self joined users to file rooms
When a user with access to a file joins its file room the user is added
as a persistent participant, so a "XXX joined the conversation" system
message is shown. However, if a user does not have direct access to a
file and joins its room the user is not added as a persistent
participant, so the system message should not be shown in that case.

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
  • Loading branch information
danxuliu committed Sep 26, 2019
commit 7fdcb46777843ac4153689501f4c8933381c1e59
4 changes: 3 additions & 1 deletion lib/Chat/SystemMessage/Listener.php
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,9 @@ public static function register(EventDispatcherInterface $dispatcher): void {
/** @var self $listener */
$listener = \OC::$server->query(self::class);
foreach ($participants as $participant) {
if ($room->getObjectType() === 'file' || $userId !== $participant['userId']) {
$userJoinedFileRoom = $room->getObjectType() === 'file' &&
(!array_key_exists('participantType', $participant) || $participant['participantType'] !== Participant::USER_SELF_JOINED);
if ($userJoinedFileRoom || $userId !== $participant['userId']) {
$listener->sendSystemMessage($room, 'user_added', ['user' => $participant['userId']]);
}
}
Expand Down