UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-22 22:41:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update Avatar pipeline, fix cloud storage media_path

Browse source
This commit is contained in:
Daniel Supernault 2022-12-02 02:45:35 -07:00
parent 9a89a2b751
commit 02edd19d4d
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Console/Commands/AvatarStorage.php
View file

@ -196,8 +196,8 @@ class AvatarStorage extends Command
continue; continue;
} }
$newMediaPath = $disk->put($newPath, $existing); $newMediaPath = $disk->put($newPath, $existing);
$avatar->media_path = $newMediaPath; $avatar->media_path = $newPath;
$avatar->cdn_url = $disk->url($newMediaPath); $avatar->cdn_url = $disk->url($newPath);
$avatar->save(); $avatar->save();
} }

3
app/Jobs/AvatarPipeline/AvatarOptimize.php
View file

@ -93,8 +93,9 @@ class AvatarOptimize implements ShouldQueue
$base = 'cache/avatars/' . $avatar->profile_id; $base = 'cache/avatars/' . $avatar->profile_id;
$disk = Storage::disk(config('filesystems.cloud')); $disk = Storage::disk(config('filesystems.cloud'));
$disk->deleteDirectory($base); $disk->deleteDirectory($base);
$path = $base . '/' . 'a' . strtolower(Str::random(random_int(3,6))) . $avatar->change_count . '.' . pathinfo($avatar->media_path, PATHINFO_EXTENSION); $path = $base . '/' . 'avatar_' . strtolower(Str::random(random_int(3,6))) . $avatar->change_count . '.' . pathinfo($avatar->media_path, PATHINFO_EXTENSION);
$url = $disk->put($path, Storage::get($avatar->media_path)); $url = $disk->put($path, Storage::get($avatar->media_path));
$avatar->media_path = $path;
$avatar->cdn_url = $disk->url($path); $avatar->cdn_url = $disk->url($path);
$avatar->save(); $avatar->save();
Storage::delete($avatar->media_path); Storage::delete($avatar->media_path);

2
app/Services/MediaStorageService.php
View file

@ -229,7 +229,7 @@ class MediaStorageService {
$base = ($local ? 'public/cache/' : 'cache/') . 'avatars/' . $avatar->profile_id; $base = ($local ? 'public/cache/' : 'cache/') . 'avatars/' . $avatar->profile_id;
$ext = $head['mime'] == 'image/jpeg' ? 'jpg' : 'png'; $ext = $head['mime'] == 'image/jpeg' ? 'jpg' : 'png';
$path = Str::random(20) . '_avatar.' . $ext; $path = 'avatar_' . strtolower(Str::random(random_int(3,6))) . '.' . $ext;
$tmpBase = storage_path('app/remcache/'); $tmpBase = storage_path('app/remcache/');
$tmpPath = 'avatar_' . $avatar->profile_id . '-' . $path; $tmpPath = 'avatar_' . $avatar->profile_id . '-' . $path;
$tmpName = $tmpBase . $tmpPath; $tmpName = $tmpBase . $tmpPath;