From: Tom Hughes <tom@compton.nu>
Date: Thu, 2 Jan 2025 18:50:39 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/5457'
X-Git-Tag: live~467
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7286ad027c7628adae872b51c3e7b1341781d3d4?hp=402d7b9c10f64c334ded4886ed805071a41932ce

Merge remote-tracking branch 'upstream/pull/5457'
---

diff --git a/config/routes.rb b/config/routes.rb
index 3ede0d33d..4ab8f307b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -311,7 +311,7 @@ OpenStreetMap::Application.routes.draw do
   get "/export/embed" => "export#embed"
 
   # messages
-  resources :messages, :id => /\d+/, :only => [:create, :show, :destroy] do
+  resources :messages, :path_names => { :new => "new/:display_name" }, :id => /\d+/, :only => [:new, :create, :show, :destroy] do
     post :mark
     patch :unmute
 
@@ -324,7 +324,7 @@ OpenStreetMap::Application.routes.draw do
   end
   get "/user/:display_name/inbox", :to => redirect(:path => "/messages/inbox")
   get "/user/:display_name/outbox", :to => redirect(:path => "/messages/outbox")
-  get "/message/new/:display_name" => "messages#new", :as => "new_message"
+  get "/message/new/:display_name", :to => redirect(:path => "/messages/new/%{display_name}")
   get "/message/read/:message_id", :to => redirect(:path => "/messages/%{message_id}")
 
   # muting users
diff --git a/test/controllers/messages_controller_test.rb b/test/controllers/messages_controller_test.rb
index ac7ca9a06..f72e69593 100644
--- a/test/controllers/messages_controller_test.rb
+++ b/test/controllers/messages_controller_test.rb
@@ -5,7 +5,7 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest
   # test all routes which lead to this controller
   def test_routes
     assert_routing(
-      { :path => "/message/new/username", :method => :get },
+      { :path => "/messages/new/username", :method => :get },
       { :controller => "messages", :action => "new", :display_name => "username" }
     )
     assert_routing(