cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve naming of changeset comment rate limit settings

Browse source
This commit is contained in:
Tom Hughes 2023-08-30 18:25:06 +01:00
parent a99450f558
commit e210b4efbf
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/models/user.rb
View file

@ -397,14 +397,14 @@ class User < ApplicationRecord
def max_changeset_comments_per_hour def max_changeset_comments_per_hour
if moderator? if moderator?
36000 Settings.moderator_changeset_comments_per_hour
else else
previous_comments = changeset_comments.limit(200).count previous_comments = changeset_comments.limit(200).count
active_reports = issues.with_status(:open).sum(:reports_count) active_reports = issues.with_status(:open).sum(:reports_count)
max_comments = previous_comments / 200.0 * Settings.max_changeset_comments_per_hour max_comments = previous_comments / 200.0 * Settings.max_changeset_comments_per_hour
max_comments = max_comments.floor.clamp(Settings.min_changeset_comments_per_hour, Settings.max_changeset_comments_per_hour) max_comments = max_comments.floor.clamp(Settings.initial_changeset_comments_per_hour, Settings.max_changeset_comments_per_hour)
max_comments /= 2**active_reports max_comments /= 2**active_reports
max_comments.floor.clamp(1, Settings.max_changeset_comments_per_hour) max_comments.floor.clamp(Settings.min_changeset_comments_per_hour, Settings.max_changeset_comments_per_hour)
end end
end end

4
config/settings.yml
View file

@ -56,8 +56,10 @@ max_messages_per_hour: 60
# Rate limit for friending # Rate limit for friending
max_friends_per_hour: 60 max_friends_per_hour: 60
# Rate limit for changeset comments # Rate limit for changeset comments
min_changeset_comments_per_hour: 6 min_changeset_comments_per_hour: 1
initial_changeset_comments_per_hour: 6
max_changeset_comments_per_hour: 60 max_changeset_comments_per_hour: 60
moderator_changeset_comments_per_hour: 36000
# Domain for handling message replies # Domain for handling message replies
#messages_domain: "messages.openstreetmap.org" #messages_domain: "messages.openstreetmap.org"
# MaxMind GeoIPv2 database # MaxMind GeoIPv2 database

4
test/controllers/api/changeset_comments_controller_test.rb
View file

@ -140,8 +140,8 @@ module Api
auth_header = basic_authorization_header user.email, "test" auth_header = basic_authorization_header user.email, "test"
assert_difference "ChangesetComment.count", Settings.min_changeset_comments_per_hour do assert_difference "ChangesetComment.count", Settings.initial_changeset_comments_per_hour do
1.upto(Settings.min_changeset_comments_per_hour) do |count| 1.upto(Settings.initial_changeset_comments_per_hour) do |count|
post changeset_comment_path(:id => changeset, :text => "Comment #{count}"), :headers => auth_header post changeset_comment_path(:id => changeset, :text => "Comment #{count}"), :headers => auth_header
assert_response :success assert_response :success
end end