github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-30 16:19:31 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Ensure reviewable counts are updated correctly for new user menu (#21222)

Browse Source 
On the client-side, message-bus subscriptions and reviewable count UI is based on the 'redesigned_user_menu_enabled' boolean. We need to use the same logic on the server-side to ensure things work correctly when legacy navigation is used alongside the new user menu.
This commit is contained in:
David Taylor 2023-04-24 16:59:32 +01:00 committed by GitHub
parent 012aaf0ba3
commit cd88af8876
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/jobs/regular/notify_reviewable.rb
View File

@ -35,7 +35,7 @@ class Jobs::NotifyReviewable < ::Jobs::Base
counts[reviewable_by_group_id] += count if reviewable_by_group_id
end
if SiteSetting.legacy_navigation_menu?
if legacy_user_menu?
notify_legacy(
User.real.admins.pluck(:id),
count: counts[:admins],
@ -46,7 +46,7 @@ class Jobs::NotifyReviewable < ::Jobs::Base
end
if reviewable.reviewable_by_moderator?
if SiteSetting.legacy_navigation_menu?
if legacy_user_menu?
notify_legacy(
User.real.moderators.where("id NOT IN (?)", @contacted).pluck(:id),
count: counts[:moderators],
@ -71,7 +71,7 @@ class Jobs::NotifyReviewable < ::Jobs::Base
count += counts[gu.group_id]
end
if SiteSetting.legacy_navigation_menu?
if legacy_user_menu?
notify_legacy([user.id], count: count, updates: updates)
else
notify_user(user, updates)
@ -103,4 +103,8 @@ class Jobs::NotifyReviewable < ::Jobs::Base
def notify_user(user, updates)
user.publish_reviewable_counts(updates.present? ? { updates: updates } : nil)
end
def legacy_user_menu?
SiteSetting.legacy_navigation_menu? && !SiteSetting.enable_new_notifications_menu
end
end

4
spec/jobs/notify_reviewable_spec.rb
View File

@ -85,6 +85,7 @@ RSpec.describe Jobs::NotifyReviewable do
it "will notify users of new reviewable content for the old user menu" do
SiteSetting.navigation_menu = "legacy"
SiteSetting.enable_new_notifications_menu = false
SiteSetting.enable_category_group_moderation = true
GroupUser.create!(group_id: group.id, user_id: moderator.id)
@ -170,6 +171,7 @@ RSpec.describe Jobs::NotifyReviewable do
it "respects priority" do
SiteSetting.navigation_menu = "legacy"
SiteSetting.enable_new_notifications_menu = false
SiteSetting.enable_category_group_moderation = true
Reviewable.set_priorities(medium: 2.0)
SiteSetting.reviewable_default_visibility = "medium"
@ -224,6 +226,8 @@ RSpec.describe Jobs::NotifyReviewable do
end
it "skips sending notifications if user_ids is empty" do
SiteSetting.navigation_menu = "legacy"
SiteSetting.enable_new_notifications_menu = false
reviewable = Fabricate(:reviewable, reviewable_by_moderator: true)
regular_user = Fabricate(:user)