Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/spreed.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2019-02-20 19:48:05 +0300
committerJoas Schilling <coding@schilljs.com>2019-02-27 17:26:50 +0300
commit7e54634fb53e5a51ab36212b0945d086f1a1573f (patch)
treeebc61fe4b4561bf99a4ad5ece770e32a960de0a1 /lib/Room.php
parent1a4f96436a88e6f0a6b4fe4a599721ca1f166f0b (diff)
Make room names non-optional
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib/Room.php')
-rw-r--r--lib/Room.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/Room.php b/lib/Room.php
index 2aa9997f0..55ecfc910 100644
--- a/lib/Room.php
+++ b/lib/Room.php
@@ -138,6 +138,10 @@ class Room {
return $this->name;
}
+ public function getDisplayName(string $userId): string {
+ return $this->manager->resolveRoomDisplayName($this, $userId);
+ }
+
public function getActiveGuests(): int {
return $this->activeGuests;
}
@@ -272,8 +276,6 @@ class Room {
return false;
}
- $oldName = $this->getName();
-
$this->dispatcher->dispatch(self::class . '::preSetName', new GenericEvent($this, [
'newName' => $newName,
'oldName' => $oldName,