From 10b3a25474716400b35a4d890cdbc3771029d6fb Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Fri, 6 Sep 2019 21:21:28 -0600
Subject: [PATCH] Update StatusController

---
 app/Http/Controllers/StatusController.php | 28 +++++++++++++++--------
 routes/web.php                            |  1 +
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/StatusController.php b/app/Http/Controllers/StatusController.php
index c5a1c9975..364ca21a8 100644
--- a/app/Http/Controllers/StatusController.php
+++ b/app/Http/Controllers/StatusController.php
@@ -22,7 +22,6 @@ class StatusController extends Controller
 {
     public function show(Request $request, $username, int $id)
     {
-        // $id = strlen($id) < 17 ? array_first(\Hashids::decode($id)) : $id;
         $user = Profile::whereNull('domain')->whereUsername($username)->firstOrFail();
 
         if($user->status != null) {
@@ -60,9 +59,24 @@ class StatusController extends Controller
         return view($template, compact('user', 'status'));
     }
 
+    public function showId(int $id)
+    {
+        abort(404);
+        $status = Status::whereNull('reblog_of_id')
+                ->whereIn('scope', ['public', 'unlisted'])
+                ->findOrFail($id);
+        return redirect($status->url());
+    }
+
     public function showEmbed(Request $request, $username, int $id)
     {
-        return;
+        abort(404);
+        $profile = Profile::whereNull('status')->whereUsername($username)->first();
+        $status = Status::whereScope('private')->find($id);
+        if(!$profile || !$status) {
+            return view('status.embed-removed');
+        }
+        return view('status.embed', compact('status'));
     }
 
     public function showObject(Request $request, $username, int $id)
@@ -77,13 +91,7 @@ class StatusController extends Controller
                 ->whereNotIn('visibility',['draft','direct'])
                 ->findOrFail($id);
 
-        if($status->uri) {
-            $url = $status->uri;
-            if(ends_with($url, '/activity')) {
-                $url = str_replace('/activity', '', $url);
-            }
-            return redirect($url);
-        }
+        abort_if($status->uri, 404);
 
         if($status->visibility == 'private' || $user->is_private) {
             if(!Auth::check()) {
@@ -190,7 +198,7 @@ class StatusController extends Controller
         $resource = new Fractal\Resource\Item($status, new Note());
         $res = $fractal->createData($resource)->toArray();
 
-        return response(json_encode($res['data']))->header('Content-Type', 'application/activity+json');
+        return response()->json($res['data'], 200, ['Content-Type' => 'application/activity+json'], JSON_PRETTY_PRINT);
     }
 
     public function edit(Request $request, $username, $id)
diff --git a/routes/web.php b/routes/web.php
index a84dc9318..694947d66 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -339,6 +339,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
     Route::get('p/{username}/{id}/c', 'CommentController@showAll');
     Route::get('p/{username}/{id}/edit', 'StatusController@edit');
     Route::post('p/{username}/{id}/edit', 'StatusController@editStore');
+    Route::get('p/{username}/{id}.json', 'StatusController@showObject');
     Route::get('p/{username}/{id}', 'StatusController@show');
     Route::get('{username}/followers', 'ProfileController@followers')->middleware('auth');
     Route::get('{username}/following', 'ProfileController@following')->middleware('auth');