IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: FlagSockpuppets should not flag a post if a post of that user was already rejected by staff (#9328)

Browse Source 
* FIX: FlagSockpuppets should not flag a post if a post of that user was already rejected by staff

* Update spec/services/flag_sockpuppets_spec.rb

Co-Authored-By: Robin Ward <robin.ward@gmail.com>

Co-authored-by: Robin Ward <robin.ward@gmail.com>
This commit is contained in:
Roman Rizzi
2020-04-01 09:20:45 -03:00
committed by GitHub
parent acc16dada3
commit b2f30aa0b5
2 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/services/spam_rule/flag_sockpuppets.rb
View File

@@ -19,8 +19,6 @@ class SpamRule::FlagSockpuppets
def reply_is_from_sockpuppet?
return false if @post.try(:post_number) == 1
first_post = @post.topic.posts.by_post_number.first
return false if first_post.user.nil?
!first_post.user.staff? &&
@@ -41,11 +39,22 @@ class SpamRule::FlagSockpuppets
locale: SiteSetting.default_locale
)
PostActionCreator.create(Discourse.system_user, @post, :spam, message: message)
flag_post(@post, message)
if (first_post = @post.topic.posts.by_post_number.first).try(:user).try(:new_user?)
PostActionCreator.create(Discourse.system_user, first_post, :spam, message: message)
end
flag_post(first_post, message) if first_post&.user&.new_user?
end
private
def flag_post(post, message)
can_trust_user = ReviewableFlaggedPost.where(status: Reviewable.statuses[:rejected], target_created_by: post.user).exists?
return if can_trust_user
PostActionCreator.create(Discourse.system_user, post, :spam, message: message)
end
def first_post
@first_post ||= @post.topic.posts.by_post_number.first
end
end