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 skip the new user badge (#10743) 

The NewUserOfTheMonth badge is part of the Badges::GettingStarted group. This group is skipped in BadgeGranter if the user skips the new user tips. However, the NewUserOfTheMonth badge granter job does not account for this. Instead, it notifies the user they've received the badge even if they did not.

This commit introduces a simple fix to allow granting of this badge even to users who skipped the new user tips.
This commit is contained in:
Justin DiRose 2020-09-24 12:58:31 -05:00 committed by GitHub
parent f1d64bbbe5
commit 82a18f125f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/badge_granter.rb
View File

@ -45,7 +45,7 @@ class BadgeGranter
def grant def grant
return if @granted_by && !Guardian.new(@granted_by).can_grant_badges?(@user) return if @granted_by && !Guardian.new(@granted_by).can_grant_badges?(@user)
return unless @badge.enabled? return unless @badge.enabled?
return if @badge.badge_grouping_id == BadgeGrouping::GettingStarted && @user.user_option.skip_new_user_tips return if @badge.badge_grouping_id == BadgeGrouping::GettingStarted && @badge.id != Badge::NewUserOfTheMonth && @user.user_option.skip_new_user_tips
find_by = { badge_id: @badge.id, user_id: @user.id } find_by = { badge_id: @badge.id, user_id: @user.id }

9
spec/services/badge_granter_spec.rb
View File

@ -225,6 +225,15 @@ describe BadgeGranter do
expect(user_badge).to eq(nil) expect(user_badge).to eq(nil)
end end
it "grants the New User of the Month badge when user skipped new user tips" do
freeze_time
user.user_option.update!(skip_new_user_tips: true)
badge = Badge.find(Badge::NewUserOfTheMonth)
user_badge = BadgeGranter.grant(badge, user, created_at: 1.year.ago)
expect(user_badge).to be_present
end
it 'grants multiple badges' do it 'grants multiple badges' do
badge = Fabricate(:badge, multiple_grant: true) badge = Fabricate(:badge, multiple_grant: true)
user_badge = BadgeGranter.grant(badge, user) user_badge = BadgeGranter.grant(badge, user)