From c609affeca12b22347aef0538bba8ef5a48f9eef Mon Sep 17 00:00:00 2001
From: Hank Grabowski <hankgrabowski@gmail.com>
Date: Fri, 17 Mar 2023 15:56:42 -0400
Subject: [PATCH] Fix Mastodon InstanceV2 structure needs image max size under
 mediaAttachment

---
 src/Module/Api/Mastodon/InstanceV2.php                     | 5 +++--
 src/Object/Api/Mastodon/InstanceV2/Configuration.php       | 7 +------
 .../Api/Mastodon/InstanceV2/MediaAttachmentsConfig.php     | 5 ++++-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/Module/Api/Mastodon/InstanceV2.php b/src/Module/Api/Mastodon/InstanceV2.php
index 2038081d87..e006c8263f 100644
--- a/src/Module/Api/Mastodon/InstanceV2.php
+++ b/src/Module/Api/Mastodon/InstanceV2.php
@@ -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),
 		);
 	}
 
diff --git a/src/Object/Api/Mastodon/InstanceV2/Configuration.php b/src/Object/Api/Mastodon/InstanceV2/Configuration.php
index a44c2e060f..276dece280 100644
--- a/src/Object/Api/Mastodon/InstanceV2/Configuration.php
+++ b/src/Object/Api/Mastodon/InstanceV2/Configuration.php
@@ -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;
 	}
 }
diff --git a/src/Object/Api/Mastodon/InstanceV2/MediaAttachmentsConfig.php b/src/Object/Api/Mastodon/InstanceV2/MediaAttachmentsConfig.php
index 085bdfd0e2..3301ed7be2 100644
--- a/src/Object/Api/Mastodon/InstanceV2/MediaAttachmentsConfig.php
+++ b/src/Object/Api/Mastodon/InstanceV2/MediaAttachmentsConfig.php
@@ -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;
 	}
 }