Merge remote-tracking branch 'upstream/main'

StevyMarlino · Oct 24, 2024 · 62c4b61 · 62c4b61
2 parents 9237a2f + ba6b2f3
commit 62c4b61
Show file tree

Hide file tree

Showing 11 changed files with 177 additions and 197 deletions.
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: 👀 Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: 🪄 Setup
         uses: ./.github/actions/setup
       - name: 🔮 Install Composer Dependencies
@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: 👀 Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: 🪄 Setup
         uses: ./.github/actions/setup
       - name: 🔮 Install Composer Dependencies
@@ -40,7 +40,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: 👀 Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: 🪄 Setup
         uses: ./.github/actions/setup
       - name: 🕵️‍♂️ Run Composer Validate

diff --git a/app/Console/Commands/GenerateSitemap.php b/app/Console/Commands/GenerateSitemap.php
@@ -20,9 +20,16 @@ final class GenerateSitemap extends Command
      * @var array|string[]
      */
     private array $noIndexPaths = [
-        '',
-        '/forum/*',
+        '/forum/channels',
+        '/forum/channels/*',
+        '/user',
         '/user/*',
+        '/dashboard/*',
+        '/rules',
+        '/terms',
+        '/privacy',
+        '/faq',
+        '/auth/github',
     ];
 
     public function handle(): void

diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
@@ -22,21 +22,10 @@ public function boot(): void
         $this->routeBindings();
 
         $this->routes(function (): void {
-            //            Route::prefix('api')
-            //                ->middleware('api')
-            //                ->namespace($this->namespace)
-            //                ->group(base_path('routes/api.php'));
-
             Route::middleware('web')
                 ->namespace($this->namespace)
                 ->group(base_path('routes/web.php'));
         });
-
-        Route::macro('redirectMap', function (array $map, int $status = 302): void {
-            foreach ($map as $old => $new) {
-                Route::redirect($old, $new, $status)->name($old);
-            }
-        });
     }
 
     protected function configureRateLimiting(): void