Merge branch 'develop' into dev-lb/gdpr-export

Author: HerrLevin

.github/workflows/phpunit.yml

@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [ 8.3 ]
+        php: [ 8.3, 8.4 ]
         dependency-version: [ prefer-stable ]
 
     steps:

Dockerfile

@@ -9,7 +9,7 @@ WORKDIR /usr/src/trwl
 RUN composer install --ignore-platform-reqs --no-interaction --no-progress --no-suggest --optimize-autoloader
 RUN php artisan optimize
 
-FROM php:8.3.13-apache
+FROM php:8.4.1-apache
 ENV APACHE_DOCUMENT_ROOT=/var/www/html/public
 
 RUN apt update && \

app/Http/Controllers/Backend/Social/MastodonController.php

@@ -10,6 +10,7 @@
 use App\Models\Status;
 use App\Models\User;
 use App\Notifications\MastodonNotSent;
+use App\Services\MastodonDomainExtractionService;
 use Error;
 use Exception;
 use GuzzleHttp\Exception\GuzzleException;
@@ -54,7 +55,7 @@ public static function getUserFromSocialite(SocialiteUser $socialiteUser, Mastod
      * @throws InvalidMastodonException
      */
     public static function getMastodonServer(string $domain): ?MastodonServer {
-        $domain = self::formatDomain($domain);
+        $domain = (new MastodonDomainExtractionService())->formatDomain($domain);
 
         $mastodonServer = MastodonServer::where('domain', $domain)->first();
 
@@ -67,22 +68,6 @@ public static function getMastodonServer(string $domain): ?MastodonServer {
         return $mastodonServer ?? self::createMastodonServer($domain);
     }
 
-    public static function formatDomain(string $domain): string {
-        $domain = strtolower($domain);
-
-        // remove leading usernames
-        if (str_contains($domain, '@')) {
-            $domain = last(explode('@', $domain));
-        }
-
-        // Force HTTPS
-        $domain = str_replace('http://', 'https://', $domain);
-        if (!str_starts_with($domain, 'https://')) {
-            $domain = 'https://' . $domain;
-        }
-        return $domain;
-    }
-
     /**
      * @param string $domain
      *

app/Http/Controllers/Frontend/Social/MastodonController.php

@@ -5,6 +5,7 @@
 use App\Exceptions\SocialAuth\InvalidMastodonException;
 use App\Http\Controllers\Backend\Social\MastodonController as MastodonBackend;
 use App\Http\Controllers\Controller;
+use App\Services\MastodonDomainExtractionService;
 use Carbon\Carbon;
 use Exception;
 use Illuminate\Http\RedirectResponse;
@@ -25,7 +26,7 @@ class MastodonController extends Controller
      * @throws ValidationException
      */
     public function redirect(Request $request): SympfonyRedirectResponse|RedirectResponse {
-        $domain    = MastodonBackend::formatDomain($request->input('domain') ?? '');
+        $domain    = (new MastodonDomainExtractionService)->formatDomain($request->input('domain') ?? '');
         $validator = Validator::make(['domain' => $domain], ['domain' => ['required', 'active_url']]);
         $validated = $validator->validate();
 

app/Http/Controllers/FrontendUserController.php

@@ -30,7 +30,7 @@ public function getProfilePage(string $username): View {
             $statuses = null;
         }
 
-        return view('profile', [
+        return view('profile.profile', [
             'statuses' => $statuses,
             'user'     => $user,
         ]);

app/Services/MastodonDomainExtractionService.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Services;
+
+class MastodonDomainExtractionService
+{
+    private const string HTTP_PREFIX    = 'https://';
+    private const string REPLACE_PREFIX = 'http://';
+
+    public function formatDomain(string $domain): string {
+        $domain = strtolower(trim($domain));
+
+        if (empty($domain)) {
+            return '';
+        }
+
+        $domain = $this->removeProtocolFromUrl($domain);
+        $domain = $this->removePathFromUrl($domain);
+        $domain = $this->extractUrlFromUserHandleFormat($domain);
+
+        return $this->forceHttps($domain);
+    }
+
+    private function extractUrlFromUserHandleFormat(string $domain): string {
+        if (str_contains($domain, '@')) {
+            $domain = last(explode('@', $domain));
+        }
+
+        return $domain;
+    }
+
+    private function removePathFromUrl(string $domain): string {
+        return explode('/', $domain)[0];
+    }
+
+    private function removeProtocolFromUrl(string $domain): string {
+        return preg_replace('/^https?:\/\//', '', $domain);
+    }
+
+    private function forceHttps(string $domain): string {
+        $domain = str_replace(self::REPLACE_PREFIX, self::HTTP_PREFIX, $domain);
+        if (!str_starts_with($domain, self::HTTP_PREFIX)) {
+            $domain = self::HTTP_PREFIX . $domain;
+        }
+
+        return $domain;
+    }
+}