mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
FEATURE: better email in support
FEATURE: new incoming_email model FEATURE: infinite scrolling in emails admin FEATURE: new 'emails:import' rake task
This commit is contained in:
@@ -18,7 +18,8 @@ class SpamRule::AutoBlock
|
||||
|
||||
def block?
|
||||
@user.blocked? or
|
||||
(!@user.has_trust_level?(TrustLevel[1]) and
|
||||
(!@user.staged? and
|
||||
!@user.has_trust_level?(TrustLevel[1]) and
|
||||
SiteSetting.num_flags_to_block_new_user > 0 and
|
||||
SiteSetting.num_users_to_block_new_user > 0 and
|
||||
num_spam_flags_against_user >= SiteSetting.num_flags_to_block_new_user and
|
||||
|
||||
@@ -21,6 +21,8 @@ class SpamRule::FlagSockpuppets
|
||||
|
||||
!first_post.user.staff? &&
|
||||
!@post.user.staff? &&
|
||||
!first_post.user.staged? &&
|
||||
!@post.user.staged? &&
|
||||
@post.user != first_post.user &&
|
||||
@post.user.ip_address == first_post.user.ip_address &&
|
||||
@post.user.new_user? &&
|
||||
|
||||
Reference in New Issue
Block a user