Merge pull request #3085 from pixelfed/staging

Staging

CHANGELOG.md

@@ -60,6 +60,7 @@
 - Updated StatusEntityLexer, prevent boosts and replies from being added to PublicTimelineService. ([32707372](https://github.com/pixelfed/pixelfed/commit/32707372))
 - Updated SpaController, persist web language changes. ([7bc684e5](https://github.com/pixelfed/pixelfed/commit/7bc684e5))
 - Update LoginController, bump decayMinutes from 1 to 60. ([6bf92bed](https://github.com/pixelfed/pixelfed/commit/6bf92bed))
+- Update SPA, rewrite autolink urls to SPA when applicable. ([0837b410](https://github.com/pixelfed/pixelfed/commit/0837b410))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.1 (2021-09-07)](https://github.com/pixelfed/pixelfed/compare/v0.11.0...v0.11.1)

app/Http/Controllers/SpaController.php

@@ -116,4 +116,13 @@ class SpaController extends Controller
 				return (string) $converter->convertToHtml($file);
 		});
 	}
+
+	public function usernameRedirect(Request $request, $username)
+	{
+		$id = AccountService::usernameToId($username);
+		if(!$id) {
+			return redirect('/i/web/404');
+		}
+		return redirect('/i/web/profile/' . $id);
+	}
 }

routes/web.php

@@ -337,6 +337,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
 		Route::post('warning', 'AccountInterstitialController@read');
 		Route::get('my2020', 'SeasonalController@yearInReview');
 
+		Route::get('web/username/{id}', 'SpaController@usernameRedirect');
 		Route::get('web/post/{id}', 'SpaController@webPost');
 		Route::get('web/profile/{id}', 'SpaController@webProfile');
 		Route::get('web/{q}', 'SpaController@index')->where('q', '.*');