github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 21:16:28 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

REFACTOR: Removes double check of site setting in badge granter

Browse Source 
...and uses `update!` because the result of `update` isn't used
This commit is contained in:
Gerhard Schlager 2020-10-05 16:58:35 +02:00 committed by Gerhard Schlager
parent 8e47532304
commit f30c5a5c3a
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/services/badge_granter.rb
View File

@ -70,17 +70,15 @@ class BadgeGranter
post_id: @post_id, post_id: @post_id,
seq: seq) seq: seq)
return unless SiteSetting.enable_badges return unless SiteSetting.enable_badges
if @granted_by != Discourse.system_user if @granted_by != Discourse.system_user
StaffActionLogger.new(@granted_by).log_badge_grant(user_badge) StaffActionLogger.new(@granted_by).log_badge_grant(user_badge)
end end
if SiteSetting.enable_badges? unless @badge.badge_type_id == BadgeType::Bronze && user_badge.granted_at < 2.days.ago
unless @badge.badge_type_id == BadgeType::Bronze && user_badge.granted_at < 2.days.ago notification = self.class.send_notification(@user.id, @user.username, @user.effective_locale, @badge)
notification = self.class.send_notification(@user.id, @user.username, @user.effective_locale, @badge) user_badge.update!(notification_id: notification.id)
user_badge.update notification_id: notification.id
end
end end
end end
end end