Merge pull request #3620 from pixelfed/staging

Staging

CHANGELOG.md

@@ -54,6 +54,7 @@
 - Add configuration to v1/instance endpoint. Fixes #3605 ([2fb18b7d](https://github.com/pixelfed/pixelfed/commit/2fb18b7d))
 - Fix remote account post counts ([149cf9dc](https://github.com/pixelfed/pixelfed/commit/149cf9dc))
 - Enforce blocks on incoming likes, shares, replies and follows on all endpoints ([1545e37c](https://github.com/pixelfed/pixelfed/commit/1545e37c))
+- Fix unlisted post web redirect and api response ([6033d837](https://github.com/pixelfed/pixelfed/commit/6033d837))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.3 (2022-05-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.2...v0.11.3)

app/Http/Controllers/PublicApiController.php

@@ -118,7 +118,9 @@ class PublicApiController extends Controller
         $status = Status::whereProfileId($profile->id)->findOrFail($postid);
         $this->scopeCheck($profile, $status);
         if(!$request->user()) {
-            $res = ['status' => StatusService::get($status->id)];
+            $cached = StatusService::get($status->id, false);
+            abort_if(!in_array($cached['visibility'], ['public', 'unlisted']), 403);
+            $res = ['status' => $cached];
         } else {
             $item = new Fractal\Resource\Item($status, new StatusStatelessTransformer());
             $res = [

app/Http/Controllers/SpaController.php

@@ -27,7 +27,11 @@ class SpaController extends Controller
 			return view('layouts.spa');
 		}
 
-		$post = StatusService::get($id);
+		$post = StatusService::get($id, false);
+
+		if($post && !in_array($post['visibility'], ['public', 'unlisted'])) {
+			return redirect('/login');
+		}
 
 		if(
 			$post &&

app/Util/Sentiment/Bouncer.php

@@ -6,6 +6,7 @@ use App\AccountInterstitial;
 use App\Status;
 use Cache;
 use Illuminate\Support\Str;
+use App\Services\StatusService;
 
 class Bouncer {
 
@@ -134,6 +135,8 @@ class Bouncer {
 		// $status->is_nsfw = true;
 		$status->save();
 
+		StatusService::del($status->id);
+
 		Cache::forget('pf:bouncer_v0:exemption_by_pid:' . $status->profile_id);
 		Cache::forget('pf:bouncer_v0:recent_by_pid:' . $status->profile_id);
 	}

public/mix-manifest.json

@@ -24,20 +24,20 @@
     "/js/stories.js": "/js/stories.js?id=814a25875cac8987d85c801dcb453114",
     "/js/installer.js": "/js/installer.js?id=d7b03f6c0bb707bec8ff9f81d328ac4a",
     "/js/manifest.js": "/js/manifest.js?id=4e6dd9cb251d9698bfccb781db000cca",
-    "/js/home-ojtjadoml.js": "/js/home-ojtjadoml.js?id=02c459b9cf4d3cbdc09d011e6b2b0384",
+    "/js/home-ojtjadoml.js": "/js/home-ojtjadoml.js?id=cefe97d0b294d6ca0ccc373b94c148db",
     "/js/compose-ojtjadoml.js": "/js/compose-ojtjadoml.js?id=8c94338835b536bb064bc14247e16a2f",
-    "/js/post-ojtjadoml.js": "/js/post-ojtjadoml.js?id=e6284016d17450507266f015b8538c04",
-    "/js/profile-ojtjadoml.js": "/js/profile-ojtjadoml.js?id=4a3be90d2e9e40145cb22abee0a091ea",
-    "/js/dmym-ojtjadoml.js": "/js/dmym-ojtjadoml.js?id=d4568ee6f290dd90ba09231493530656",
-    "/js/dmyh-ojtjadoml.js": "/js/dmyh-ojtjadoml.js?id=75dacce771c10b6e31eb97dcb45de367",
-    "/js/daci-ojtjadoml.js": "/js/daci-ojtjadoml.js?id=30bc9689cc686fe10a04dcd73e375e6d",
-    "/js/dffc-ojtjadoml.js": "/js/dffc-ojtjadoml.js?id=5a9e11eea6fd81780a2061445a168828",
-    "/js/dsfc-ojtjadoml.js": "/js/dsfc-ojtjadoml.js?id=b0b2a2e723e876e52d4f57f0bb57567e",
-    "/js/dssc-ojtjadoml.js": "/js/dssc-ojtjadoml.js?id=a1cdd547ab358db866674a708d2823a2",
+    "/js/post-ojtjadoml.js": "/js/post-ojtjadoml.js?id=7727e4bc08d90aae8b67478d05f990d9",
+    "/js/profile-ojtjadoml.js": "/js/profile-ojtjadoml.js?id=a7dd295a6e0dd2b7811a0179ff92a694",
+    "/js/dmym-ojtjadoml.js": "/js/dmym-ojtjadoml.js?id=bf023117491f2676ad33787a0e17116c",
+    "/js/dmyh-ojtjadoml.js": "/js/dmyh-ojtjadoml.js?id=52ebca2a8ee46d69dd862d3efcbc97f4",
+    "/js/daci-ojtjadoml.js": "/js/daci-ojtjadoml.js?id=100a149e21d603970e279642d30e98c3",
+    "/js/dffc-ojtjadoml.js": "/js/dffc-ojtjadoml.js?id=8b556e9e5d4925e5945f2b7e1e711462",
+    "/js/dsfc-ojtjadoml.js": "/js/dsfc-ojtjadoml.js?id=0dfb062abb441782ab5ff1e55fe31f32",
+    "/js/dssc-ojtjadoml.js": "/js/dssc-ojtjadoml.js?id=879f1137cb672607ddedbcdda2d9f4ed",
     "/js/discover-ojtjadoml.js": "/js/discover-ojtjadoml.js?id=c0789a5495c786e11df7f3df649130f9",
     "/js/notifications-ojtjadoml.js": "/js/notifications-ojtjadoml.js?id=e1880951a0cf2b07efd767716254a7e5",
     "/js/dms-ojtjadoml.js": "/js/dms-ojtjadoml.js?id=d0319c4eda168b305b5599802c2a2c8c",
-    "/js/dmsg-ojtjadoml.js": "/js/dmsg-ojtjadoml.js?id=de70e20249d9a4f3c0ae68b5cc737d1f",
+    "/js/dmsg-ojtjadoml.js": "/js/dmsg-ojtjadoml.js?id=9c924703b85b74efff01d9773e71bba4",
     "/css/appdark.css": "/css/appdark.css?id=d6006aa8d3880210368434c64b942a40",
     "/css/app.css": "/css/app.css?id=66c10c9502955c88d471277fface8c32",
     "/css/spa.css": "/css/spa.css?id=4c78f163c6ad4e0f25ced75c7dd624b6",