diff options
author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2022-03-01 23:15:09 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-01 23:15:09 +0300 |
commit | 1c633f288e278c2874ddb1a990c3b72689fd0814 (patch) | |
tree | ea61c6abfe0aaec905f5f53895f0d331bb7cca9e /lib | |
parent | 193d3b2193e2e9309ae5f930da91b73c22ccdc2c (diff) | |
parent | b57196179f8c093eafbd6a8a680c182c95c90bee (diff) |
Merge pull request #6945 from nextcloud/techdebt/noid/improve-activity-generation
Only calculate the room name once instead of loading all participants
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Activity/Listener.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/Activity/Listener.php b/lib/Activity/Listener.php index 232225b68..57410417f 100644 --- a/lib/Activity/Listener.php +++ b/lib/Activity/Listener.php @@ -232,6 +232,11 @@ class Listener { return; } + // We know the new participant is in the room, + // so skip loading them just to make sure they can read it. + // Must be overwritten later on for one-to-one chats. + $roomName = $room->getDisplayName($actorId); + foreach ($participants as $participant) { if ($participant['actorType'] !== Attendee::ACTOR_USERS) { // No user => no activity @@ -244,7 +249,10 @@ class Listener { } try { - $roomName = $room->getDisplayName($participant['actorId']); + if ($room->getType() === Room::TYPE_ONE_TO_ONE) { + // Overwrite the room name with the other participant + $roomName = $room->getDisplayName($participant['actorId']); + } $event ->setObject('room', $room->getId(), $roomName) ->setSubject('invitation', [ |