Skip to content

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

DEV: Deprecate calling user.groups on client directly (#42711)

Martin Brennanc1e14963b9ef
diff --git a/frontend/discourse/admin/controllers/edit-category/tabs.js b/frontend/discourse/admin/controllers/edit-category/tabs.js
index d588fb945da..b5192fc29ed 100644
--- a/frontend/discourse/admin/controllers/edit-category/tabs.js
+++ b/frontend/discourse/admin/controllers/edit-category/tabs.js
@@ -375,8 +375,13 @@ export default class EditCategoryTabsController extends Controller {
return false;
}
- const userGroupIds = new Set(this.currentUser.groups.map((g) => g.id));
+ const userGroupIds = new Set(
+ this.currentUser.visibleGroups.map((g) => g.id)
+ );
+ // TODO (martin) Update this with granular_anonymous_and_logged_in_groups_permissions to
+ // do a server-side check, since this is only checking against the current user's visible
+ // groups, it should check against _all_ their groups.
return !permissions.some(
(p) =>
p.group_id === AUTO_GROUPS.everyone.id || userGroupIds.has(p.group_id)
diff --git a/frontend/discourse/admin/models/admin-user.js b/frontend/discourse/admin/models/admin-user.js
index 9fc5f1b2d0b..92356b269c3 100644
--- a/frontend/discourse/admin/models/admin-user.js
+++ b/frontend/discourse/admin/models/admin-user.js
@@ -21,6 +21,12 @@ export default class AdminUser extends User {
static async find(user_id, opts = { raw: false }) {
const result = await ajax(`/admin/users/${user_id}.json`);
result.loadedDetails = true;
+
+ if (Object.hasOwn(result, "groups")) {
+ result.visibleGroups = result.groups;
+ delete result.groups;
+ }
+
return opts?.raw ? result : AdminUser.create(result);
}
@@ -32,7 +38,7 @@ export default class AdminUser extends User {
adminUserView = true;
- @autoTrackedArray groups;
+ @autoTrackedArray visibleGroups;
@computed("active", "staged")
get canViewProfile() {
@@ -65,11 +71,11 @@ export default class AdminUser extends User {
}
get customGroups() {
- return this.groups?.filter((g) => !g.automatic) ?? [];
+ return this.visibleGroups?.filter((g) => !g.automatic) ?? [];
}
get automaticGroups() {
- return this.groups?.filter((g) => g.automatic) ?? [];
+ return this.visibleGroups?.filter((g) => g.automatic) ?? [];
}
@computed("bounce_score", "reset_bounce_score_after")
@@ -116,14 +122,16 @@ export default class AdminUser extends User {
data: { group_id: added.id },
});
- this.groups.push(added);
+ this.visibleGroups.push(added);
}
groupRemoved(groupId) {
return ajax(`/admin/users/${this.id}/groups/${groupId}`, {
type: "DELETE",
}).then(() => {
- this.groups = this.groups.filter((group) => group.id !== groupId);
+ this.visibleGroups = this.visibleGroups.filter(
+ (group) => group.id !== groupId
+ );
if (this.primary_group_id === groupId) {
this.set("primary_group_id", null);
}
diff --git a/frontend/discourse/app/components/modal/create-invite-with-roles.gjs b/frontend/discourse/app/components/modal/create-invite-with-roles.gjs
index ee22af985a5..ee7dcc19c10 100644
--- a/frontend/discourse/app/components/modal/create-invite-with-roles.gjs
+++ b/frontend/discourse/app/components/modal/create-invite-with-roles.gjs
@@ -188,7 +188,7 @@ export default class CreateInviteWithRoles extends Component {
get canInviteToGroup() {
return (
this.currentUser.staff ||
- this.currentUser.groups.some((g) => g.group_user?.owner)
+ this.currentUser.visibleGroups.some((g) => g.group_user?.owner)
);
}
diff --git a/frontend/discourse/app/components/modal/create-invite.gjs b/frontend/discourse/app/components/modal/create-invite.gjs
index 573686e92f4..05ea813f7e5 100644
--- a/frontend/discourse/app/components/modal/create-invite.gjs
+++ b/frontend/discourse/app/components/modal/create-invite.gjs
@@ -191,7 +191,7 @@ export default class CreateInvite extends Component {
get canInviteToGroup() {
return (
this.currentUser.staff ||
- this.currentUser.groups.some((g) => g.group_user?.owner)
+ this.currentUser.visibleGroups.some((g) => g.group_user?.owner)
);
}
diff --git a/frontend/discourse/app/models/topic.js b/frontend/discourse/app/models/topic.js
index 0d158f48d81..8c5fdc6a6f6 100644
--- a/frontend/discourse/app/models/topic.js
+++ b/frontend/discourse/app/models/topic.js
@@ -918,7 +918,7 @@ export default class Topic extends RestModel {
if (
opts.force_destroy ||
(!deleted_by.staff &&
- !deleted_by.groups.some((group) =>
+ !deleted_by.visibleGroups.some((group) =>
this.category?.moderating_group_ids?.includes(group.id)
) &&
!deleted_by.can_delete_all_posts_and_topics)
diff --git a/frontend/discourse/app/models/user.js b/frontend/discourse/app/models/user.js
index 80763e2eb88..93750750461 100644
--- a/frontend/discourse/app/models/user.js
+++ b/frontend/discourse/app/models/user.js
@@ -201,8 +201,18 @@ export default class User extends RestModel.extend(Evented) {
if (userJson) {
userJson.isCurrent = true;
+ // Calling user.groups is deprecated, see discourse.user.groups,
+ // it is replaced by visibleGroups
+ if (
+ !Object.hasOwn(userJson, "visibleGroups") &&
+ Object.hasOwn(userJson, "groups")
+ ) {
+ userJson.visibleGroups = userJson.groups;
+ delete userJson.groups;
+ }
+
if (userJson.primary_group_id) {
- const primaryGroup = userJson.groups.find(
+ const primaryGroup = userJson.visibleGroups.find(
(group) => group.id === userJson.primary_group_id
);
if (primaryGroup) {
@@ -343,9 +353,11 @@ export default class User extends RestModel.extend(Evented) {
return this.sidebarTags?.map?.((item) => item.name) ?? [];
}
- @computed("[email protected]_messages")
+ @computed("[email protected]_messages")
get groupsWithMessages() {
- return this.groups?.filter?.((item) => item.has_messages === true) ?? [];
+ return (
+ this.visibleGroups?.filter?.((item) => item.has_messages === true) ?? []
+ );
}
@computed("can_pick_theme_with_custom_homepage")
@@ -416,6 +428,18 @@ export default class User extends RestModel.extend(Evented) {
// prevents staff property to be overridden
set staff(value) {}
+ get groups() {
+ deprecated(
+ "Calling user.groups is deprecated, use user.visibleGroups instead, it more accurately reflects what this array of groups represents, not all of the user's group memberships may be serialized to the client. For permission checks, check the user's groups server-side and add an attribute to the User/CurrentUserSerializer, or use `resolve_group_memberships: true` for theme settings.",
+ {
+ id: "discourse.user.groups",
+ since: "2026.8.0-latest.1",
+ url: "https://meta.discourse.org/t/-/411124",
+ }
+ );
+ return this.visibleGroups;
+ }
+
@computed("has_unseen_features")
get hasUnseenFeatures() {
return this.staff && this.get("has_unseen_features");
@@ -524,7 +548,7 @@ export default class User extends RestModel.extend(Evented) {
return userPath(`${username}/messages`);
} else if (groups) {
const firstAllowedGroup = groups.find((allowedGroup) =>
- this.groups.some((userGroup) => userGroup.id === allowedGroup.id)
+ this.visibleGroups.some((userGroup) => userGroup.id === allowedGroup.id)
);
if (firstAllowedGroup) {
@@ -903,9 +927,9 @@ export default class User extends RestModel.extend(Evented) {
);
}
- @computed("groups.[]")
+ @computed("visibleGroups.[]")
get filteredGroups() {
- const groups = this.groups || [];
+ const groups = this.visibleGroups || [];
return groups.filter((group) => {
return !group.automatic || group.id === AUTO_GROUPS.moderators.id;
@@ -973,16 +997,13 @@ export default class User extends RestModel.extend(Evented) {
);
}
- if (!isEmpty(json.user.groups) && !isEmpty(json.user.group_users)) {
- const groups = [];
-
- for (let i = 0; i < json.user.groups.length; i++) {
- const group = Group.create(json.user.groups[i]);
- group.group_user = json.user.group_users[i];
- groups.push(group);
- }
-
- json.user.groups = groups;
+ if (Object.hasOwn(json.user, "groups")) {
+ json.user.visibleGroups = json.user.groups.map((groupJson, index) => {
+ const group = Group.create(groupJson);
+ group.group_user = json.user.group_users?.[index];
+ return group;
+ });
+ delete json.user.groups;
}
if (json.user.invited_by) {
@@ -1301,11 +1322,11 @@ export default class User extends RestModel.extend(Evented) {
return group.get("can_admin_group") || group.get("is_group_owner");
}
- @computed("[email protected]", "badges.[]")
+ @computed("[email protected]", "badges.[]")
get availableTitles() {
const titles = [];
- (this.groups || []).forEach((group) => {
+ (this.visibleGroups || []).forEach((group) => {
if (get(group, "title")) {
titles.push(get(group, "title"));
}
@@ -1327,12 +1348,12 @@ export default class User extends RestModel.extend(Evented) {
});
}
- @computed("groups.[]")
+ @computed("visibleGroups.[]")
get availableFlairs() {
const flairs = [];
- if (this.groups) {
- this.groups.forEach((group) => {
+ if (this.visibleGroups) {
+ this.visibleGroups.forEach((group) => {
if (group.flair_url) {
flairs.push({
id: group.id,
@@ -1573,6 +1594,11 @@ User.reopenClass({
args = args || {};
this.deleteStatusTrackingFields(args);
+ if (Object.hasOwn(args, "groups")) {
+ args.visibleGroups = args.groups;
+ delete args.groups;
+ }
+
return this._super(args);
},
diff --git a/frontend/discourse/app/routes/user-private-messages/group.js b/frontend/discourse/app/routes/user-private-messages/group.js
index ed934f3c992..36bdeeca497 100644
--- a/frontend/discourse/app/routes/user-private-messages/group.js
+++ b/frontend/discourse/app/routes/user-private-messages/group.js
@@ -6,7 +6,7 @@ export default class extends DiscourseRoute {
model(params) {
return this.modelFor("user")
- .get("groups")
+ .get("visibleGroups")
.find((group) => {
return group.name.toLowerCase() === params.name.toLowerCase();
});
diff --git a/frontend/discourse/app/services/pm-topic-tracking-state.js b/frontend/discourse/app/services/pm-topic-tracking-state.js
index 843e0ab0c10..89421ca05c3 100644
--- a/frontend/discourse/app/services/pm-topic-tracking-state.js
+++ b/frontend/discourse/app/services/pm-topic-tracking-state.js
@@ -153,7 +153,7 @@ class PrivateMessageTopicTrackingState extends Service {
@bind
_isPersonal(topic) {
- const groups = this.currentUser?.groups;
+ const groups = this.currentUser?.visibleGroups;
if (!groups || groups.length === 0) {
return true;
@@ -166,7 +166,7 @@ class PrivateMessageTopicTrackingState extends Service {
@bind
_isGroup(topic, activeGroupName) {
- return this.currentUser.groups.some((group) => {
+ return this.currentUser.visibleGroups.some((group) => {
return (
group.name === (activeGroupName || this.activeGroup.name) &&
topic.group_ids?.includes(group.id)
@@ -237,7 +237,7 @@ class PrivateMessageTopicTrackingState extends Service {
this._displayMessageForGroupInbox(message) ||
(this.inbox === "user" &&
(message.payload.group_ids.length === 0 ||
- this.currentUser.groups.filter((group) => {
+ this.currentUser.visibleGroups.filter((group) => {
return message.payload.group_ids.includes(group.id);
}).length === 0))
);
diff --git a/frontend/discourse/tests/acceptance/admin-onboarding-banner-test.gjs b/frontend/discourse/tests/acceptance/admin-onboarding-banner-test.gjs
index 273ad531e1b..d3ee1ba939d 100644
--- a/frontend/discourse/tests/acceptance/admin-onboarding-banner-test.gjs
+++ b/frontend/discourse/tests/acceptance/admin-onboarding-banner-test.gjs
@@ -134,7 +134,7 @@ acceptance("Admin - Onboarding Banner", function (needs) {
needs.user({
admin: true,
- groups: [AUTO_GROUPS.admins],
+ visibleGroups: [AUTO_GROUPS.admins],
show_site_owner_onboarding: true,
});
@@ -585,7 +585,7 @@ acceptance("Admin - Onboarding Banner", function (needs) {
acceptance("Admin - Onboarding Banner - admin invites", function (needs) {
needs.user({
admin: true,
- groups: [AUTO_GROUPS.admins],
+ visibleGroups: [AUTO_GROUPS.admins],
show_site_owner_onboarding: true,
can_create_admin_invite: true,
});
@@ -664,7 +664,7 @@ acceptance("Admin - Onboarding Banner - non admin user", function (needs) {
acceptance("Admin - Onboarding Banner - setting disabled", function (needs) {
needs.user({
admin: true,
- groups: [AUTO_GROUPS.admins],
+ visibleGroups: [AUTO_GROUPS.admins],
});
needs.settings({
enable_site_owner_onboarding: false,
diff --git a/frontend/discourse/tests/acceptance/admin-sidebar-section-test.js b/frontend/discourse/tests/acceptance/admin-sidebar-section-test.js
index 83c046eadbe..9a5212402af 100644
--- a/frontend/discourse/tests/acceptance/admin-sidebar-section-test.js
+++ b/frontend/discourse/tests/acceptance/admin-sidebar-section-test.js
@@ -15,7 +15,7 @@ import I18n from "discourse-i18n";
acceptance("Admin Sidebar - Sections", function (needs) {
needs.user({
admin: true,
- groups: [AUTO_GROUPS.admins],
+ visibleGroups: [AUTO_GROUPS.admins],
});
let _originalTestTranslations;
@@ -218,7 +218,7 @@ acceptance("Admin Sidebar - Sections", function (needs) {
acceptance("Admin Sidebar - Sections - Plugin API", function (needs) {
needs.user({
admin: true,
- groups: [AUTO_GROUPS.admins],
+ visibleGroups: [AUTO_GROUPS.admins],
});
needs.hooks.beforeEach(() => {
@@ -337,7 +337,7 @@ acceptance("Admin Sidebar - Sections - Plugin API", function (needs) {
acceptance("Admin Sidebar - Plugin Icons", function (needs) {
needs.user({
admin: true,
- groups: [AUTO_GROUPS.admins],
+ visibleGroups: [AUTO_GROUPS.admins],
});
needs.hooks.beforeEach(() => {
@@ -425,7 +425,7 @@ acceptance(
function (needs) {
needs.user({
admin: true,
- groups: [AUTO_GROUPS.admins],
+ visibleGroups: [AUTO_GROUPS.admins],
});
needs.hooks.beforeEach(() => {
diff --git a/frontend/discourse/tests/acceptance/composer-actions-test.js b/frontend/discourse/tests/acceptance/composer-actions-test.js
index b3667579996..83b47a29679 100644
--- a/frontend/discourse/tests/acceptance/composer-actions-test.js
+++ b/frontend/discourse/tests/acceptance/composer-actions-test.js
@@ -305,7 +305,7 @@ acceptance("Composer Actions", function (needs) {
admin: false,
trust_level: 3,
whisperer: false,
- groups: [{ id: 13, name: "tl3_group" }],
+ visibleGroups: [{ id: 13, name: "tl3_group" }],
});
await visit("/t/internationalization-localization/280");
await click("article#post_3 button.reply");
@@ -326,7 +326,7 @@ acceptance("Composer Actions", function (needs) {
admin: false,
trust_level: 4,
whisperer: false,
- groups: [{ id: 13, name: "tl4_group" }],
+ visibleGroups: [{ id: 13, name: "tl4_group" }],
});
await visit("/t/internationalization-localization/280");
await click("article#post_3 button.reply");
diff --git a/frontend/discourse/tests/acceptance/design-wizard-test.gjs b/frontend/discourse/tests/acceptance/design-wizard-test.gjs
index 1682e5afc0b..e9949c655b1 100644
--- a/frontend/discourse/tests/acceptance/design-wizard-test.gjs
+++ b/frontend/discourse/tests/acceptance/design-wizard-test.gjs
@@ -55,7 +55,7 @@ acceptance("Design wizard - admin launch", function (needs) {
needs.user({
admin: true,
- groups: [AUTO_GROUPS.admins],
+ visibleGroups: [AUTO_GROUPS.admins],
can_run_design_wizard: true,
});
@@ -221,7 +221,7 @@ acceptance("Design wizard - customized site", function (needs) {
// past what the wizard can express
needs.user({
admin: true,
- groups: [AUTO_GROUPS.admins],
+ visibleGroups: [AUTO_GROUPS.admins],
can_run_design_wizard: false,
});
diff --git a/frontend/discourse/tests/acceptance/header-api-test.gjs b/frontend/discourse/tests/acceptance/header-api-test.gjs
index 91d284ce02e..1a14edb8600 100644
--- a/frontend/discourse/tests/acceptance/header-api-test.gjs
+++ b/frontend/discourse/tests/acceptance/header-api-test.gjs
@@ -82,7 +82,7 @@ acceptance("Header API - anonymous", function (needs) {
});
acceptance("Glimmer Header API - authenticated", function (needs) {
- needs.user({ groups: AUTO_GROUPS.everyone });
+ needs.user({ visibleGroups: AUTO_GROUPS.everyone });
test("can add buttons to the header", async function (assert) {
withPluginApi((api) => {
diff --git a/frontend/discourse/tests/acceptance/preferences-test.js b/frontend/discourse/tests/acceptance/preferences-test.js
index 93cee73241a..e2082f3e8d9 100644
--- a/frontend/discourse/tests/acceptance/preferences-test.js
+++ b/frontend/discourse/tests/acceptance/preferences-test.js
@@ -182,7 +182,7 @@ acceptance("Ignored users", function (needs) {
moderator: false,
admin: false,
can_ignore_users: false,
- groups: [
+ visibleGroups: [
{
id: 10,
name: "trust_level_0",
diff --git a/frontend/discourse/tests/acceptance/user-menu-test.js b/frontend/discourse/tests/acceptance/user-menu-test.js
index 7b831abfc61..6f8b32748f8 100644
--- a/frontend/discourse/tests/acceptance/user-menu-test.js
+++ b/frontend/discourse/tests/acceptance/user-menu-test.js
@@ -566,7 +566,7 @@ acceptance("User menu", function (needs) {
is_anonymous: false,
can_post_anonymously: false,
trust_level: 2,
- groups: [
+ visibleGroups: [
AUTO_GROUPS.trust_level_0,
AUTO_GROUPS.trust_level_1,
AUTO_GROUPS.trust_level_2,
@@ -591,7 +591,7 @@ acceptance("User menu", function (needs) {
is_anonymous: true,
trust_level: 2,
can_post_anonymously: true,
- groups: [
+ visibleGroups: [
AUTO_GROUPS.trust_level_0,
AUTO_GROUPS.trust_level_1,
AUTO_GROUPS.trust_level_2,
@@ -609,7 +609,7 @@ acceptance("User menu", function (needs) {
is_anonymous: true,
can_post_anonymously: true,
trust_level: 4,
- groups: [
+ visibleGroups: [
AUTO_GROUPS.trust_level_0,
AUTO_GROUPS.trust_level_1,
AUTO_GROUPS.trust_level_2,
@@ -631,7 +631,7 @@ acceptance("User menu", function (needs) {
is_anonymous: false,
can_post_anonymously: false,
trust_level: 2,
- groups: [
+ visibleGroups: [
AUTO_GROUPS.trust_level_0,
AUTO_GROUPS.trust_level_1,
AUTO_GROUPS.trust_level_2,
diff --git a/frontend/discourse/tests/acceptance/user-private-messages-test.js b/frontend/discourse/tests/acceptance/user-private-messages-test.js
index 773fcd1b40a..b3dae1b160b 100644
--- a/frontend/discourse/tests/acceptance/user-private-messages-test.js
+++ b/frontend/discourse/tests/acceptance/user-private-messages-test.js
@@ -60,7 +60,7 @@ function withGroupMessagesSetup(needs) {
needs.user({
id: 5,
username: "charlie",
- groups: [{ id: 14, name: "awesome_group", has_messages: true }],
+ visibleGroups: [{ id: 14, name: "awesome_group", has_messages: true }],
});
needs.site({
diff --git a/frontend/discourse/tests/integration/components/user-menu/menu-test.gjs b/frontend/discourse/tests/integration/components/user-menu/menu-test.gjs
index bdef57dd12f..3cfe0d6e673 100644
--- a/frontend/discourse/tests/integration/components/user-menu/menu-test.gjs
+++ b/frontend/discourse/tests/integration/components/user-menu/menu-test.gjs
@@ -108,7 +108,7 @@ module("Integration | Component | UserMenu", function (hooks) {
test("messages tab isn't shown if current user does not have can_send_private_messages permission", async function (assert) {
this.currentUser.set("moderator", false);
this.currentUser.set("admin", false);
- this.currentUser.set("groups", []);
+ this.currentUser.set("visibleGroups", []);
this.currentUser.set("can_send_private_messages", false);
await render(<template><Menu /></template>);
@@ -128,7 +128,7 @@ module("Integration | Component | UserMenu", function (hooks) {
test("messages tab is shown if user has can_send_private_messages permission", async function (assert) {
this.currentUser.set("moderator", true);
this.currentUser.set("admin", false);
- this.currentUser.set("groups", []);
+ this.currentUser.set("visibleGroups", []);
this.currentUser.set("can_send_private_messages", true);
await render(<template><Menu /></template>);
diff --git a/frontend/discourse/tests/unit/models/user-test.js b/frontend/discourse/tests/unit/models/user-test.js
index 57ade174159..6e89cce278a 100644
--- a/frontend/discourse/tests/unit/models/user-test.js
+++ b/frontend/discourse/tests/unit/models/user-test.js
@@ -237,7 +237,7 @@ module("Unit | Model | user", function (hooks) {
allowed_users: [user],
allowed_groups: [group1, group2],
};
- user.groups = [group2];
+ user.visibleGroups = [group2];
assert.strictEqual(
user.pmPath(topic),
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat.js b/plugins/chat/assets/javascripts/discourse/services/chat.js
index cdf99e49255..565f5da9c2f 100644
--- a/plugins/chat/assets/javascripts/discourse/services/chat.js
+++ b/plugins/chat/assets/javascripts/discourse/services/chat.js
@@ -109,7 +109,7 @@ export default class Chat extends Service {
this._activeChannel = channel;
}
- @computed("currentUser.staff", "currentUser.groups.[]")
+ @computed("currentUser.staff")
get userCanDirectMessage() {
if (!this.currentUser) {
return false;
diff --git a/plugins/discourse-adplugin/test/javascripts/acceptance/adsense-test.js b/plugins/discourse-adplugin/test/javascripts/acceptance/adsense-test.js
index b8437ff308c..71a29b25b01 100644
--- a/plugins/discourse-adplugin/test/javascripts/acceptance/adsense-test.js
+++ b/plugins/discourse-adplugin/test/javascripts/acceptance/adsense-test.js
@@ -46,7 +46,7 @@ acceptance(`AdSense`, function (needs) {
updateCurrentUser({
staff: false,
trust_level: 1,
- groups: [AUTO_GROUPS.trust_level_1],
+ visibleGroups: [AUTO_GROUPS.trust_level_1],
show_adsense_ads: true,
show_to_groups: true,
});
@@ -77,7 +77,7 @@ acceptance(`AdSense`, function (needs) {
updateCurrentUser({
staff: false,
trust_level: 3,
- groups: [AUTO_GROUPS.trust_level_3],
+ visibleGroups: [AUTO_GROUPS.trust_level_3],
});
await visit("/t/280");
assert
@@ -89,7 +89,7 @@ acceptance(`AdSense`, function (needs) {
updateCurrentUser({
staff: false,
trust_level: 1,
- groups: [groupFixtures["/groups/discourse.json"].group],
+ visibleGroups: [groupFixtures["/groups/discourse.json"].group],
});
await visit("/t/280");
assert
diff --git a/plugins/discourse-adplugin/test/javascripts/acceptance/dfp-test.js b/plugins/discourse-adplugin/test/javascripts/acceptance/dfp-test.js
index b3c2adf07d5..09316ea805c 100644
--- a/plugins/discourse-adplugin/test/javascripts/acceptance/dfp-test.js
+++ b/plugins/discourse-adplugin/test/javascripts/acceptance/dfp-test.js
@@ -70,7 +70,7 @@ acceptance(`DFP Ads`, function (needs) {
updateCurrentUser({
staff: false,
trust_level: 3,
- groups: [
+ visibleGroups: [
AUTO_GROUPS.trust_level_1,
AUTO_GROUPS.trust_level_2,
AUTO_GROUPS.trust_level_3,
@@ -86,7 +86,7 @@ acceptance(`DFP Ads`, function (needs) {
updateCurrentUser({
staff: false,
trust_level: 1,
- groups: [groupFixtures["/groups/discourse.json"].group],
+ visibleGroups: [groupFixtures["/groups/discourse.json"].group],
});
await visit("/t/280");
assert
diff --git a/plugins/discourse-ai/test/javascripts/acceptance/post-helper-menu-test.js b/plugins/discourse-ai/test/javascripts/acceptance/post-helper-menu-test.js
index a0b2a8a5d50..2f22830d164 100644
--- a/plugins/discourse-ai/test/javascripts/acceptance/post-helper-menu-test.js
+++ b/plugins/discourse-ai/test/javascripts/acceptance/post-helper-menu-test.js
@@ -26,7 +26,7 @@ acceptance("Post Helper Menu", function (needs) {
needs.user({
admin: true,
moderator: true,
- groups: [AUTO_GROUPS.admins],
+ visibleGroups: [AUTO_GROUPS.admins],
can_use_assistant_in_post: true,
ai_helper_prompts: aiHelperPrompts,
trust_level: 4,
diff --git a/plugins/poll/assets/javascripts/discourse/components/poll.gjs b/plugins/poll/assets/javascripts/discourse/components/poll.gjs
index 9f58346a490..60c0110b127 100644
--- a/plugins/poll/assets/javascripts/discourse/components/poll.gjs
+++ b/plugins/poll/assets/javascripts/discourse/components/poll.gjs
@@ -68,7 +68,9 @@ export default class PollComponent extends Component {
}
const userGroups =
- user && user.groups && user.groups.map((g) => g.name.toLowerCase());
+ user &&
+ user.visibleGroups &&
+ user.visibleGroups.map((g) => g.name.toLowerCase());
return userGroups && pollGroups.some((g) => userGroups.includes(g));
};