From d34a75523a4c1ba344a0f2520d440d7eb24e6e55 Mon Sep 17 00:00:00 2001
From: Refringe <me@refringe.com>
Date: Sun, 23 Jun 2024 08:34:22 -0400
Subject: [PATCH] Fixes Local Image Issue

Local images should now appear. Needed to specify the public disk to ensure that HTTPS was used.
---
 app/Models/Mod.php                            | 53 ++++++++++++++++---
 app/Models/User.php                           | 11 ++++
 resources/views/components/mod-list.blade.php |  2 +-
 resources/views/mod/show.blade.php            |  2 +-
 4 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/app/Models/Mod.php b/app/Models/Mod.php
index 2dca7ef..a6344be 100644
--- a/app/Models/Mod.php
+++ b/app/Models/Mod.php
@@ -9,6 +9,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Laravel\Scout\Searchable;
 
@@ -31,17 +32,10 @@ class Mod extends Model
 
     protected static function booted(): void
     {
+        // Apply the global scope to exclude disabled mods.
         static::addGlobalScope(new DisabledScope);
     }
 
-    protected function slug(): Attribute
-    {
-        return Attribute::make(
-            get: fn (string $value) => strtolower($value),
-            set: fn (string $value) => Str::slug($value),
-        );
-    }
-
     public function user(): BelongsTo
     {
         return $this->belongsTo(User::class);
@@ -57,6 +51,9 @@ class Mod extends Model
         return $this->hasMany(ModVersion::class);
     }
 
+    /**
+     * Scope a query to include the total number of downloads for a mod.
+     */
     public function scopeWithTotalDownloads($query)
     {
         return $query->addSelect(['total_downloads' => ModVersion::selectRaw('SUM(downloads) AS total_downloads')
@@ -110,6 +107,9 @@ class Mod extends Model
             ->with(['lastUpdatedVersion', 'lastUpdatedVersion.sptVersion']);
     }
 
+    /**
+     * Get the indexable data array for the model.
+     */
     public function toSearchableArray(): array
     {
         return [
@@ -124,8 +124,45 @@ class Mod extends Model
         ];
     }
 
+    /**
+     * Determine if the model should be searchable.
+     */
     public function shouldBeSearchable(): bool
     {
         return ! $this->disabled;
     }
+
+    /**
+     * Get the URL to the thumbnail.
+     */
+    public function thumbnailUrl(): Attribute
+    {
+        return Attribute::get(function (): string {
+            return $this->thumbnail
+                ? Storage::disk($this->thumbnailDisk())->url($this->thumbnail)
+                : '';
+        });
+    }
+
+    /**
+     * Get the disk where the thumbnail is stored.
+     */
+    protected function thumbnailDisk(): string
+    {
+        return match (config('app.env')) {
+            'production' => 'r2', // Cloudflare R2 Storage
+            default => 'public', // Local
+        };
+    }
+
+    /**
+     * Ensure the slug is always lower case when retrieved and slugified when saved.
+     */
+    protected function slug(): Attribute
+    {
+        return Attribute::make(
+            get: fn (string $value) => Str::lower($value),
+            set: fn (string $value) => Str::slug($value),
+        );
+    }
 }
diff --git a/app/Models/User.php b/app/Models/User.php
index f7acc1e..a5ef6ef 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -84,4 +84,15 @@ class User extends Authenticatable implements MustVerifyEmail
             'password' => 'hashed',
         ];
     }
+
+    /**
+     * Get the disk that profile photos should be stored on.
+     */
+    protected function profilePhotoDisk(): string
+    {
+        return match (config('app.env')) {
+            'production' => 'r2', // Cloudflare R2 Storage
+            default => 'public', // Local
+        };
+    }
 }
diff --git a/resources/views/components/mod-list.blade.php b/resources/views/components/mod-list.blade.php
index ee1b199..6e3c13e 100644
--- a/resources/views/components/mod-list.blade.php
+++ b/resources/views/components/mod-list.blade.php
@@ -10,7 +10,7 @@
                             <img src="https://placehold.co/450x450/EEE/31343C?font=source-sans-pro&text={{ $mod->name }}" alt="{{ $mod->name }}" class="block dark:hidden h-48 w-full object-cover md:h-full md:w-48 transform group-hover:scale-110 transition-all duration-200">
                             <img src="https://placehold.co/450x450/31343C/EEE?font=source-sans-pro&text={{ $mod->name }}" alt="{{ $mod->name }}" class="hidden dark:block h-48 w-full object-cover md:h-full md:w-48 transform group-hover:scale-110 transition-all duration-200">
                         @else
-                            <img src="{{ asset($mod->thumbnail) }}" alt="{{ $mod->name }}" class="h-48 w-full object-cover md:h-full md:w-48 transform group-hover:scale-110 transition-all duration-200">
+                            <img src="{{ $mod->thumbnailUrl }}" alt="{{ $mod->name }}" class="h-48 w-full object-cover md:h-full md:w-48 transform group-hover:scale-110 transition-all duration-200">
                         @endif
                     </div>
                     <div class="flex flex-col w-full justify-between p-5">
diff --git a/resources/views/mod/show.blade.php b/resources/views/mod/show.blade.php
index 33c964c..06c4eb2 100644
--- a/resources/views/mod/show.blade.php
+++ b/resources/views/mod/show.blade.php
@@ -15,7 +15,7 @@
                             <img src="https://placehold.co/144x144/EEE/31343C?font=source-sans-pro&text={{ $mod->name }}" alt="{{ $mod->name }}" class="block dark:hidden w-36 rounded-lg">
                             <img src="https://placehold.co/144x144/31343C/EEE?font=source-sans-pro&text={{ $mod->name }}" alt="{{ $mod->name }}" class="hidden dark:block w-36 rounded-lg">
                         @else
-                            <img src="{{ Storage::url($mod->thumbnail) }}" alt="{{ $mod->name }}" class="w-36 rounded-lg">
+                            <img src="{{ $mod->thumbnailUrl }}" alt="{{ $mod->name }}" class="w-36 rounded-lg">
                         @endif
                     </div>
                     <div class="grow flex flex-col justify-center items-center sm:items-start text-gray-800 dark:text-gray-200">