FIX: don't show option to flag with notify_user to trust level 0 users. they can't send private messages.

This commit is contained in:
Neil Lalonde 2014-03-10 11:48:27 -04:00
parent 33f483a47e
commit 2838e1c3b5
2 changed files with 9 additions and 1 deletions

View file

@ -10,7 +10,7 @@ module PostGuardain
already_did_flagging = taken.any? && (taken & PostActionType.flag_types.values).any? already_did_flagging = taken.any? && (taken & PostActionType.flag_types.values).any?
if authenticated? && post if authenticated? && post
# we always allow flagging - NOTE: this does not seem true, see specs. (MVH) # we allow flagging for trust level 1 and higher
(is_flag && @user.has_trust_level?(:basic) && not(already_did_flagging)) || (is_flag && @user.has_trust_level?(:basic) && not(already_did_flagging)) ||
# not a flagging action, and haven't done it already # not a flagging action, and haven't done it already
@ -22,6 +22,9 @@ module PostGuardain
# don't like your own stuff # don't like your own stuff
not(action_key == :like && is_my_own?(post)) && not(action_key == :like && is_my_own?(post)) &&
# new users can't notify_user because they are not allowed to send private messages
not(action_key == :notify_user && !@user.has_trust_level?(:basic)) &&
# no voting more than once on single vote topics # no voting more than once on single vote topics
not(action_key == :vote && opts[:voted_in_topic] && post.topic.has_meta_data_boolean?(:single_vote)) not(action_key == :vote && opts[:voted_in_topic] && post.topic.has_meta_data_boolean?(:single_vote))
end end

View file

@ -71,6 +71,11 @@ describe Guardian do
user.trust_level = TrustLevel.levels[:new] user.trust_level = TrustLevel.levels[:new]
Guardian.new(user).post_can_act?(post, :off_topic).should be_false Guardian.new(user).post_can_act?(post, :off_topic).should be_false
end end
it "returns false for a new user flagging with notify_user" do
user.trust_level = TrustLevel.levels[:new]
Guardian.new(user).post_can_act?(post, :notify_user).should be_false # because new users can't send private messages
end
end end
end end