jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

upload limits: fix point cap being exceeded.

Browse Source
This commit is contained in:
evazion
2020-01-31 02:46:01 -06:00
parent 76630bbf73
commit 067c6a10e7
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/logical/upload_limit.rb
View File

@@ -43,6 +43,7 @@ class UploadLimit
user.with_lock do user.with_lock do
if incremental if incremental
user.upload_points += UploadLimit.upload_value(user.upload_points, post.is_deleted) user.upload_points += UploadLimit.upload_value(user.upload_points, post.is_deleted)
user.upload_points = user.upload_points.clamp(0, MAXIMUM_POINTS)
user.save! user.save!
else else
user.update!(upload_points: UploadLimit.points_for_user(user)) user.update!(upload_points: UploadLimit.points_for_user(user))

10
test/unit/upload_limit_test.rb
View File

@@ -25,6 +25,16 @@ class UploadLimitTest < ActiveSupport::TestCase
@post.approve!(@approver) @post.approve!(@approver)
assert_equal(1010, @user.reload.upload_points) assert_equal(1010, @user.reload.upload_points)
end end
should "not increase the uploader's upload points beyond the maximum" do
@user.update!(upload_points: UploadLimit::MAXIMUM_POINTS)
@post = create(:post, uploader: @user, is_pending: true, created_at: 7.days.ago)
assert_equal(UploadLimit::MAXIMUM_POINTS, @user.reload.upload_points)
@post.approve!(@approver)
assert_equal(UploadLimit::MAXIMUM_POINTS, @user.reload.upload_points)
end
end end
context "an approved post that is deleted" do context "an approved post that is deleted" do