Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 18 additions & 6 deletions src/utils/commandComparing.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,28 @@
function normalizeDefaultMemberPermissions(value) {
if (value == null) return null;

if (typeof value === "object" && "bitfield" in value) {
return value.bitfield.toString();
}

return String(value);
}

module.exports = (existing, local) => {
const changed = (a, b) => JSON.stringify(a) !== JSON.stringify(b);

if (changed(existing.name, local.data.name) || changed(existing.description || undefined, local.data.description || undefined)) {
return true;
};

if (
changed(
existing.default_member_permissions ?? null,
local.data.default_member_permissions ?? null
)
) {
const existingPermissions = normalizeDefaultMemberPermissions(
existing.defaultMemberPermissions ?? existing.default_member_permissions
);
const localPermissions = normalizeDefaultMemberPermissions(
local.data.default_member_permissions ?? local.data.defaultMemberPermissions
);

if (changed(existingPermissions, localPermissions)) {
return true;
}

Expand Down
63 changes: 63 additions & 0 deletions tests/command-comparing.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
const { test } = require("node:test");
const assert = require("node:assert");
const commandComparing = require("../src/utils/commandComparing");
const {
PermissionFlagsBits,
PermissionsBitField,
SlashCommandBuilder,
} = require("discord.js");

function makeLocalCommand(permission) {
return {
data: new SlashCommandBuilder()
.setName("ban")
.setDescription("Ban a user")
.setDefaultMemberPermissions(permission)
.toJSON(),
};
}

test("commandComparing treats matching discord.js permissions as unchanged", () => {
const local = makeLocalCommand(PermissionFlagsBits.BanMembers);
const existing = {
name: "ban",
description: "Ban a user",
options: [],
defaultMemberPermissions: new PermissionsBitField(
PermissionFlagsBits.BanMembers
).freeze(),
};

assert.strictEqual(commandComparing(existing, local), false);
});

test("commandComparing detects default_member_permissions changes", () => {
const local = makeLocalCommand(PermissionFlagsBits.BanMembers);
const existing = {
name: "ban",
description: "Ban a user",
options: [],
defaultMemberPermissions: new PermissionsBitField(
PermissionFlagsBits.KickMembers
).freeze(),
};

assert.strictEqual(commandComparing(existing, local), true);
});

test("commandComparing treats null and missing permissions as equivalent", () => {
const local = {
data: new SlashCommandBuilder()
.setName("ping")
.setDescription("Ping")
.toJSON(),
};
const existing = {
name: "ping",
description: "Ping",
options: [],
defaultMemberPermissions: null,
};

assert.strictEqual(commandComparing(existing, local), false);
});