fix pictures 3

2026-06-29 20:07:03 +03:30
parent 56ee99702b
commit b4585dd4f3
3 changed files with 99 additions and 6 deletions
@@ -2,6 +2,7 @@

 namespace App\Models;

+use App\Models\Setting;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;

@@ -42,10 +43,6 @@ class File extends Model
        return $this->src;
    }

-    /**
-     * ساخت URL عمومی از مسیر نسبی storage/...
-     * قبلاً: env('domain') + path — بدون اسلش بین دامنه و مسیر خراب می‌شد.
-     */
    public static function publicUrl(?string $path): ?string
    {
        if ($path === null || trim($path) === '') {
@@ -58,8 +55,64 @@ class File extends Model
            return $trimmed;
        }

-        $domain = rtrim((string) (env('domain') ?: config('app.url')), '/');
+        $base = self::resolvePublicBaseUrl();
+        if ($base === '') {
+            return null;
+        }

-        return $domain.'/'.ltrim($trimmed, '/');
+        $relative = ltrim($trimmed, '/');
+        if (! str_starts_with($relative, 'storage/')) {
+            $relative = 'storage/'.$relative;
+        }
+
+        return $base.'/'.$relative;
+    }
+
+    /**
+     * پایهٔ URL فایل‌های storage — cache-safe و مستقل از env() خام.
+     */
+    public static function resolvePublicBaseUrl(): string
+    {
+        $domain = config('app.domain');
+        if (is_string($domain) && $domain !== '' && ! str_contains($domain, 'localhost')) {
+            return rtrim($domain, '/');
+        }
+
+        $appUrl = config('app.url');
+        if (is_string($appUrl) && $appUrl !== '' && ! str_contains($appUrl, 'localhost') && str_contains($appUrl, '/server')) {
+            return rtrim($appUrl, '/');
+        }
+
+        try {
+            $rows = Setting::query()
+                ->whereIn('key', ['bace_url', 'server_url', 'admin_url', 'app_url'])
+                ->where('is_active', 1)
+                ->pluck('value', 'key');
+
+            foreach (['bace_url', 'server_url'] as $key) {
+                $value = trim((string) ($rows[$key] ?? ''));
+                if ($value !== '' && preg_match('/^https?:\/\//i', $value)) {
+                    return rtrim($value, '/');
+                }
+            }
+
+            $adminUrl = trim((string) ($rows['admin_url'] ?? ''));
+            if ($adminUrl !== '' && preg_match('#/admin#i', $adminUrl)) {
+                return rtrim(preg_replace('#/admin/?$#i', '/server', rtrim($adminUrl, '/')), '/');
+            }
+
+            $siteUrl = trim((string) ($rows['app_url'] ?? ''));
+            if ($siteUrl !== '' && preg_match('/^https?:\/\//i', $siteUrl)) {
+                return rtrim($siteUrl, '/').'/server';
+            }
+        } catch (\Throwable) {
+            // DB unavailable during deploy/migrate
+        }
+
+        if (is_string($appUrl) && $appUrl !== '' && ! str_contains($appUrl, 'localhost')) {
+            return rtrim($appUrl, '/');
+        }
+
+        return '';
    }
 }