From 1899c535167aef0651519f6cf1518f8375f89f3a Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 18 Dec 2022 06:30:32 +0000
Subject: [PATCH] API: Fix interoperability between Friendica and Mastodon part

---
 src/Factory/Api/Friendica/Photo.php | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/Factory/Api/Friendica/Photo.php b/src/Factory/Api/Friendica/Photo.php
index 2621a7830c..44a671e16b 100644
--- a/src/Factory/Api/Friendica/Photo.php
+++ b/src/Factory/Api/Friendica/Photo.php
@@ -74,12 +74,13 @@ class Photo extends BaseFactory
 		if (empty($photos)) {
 			throw new HTTPException\NotFoundException();
 		}
-		$data       = $photos[0];
-		$data['id'] = $data['resource-id'];
+		$data = $photos[0];
+
+		$data['media-id'] = $data['id'];
+		$data['id']       = $data['resource-id'];
+
 		if (is_int($scale)) {
 			$data['data'] = base64_encode(ModelPhoto::getImageDataForPhoto($data));
-		} else {
-			unset($data['datasize']); //needed only with scale param
 		}
 
 		if ($type == 'xml') {
@@ -99,12 +100,21 @@ class Photo extends BaseFactory
 			} else {
 				$data['link'][$id] = $link;
 			}
+			if (is_null($scale)) {
+				$data['scales'][] = [
+					'id'     => $photo['id'],
+					'scale'  => $photo['scale'],
+					'link'   => $link,
+					'width'  => $photo['width'],
+					'height' => $photo['height'],
+					'size'   => $photo['datasize'],
+				];
+			}
 		}
 
 		unset($data['backend-class']);
 		unset($data['backend-ref']);
 		unset($data['resource-id']);
-		unset($data['scale']);
 
 		if ($with_posts) {
 			// retrieve item element for getting activities (like, dislike etc.) related to photo