Merge pull request #3264 from pixelfed/staging

Staging

CHANGELOG.md

@@ -57,6 +57,8 @@
 - Updated ComposeController, add collection support to compose endpoint. ([ec2cfaf5](https://github.com/pixelfed/pixelfed/commit/ec2cfaf5))
 - Updated instance config, match default oauth settings in AuthServiceProvider. ([52f25ff1](https://github.com/pixelfed/pixelfed/commit/52f25ff1))
 - Updated ComposeModal.vue, fix redirect after posting. Fixes #3254. ([5db64e94](https://github.com/pixelfed/pixelfed/commit/5db64e94))
+- Updated StatusController, redirect status view for authed users to Metro 2.0 UI. ([71dff472](https://github.com/pixelfed/pixelfed/commit/71dff472))
+- Updated ProfileController, redirect profile view for authed users to Metro 2.0 UI. ([7f8129a7](https://github.com/pixelfed/pixelfed/commit/7f8129a7))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.2 (2022-01-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.1...v0.11.2)

app/Http/Controllers/ProfileController.php

@@ -26,6 +26,17 @@ class ProfileController extends Controller
 {
 	public function show(Request $request, $username)
 	{
+		// redirect authed users to Metro 2.0
+		if($request->user()) {
+			// unless they force static view
+			if(!$request->has('fs') || $request->input('fs') != '1') {
+				$pid = AccountService::usernameToId($username);
+				if($pid) {
+					return redirect('/i/web/profile/' . $pid);
+				}
+			}
+		}
+
 		$user = Profile::whereNull('domain')
 			->whereNull('status')
 			->whereUsername($username)

app/Http/Controllers/StatusController.php

@@ -31,6 +31,14 @@ class StatusController extends Controller
 {
 	public function show(Request $request, $username, $id)
 	{
+		// redirect authed users to Metro 2.0
+		if($request->user()) {
+			// unless they force static view
+			if(!$request->has('fs') || $request->input('fs') != '1') {
+				return redirect('/i/web/post/' . $id);
+			}
+		}
+
 		$user = Profile::whereNull('domain')->whereUsername($username)->firstOrFail();
 
 		if($user->status != null) {

public/mix-manifest.json

@@ -6,7 +6,7 @@
     "/js/profile.js": "/js/profile.js?id=205015f18099f8ccfe59843dc5892624",
     "/js/status.js": "/js/status.js?id=f0e2ad5d590f2f2d93327b134a1aae1a",
     "/js/timeline.js": "/js/timeline.js?id=e1ef49a2bf4241f4353e2ee48ff965c5",
-    "/js/compose.js": "/js/compose.js?id=08f82bff39cf03cd84c1358b8d5dddd4",
+    "/js/compose.js": "/js/compose.js?id=09edd510f7cb4878c176a9c0d51f09fb",
     "/js/compose-classic.js": "/js/compose-classic.js?id=cd528ed559170702655d497b469a905b",
     "/js/search.js": "/js/search.js?id=1ad4af345d2c8a14541a03937ea4904b",
     "/js/developers.js": "/js/developers.js?id=5789400f559a5329ce547f5eed0de929",
@@ -23,10 +23,10 @@
     "/js/spa.js": "/js/spa.js?id=fe1fa8c012ea5c2b15c9e4c10ebe1da5",
     "/js/stories.js": "/js/stories.js?id=048de600ee6dfccaeaf06070999cb892",
     "/js/manifest.js": "/js/manifest.js?id=408e0d9f96091e680f9aed91d8409161",
-    "/js/home-chunk.js": "/js/home-chunk.js?id=20022a484d49cbdfc428b963859f0de2",
-    "/js/compose-chunk.js": "/js/compose-chunk.js?id=69d57b8f5c41690b7a08f4a4174edd0e",
-    "/js/post-chunk.js": "/js/post-chunk.js?id=a588368947321316b1cdf5393e7ae283",
-    "/js/profile-chunk.js": "/js/profile-chunk.js?id=3d2eb6b341868fdf44e78ecb4c61b1e1",
+    "/js/home-chunk.js": "/js/home-chunk.js?id=3b5da705db3a1ca342bbff3319dcd5f1",
+    "/js/compose-chunk.js": "/js/compose-chunk.js?id=cf39dd2fa64073fefd76ef2bb793ce9e",
+    "/js/post-chunk.js": "/js/post-chunk.js?id=083bb90731e5e1429822db7edb6a26ed",
+    "/js/profile-chunk.js": "/js/profile-chunk.js?id=aea66773b0837a32bd9b3f993107c1bd",
     "/css/appdark.css": "/css/appdark.css?id=a661085d048e4e6b953ba58086d34007",
     "/css/app.css": "/css/app.css?id=ef378884d2b1cf81e12851d2aab5089a",
     "/css/spa.css": "/css/spa.css?id=c1320213cd53b5dbb38057e8054bb0db",