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

FEATURE: Support designating multiple groups as mods on category (#28655)

Browse Source 
Currently, categories support designating only 1 group as a moderation group on the category. This commit removes the one group limitation and makes it possible to designate multiple groups as mods on a category.

Internal topic: t/124648.
This commit is contained in:
Osama Sayegh
2024-09-04 04:38:46 +03:00
committed by GitHub
parent 7092d88ee4
commit 280adda09c
49 changed files with 388 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
spec/models/about_spec.rb
View File

@ -67,31 +67,28 @@ RSpec.describe About do
end
describe "#category_moderators" do
let(:user) { Fabricate(:user) }
let(:public_cat_moderator) { Fabricate(:user, last_seen_at: 1.month.ago) }
let(:private_cat_moderator) { Fabricate(:user, last_seen_at: 2.month.ago) }
let(:common_moderator) { Fabricate(:user, last_seen_at: 3.month.ago) }
let(:common_moderator_2) { Fabricate(:user, last_seen_at: 4.month.ago) }
fab!(:user)
fab!(:public_cat_moderator) { Fabricate(:user, last_seen_at: 1.month.ago) }
fab!(:private_cat_moderator) { Fabricate(:user, last_seen_at: 2.month.ago) }
fab!(:common_moderator) { Fabricate(:user, last_seen_at: 3.month.ago) }
fab!(:common_moderator_2) { Fabricate(:user, last_seen_at: 4.month.ago) }
let(:public_group) do
group = Fabricate(:public_group)
group.add(public_cat_moderator)
group.add(common_moderator)
group.add(common_moderator_2)
group
fab!(:public_group) do
Fabricate(:public_group, users: [public_cat_moderator, common_moderator, common_moderator_2])
end
let(:private_group) do
group = Fabricate(:group)
group.add(private_cat_moderator)
group.add(common_moderator)
group.add(common_moderator_2)
group
fab!(:private_group) do
Fabricate(:group, users: [private_cat_moderator, common_moderator, common_moderator_2])
end
let!(:public_cat) { Fabricate(:category, reviewable_by_group: public_group) }
let!(:private_cat) do
Fabricate(:private_category, group: private_group, reviewable_by_group: private_group)
fab!(:public_cat) { Fabricate(:category) }
fab!(:public_category_moderation_group) do
Fabricate(:category_moderation_group, category: public_cat, group: public_group)
end
fab!(:private_cat) { Fabricate(:private_category, group: private_group) }
fab!(:private_category_moderation_group) do
Fabricate(:category_moderation_group, category: private_cat, group: private_group)
end
it "lists moderators of the category that the current user can see" do
@ -120,6 +117,19 @@ RSpec.describe About do
expect(results.size).to eq(2)
results.each { |res| expect(res.moderators.size).to eq(2) }
end
it "doesn't list the same user twice as a category mod if the user is member of multiple groups" do
Fabricate(:category_moderation_group, category: public_cat, group: private_group)
results = About.new(nil).category_moderators
mods = results.find { |r| r.category.id == public_cat.id }.moderators
expect(mods.map(&:id)).to contain_exactly(
public_cat_moderator.id,
common_moderator.id,
common_moderator_2.id,
private_cat_moderator.id,
)
end
end
describe "#admins" do