Skip to content

A platform for community discussion. Free, open, simple.

PERF: Avoid repeated membership queries in MCP group listings (#44161)

Natalie Tayfbada8718835
diff --git a/lib/discourse_mcp/tools/groups.rb b/lib/discourse_mcp/tools/groups.rb
index 22512952399..c6b0b9480b2 100644
--- a/lib/discourse_mcp/tools/groups.rb
+++ b/lib/discourse_mcp/tools/groups.rb
@@ -5,7 +5,6 @@ require "group_directory_query"
module DiscourseMcp
module Tools
module GroupSupport
- MEMBERSHIP_NOT_LOADED = Object.new.freeze
SAFE_DETAIL_FIELDS = %i[
id
automatic
@@ -75,20 +74,9 @@ module DiscourseMcp
group or raise ToolError, I18n.t("mcp.errors.group_not_found")
end
- def group_json(
- group,
- guardian,
- membership: MEMBERSHIP_NOT_LOADED,
- can_see_members: MEMBERSHIP_NOT_LOADED
- )
- if membership.equal?(MEMBERSHIP_NOT_LOADED)
- membership = group.group_users.find_by(user: guardian.user) if guardian.authenticated?
- end
- if can_see_members.equal?(MEMBERSHIP_NOT_LOADED)
- can_see_members = guardian.can_see_group_members?(group)
- end
-
- can_admin_group = guardian.can_admin_group?(group)
+ def group_json(group, guardian, membership:, can_see_members:)
+ is_group_owner = membership&.owner? || false
+ can_admin_group = guardian.can_admin_group?(group, is_group_owner:)
{
id: group.id,
name: group.name,
@@ -105,9 +93,9 @@ module DiscourseMcp
allow_membership_requests: group.allow_membership_requests,
bio_excerpt: group.bio_cooked.present? ? PrettyText.excerpt(group.bio_cooked, 200) : nil,
is_group_user: membership.present?,
- is_group_owner: membership&.owner? || false,
+ is_group_owner:,
can_see_members:,
- can_edit_group: guardian.can_edit_group?(group, group_user: membership),
+ can_edit_group: guardian.can_edit_group?(group, is_group_owner:),
can_admin_group:,
}
end
diff --git a/lib/guardian/group_guardian.rb b/lib/guardian/group_guardian.rb
index 7bfb0b7b7da..bd08beb9ed8 100644
--- a/lib/guardian/group_guardian.rb
+++ b/lib/guardian/group_guardian.rb
@@ -2,8 +2,6 @@
#mixin for all guardian methods dealing with group permissions
module GroupGuardian
- GROUP_USER_NOT_PRELOADED = Object.new.freeze
-
# Creating Method
def can_create_group?
is_admin? || (SiteSetting.moderators_manage_groups && is_moderator?)
@@ -12,20 +10,21 @@ module GroupGuardian
# Edit authority for groups means membership changes only.
# Automatic groups are not represented in the GROUP_USERS
# table and thus do not allow membership changes.
- def can_edit_group?(group, group_user: GROUP_USER_NOT_PRELOADED)
+ def can_edit_group?(group, is_group_owner: nil)
return false if group.automatic
- return true if can_admin_group?(group)
+ return true if can_admin_group?(group, is_group_owner:)
+ return is_group_owner unless is_group_owner.nil?
- group_user = group.group_users.find_by(user:) if group_user.equal?(GROUP_USER_NOT_PRELOADED)
- group_user&.owner? || false
+ group.group_users.exists?(user:, owner: true)
end
- def can_admin_group?(group)
- is_admin? ||
- (
- SiteSetting.moderators_manage_groups && is_moderator? && can_see?(group) &&
- group.id != Group::AUTO_GROUPS[:admins]
- )
+ def can_admin_group?(group, is_group_owner: false)
+ return true if is_admin?
+ return false unless SiteSetting.moderators_manage_groups && is_moderator?
+ return false if group.id == Group::AUTO_GROUPS[:admins]
+ return true if is_group_owner
+
+ can_see?(group)
end
def can_see_group_messages?(group)
diff --git a/spec/lib/guardian_spec.rb b/spec/lib/guardian_spec.rb
index 4e6fc03a786..bc0bb6fa0ec 100644
--- a/spec/lib/guardian_spec.rb
+++ b/spec/lib/guardian_spec.rb
@@ -2948,23 +2948,33 @@ RSpec.describe Guardian do
end
describe "#can_edit_group?" do
- it "accepts a preloaded group membership" do
+ it "accepts known ownership and looks it up when omitted" do
group.add(member)
group.add_owner(owner)
- expect(
- Guardian.new(owner).can_edit_group?(
- group,
- group_user: group.group_users.find_by(user: owner),
- ),
- ).to eq(true)
- expect(
- Guardian.new(member).can_edit_group?(
- group,
- group_user: group.group_users.find_by(user: member),
- ),
- ).to eq(false)
- expect(Guardian.new(another_user).can_edit_group?(group, group_user: nil)).to eq(false)
+ expect(owner.guardian.can_edit_group?(group, is_group_owner: true)).to eq(true)
+ expect(member.guardian.can_edit_group?(group, is_group_owner: false)).to eq(false)
+ expect(owner.guardian.can_edit_group?(group)).to eq(true)
+ expect(member.guardian.can_edit_group?(group)).to eq(false)
+ end
+ end
+
+ describe "#can_admin_group?" do
+ it "preserves role and visibility restrictions with known ownership" do
+ SiteSetting.moderators_manage_groups = true
+ group.update!(visibility_level: Group.visibility_levels[:owners])
+ group.add_owner(moderator)
+ group.add_owner(owner)
+ expect(moderator.guardian.can_admin_group?(group, is_group_owner: true)).to eq(true)
+ expect(owner.guardian.can_admin_group?(group, is_group_owner: true)).to eq(false)
+ expect(admin.guardian.can_admin_group?(group, is_group_owner: false)).to eq(true)
+
+ hidden_group = Fabricate(:group, visibility_level: Group.visibility_levels[:owners])
+ expect(moderator.guardian.can_admin_group?(hidden_group, is_group_owner: false)).to eq(false)
+ expect(moderator.guardian.can_admin_group?(Group[:admins], is_group_owner: true)).to eq(false)
+
+ SiteSetting.moderators_manage_groups = false
+ expect(moderator.guardian.can_admin_group?(group, is_group_owner: true)).to eq(false)
end
end
diff --git a/spec/requests/mcp_groups_spec.rb b/spec/requests/mcp_groups_spec.rb
index a41215c3b76..167e0c57e17 100644
--- a/spec/requests/mcp_groups_spec.rb
+++ b/spec/requests/mcp_groups_spec.rb
@@ -229,6 +229,7 @@ describe "MCP group tools" do
call_tool("discourse_get_group", { id: group.id })
expect(response.status).to eq(200)
+ expect(structured_content.dig("group", "id")).to eq(group.id)
expect(response.body).not_to include(secret, group.incoming_email, group.email_username)
end
@@ -261,6 +262,30 @@ describe "MCP group tools" do
DiscoursePluginRegistry.unregister_modifier(plugin, :groups_index_query, &modifier) if plugin
end
+ it "keeps membership queries bounded for moderators managing owner-visible groups" do
+ SiteSetting.moderators_manage_groups = true
+ moderator = Fabricate(:moderator, refresh_auto_groups: true)
+ group = Fabricate(:group, visibility_level: Group.visibility_levels[:owners])
+ make_owner(group, moderator)
+ authorize("mcp:groups:read", auth_user: moderator)
+
+ initial_queries =
+ track_sql_queries { call_tool("discourse_list_groups", { limit: 100 }) }.grep(/group_users/i)
+ expect(structured_content["groups"]).to include(
+ include("id" => group.id, "can_admin_group" => true, "can_edit_group" => true),
+ )
+
+ 5.times do
+ owned_group = Fabricate(:group, visibility_level: Group.visibility_levels[:owners])
+ make_owner(owned_group, moderator)
+ end
+ expanded_queries =
+ track_sql_queries { call_tool("discourse_list_groups", { limit: 100 }) }.grep(/group_users/i)
+
+ expect(response.status).to eq(200)
+ expect(expanded_queries.size).to be <= initial_queries.size
+ end
+
it "preserves the difference between moderator and administrator visibility" do
hidden_group = Fabricate(:group, visibility_level: Group.visibility_levels[:owners])
make_owner(hidden_group, Fabricate(:user))