Skip to content

Commit

Permalink
adjust to new OCP\Color interface
Browse files Browse the repository at this point in the history
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
  • Loading branch information
Julien Veyssier committed Jul 16, 2022
1 parent a10feee commit 402d60b
Showing 1 changed file with 16 additions and 6 deletions.
22 changes: 16 additions & 6 deletions lib/Service/ProjectService.php
Expand Up @@ -12,6 +12,7 @@

namespace OCA\Cospend\Service;

use Exception;
use OCP\Files\FileInfo;
use OCP\IL10N;
use OCP\IConfig;
Expand Down Expand Up @@ -2470,12 +2471,21 @@ public function getMembers(string $projectId, ?string $order = null, ?int $lastc
$dbColor = $row['color'];
if ($dbColor === null) {
$av = $this->avatarManager->getGuestAvatar($dbName);
$dbColor = $av->avatarBackgroundColor($dbName);
$dbColor = [
'r' => $dbColor->{'r'},
'g' => $dbColor->{'g'},
'b' => $dbColor->{'b'},
];
$avatarBgColor = $av->avatarBackgroundColor($dbName);
try {
$dbColor = [
'r' => $avatarBgColor->{'r'},
'g' => $avatarBgColor->{'g'},
'b' => $avatarBgColor->{'b'},
];
} catch (Exception | Throwable $e) {
// NC >= 25
$dbColor = [
'r' => $avatarBgColor->red(),
'g' => $avatarBgColor->green(),
'b' => $avatarBgColor->blue(),
];
}
} else {
$dbColor = Utils::hexToRgb($dbColor);
}
Expand Down

0 comments on commit 402d60b

Please sign in to comment.