public-legacy/manage/users/role.php

@@ -3,7 +3,7 @@ namespace Misuzu;
 
 use RuntimeException;
 use Index\Colour\Colour;
-use Index\Colour\ColourRgb;
+use Index\Colour\ColourRGB;
 use Misuzu\Perm;
 
 $authInfo = $msz->getAuthInfo();
@@ -86,7 +86,7 @@ while($_SERVER['REQUEST_METHOD'] === 'POST' && CSRF::validateRequest()) {
 
     $roleColour = $colourInherit
         ? Colour::none()
-        : new ColourRgb($colourRed, $colourGreen, $colourBlue);
+        : new ColourRGB($colourRed, $colourGreen, $colourBlue);
 
     if(mb_strlen($roleDesc) > 1000) {
         echo 'Description may not be longer than 1000 characters.';

src/LegacyRoutes.php

@@ -2,18 +2,16 @@
 namespace Misuzu;
 
 use Index\Http\Routing\{HttpGet,RouteHandler,RouteHandlerTrait};
-use Index\Urls\{UrlFormat,UrlRegistry,UrlSource};
+use Index\Urls\{UrlFormat,UrlRegistry,UrlSource,UrlSourceTrait};
 
 class LegacyRoutes implements RouteHandler, UrlSource {
-    use RouteHandlerTrait;
+    use RouteHandlerTrait, UrlSourceTrait;
 
     public function __construct(
         private UrlRegistry $urls
     ) {}
 
     public function registerUrls(UrlRegistry $urls): void {
-        UrlFormat::register($urls, $this);
-
         // eventually this should be handled by context classes
         $urls->register('search-index', '/search.php');
         $urls->register('search-query', '/search.php', ['q' => '<query>'], '<section>');

src/Users/UsersRpcActions.php

@@ -6,7 +6,7 @@ use Misuzu\SiteInfo;
 use Misuzu\Users\Assets\UserAvatarAsset;
 use Aiwass\Server\{RpcActionHandler,RpcQuery};
 use Index\XArray;
-use Index\Colour\{Colour,ColourRgb};
+use Index\Colour\{Colour,ColourRGB};
 use Index\Urls\UrlRegistry;
 
 final class UsersRpcActions extends RpcActionHandler {
@@ -35,7 +35,7 @@ final class UsersRpcActions extends RpcActionHandler {
         } else {
             // Index doesn't have a proper toRawRGB func???
             $colourRaw = Colour::toMisuzu($colour) & 0xFFFFFF;
-            $colourCSS = (string)ColourRgb::convert($colour);
+            $colourCSS = (string)ColourRGB::convert($colour);
         }
 
         $baseUrl = $this->siteInfo->getURL();