X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d6c01586fe1703d69184828b332e2eace844cac8..b7bdc88008672fd065529f1b016256a55964fe1b:/app/controllers/api/notes_controller.rb

diff --git a/app/controllers/api/notes_controller.rb b/app/controllers/api/notes_controller.rb
index 23ea4e955..703f275aa 100644
--- a/app/controllers/api/notes_controller.rb
+++ b/app/controllers/api/notes_controller.rb
@@ -298,10 +298,21 @@ module Api
       end
 
       # Find the notes we want to return
-      sort_by = params[:sort_by] == "created_at" ? "created_at" : "updated_at"
-      order_by = params[:order_by] == "ASC" ? "ASC" : "DESC"
+      @notes = if params[:sort] == "created_at"
+                 if params[:order] == "oldest"
+                   @notes.order("created_at ASC")
+                 else
+                   @notes.order("created_at DESC")
+                 end
+               else
+                 if params[:order] == "oldest"
+                   @notes.order("updated_at ASC")
+                 else
+                   @notes.order("updated_at DESC")
+                 end
+               end
 
-      @notes = @notes.order("#{sort_by} #{order_by}").limit(result_limit).preload(:comments)
+      @notes = @notes.distinct.limit(result_limit).preload(:comments)
 
       # Render the result
       respond_to do |format|