YunoHost-Apps/pixelfed_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/pixelfed_ynh.git synced 2024-09-03 20:06:04 +02:00
Code Issues Activity Actions

Update MediaStorageService, improve support for pleroma .blob avatars

Browse source
This commit is contained in:
Daniel Supernault 2022-12-12 23:46:51 -07:00
parent aaed2bf66e
commit 66226658db
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Services/MediaStorageService.php
View file

@ -203,6 +203,7 @@ class MediaStorageService {
} }
$mimes = [ $mimes = [
'application/octet-stream',
'image/jpeg', 'image/jpeg',
'image/png', 'image/png',
]; ];
@ -239,6 +240,15 @@ class MediaStorageService {
} }
file_put_contents($tmpName, $data); file_put_contents($tmpName, $data);
$mimeCheck = Storage::mimeType('remcache/' . $tmpPath);
if(!$mimeCheck || !in_array($mimeCheck, ['image/png', 'image/jpeg'])) {
$avatar->last_fetched_at = now();
$avatar->save();
unlink($tmpName);
return;
}
$disk = Storage::disk($driver); $disk = Storage::disk($driver);
$file = $disk->putFileAs($base, new File($tmpName), $path, 'public'); $file = $disk->putFileAs($base, new File($tmpName), $path, 'public');
$permalink = $disk->url($file); $permalink = $disk->url($file);