refactor the Flight router calls

biotorrents · Jun 1, 2024 · 4747268 · 4747268
1 parent 57aa98b
commit 4747268
Show file tree

Hide file tree

Showing 19 changed files with 200 additions and 79 deletions.
diff --git a/app/Twig.php b/app/Twig.php
@@ -170,6 +170,9 @@ function ($lock_to = null) {
             [ "is_safe" => ["html"] ]
         ));
 
+        # https://kint-php.github.io/kint/advanced/#twig
+        $twig->addExtension(new \Kint\Twig\TwigExtension());
+
         /*
         # DebugBar
         $profile = new \Twig\Profiler\Profile();

diff --git a/bootstrap/web.php b/bootstrap/web.php
@@ -11,6 +11,12 @@
 $app = Gazelle\App::go();
 $app->executionContext = "web";
 
+# load the error handler
+# https://github.com/filp/whoops
+$whoops = new \Whoops\Run();
+$whoops->pushHandler(new \Whoops\Handler\PrettyPageHandler());
+$whoops->register();
+
 # quick sanity checks
 $app->gotcha();
 

diff --git a/composer.json b/composer.json
@@ -50,13 +50,15 @@
     "ergebnis/composer-normalize": "^2.42.0",
     "erusev/parsedown": "1.8.0-beta-7",
     "erusev/parsedown-extra": "0.8.0",
+    "filp/whoops": "^2.15",
     "firebase/php-jwt": "^6.10",
     "foolz/sphinxql-query-builder": "^3.0.2",
     "friendsofphp/php-cs-fixer": "^3.57.1",
     "guzzlehttp/guzzle": "^7.8.1",
     "illuminate/database": "^9.52.16",
     "illuminate/support": "^9.52.16",
     "kint-php/kint": "^4.2.3",
+    "kint-php/kint-twig": "^5.0",
     "maximebf/debugbar": "^1.22.3",
     "mikecao/flight": "^2.0.1",
     "minishlink/web-push": "^8.0",

diff --git a/composer.lock b/composer.lock
diff --git a/routes/api/better.php b/routes/api/better.php
@@ -8,35 +8,35 @@
  */
 
 # badFolders
-Flight::route("GET /api/better/badFolders(/@snatchedOnly)", ["Gazelle\Api\Better", "badFolders"])->addMiddleware(function () {
+Flight::get("/api/better/badFolders(/@snatchedOnly)", ["Gazelle\Api\Better", "badFolders"])->addMiddleware(function () {
     $app = Gazelle\App::go();
     $app->middleware(["torrents" => "read"]);
 });
 
 
 # badTags
-Flight::route("GET /api/better/badTags(/@snatchedOnly)", ["Gazelle\Api\Better", "badTags"])->addMiddleware(function () {
+Flight::get("/api/better/badTags(/@snatchedOnly)", ["Gazelle\Api\Better", "badTags"])->addMiddleware(function () {
     $app = Gazelle\App::go();
     $app->middleware(["torrents" => "read"]);
 });
 
 
 # missingCitations
-Flight::route("GET /api/better/missingCitations(/@snatchedOnly)", ["Gazelle\Api\Better", "missingCitations"])->addMiddleware(function () {
+Flight::get("/api/better/missingCitations(/@snatchedOnly)", ["Gazelle\Api\Better", "missingCitations"])->addMiddleware(function () {
     $app = Gazelle\App::go();
     $app->middleware(["torrents" => "read"]);
 });
 
 
 # missingPictures
-Flight::route("GET /api/better/missingPictures(/@snatchedOnly)", ["Gazelle\Api\Better", "missingPictures"])->addMiddleware(function () {
+Flight::get("/api/better/missingPictures(/@snatchedOnly)", ["Gazelle\Api\Better", "missingPictures"])->addMiddleware(function () {
     $app = Gazelle\App::go();
     $app->middleware(["torrents" => "read"]);
 });
 
 
 # singleSeeder
-Flight::route("GET /api/better/singleSeeder(/@snatchedOnly)", ["Gazelle\Api\Better", "singleSeeder"])->addMiddleware(function () {
+Flight::get("/api/better/singleSeeder(/@snatchedOnly)", ["Gazelle\Api\Better", "singleSeeder"])->addMiddleware(function () {
     $app = Gazelle\App::go();
     $app->middleware(["torrents" => "read"]);
 });
diff --git a/routes/api/bonusPoints.php b/routes/api/bonusPoints.php
@@ -8,4 +8,4 @@
  */
 
 # checkout
-Flight::route("POST /api/store/checkout/@item", ["Gazelle\Api\BonusPoints", "checkout"]);
+Flight::post("/api/store/checkout/@item", ["Gazelle\Api\BonusPoints", "checkout"]);
diff --git a/routes/api/collages.php b/routes/api/collages.php
@@ -8,35 +8,35 @@
  */
 
 # browse
-Flight::route("POST /api/collages/browse", ["Gazelle\Api\Collages", "browse"])->addMiddleware(function () {
+Flight::post("/api/collages/browse", ["Gazelle\Api\Collages", "browse"])->addMiddleware(function () {
     $app = Gazelle\App::go();
     $app->middleware(["collages" => "read"]);
 });
 
 
 # create
-Flight::route("POST /api/collages", ["Gazelle\Api\Collages", "create"])->addMiddleware(function () {
+Flight::post("/api/collages", ["Gazelle\Api\Collages", "create"])->addMiddleware(function () {
     $app = Gazelle\App::go();
     $app->middleware(["collages" => "create"]);
 });
 
 
 # read
-Flight::route("GET /api/collages/@identifier", ["Gazelle\Api\Collages", "read"])->addMiddleware(function () {
+Flight::get("/api/collages/@identifier", ["Gazelle\Api\Collages", "read"])->addMiddleware(function () {
     $app = Gazelle\App::go();
     $app->middleware(["collages" => "read"]);
 });
 
 
 # update
-Flight::route("PATCH /api/collages/@identifier", ["Gazelle\Api\Collages", "update"])->addMiddleware(function () {
+Flight::patch("/api/collages/@identifier", ["Gazelle\Api\Collages", "update"])->addMiddleware(function () {
     $app = Gazelle\App::go();
     $app->middleware(["collages" => "update"]);
 });
 
 
 # delete
-Flight::route("DELETE /api/collages/@identifier", ["Gazelle\Api\Collages", "delete"])->addMiddleware(function () {
+Flight::delete("/api/collages/@identifier", ["Gazelle\Api\Collages", "delete"])->addMiddleware(function () {
     $app = Gazelle\App::go();
     $app->middleware(["collages" => "delete"]);
 });
diff --git a/routes/api/creators.php b/routes/api/creators.php
@@ -8,35 +8,35 @@
  */
 
 # browse
-Flight::route("POST /api/creators/browse", ["Gazelle\Api\Creators", "browse"])->addMiddleware(function () {
+Flight::post("/api/creators/browse", ["Gazelle\Api\Creators", "browse"])->addMiddleware(function () {
     $app = Gazelle\App::go();
     $app->middleware(["creators" => "read"]);
 });
 
 
 # create
-Flight::route("POST /api/creators", ["Gazelle\Api\Creators", "create"])->addMiddleware(function () {
+Flight::post("/api/creators", ["Gazelle\Api\Creators", "create"])->addMiddleware(function () {
     $app = Gazelle\App::go();
     $app->middleware(["creators" => "create"]);
 });
 
 
 # read
-Flight::route("GET /api/creators/@identifier", ["Gazelle\Api\Creators", "read"])->addMiddleware(function () {
+Flight::get("/api/creators/@identifier", ["Gazelle\Api\Creators", "read"])->addMiddleware(function () {
     $app = Gazelle\App::go();
     $app->middleware(["creators" => "read"]);
 });
 
 
 # update
-Flight::route("PATCH /api/creators/@identifier", ["Gazelle\Api\Creators", "update"])->addMiddleware(function () {
+Flight::patch("/api/creators/@identifier", ["Gazelle\Api\Creators", "update"])->addMiddleware(function () {
     $app = Gazelle\App::go();
     $app->middleware(["creators" => "update"]);
 });
 
 
 # delete
-Flight::route("DELETE /api/creators/@identifier", ["Gazelle\Api\Creators", "delete"])->addMiddleware(function () {
+Flight::delete("/api/creators/@identifier", ["Gazelle\Api\Creators", "delete"])->addMiddleware(function () {
     $app = Gazelle\App::go();
     $app->middleware(["creators" => "delete"]);
 });
diff --git a/routes/api/friends.php b/routes/api/friends.php
@@ -8,28 +8,28 @@
  */
 
 # create
-Flight::route("POST /api/friends", ["Gazelle\Api\Friends", "create"])->addMiddleware(function () {
+Flight::post("/api/friends", ["Gazelle\Api\Friends", "create"])->addMiddleware(function () {
     $app = Gazelle\App::go();
     $app->middleware(["userProfiles" => "create"]);
 });
 
 
 # read
-Flight::route("GET /api/friends(/@identifier)", ["Gazelle\Api\Friends", "read"])->addMiddleware(function () {
+Flight::get("/api/friends(/@identifier)", ["Gazelle\Api\Friends", "read"])->addMiddleware(function () {
     $app = Gazelle\App::go();
     $app->middleware(["userProfiles" => "read"]);
 });
 
 
 # update
-Flight::route("PATCH /api/friends/@identifier", ["Gazelle\Api\Friends", "update"])->addMiddleware(function () {
+Flight::patch("/api/friends/@identifier", ["Gazelle\Api\Friends", "update"])->addMiddleware(function () {
     $app = Gazelle\App::go();
     $app->middleware(["userProfiles" => "update"]);
 });
 
 
 # delete
-Flight::route("DELETE /api/friends/@identifier", ["Gazelle\Api\Friends", "delete"])->addMiddleware(function () {
+Flight::delete("/api/friends/@identifier", ["Gazelle\Api\Friends", "delete"])->addMiddleware(function () {
     $app = Gazelle\App::go();
     $app->middleware(["userProfiles" => "delete"]);
 });
diff --git a/routes/api/groups.php b/routes/api/groups.php
@@ -8,35 +8,35 @@
  */
 
 # browse
-Flight::route("POST /api/groups/browse", ["Gazelle\Api\Groups", "browse"])->addMiddleware(function () {
+Flight::post("/api/groups/browse", ["Gazelle\Api\Groups", "browse"])->addMiddleware(function () {
     $app = Gazelle\App::go();
     $app->middleware(["torrentGroups" => "read"]);
 });
 
 
 # create
-Flight::route("POST /api/groups", ["Gazelle\Api\Groups", "create"])->addMiddleware(function () {
+Flight::post("/api/groups", ["Gazelle\Api\Groups", "create"])->addMiddleware(function () {
     $app = Gazelle\App::go();
     $app->middleware(["torrentGroups" => "create"]);
 });
 
 
 # read
-Flight::route("GET /api/groups/@identifier", ["Gazelle\Api\Groups", "read"])->addMiddleware(function () {
+Flight::get("/api/groups/@identifier", ["Gazelle\Api\Groups", "read"])->addMiddleware(function () {
     $app = Gazelle\App::go();
     $app->middleware(["torrentGroups" => "read"]);
 });
 
 
 # update
-Flight::route("PATCH /api/groups/@identifier", ["Gazelle\Api\Groups", "update"])->addMiddleware(function () {
+Flight::patch("/api/groups/@identifier", ["Gazelle\Api\Groups", "update"])->addMiddleware(function () {
     $app = Gazelle\App::go();
     $app->middleware(["torrentGroups" => "update"]);
 });
 
 
 # delete
-Flight::route("DELETE /api/groups/@identifier", ["Gazelle\Api\Groups", "delete"])->addMiddleware(function () {
+Flight::delete("/api/groups/@identifier", ["Gazelle\Api\Groups", "delete"])->addMiddleware(function () {
     $app = Gazelle\App::go();
     $app->middleware(["torrentGroups" => "delete"]);
 });