mirror of
https://github.com/discourse/discourse.git
synced 2024-12-19 01:43:53 +08:00
bc63232d2e
When a tab is open but left unattended for a while, the red, green, and blue pills tend to go out of sync. So whevener we open the notifications menu, we sync up the notification count (eg. blue and green pills) with the server. However, the reviewable count (eg. the red pill) is not a notification and is located in the hamburger menu. This commit adds a new route on the server side to retrieve the reviewable count for the current user and a ping (refreshReviewableCount) from the client side to sync the reviewable count whenever they open the hamburger menu. REFACTOR: I also refactored the hamburger-menu widget code to prevent repetitive uses of "this.". PERF: I improved the performance of the 'notify_reviewable' job by doing only 1 query to the database to retrieve all the pending reviewables and then tallying based on the various rights.
45 lines
1.2 KiB
Ruby
45 lines
1.2 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class Jobs::NotifyReviewable < ::Jobs::Base
|
|
|
|
def execute(args)
|
|
return unless reviewable = Reviewable.find_by(id: args[:reviewable_id])
|
|
|
|
@contacted = Set.new
|
|
|
|
counts = Hash.new(0)
|
|
|
|
Reviewable.default_visible.pending.each do |r|
|
|
counts[:admins] += 1
|
|
counts[:moderators] += 1 if r.reviewable_by_moderator?
|
|
counts[r.reviewable_by_group_id] += 1 if r.reviewable_by_group_id
|
|
end
|
|
|
|
# admins
|
|
notify(counts[:admins], User.real.admins.pluck(:id))
|
|
|
|
# moderators
|
|
if reviewable.reviewable_by_moderator?
|
|
notify(counts[:moderators], User.real.moderators.where("id NOT IN (?)", @contacted).pluck(:id))
|
|
end
|
|
|
|
# category moderators
|
|
if SiteSetting.enable_category_group_moderation? && (group = reviewable.reviewable_by_group)
|
|
group.users.includes(:group_users).where("users.id NOT IN (?)", @contacted).find_each do |user|
|
|
count = user.group_users.map { |gu| counts[gu.group_id] }.sum
|
|
notify(count, [user.id])
|
|
end
|
|
end
|
|
end
|
|
|
|
protected
|
|
|
|
def notify(count, user_ids)
|
|
return if user_ids.blank?
|
|
data = { reviewable_count: count }
|
|
MessageBus.publish("/reviewable_counts", data, user_ids: user_ids)
|
|
@contacted += user_ids
|
|
end
|
|
|
|
end
|