From c383f1008dcc8ea0ea5f3b6f9cb07015f81202a2 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 22 Mar 2022 21:56:22 -0600
Subject: [PATCH] Update ApiV1Controller, fix instance endpoint

---
 app/Http/Controllers/Api/ApiV1Controller.php | 32 ++++++++++++++++++--
 app/Transformer/Api/AccountTransformer.php   |  1 +
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Api/ApiV1Controller.php b/app/Http/Controllers/Api/ApiV1Controller.php
index d096822f9..3615867ab 100644
--- a/app/Http/Controllers/Api/ApiV1Controller.php
+++ b/app/Http/Controllers/Api/ApiV1Controller.php
@@ -1236,11 +1236,13 @@ class ApiV1Controller extends Controller
 				'description' => 'Pixelfed is an image sharing platform, an ethical alternative to centralized platforms',
 				'email' => config('instance.email'),
 				'version' => '2.7.2 (compatible; Pixelfed ' . config('pixelfed.version') .')',
-				'urls' => [],
+				'urls' => [
+					'streaming_api' => 'wss://' . config('pixelfed.domain.app')
+				],
 				'stats' => $stats,
-				'thumbnail' => url('headers/default.jpg'),
+				'thumbnail' => url('img/pixelfed-icon-color.png'),
 				'languages' => ['en'],
-				'registrations' => (bool) config('pixelfed.open_registration'),
+				'registrations' => (bool) config_cache('pixelfed.open_registration'),
 				'approval_required' => false,
 				'contact_account' => $contact,
 				'rules' => $rules
@@ -1434,6 +1436,30 @@ class ApiV1Controller extends Controller
 		return response()->json($res);
 	}
 
+	/**
+	 * GET /api/v1/media/{id}
+	 *
+	 * @param  integer  $id
+	 *
+	 * @return MediaTransformer
+	 */
+	public function mediaGet(Request $request, $id)
+	{
+		abort_if(!$request->user(), 403);
+
+		$user = $request->user();
+
+		$media = Media::whereUserId($user->id)
+			->whereNull('status_id')
+			->findOrFail($id);
+
+		$resource = new Fractal\Resource\Item($media, new MediaTransformer());
+		$res = $this->fractal->createData($resource)->toArray();
+		$res['preview_url'] = url('/storage/no-preview.png');
+		$res['url'] = url('/storage/no-preview.png');
+		return response()->json($res);
+	}
+
 	/**
 	 * GET /api/v1/mutes
 	 *
diff --git a/app/Transformer/Api/AccountTransformer.php b/app/Transformer/Api/AccountTransformer.php
index 6e6d9ea16..e8ac84196 100644
--- a/app/Transformer/Api/AccountTransformer.php
+++ b/app/Transformer/Api/AccountTransformer.php
@@ -24,6 +24,7 @@ class AccountTransformer extends Fractal\TransformerAbstract
 			'username' => $username,
 			'acct' => $acct,
 			'display_name' => $profile->name,
+			'discoverable' => true,
 			'locked' => (bool) $profile->is_private,
 			'followers_count' => (int) $profile->followerCount(),
 			'following_count' => (int) $profile->followingCount(),