From 71dff472cc955dde913db57a8c65e2ab71268e1f Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 18 Feb 2022 03:25:42 -0700 Subject: [PATCH 1/4] Update StatusController, redirect status view for authed users to Metro 2.0 UI --- app/Http/Controllers/StatusController.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/Http/Controllers/StatusController.php b/app/Http/Controllers/StatusController.php index edea1ea1e..1940390d5 100644 --- a/app/Http/Controllers/StatusController.php +++ b/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) { From 7f8129a75c8e57886286d22f557b8fb6b3bbfd1a Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 18 Feb 2022 03:38:35 -0700 Subject: [PATCH 2/4] Update ProfileController, redirect profile view for authed users to Metro 2.0 UI --- app/Http/Controllers/ProfileController.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 83872b443..7dbda1191 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/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) From 211b798253046911cb4c537efdeb80d0dc40ba70 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 18 Feb 2022 03:44:08 -0700 Subject: [PATCH 3/4] Update compiled assets --- public/js/compose-chunk.js | Bin 115321 -> 115430 bytes public/js/compose.js | Bin 65729 -> 65751 bytes public/js/home-chunk.js | Bin 130465 -> 130507 bytes public/js/post-chunk.js | Bin 121017 -> 121059 bytes public/js/profile-chunk.js | Bin 168473 -> 168569 bytes public/mix-manifest.json | Bin 2683 -> 2683 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/public/js/compose-chunk.js b/public/js/compose-chunk.js index d8f8bc635a6870472028cbc7dc7cb60398f0d3e1..0e914358e9859575a38a55ce6ad7ca04d8efb334 100644 GIT binary patch delta 210 zcmey_!v3t4eFHBOmribKNk)E3u~qftzA!PFl8nq^J(Z&T(vs97y@Jx>3=JjyO#SlI zBqhz-%{)vyLIianN>Xz(OEi>{bMlKf9}J5&VKp)_Gceq&*nNqS)zZko(0KFr9yMl& z=;XcqQY=R1md2AECM<`@f`nL23{1_9COb}WWCclDOjazDoZi64*tq%C#BxR{o$CBN kt7?!1sa7R=VA?l7B{8SAc5~un#%ic;pq}kOJwG=C0Bd?jW&i*H delta 146 zcmaFX%Ko#3eFHDkW-q4gA(QurOK&y^w>1$kH8wLc($q<`&D1b8HL>Ad2e?+ zBa5klxzT3NUNvS`u$syI6Qo#-4J=J2>rQZ*d}Tr^SOHkn%*fIlB+3eswwSEYBRTyo hA7kTY+ezh&(;H(Mr8d8q{Je@4qzo*(9Vq*AGXQYVFjoKo diff --git a/public/js/compose.js b/public/js/compose.js index e85f3aec2daf8a1f559af654b4b5aaa5a1e9c4a5..0792cc7c4710b5bc90475643737cd33b4a874c08 100644 GIT binary patch delta 95 zcmX@u$a1}rWy4by8J&`h%wj#2)ZEMx4W;Cq{Nhw4&03xGe5b_Z?8$-}TARgHMO0ZW ujSLKpH|u-tXM`{(H+rkHni!ax8%>t;abyOvCV%i&m>loPvAN5~dL)8_q`u8A@OB_=1nlx8(HH8(V#-1yRQ^UoJjJW%e!E0WU} X+-Gc@9{ZJ%t9j4Y?R&m5K4k|0Yb7yD delta 73 zcmX^8n|usVY-G84&Lw3rCNty7j;DnuJ3QxPwY0P}Fq@qC(0;Sx dOBo&(5O?y$i&E1c%w%kAzVmhaov)1V*#T^bAAkS= diff --git a/public/js/post-chunk.js b/public/js/post-chunk.js index ae8c5748d5379392d6a2bbc9d04d7d4e1975987b..02e7dbafa6bad19d31f2906ea9c3594ad25cc85e 100644 GIT binary patch delta 94 zcmdnFk^S*T_6_nh8aFHOGHTmIXDOO`sb3^0FAFexXzIJsVHw%b6UBI4k_GaTpZQlT#&m?sK delta 62 zcmaF7k$vYz_6_nlIh%t|w)y&eu!hCy{9AhLelZEl*jWWX1Cm1ktvKpJ38yZiasLtrP zU0sK98w*6?^o1IXQp|>yX44<40A(Bu8SB}hNkXgZTN*Yw}TOkC5`iZ%JZ@GKBQp!b?Q`T9BYDBX(>EG0 zO0im6S{j&5f2hOgxII#baT^On8CZ_R!rat+`a*q1r|l(%jJ51gwTaglXSGkTWZXW% zl4-pzL{XwF)8eTw83m`Wv}EL&{&Etd_;#rbCJwIY+U1O*)9gK|cJ V?f;6Hb_?Q?QDEA>wVmk*7XbfVLu>#5 diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 112f25641397af429987fff4cce53fe40a14f72b..6cc789cb00d7659acb86a87ffa7e423a8c94af2d 100644 GIT binary patch delta 200 zcmWNIyOF{`3_#~R2e<$e|;EfCQX2~OYVGkvD}WjL{$ z6-Yr%mzCBARE1mGSR@X8%5dJzsKta*F-3tUxMbA`L||)H0=f*x{yO}fS|FR{kh&zo z@Gz<#TTP73x$j4u(~7FRY4GB(WL|SNB{!{-t6RVQPW?Lm&*D-m5$bl3U{+(rU`9yP KK<)V$-#=dp6FM0H delta 200 zcmWN;yKMt83;b<&QN){r}?_l-m?f5XjGzLVq7qQoFY!h?BK8K!In L6b2mM>+k6gPtZ7C From 4c301a95ba94aa96c2347636ed0a32b65315e465 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 18 Feb 2022 03:44:33 -0700 Subject: [PATCH 4/4] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc905f9d9..193240e7d 100644 --- a/CHANGELOG.md +++ b/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)