keith
/
friendica
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12903 from HankG/fix-mastodon-instance-v2-structure 

Fix Mastodon InstanceV2 structure needs image max size under mediaAttachment
This commit is contained in:
Hypolite Petovan 2023-03-17 16:59:27 -04:00 committed by GitHub
parent 6e94220642 c609affeca
commit 5d92083a6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Module/Api/Mastodon/InstanceV2.php
View File

@ -112,10 +112,11 @@ class InstanceV2 extends BaseApi
$this->config->get('config', 'max_import_size')
));
$image_size_limit = $this->config->get('system', 'maximagesize');
return new InstanceEntity\Configuration(
$statuses_config,
new InstanceEntity\MediaAttachmentsConfig(Images::supportedTypes()),
$this->config->get('system', 'maximagesize')
new InstanceEntity\MediaAttachmentsConfig(Images::supportedTypes(), $image_size_limit),
);
}

7
src/Object/Api/Mastodon/InstanceV2/Configuration.php
View File

@ -34,21 +34,16 @@ class Configuration extends BaseDataTransferObject
protected $statuses;
/** @var MediaAttachmentsConfig */
protected $media_attachments;
/** @var int */
protected $image_size_limit;
/**
* @param StatusesConfig $statuses
* @param MediaAttachmentsConfig $media_attachments
* @param int $image_size_limit
*/
public function __construct(
StatusesConfig $statuses,
MediaAttachmentsConfig $media_attachments,
int $image_size_limit
MediaAttachmentsConfig $media_attachments
) {
$this->statuses = $statuses;
$this->media_attachments = $media_attachments;
$this->image_size_limit = $image_size_limit;
}
}

5
src/Object/Api/Mastodon/InstanceV2/MediaAttachmentsConfig.php
View File

@ -32,12 +32,15 @@ class MediaAttachmentsConfig extends BaseDataTransferObject
{
/** @var string[] */
protected $supported_mime_types;
/** @var int */
protected $image_size_limit;
/**
* @param array $supported_mime_types
*/
public function __construct(array $supported_mime_types)
public function __construct(array $supported_mime_types, int $image_size_limit)
{
$this->supported_mime_types = $supported_mime_types;
$this->image_size_limit = $image_size_limit;
}
}