X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3adb697385824cb7b7208825d9ba3535d8f4d67f..8aeb16a50c3cd55c953aaec8dcc2b881fb132c88:/config/routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 871fef1bf..aae32527a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -71,24 +71,23 @@ OpenStreetMap::Application.routes.draw do
     get "user/details" => "users#details"
     get "user/gpx_files" => "users#gpx_files"
     get "users" => "users#index", :as => :api_users
+  end
 
-    resources :user_preferences, :except => [:new, :create, :edit], :param => :preference_key, :path => "user/preferences", :controller => "user_preferences" do
+  namespace :api, :path => "api/0.6" do
+    resources :user_preferences, :except => [:new, :create, :edit], :param => :preference_key, :path => "user/preferences" do
       collection do
         put "" => "user_preferences#update_all", :as => ""
       end
     end
 
-    resources :messages, :path => "user/messages", :constraints => { :id => /\d+/ }, :only => [:create, :show, :destroy], :controller => "messages", :as => :api_messages do
+    resources :messages, :path => "user/messages", :constraints => { :id => /\d+/ }, :only => [:create, :show, :update, :destroy] do
       collection do
         get "inbox"
         get "outbox"
       end
     end
+    post "/user/messages/:id" => "messages#update"
 
-    post "/user/messages/:id" => "messages#update", :as => :api_message_update
-  end
-
-  namespace :api, :path => "api/0.6" do
     resources :traces, :path => "gpx", :only => [:create, :show, :update, :destroy], :id => /\d+/ do
       scope :module => :traces do
         resource :data, :only => :show
@@ -127,7 +126,8 @@ OpenStreetMap::Application.routes.draw do
   get "/relation/:id/history" => "old_relations#index", :id => /\d+/, :as => :relation_history
   resources :old_relations, :path => "/relation/:id/history", :id => /\d+/, :version => /\d+/, :param => :version, :only => :show
   resources :changesets, :path => "changeset", :id => /\d+/, :only => :show do
-    match :subscribe, :unsubscribe, :on => :member, :via => [:get, :post]
+    match :subscribe, :on => :member, :via => [:get, :post]
+    match :unsubscribe, :on => :member, :via => [:get, :post]
 
     namespace :changeset_comments, :as => :comments, :path => :comments do
       resource :feed, :only => :show, :defaults => { :format => "rss" }
@@ -258,7 +258,8 @@ OpenStreetMap::Application.routes.draw do
   scope "/user/:display_name" do
     resources :diary_entries, :path => "diary", :only => [:edit, :update, :show], :id => /\d+/ do
       member do
-        post :hide, :unhide
+        post :hide
+        post :unhide
       end
     end
   end
@@ -289,8 +290,9 @@ OpenStreetMap::Application.routes.draw do
   match "/user/:display_name/remove_friend" => "friendships#remove_friend", :via => [:get, :post], :as => "remove_friend"
 
   # user lists
-  match "/users" => "users#index", :via => [:get, :post]
-  match "/users/:status" => "users#index", :via => [:get, :post]
+  namespace :users do
+    resource :list, :path => "(:status)", :only => [:show, :update]
+  end
 
   # geocoder
   get "/search" => "geocoder#search"