feat(artwork): sidebar layout, icon actions, original download URL fix
- ArtworkDownloadController: fix resolveDownloadUrl() to use correct CDN
path: original/{h1}/{h2}/{hash}.{file_ext} (was wrong originals/h1/h2/h3/orig.webp)
Wrap incrementDownloads() in try/catch so Redis failure can't break the response
- ArtworkPage: move ArtworkAuthor from left column to right sidebar
Sidebar now stacks: Author → Actions → Awards (sticky top-24)
Mobile block follows same order above main content
- ArtworkActions: replace four stacked text buttons with a compact 4-col icon grid
Like (heart, rose when active), Save (star, amber when active),
Share (network icon), Report (flag icon, red on hover)
Download remains full-width orange CTA
- ArtworkAuthor: add icons to Profile (person) and Follow buttons
Follow shows circle-check icon; Following state shows user-plus icon
This commit is contained in:
@@ -11,6 +11,7 @@ use App\Services\ThumbnailPresenter;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
/**
|
||||
* POST /api/art/{id}/download
|
||||
@@ -48,12 +49,26 @@ final class ArtworkDownloadController extends Controller
|
||||
$this->recordDownload($request, $artwork);
|
||||
|
||||
// Increment counters — deferred via Redis when available.
|
||||
$this->stats->incrementDownloads((int) $artwork->id, 1, defer: true);
|
||||
try {
|
||||
$this->stats->incrementDownloads((int) $artwork->id, 1, defer: true);
|
||||
} catch (\Throwable) {
|
||||
// Stats failure must never interrupt the download.
|
||||
}
|
||||
|
||||
// Resolve the highest-resolution download URL available.
|
||||
$url = $this->resolveDownloadUrl($artwork);
|
||||
|
||||
return response()->json(['ok' => true, 'url' => $url]);
|
||||
// Build a user-friendly download filename: "title-slug.file_ext"
|
||||
$ext = $artwork->file_ext ?: $artwork->thumb_ext ?: 'webp';
|
||||
$slug = Str::slug((string) ($artwork->slug ?: $artwork->title)) ?: (string) $artwork->id;
|
||||
$filename = $slug . '.' . $ext;
|
||||
|
||||
return response()->json([
|
||||
'ok' => true,
|
||||
'url' => $url,
|
||||
'filename' => $filename,
|
||||
'size' => (int) ($artwork->file_size ?? 0),
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -80,17 +95,34 @@ final class ArtworkDownloadController extends Controller
|
||||
}
|
||||
|
||||
/**
|
||||
* Resolve the best available download URL: XL → LG → MD.
|
||||
* Returns an empty string if no thumbnail can be resolved.
|
||||
* Resolve the original full-resolution CDN URL.
|
||||
*
|
||||
* Originals are stored at: {cdn}/original/{h1}/{h2}/{hash}.{file_ext}
|
||||
* h1 = first 2 chars of hash, h2 = next 2 chars, filename = full hash + file_ext.
|
||||
* Falls back to XL → LG → MD thumbnail when hash is unavailable.
|
||||
*/
|
||||
private function resolveDownloadUrl(Artwork $artwork): string
|
||||
{
|
||||
$hash = $artwork->hash ?? null;
|
||||
$ext = ltrim((string) ($artwork->file_ext ?: $artwork->thumb_ext ?: 'webp'), '.');
|
||||
|
||||
if (!empty($hash)) {
|
||||
$h = strtolower(preg_replace('/[^a-f0-9]/', '', $hash));
|
||||
$h1 = substr($h, 0, 2);
|
||||
$h2 = substr($h, 2, 2);
|
||||
$cdn = rtrim((string) config('cdn.files_url', 'https://files.skinbase.org'), '/');
|
||||
|
||||
return sprintf('%s/original/%s/%s/%s.%s', $cdn, $h1, $h2, $h, $ext);
|
||||
}
|
||||
|
||||
// Fallback: best available thumbnail size
|
||||
foreach (['xl', 'lg', 'md'] as $size) {
|
||||
$thumb = ThumbnailPresenter::present($artwork, $size);
|
||||
if (! empty($thumb['url'])) {
|
||||
if (!empty($thumb['url'])) {
|
||||
return (string) $thumb['url'];
|
||||
}
|
||||
}
|
||||
|
||||
return '';
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user