diff --git a/packages/tagscript-plugin-discord/tests/Structures/Structures.ts b/packages/tagscript-plugin-discord/tests/Structures/Structures.ts index 1b2db74e..919a2645 100644 --- a/packages/tagscript-plugin-discord/tests/Structures/Structures.ts +++ b/packages/tagscript-plugin-discord/tests/Structures/Structures.ts @@ -7,6 +7,7 @@ import { GuildMember, GuildMemberFlags, InteractionType, + Locale, Role, RoleFlags, TextChannel, @@ -43,7 +44,12 @@ const roleObject: APIRole = { permissions: '8', managed: false, mentionable: false, - flags: RoleFlags.InPrompt + flags: RoleFlags.InPrompt, + colors: { + primary_color: 0, + secondary_color: 0, + tertiary_color: 0 + } }; const everyoneRoleObject: APIRole = { @@ -57,7 +63,12 @@ const everyoneRoleObject: APIRole = { permissions: '0', managed: false, mentionable: false, - flags: RoleFlags.InPrompt + flags: RoleFlags.InPrompt, + colors: { + primary_color: 0, + secondary_color: 0, + tertiary_color: 0 + } }; const guildObject = { @@ -232,16 +243,15 @@ const interactionObject: APIApplicationCommandInteraction = { user: userObject, token: '', version: 1, - locale: 'en-US', - guild_locale: 'en-US', + locale: Locale.EnglishUS, + guild_locale: Locale.EnglishUS, entitlements: [], app_permissions: '8', channel: channelObject, - authorizing_integration_owners: {} + authorizing_integration_owners: {}, + attachment_size_limit: 8_388_608 }; -/* eslint-disable @typescript-eslint/no-unsafe-assignment */ - // @ts-expect-error(2674) using protected constructor to test export const user: User = new User(client, userObject); @@ -262,5 +272,3 @@ export const channel2: TextChannel = new TextChannel(guild, channel2Object, clie // @ts-expect-error(2674) using protected constructor to test export const interaction: ChatInputCommandInteraction = new ChatInputCommandInteraction(client, interactionObject); - -/* eslint-enable @typescript-eslint/no-unsafe-assignment */ diff --git a/packages/tagscript-plugin-discord/tests/Transformer/User.test.ts b/packages/tagscript-plugin-discord/tests/Transformer/User.test.ts index 6a98d037..a92fb389 100644 --- a/packages/tagscript-plugin-discord/tests/Transformer/User.test.ts +++ b/packages/tagscript-plugin-discord/tests/Transformer/User.test.ts @@ -11,7 +11,7 @@ describe('UserTransformer', () => { expect((await ts.run('{user(username)}', { user: new UserTransformer(user) })).body).toBe('parbez'); expect((await ts.run('{user(a)}', { user: new UserTransformer(user) })).body).toBe('{user(a)}'); expect((await ts.run('{user(b)}', { user: new UserTransformer(user, { b: (user) => user.defaultAvatarURL }) })).body).toBe( - 'https://cdn.discordapp.com/embed/avatars/0.png' + 'https://cdn.discordapp.com/embed/avatars/3.png' ); }); diff --git a/packages/tagscript-plugin-discord/tests/Transformer/__snapshots__/GuildMember.test.ts.snap b/packages/tagscript-plugin-discord/tests/Transformer/__snapshots__/GuildMember.test.ts.snap index bc687eb9..2925933e 100644 --- a/packages/tagscript-plugin-discord/tests/Transformer/__snapshots__/GuildMember.test.ts.snap +++ b/packages/tagscript-plugin-discord/tests/Transformer/__snapshots__/GuildMember.test.ts.snap @@ -20,7 +20,7 @@ exports[`MemberTransformer > should match the snapshot 1`] = ` "roleIds": "933378013154906142, 933368398996447292", "roleNames": "., @everyone", "roles": "<@&933378013154906142> @everyone", - "tag": "parbez#0000", + "tag": "parbez", "timeoutUntil": "", "timeoutUntilTimestamp": null, "topRole": ".", diff --git a/packages/tagscript-plugin-discord/tests/Transformer/__snapshots__/User.test.ts.snap b/packages/tagscript-plugin-discord/tests/Transformer/__snapshots__/User.test.ts.snap index f9abd800..b3d06ff6 100644 --- a/packages/tagscript-plugin-discord/tests/Transformer/__snapshots__/User.test.ts.snap +++ b/packages/tagscript-plugin-discord/tests/Transformer/__snapshots__/User.test.ts.snap @@ -12,7 +12,7 @@ exports[`UserTransformer > should match the snapshot 1`] = ` "id": "758880890159235083", "mention": "<@758880890159235083>", "name": "", - "tag": "parbez#0000", + "tag": "parbez", "username": "parbez", } `; diff --git a/packages/tagscript/src/lib/Utils/Util.ts b/packages/tagscript/src/lib/Utils/Util.ts index f9204e80..0eecf6e1 100644 --- a/packages/tagscript/src/lib/Utils/Util.ts +++ b/packages/tagscript/src/lib/Utils/Util.ts @@ -19,6 +19,7 @@ export const escapeRegex = /(?[():{|}])/g; */ export const asyncFilter = async (values: T[], fn: (t: T) => Awaitable) => { const promises = values.map(fn); + // eslint-disable-next-line @typescript-eslint/await-thenable const booleans = await Promise.all(promises); return values.filter((_, index) => booleans[index]); };