From ecdea34323ee8c721ab758dd0f4e9c4e9c6d5e54 Mon Sep 17 00:00:00 2001 From: r888888888 Date: Fri, 17 Mar 2017 12:13:27 -0700 Subject: [PATCH] revert e7b3fae215b856bedce5c8814ba575d1bbf9b685 --- app/models/post_flag.rb | 8 +++++--- test/unit/post_flag_test.rb | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/models/post_flag.rb b/app/models/post_flag.rb index f46024052..d2f42364e 100644 --- a/app/models/post_flag.rb +++ b/app/models/post_flag.rb @@ -95,10 +95,12 @@ class PostFlag < ActiveRecord::Base end def validate_creator_is_not_limited - if creator.created_at > 1.week.ago + if CurrentUser.can_approve_posts? + # do nothing + elsif creator.created_at > 1.week.ago errors[:creator] << "cannot flag within the first week of sign up" - elsif creator.is_gold? && flag_count_for_creator >= 5 - errors[:creator] << "can flag 5 posts a day" + elsif creator.is_gold? && flag_count_for_creator >= 10 + errors[:creator] << "can flag 10 posts a day" elsif !creator.is_gold? && flag_count_for_creator >= 1 errors[:creator] << "can flag 1 post a day" end diff --git a/test/unit/post_flag_test.rb b/test/unit/post_flag_test.rb index f5668304b..9e4afa602 100644 --- a/test/unit/post_flag_test.rb +++ b/test/unit/post_flag_test.rb @@ -48,13 +48,13 @@ class PostFlagTest < ActiveSupport::TestCase assert_equal(["You have already flagged this post"], @post_flag.errors.full_messages) end - should "not be able to flag more than 5 posts in 24 hours" do + should "not be able to flag more than 10 posts in 24 hours" do @post_flag = PostFlag.new(:post => @post, :reason => "aaa", :is_resolved => false) - @post_flag.expects(:flag_count_for_creator).returns(5) + @post_flag.expects(:flag_count_for_creator).returns(10) assert_difference("PostFlag.count", 0) do @post_flag.save end - assert_equal(["You can flag 5 posts a day"], @post_flag.errors.full_messages) + assert_equal(["You can flag 10 posts a day"], @post_flag.errors.full_messages) end should "not be able to flag a deleted post" do