mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
Don't send more pm's after a user has been blocked from making posts. This can happen if a staff member flags posts that are already hidden.
This commit is contained in:
@@ -48,8 +48,9 @@ class SpamRulesEnforcer
|
||||
|
||||
def punish_user
|
||||
Post.transaction do
|
||||
UserBlocker.block(@user, nil, {message: :too_many_spam_flags})
|
||||
GroupMessage.create(Group[:moderators].name, :user_automatically_blocked, {user: @user, limit_once_per: false})
|
||||
if UserBlocker.block(@user, nil, {message: :too_many_spam_flags})
|
||||
GroupMessage.create(Group[:moderators].name, :user_automatically_blocked, {user: @user, limit_once_per: false})
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -14,9 +14,13 @@ class UserBlocker
|
||||
|
||||
def block
|
||||
hide_posts
|
||||
@user.blocked = true
|
||||
if @user.save
|
||||
SystemMessage.create(@user, @opts[:message] || :blocked_by_staff)
|
||||
unless @user.blocked?
|
||||
@user.blocked = true
|
||||
if @user.save
|
||||
SystemMessage.create(@user, @opts[:message] || :blocked_by_staff)
|
||||
end
|
||||
else
|
||||
false
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user