Skip to content

[codex] fix unordered application command arrays #866

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

Draft
valipuha wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[codex] fix unordered application command arrays #866

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
12 changes: 7 additions & 5 deletions src/lib/utils/application-commands/compute-differences/contexts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,26 @@ export function* checkInteractionContextTypes(
}
// 2. Maybe changes in order or additions, log
else if (newContexts?.length) {
const sortedExistingContexts = [...existingContexts!].sort((first, second) => first - second);
const sortedNewContexts = [...newContexts].sort((first, second) => first - second);
let index = 0;

for (const newContext of newContexts) {
for (const newContext of sortedNewContexts) {
const currentIndex = index++;

if (existingContexts![currentIndex] !== newContext) {
if (sortedExistingContexts[currentIndex] !== newContext) {
yield {
key: `contexts[${currentIndex}]`,
original: `contexts type ${existingContexts?.[currentIndex]}`,
original: `contexts type ${sortedExistingContexts[currentIndex]}`,
expected: `contexts type ${newContext}`
};
}
}

if (index < existingContexts!.length) {
if (index < sortedExistingContexts.length) {
let type: InteractionContextType;

while ((type = existingContexts![index]) !== undefined) {
while ((type = sortedExistingContexts[index]) !== undefined) {
yield {
key: `contexts[${index}]`,
original: `context ${type} present`,
Expand Down
12 changes: 7 additions & 5 deletions src/lib/utils/application-commands/compute-differences/integration_types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,26 @@ export function* checkIntegrationTypes(
}
// 2. Maybe changes in order or additions, log
else if (newIntegrationTypes?.length) {
const sortedExistingIntegrationTypes = [...existingIntegrationTypes!].sort((first, second) => first - second);
const sortedNewIntegrationTypes = [...newIntegrationTypes].sort((first, second) => first - second);
let index = 0;

for (const newIntegrationType of newIntegrationTypes) {
for (const newIntegrationType of sortedNewIntegrationTypes) {
const currentIndex = index++;

if (existingIntegrationTypes![currentIndex] !== newIntegrationType) {
if (sortedExistingIntegrationTypes[currentIndex] !== newIntegrationType) {
yield {
key: `integrationTypes[${currentIndex}]`,
original: `integration type ${existingIntegrationTypes?.[currentIndex]}`,
original: `integration type ${sortedExistingIntegrationTypes[currentIndex]}`,
expected: `integration type ${newIntegrationType}`
};
}
}

if (index < existingIntegrationTypes!.length) {
if (index < sortedExistingIntegrationTypes.length) {
let type: ApplicationIntegrationType;

while ((type = existingIntegrationTypes![index]) !== undefined) {
while ((type = sortedExistingIntegrationTypes[index]) !== undefined) {
yield {
key: `integrationTypes[${index}]`,
original: `integration type ${type} present`,
Expand Down
34 changes: 33 additions & 1 deletion tests/application-commands/computeDifferences.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ApplicationCommandOptionType, ApplicationCommandType, type RESTPostAPIChatInputApplicationCommandsJSONBody } from 'discord-api-types/v10';
import { ChannelType } from 'discord.js';
import { ApplicationIntegrationType, ChannelType, InteractionContextType } from 'discord.js';
import { getCommandDifferences as getCommandDifferencesRaw } from '../../src/lib/utils/application-commands/computeDifferences';

function getCommandDifferences(...args: Parameters<typeof getCommandDifferencesRaw>) {
Expand Down Expand Up @@ -59,6 +59,38 @@ describe('Compute differences for provided application commands', () => {
expect(getCommandDifferences(command1, command2, false)).toEqual([]);
});

test('GIVEN two commands with the same integration types in a different order THEN do not return any difference', () => {
const command1: RESTPostAPIChatInputApplicationCommandsJSONBody = {
description: 'description 1',
name: 'command1',
integration_types: [ApplicationIntegrationType.UserInstall, ApplicationIntegrationType.GuildInstall]
};

const command2: RESTPostAPIChatInputApplicationCommandsJSONBody = {
description: 'description 1',
name: 'command1',
integration_types: [ApplicationIntegrationType.GuildInstall, ApplicationIntegrationType.UserInstall]
};

expect(getCommandDifferences(command1, command2, false)).toEqual([]);
});

test('GIVEN two commands with the same contexts in a different order THEN do not return any difference', () => {
const command1: RESTPostAPIChatInputApplicationCommandsJSONBody = {
description: 'description 1',
name: 'command1',
contexts: [InteractionContextType.PrivateChannel, InteractionContextType.Guild]
};

const command2: RESTPostAPIChatInputApplicationCommandsJSONBody = {
description: 'description 1',
name: 'command1',
contexts: [InteractionContextType.Guild, InteractionContextType.PrivateChannel]
};

expect(getCommandDifferences(command1, command2, false)).toEqual([]);
});

test('GIVEN 2 different descriptions THEN return the difference', () => {
const command1: RESTPostAPIChatInputApplicationCommandsJSONBody = {
description: 'description 1',
Expand Down