Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: don't grant new user of the month badge to suspended users or based on deleted topics/posts

This commit is contained in:
Régis Hanol 2018-02-13 17:32:38 +01:00
parent 6bfc25d895
commit 7d501058d7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/jobs/scheduled/grant_new_user_of_the_month_badges.rb
View File

@ -64,12 +64,16 @@ module Jobs
LEFT OUTER JOIN topics AS t ON t.id = p.topic_id LEFT OUTER JOIN topics AS t ON t.id = p.topic_id
WHERE u.active WHERE u.active
AND u.id > 0 AND u.id > 0
AND u.id NOT IN (#{current_owners.join(',')})
AND NOT u.staged AND NOT u.staged
AND NOT u.admin AND NOT u.admin
AND NOT u.moderator AND NOT u.moderator
AND t.archetype <> '#{Archetype.private_message}' AND u.suspended_at IS NULL
AND u.suspended_till IS NULL
AND u.created_at >= CURRENT_TIMESTAMP - '1 month'::INTERVAL AND u.created_at >= CURRENT_TIMESTAMP - '1 month'::INTERVAL
AND u.id NOT IN (#{current_owners.join(',')}) AND t.archetype <> '#{Archetype.private_message}'
AND t.deleted_at IS NULL
AND p.deleted_at IS NULL
GROUP BY u.id GROUP BY u.id
HAVING COUNT(DISTINCT p.id) > 1 HAVING COUNT(DISTINCT p.id) > 1
AND COUNT(DISTINCT p.topic_id) > 1 AND COUNT(DISTINCT p.topic_id) > 1