github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-22 11:44:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Don't grant sharing badges to users who don't exist (#13851)

Browse Source 
In badge queries for 'First Share' and 'Nice/Good/Great Share' badges,
check that the user exists.

For 'Nice+ Share' badges, also grant badges if the number of shares is
equal to the threshhold count to better match the descriptions.
This commit is contained in:
wbhouston 2021-07-27 02:32:59 -04:00 committed by GitHub
parent 1780961e70
commit efe38efb0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/badge_queries.rb
View File

@ -61,7 +61,7 @@ module BadgeQueries
SELECT i.user_id, MIN(i.id) i_id
FROM incoming_links i
JOIN badge_posts p on p.id = i.post_id
WHERE i.user_id IS NOT NULL
JOIN users u on u.id = i.user_id
GROUP BY i.user_id
) as views
JOIN incoming_links i2 ON i2.id = views.i_id
@ -196,9 +196,9 @@ module BadgeQueries
SELECT i.user_id, MIN(i.id) i_id
FROM incoming_links i
JOIN badge_posts p on p.id = i.post_id
WHERE i.user_id IS NOT NULL
JOIN users u on u.id = i.user_id
GROUP BY i.user_id,i.post_id
HAVING COUNT(*) > #{count}
HAVING COUNT(*) >= #{count}
) as views
JOIN incoming_links i2 ON i2.id = views.i_id
SQL

15
spec/services/badge_granter_spec.rb
View File

@ -205,6 +205,21 @@ describe BadgeGranter do
BadgeGranter.backfill(Badge.find(Badge::FirstLike))
}.to_not change { Notification.where(user_id: user.id).count }
end
it 'does not grant sharing badges to deleted users' do
post = Fabricate(:post)
incoming_links = Fabricate.times(25, :incoming_link, post: post, user: user)
user_id = user.id
user.destroy!
nice_share = Badge.find(Badge::NiceShare)
first_share = Badge.find(Badge::FirstShare)
BadgeGranter.backfill(nice_share)
BadgeGranter.backfill(first_share)
expect(UserBadge.where(user_id: user_id).count).to eq(0)
end
end
describe 'grant' do