oldkid/friendica
1
0
Fork 0
mirror of https://git.sekbaer.de/Friendica/friendica.git synced 2025-06-12 01:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ensure $attachment has a width and a height when it's an image in Mastodon\Attachment

Browse source 
- Address https://github.com/friendica/friendica/issues/11993#issuecomment-1323274513
This commit is contained in:
Hypolite Petovan 2022-11-23 11:00:15 -05:00
parent a5af1408d6
commit 7c6d54c989
2 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Factory/Api/Mastodon/Attachment.php
View file

@ -94,12 +94,17 @@ class Attachment extends BaseFactory
*/
public function createFromPhoto(int $id): array
{
$photo = Photo::selectFirst(['resource-id', 'uid', 'id', 'title', 'type'], ['id' => $id]);
$photo = Photo::selectFirst(['resource-id', 'uid', 'id', 'title', 'type', 'width', 'height'], ['id' => $id]);
if (empty($photo)) {
return [];
}
$attachment = ['id' => $photo['id'], 'description' => $photo['title']];
$attachment = [
'id' => $photo['id'],
'description' => $photo['title'],
'width' => $photo['width'],
'height' => $photo['height'],
];
$photoTypes = Images::supportedTypes();
$ext = $photoTypes[$photo['type']];
@ -113,7 +118,6 @@ class Attachment extends BaseFactory
$preview_url = '';
}
$object = new \Friendica\Object\Api\Mastodon\Attachment($attachment, 'image', $url, $preview_url, '');
return $object->toArray();
}