GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[AttachmentThumbnail] Use other thumbnail when requested isn't available and there's no original file

Browse Source
This commit is contained in:
Diogo Peralta Cordeiro 2021-09-23 16:19:34 +01:00
parent b6d80003d8
commit 3268559f9a
Signed by: diogo
GPG Key ID: 18D2D35001FBFAB0
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/StoreRemoteMedia/StoreRemoteMedia.php
View File

@ -160,6 +160,7 @@ class StoreRemoteMedia extends Plugin
$attachment = GSFile::storeFileAsAttachment($temp_file); $attachment = GSFile::storeFileAsAttachment($temp_file);
// Relate the link with the attachment // Relate the link with the attachment
// TODO: Create a function that gets the title from content disposition or URL when such header isn't available
DB::persist(AttachmentToLink::create([ DB::persist(AttachmentToLink::create([
'link_id' => $link->getId(), 'link_id' => $link->getId(),
'attachment_id' => $attachment->getId(), 'attachment_id' => $attachment->getId(),

10
src/Entity/AttachmentThumbnail.php
View File

@ -152,7 +152,7 @@ class AttachmentThumbnail extends Entity
* *
* @return mixed * @return mixed
*/ */
public static function getOrCreate(Attachment $attachment, ?string $size = null, bool $crop = false) public static function getOrCreate(Attachment $attachment, ?string $size = null, bool $crop = false): ?self
{ {
$size = $size ?? Common::config('thumbnail', 'default_size'); $size = $size ?? Common::config('thumbnail', 'default_size');
$size_int = match ($size) { $size_int = match ($size) {
@ -171,7 +171,13 @@ class AttachmentThumbnail extends Entity
} }
[$predicted_width, $predicted_height] = self::predictScalingValues($attachment->getWidth(), $attachment->getHeight(), $size, $crop); [$predicted_width, $predicted_height] = self::predictScalingValues($attachment->getWidth(), $attachment->getHeight(), $size, $crop);
if (!file_exists($attachment->getPath())) { if (!file_exists($attachment->getPath())) {
throw new NotStoredLocallyException(); // Before we quit, check if there's any other thumb
$alternative_thumbs = DB::findBy('attachment_thumbnail', ['attachment_id' => $attachment->getId()]);
if ($alternative_thumbs === []) {
throw new NotStoredLocallyException();
} else {
return $alternative_thumbs[0];
}
} }
$thumbnail = self::create(['attachment_id' => $attachment->getId()]); $thumbnail = self::create(['attachment_id' => $attachment->getId()]);
$mimetype = $attachment->getMimetype(); $mimetype = $attachment->getMimetype();