From ef4c9a3306e86377b875d479c7036f5f3ad17410 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Thu, 2 Nov 2023 10:08:19 +0000
Subject: [PATCH] Make change set comment rate limit errors display properly

Fixes #4320
---
 app/assets/javascripts/index/changeset.js | 2 +-
 app/views/browse/changeset.html.erb       | 2 +-
 lib/osm.rb                                | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/index/changeset.js b/app/assets/javascripts/index/changeset.js
index a6213b9c4..a659feef6 100644
--- a/app/assets/javascripts/index/changeset.js
+++ b/app/assets/javascripts/index/changeset.js
@@ -47,7 +47,7 @@ OSM.Changeset = function (map) {
         OSM.loadSidebarContent(window.location.pathname, page.load);
       },
       error: function (xhr, xhr_status, http_status) {
-        $(form).find("#comment-error").text(http_status);
+        $(form).find("#comment-error").text(xhr.responseText);
         $(form).find("#comment-error").prop("hidden", false);
         $(form).find("input[type=submit]").prop("disabled", false);
       }
diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 93e0abf21..74596e529 100644
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -78,7 +78,7 @@
         <div class="mb-3">
           <textarea class="form-control" name="text" cols="40" rows="5"></textarea>
         </div>
-        <div id="comment-error" class="alert-danger p-2 mb-3" hidden>
+        <div id="comment-error" class="alert alert-danger p-2 mb-3" hidden>
         </div>
         <div>
           <input type="submit" name="comment" value="<%= t("javascripts.changesets.show.comment") %>" data-changeset-id="<%= @changeset.id %>" data-method="POST" data-url="<%= changeset_comment_url(@changeset) %>" disabled="1" class="btn btn-sm btn-primary" />
diff --git a/lib/osm.rb b/lib/osm.rb
index 6d945c4fe..905f3ac97 100644
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -355,6 +355,10 @@ module OSM
 
   # Raised when a rate limit is exceeded
   class APIRateLimitExceeded < APIError
+    def initialize
+      super "Rate limit exceeded"
+    end
+
     def status
       :too_many_requests
     end
-- 
2.39.5