mirror of
https://github.com/friendica/friendica
synced 2024-12-23 02:40:17 +00:00
Fix Mastodon InstanceV2 structure needs image max size under mediaAttachment
This commit is contained in:
parent
6e94220642
commit
c609affeca
3 changed files with 8 additions and 9 deletions
|
@ -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),
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue