Skip to content

fix(discord): Update permission guild ID handling and enhance fallback logic in tests #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mergify merged 1 commit into from
May 8, 2026
Merged

fix(discord): Update permission guild ID handling and enhance fallback logic in tests #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ services:
MONGO_AUTH_SOURCE: ${MONGO_AUTH_SOURCE:-mqtt}
MONGO_URL: ${MONGO_URL:-}
MONGO_DB_NAME: ${MONGO_DB_NAME:-mqtt}
HUBOT_DISCORD_PERMISSION_GUILD_ID: ${HUBOT_DISCORD_PERMISSION_GUILD_ID:-}
HUBOT_DISCORD_PERMISSION_GUILD_ID: ${MQTT_ADMIN_GUILD_ID:-}
MQTT_ADMIN_GUILD_ID: ${MQTT_ADMIN_GUILD_ID:-}
MQTT_ADMIN_ROLE_IDS: ${MQTT_ADMIN_ROLE_IDS:-}
extra_hosts:
Expand Down
12 changes: 6 additions & 6 deletions scripts/lib/discord-role-permissions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ function hasAnyRole(roleCollection, roleIds) {

function getPermissionGuildId(context) {
const rawMessage = getRawMessageFromContext(context);
return String(
process.env.HUBOT_DISCORD_PERMISSION_GUILD_ID
?? process.env.MQTT_ADMIN_GUILD_ID
?? rawMessage?.guildId
?? "",
).trim();
return [
process.env.MQTT_ADMIN_GUILD_ID,
rawMessage?.guildId,
]
.map((value) => String(value ?? "").trim())
.find(Boolean) ?? "";
}

export function createDiscordRolePermissionProvider(robot) {
Expand Down
15 changes: 15 additions & 0 deletions test/discord-role-permissions.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,21 @@ test("Discord role permission provider fetches configured guild membership for D
assert.equal(await provider.hasRole(null, ["env:MQTT_ADMIN_ROLE_IDS"], createContext({ guildId: null })), true);
});

test("Discord role permission provider falls back when permission guild env is empty", async () => {
process.env.HUBOT_DISCORD_PERMISSION_GUILD_ID = "";
process.env.MQTT_ADMIN_GUILD_ID = "929659839196561419";
process.env.MQTT_ADMIN_ROLE_IDS = "1";
const robot = createRobot();
robot.fetchedGuildMembers.set("505598218306977793", {
roles: {
cache: new Map([["1", { id: "1" }]]),
},
});
const provider = createDiscordRolePermissionProvider(robot);

assert.equal(await provider.hasRole(null, ["env:MQTT_ADMIN_ROLE_IDS"], createContext({ guildId: null })), true);
});

test("installDiscordRolePermissionProvider installs provider once", () => {
const robot = createRobot();

Expand Down
Loading