diff --git a/composer.lock b/composer.lock index 45963ded209..26b90860271 100644 --- a/composer.lock +++ b/composer.lock @@ -13,17 +13,17 @@ "source": { "type": "git", "url": "https://github.com/ChristophWurst/nextcloud_composer.git", - "reference": "56056903c03bf8c29b2a2822153951c8f783a85a" + "reference": "8bd067e9ce95dcf1ee6beaa3b27a0f13a14ae901" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/56056903c03bf8c29b2a2822153951c8f783a85a", - "reference": "56056903c03bf8c29b2a2822153951c8f783a85a", + "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/8bd067e9ce95dcf1ee6beaa3b27a0f13a14ae901", + "reference": "8bd067e9ce95dcf1ee6beaa3b27a0f13a14ae901", "shasum": "" }, "require": { "php": "^7.4 || ~8.0 || ~8.1", - "psr/container": "^1.0", + "psr/container": "^1.1.1", "psr/event-dispatcher": "^1.0", "psr/log": "^1.1" }, @@ -31,7 +31,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "24.0.0-dev" + "dev-master": "25.0.0-dev" } }, "notification-url": "https://packagist.org/downloads/", @@ -49,7 +49,7 @@ "issues": "https://github.com/ChristophWurst/nextcloud_composer/issues", "source": "https://github.com/ChristophWurst/nextcloud_composer/tree/master" }, - "time": "2022-03-01T01:41:01+00:00" + "time": "2022-07-09T02:03:24+00:00" }, { "name": "composer/pcre", diff --git a/lib/Service/SessionService.php b/lib/Service/SessionService.php index bfe43726d0e..105da897ace 100644 --- a/lib/Service/SessionService.php +++ b/lib/Service/SessionService.php @@ -226,8 +226,13 @@ public function updateSession(int $documentId, int $sessionId, string $sessionTo private function getColorForGuestName(string $guestName = null): string { $guestName = $this->userId ?? $guestName; - $uniqueGuestId = !empty($guestName) ? $guestName : $this->secureRandom->generate(12); - $color = $this->avatarManager->getGuestAvatar($uniqueGuestId)->avatarBackgroundColor($uniqueGuestId); - return sprintf("#%02x%02x%02x", $color->r, $color->g, $color->b); + $uniqueGuestId = empty($guestName) + ? $this->secureRandom->generate(12) + : $guestName; + + return $this->avatarManager + ->getGuestAvatar($uniqueGuestId) + ->avatarBackgroundColor($uniqueGuestId) + ->name(); } }