Update MediaStorageService, improve support for pleroma .blob avatars

pixelfed · Dec 13, 2022 · 6622665 · 6622665
1 parent aaed2bf
commit 6622665
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/app/Services/MediaStorageService.php b/app/Services/MediaStorageService.php
@@ -203,6 +203,7 @@ protected function fetchAvatar($avatar, $local = false)
 		}
 
 		$mimes = [
+			'application/octet-stream',
 			'image/jpeg',
 			'image/png',
 		];
@@ -239,6 +240,15 @@ protected function fetchAvatar($avatar, $local = false)
 		}
 		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);
 		$file = $disk->putFileAs($base, new File($tmpName), $path, 'public');
 		$permalink = $disk->url($file);