chore: Refactor configuration files based on Laravel 10 skeleton

app/Console/Kernel.php

@@ -7,20 +7,8 @@ use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
 class Kernel extends ConsoleKernel
 {
-    /**
-     * The Artisan commands provided by your application.
-     *
-     * @var array<int, string>
-     */
-    protected $commands = [
-        Commands\ParseCachedWebMentions::class,
-        Commands\ReDownloadWebMentions::class,
-    ];
-
     /**
      * Define the application's command schedule.
-     *
-     * @codeCoverageIgnore
      */
     protected function schedule(Schedule $schedule): void
     {
@@ -33,7 +21,7 @@ class Kernel extends ConsoleKernel
      */
     protected function commands(): void
     {
-        $this->load(__DIR__ . '/Commands');
+        $this->load(__DIR__.'/Commands');
 
         require base_path('routes/console.php');
     }

app/Http/Controllers/Controller.php

@@ -3,13 +3,10 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
 
 class Controller extends BaseController
 {
-    use AuthorizesRequests;
-    use DispatchesJobs;
-    use ValidatesRequests;
+    use AuthorizesRequests, ValidatesRequests;
 }

app/Http/Controllers/FeedsController.php

@@ -152,7 +152,7 @@ class FeedsController extends Controller
             'author' => [
                 'type' => 'card',
                 'name' => config('user.displayname'),
-                'url' => config('app.longurl'),
+                'url' => config('url.longurl'),
             ],
             'children' => $items,
         ], 200, [
@@ -188,7 +188,7 @@ class FeedsController extends Controller
             'author' => [
                 'type' => 'card',
                 'name' => config('user.displayname'),
-                'url' => config('app.longurl'),
+                'url' => config('url.longurl'),
             ],
             'children' => $items,
         ], 200, [

app/Http/Controllers/TokenEndpointController.php

@@ -45,7 +45,7 @@ class TokenEndpointController extends Controller
     public function create(Request $request): JsonResponse
     {
         $auth = $this->verifyIndieAuthCode(
-            config('app.authorization_endpoint'),
+            config('url.authorization_endpoint'),
             $request->input('code'),
             $request->input('redirect_uri'),
             $request->input('client_id'),

app/Http/Kernel.php

@@ -33,13 +33,11 @@ class Kernel extends HttpKernel
             \App\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
-            // \Illuminate\Session\Middleware\AuthenticateSession::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
             \App\Http\Middleware\LinkHeadersMiddleware::class,
             \App\Http\Middleware\LocalhostSessionMiddleware::class,
-            \App\Http\Middleware\ActivityStreamLinks::class,
             \App\Http\Middleware\CSPHeader::class,
         ],
 
@@ -53,7 +51,7 @@ class Kernel extends HttpKernel
     /**
      * The application's middleware aliases.
      *
-     * Aliases may be used to conveniently assign middleware to routes and groups.
+     * Aliases may be used instead of class names to conveniently assign middleware to routes and groups.
      *
      * @var array<string, class-string|string>
      */
@@ -65,7 +63,8 @@ class Kernel extends HttpKernel
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
         'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
         'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
-        'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
+        'precognitive' => \Illuminate\Foundation\Http\Middleware\HandlePrecognitiveRequests::class,
+        'signed' => \App\Http\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
         'micropub.token' => \App\Http\Middleware\VerifyMicropubToken::class,

app/Http/Middleware/ActivityStreamLinks.php

@@ -1,28 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Illuminate\Http\Request;
-use Symfony\Component\HttpFoundation\Response;
-
-class ActivityStreamLinks
-{
-    /**
-     * Handle an incoming request.
-     */
-    public function handle(Request $request, Closure $next): Response
-    {
-        $response = $next($request);
-        if ($request->path() === '/') {
-            $response->header('Link', '<' . config('app.url') . '>; rel="application/activity+json"', false);
-        }
-        if ($request->is('notes/*')) {
-            $response->header('Link', '<' . $request->url() . '>; rel="application/activity+json"', false);
-        }
-
-        return $response;
-    }
-}

app/Http/Middleware/ValidateSignature.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Routing\Middleware\ValidateSignature as Middleware;
+
+class ValidateSignature extends Middleware
+{
+    /**
+     * The names of the query string parameters that should be ignored.
+     *
+     * @var array<int, string>
+     */
+    protected $except = [
+        // 'fbclid',
+        // 'utm_campaign',
+        // 'utm_content',
+        // 'utm_medium',
+        // 'utm_source',
+        // 'utm_term',
+    ];
+}

app/Jobs/SendWebMentions.php

@@ -62,7 +62,7 @@ class SendWebMentions implements ShouldQueue
     public function discoverWebmentionEndpoint(string $url): ?string
     {
         // let’s not send webmentions to myself
-        if (parse_url($url, PHP_URL_HOST) === config('app.longurl')) {
+        if (parse_url($url, PHP_URL_HOST) === config('url.longurl')) {
             return null;
         }
         if (Str::startsWith($url, '/notes/tagged/')) {

app/Models/Note.php

@@ -179,7 +179,7 @@ class Note extends Model
 
     public function getShorturlAttribute(): string
     {
-        return config('app.shorturl') . '/notes/' . $this->nb60id;
+        return config('url.shorturl') . '/notes/' . $this->nb60id;
     }
 
     public function getIso8601Attribute(): string

app/Models/Place.php

@@ -84,7 +84,7 @@ class Place extends Model
     protected function shorturl(): Attribute
     {
         return Attribute::get(
-            get: fn ($value, $attributes) => config('app.shorturl') . '/places/' . $attributes['slug'],
+            get: fn ($value, $attributes) => config('url.shorturl') . '/places/' . $attributes['slug'],
         );
     }
 

app/Providers/AuthServiceProvider.php

@@ -2,6 +2,7 @@
 
 namespace App\Providers;
 
+// use Illuminate\Support\Facades\Gate;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
 
 class AuthServiceProvider extends ServiceProvider
@@ -12,7 +13,7 @@ class AuthServiceProvider extends ServiceProvider
      * @var array<class-string, class-string>
      */
     protected $policies = [
-        // 'App\Models\Model' => 'App\Policies\ModelPolicy',
+        //
     ];
 
     /**

app/Providers/RouteServiceProvider.php

@@ -11,7 +11,7 @@ use Illuminate\Support\Facades\Route;
 class RouteServiceProvider extends ServiceProvider
 {
     /**
-     * The path to the "home" route for your application.
+     * The path to your application's "home" route.
      *
      * Typically, users are redirected here after authentication.
      *
@@ -24,7 +24,9 @@ class RouteServiceProvider extends ServiceProvider
      */
     public function boot(): void
     {
-        $this->configureRateLimiting();
+        RateLimiter::for('api', function (Request $request) {
+            return Limit::perMinute(60)->by($request->user()?->id ?: $request->ip());
+        });
 
         $this->routes(function () {
             Route::middleware('api')
@@ -35,14 +37,4 @@ class RouteServiceProvider extends ServiceProvider
                 ->group(base_path('routes/web.php'));
         });
     }
-
-    /**
-     * Configure the rate limiters for the application.
-     */
-    protected function configureRateLimiting(): void
-    {
-        RateLimiter::for('api', function (Request $request) {
-            return Limit::perMinute(60)->by($request->user()?->id ?: $request->ip());
-        });
-    }
 }