Merge remote-tracking branch 'parent/main' into upstream-20240731

config/routes.rb

@@ -151,7 +151,11 @@ Rails.application.routes.draw do
   resource :inbox, only: [:create], module: :activitypub
   resources :contexts, only: [:show], module: :activitypub
 
-  get '/:encoded_at(*path)', to: redirect('/@%{path}'), constraints: { encoded_at: /%40/ }
+  constraints(encoded_path: /%40.*/) do
+    get '/:encoded_path', to: redirect { |params|
+      "/#{params[:encoded_path].gsub('%40', '@')}"
+    }
+  end
 
   constraints(username: %r{[^@/.]+}) do
     with_options to: 'accounts#show' do