Skip to content

Commit

Permalink
feat(unicode): add pagination
Browse files Browse the repository at this point in the history
  • Loading branch information
kyranet committed Nov 1, 2024
1 parent adb7ae5 commit ddafb15
Show file tree
Hide file tree
Showing 10 changed files with 325 additions and 218 deletions.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@
"main": "dist/main.js",
"type": "module",
"imports": {
"#lib/*": "./dist/lib/*.js",
"#lib/structures": "./dist/lib/structures/index.js",
"#lib/unicode": "./dist/lib/utilities/unicode/index.js",
"#lib/*": "./dist/lib/*.js",
"#generated/*": "./src/generated/*"
},
"scripts": {
Expand Down
194 changes: 19 additions & 175 deletions src/commands/unicode.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import { EmbedColors } from '#lib/common/constants';
import { LanguageKeys } from '#lib/i18n/LanguageKeys';
import { BidirectionalCategory, Category, Class, SearchCategory, getUnicode, searchUnicode } from '#lib/utilities/unicode';
import { EmbedBuilder, bold, inlineCode, italic } from '@discordjs/builders';
import { isNullish } from '@sapphire/utilities';
import { Command, RegisterCommand, RegisterSubcommand } from '@skyra/http-framework';
import {
applyLocalizedBuilder,
createSelectMenuChoiceName,
getSupportedUserLanguageT,
type TFunction,
type TypedT
} from '@skyra/http-framework-i18n';
BidirectionalCategory,
Class,
SearchCategory,
UnicodeBidirectionalCategoryKeyMapper,
UnicodeClassKeyMapper,
getSelectMenuComponents,
getUnicodeInformationEmbeds,
searchUnicode
} from '#lib/unicode';
import { Command, RegisterCommand, RegisterSubcommand } from '@skyra/http-framework';
import { applyLocalizedBuilder, createSelectMenuChoiceName, getSupportedUserLanguageT } from '@skyra/http-framework-i18n';
import { ApplicationIntegrationType, InteractionContextType, MessageFlags } from 'discord-api-types/v10';

const Root = LanguageKeys.Commands.Unicode;
Expand All @@ -28,9 +28,12 @@ export class UserCommand extends Command {
public async inspect(interaction: Command.ChatInputInteraction, options: InspectOptions) {
const ids = [...options.character];
const t = getSupportedUserLanguageT(interaction);
const content = ids.length > 10 ? t(Root.TooManyCharacters) : '';
const embeds = ids.slice(0, 10).map((id) => this.getInformation(t, id));
return interaction.reply({ content, embeds, flags: MessageFlags.Ephemeral });
const content = ids.length > 250 ? t(Root.TooManyCharacters) : '';
const characters = ids.slice(0, 250);

const components = characters.length > 10 ? getSelectMenuComponents(t, characters) : undefined;
const embeds = getUnicodeInformationEmbeds(t, characters.slice(0, 10));
return interaction.reply({ content, embeds, components: components, flags: MessageFlags.Ephemeral });

Check failure on line 36 in src/commands/unicode.ts

View workflow job for this annotation

GitHub Actions / Linting NodeJS

Expected property shorthand
}

@RegisterSubcommand((builder) =>
Expand Down Expand Up @@ -61,13 +64,13 @@ export class UserCommand extends Command {
)
.addNumberOption((builder) =>
applyLocalizedBuilder(builder, Root.OptionsBidirectionalCategory).setChoices(
...Object.entries(UserCommand.UnicodeBidirectionalCategoryKeyMapper) //
...Object.entries(UnicodeBidirectionalCategoryKeyMapper) //
.map(([key, value]) => createSelectMenuChoiceName(value, { value: Number(key) }))
)
)
.addNumberOption((builder) =>
applyLocalizedBuilder(builder, Root.OptionsClass).setChoices(
...Object.entries(UserCommand.UnicodeClassKeyMapper) //
...Object.entries(UnicodeClassKeyMapper) //
.map(([key, value]) => createSelectMenuChoiceName(value, { value: Number(key) }))
)
)
Expand All @@ -91,165 +94,6 @@ export class UserCommand extends Command {
}))
});
}

private getInformation(t: TFunction, character: string) {
const id = character.codePointAt(0)!;
const unicode = getUnicode(id);
const embed = new EmbedBuilder();
const lines = [bold(`${inlineCode(character)}${id.toString(16).toUpperCase().padStart(4, '0')}`)] as string[];

if (isNullish(unicode)) {
embed.setColor(EmbedColors.Error);
lines.push(t(Root.UnknownCharacter));
} else {
embed.setColor(UserCommand.UnicodeCategoryColorMapper[unicode.category]);
lines.push(
t(Root.InformationBasic, {
name: unicode.unicodeName || unicode.name,
category: t(UserCommand.UnicodeCategoryKeyMapper[unicode.category]),
bidirectionalCategory: t(UserCommand.UnicodeBidirectionalCategoryKeyMapper[unicode.bidirectionalCategory]),
class:
unicode.class >= Class.CCC10 && unicode.class <= Class.CCC132
? Class[unicode.class]
: t(UserCommand.UnicodeClassKeyMapper[unicode.class as keyof typeof UserCommand.UnicodeClassKeyMapper])
})
);
if (unicode.value) lines.push(t(Root.InformationValue, { value: unicode.value }));
if (unicode.mirrored) lines.push(t(Root.InformationMirrored));
if (unicode.mapping.base) {
lines.push(t(Root.InformationMappingBase, { value: this.parseMapping(unicode.mapping.base) }));
}
if (unicode.mapping.lowercase) {
lines.push(t(Root.InformationMappingLowercase, { value: this.parseMapping(unicode.mapping.lowercase) }));
}
if (unicode.mapping.uppercase) {
lines.push(t(Root.InformationMappingUppercase, { value: this.parseMapping(unicode.mapping.uppercase) }));
}
if (unicode.comment) lines.push(t(Root.InformationComment, { value: unicode.comment }));
}

return embed.setDescription(lines.join('\n')).toJSON();
}

private parseMapping(mapping: string) {
return mapping
.split(' ')
.map((part) => (part.startsWith('<') ? italic(part) : `${inlineCode(String.fromCodePoint(parseInt(part, 16)))} ${italic(part)}`))
.join(' + ');
}

private static readonly UnicodeCategoryColorMapper = {
[Category.Control]: 0x607d8b,
[Category.Format]: 0x9e9e9e,
[Category.PrivateUse]: 0x9e9e9e,
[Category.Surrogate]: 0x795548,
[Category.LowercaseLetter]: 0x03a9f4,
[Category.ModifierLetter]: 0x03a9f4,
[Category.OtherLetter]: 0x03a9f4,
[Category.TitlecaseLetter]: 0x03a9f4,
[Category.UppercaseLetter]: 0x03a9f4,
[Category.SpacingMark]: 0x009688,
[Category.EnclosingMark]: 0x009688,
[Category.NonspacingMark]: 0x009688,
[Category.DecimalNumber]: 0x3f51b5,
[Category.LetterNumber]: 0x3f51b5,
[Category.OtherNumber]: 0x3f51b5,
[Category.ConnectorPunctuation]: 0x4caf50,
[Category.DashPunctuation]: 0x4caf50,
[Category.ClosePunctuation]: 0x4caf50,
[Category.FinalPunctuation]: 0x4caf50,
[Category.InitialPunctuation]: 0x4caf50,
[Category.OtherPunctuation]: 0x4caf50,
[Category.OpenPunctuation]: 0x4caf50,
[Category.CurrencySymbol]: 0xffeb3b,
[Category.ModifierSymbol]: 0xffeb3b,
[Category.MathSymbol]: 0xffeb3b,
[Category.OtherSymbol]: 0xffeb3b,
[Category.LineSeparator]: 0xff9800,
[Category.ParagraphSeparator]: 0xff9800,
[Category.SpaceSeparator]: 0xff9800
} satisfies Record<Category, number>;

private static readonly UnicodeCategoryKeyMapper = {
[Category.Control]: Root.CategoryControl,
[Category.Format]: Root.CategoryFormat,
[Category.PrivateUse]: Root.CategoryPrivateUse,
[Category.Surrogate]: Root.CategorySurrogate,
[Category.LowercaseLetter]: Root.CategoryLowercaseLetter,
[Category.ModifierLetter]: Root.CategoryModifierLetter,
[Category.OtherLetter]: Root.CategoryOtherLetter,
[Category.TitlecaseLetter]: Root.CategoryTitlecaseLetter,
[Category.UppercaseLetter]: Root.CategoryUppercaseLetter,
[Category.SpacingMark]: Root.CategorySpacingMark,
[Category.EnclosingMark]: Root.CategoryEnclosingMark,
[Category.NonspacingMark]: Root.CategoryNonspacingMark,
[Category.DecimalNumber]: Root.CategoryDecimalNumber,
[Category.LetterNumber]: Root.CategoryLetterNumber,
[Category.OtherNumber]: Root.CategoryOtherNumber,
[Category.ConnectorPunctuation]: Root.CategoryConnectorPunctuation,
[Category.DashPunctuation]: Root.CategoryDashPunctuation,
[Category.ClosePunctuation]: Root.CategoryClosePunctuation,
[Category.FinalPunctuation]: Root.CategoryFinalPunctuation,
[Category.InitialPunctuation]: Root.CategoryInitialPunctuation,
[Category.OtherPunctuation]: Root.CategoryOtherPunctuation,
[Category.OpenPunctuation]: Root.CategoryOpenPunctuation,
[Category.CurrencySymbol]: Root.CategoryCurrencySymbol,
[Category.ModifierSymbol]: Root.CategoryModifierSymbol,
[Category.MathSymbol]: Root.CategoryMathSymbol,
[Category.OtherSymbol]: Root.CategoryOtherSymbol,
[Category.LineSeparator]: Root.CategoryLineSeparator,
[Category.ParagraphSeparator]: Root.CategoryParagraphSeparator,
[Category.SpaceSeparator]: Root.CategorySpaceSeparator
} satisfies Record<Category, TypedT>;

private static readonly UnicodeBidirectionalCategoryKeyMapper = {
[BidirectionalCategory.ArabicLetter]: Root.CategoryBidirectionalArabicLetter,
[BidirectionalCategory.ArabicNumber]: Root.CategoryBidirectionalArabicNumber,
[BidirectionalCategory.ParagraphSeparator]: Root.CategoryBidirectionalParagraphSeparator,
[BidirectionalCategory.BoundaryNeutral]: Root.CategoryBidirectionalBoundaryNeutral,
[BidirectionalCategory.CommonSeparator]: Root.CategoryBidirectionalCommonSeparator,
[BidirectionalCategory.EuropeanNumber]: Root.CategoryBidirectionalEuropeanNumber,
[BidirectionalCategory.EuropeanSeparator]: Root.CategoryBidirectionalEuropeanSeparator,
[BidirectionalCategory.EuropeanTerminator]: Root.CategoryBidirectionalEuropeanTerminator,
[BidirectionalCategory.FirstStrongIsolate]: Root.CategoryBidirectionalFirstStrongIsolate,
[BidirectionalCategory.LeftToRight]: Root.CategoryBidirectionalLeftToRight,
[BidirectionalCategory.LeftToRightEmbedding]: Root.CategoryBidirectionalLeftToRightEmbedding,
[BidirectionalCategory.LeftToRightIsolate]: Root.CategoryBidirectionalLeftToRightIsolate,
[BidirectionalCategory.LeftToRightOverride]: Root.CategoryBidirectionalLeftToRightOverride,
[BidirectionalCategory.NonSpacingMark]: Root.CategoryBidirectionalNonSpacingMark,
[BidirectionalCategory.OtherNeutral]: Root.CategoryBidirectionalOtherNeutral,
[BidirectionalCategory.PopDirectionalFormat]: Root.CategoryBidirectionalPopDirectionalFormat,
[BidirectionalCategory.PopDirectionalIsolate]: Root.CategoryBidirectionalPopDirectionalIsolate,
[BidirectionalCategory.RightToLeft]: Root.CategoryBidirectionalRightToLeft,
[BidirectionalCategory.RightToLeftEmbedding]: Root.CategoryBidirectionalRightToLeftEmbedding,
[BidirectionalCategory.RightToLeftIsolate]: Root.CategoryBidirectionalRightToLeftIsolate,
[BidirectionalCategory.RightToLeftOverride]: Root.CategoryBidirectionalRightToLeftOverride,
[BidirectionalCategory.SegmentSeparator]: Root.CategoryBidirectionalSegmentSeparator,
[BidirectionalCategory.WhiteSpace]: Root.CategoryBidirectionalWhiteSpace
} satisfies Record<BidirectionalCategory, TypedT>;

private static readonly UnicodeClassKeyMapper = {
[Class.NotReordered]: Root.ClassNotReordered,
[Class.Overlay]: Root.ClassOverlay,
[Class.Unnamed]: Root.ClassUnnamed,
[Class.Nukta]: Root.ClassNukta,
[Class.KanaVoicing]: Root.ClassKanaVoicing,
[Class.Virama]: Root.ClassVirama,
[Class.AttachedBelow]: Root.ClassAttachedBelow,
[Class.AttachedAbove]: Root.ClassAttachedAbove,
[Class.AttachedAboveRight]: Root.ClassAttachedAboveRight,
[Class.BelowLeft]: Root.ClassBelowLeft,
[Class.Below]: Root.ClassBelow,
[Class.BelowRight]: Root.ClassBelowRight,
[Class.Left]: Root.ClassLeft,
[Class.Right]: Root.ClassRight,
[Class.AboveLeft]: Root.ClassAboveLeft,
[Class.Above]: Root.ClassAbove,
[Class.AboveRight]: Root.ClassAboveRight,
[Class.DoubleBelow]: Root.ClassDoubleBelow,
[Class.DoubleAbove]: Root.ClassDoubleAbove,
[Class.IotaSubscript]: Root.ClassIotaSubscript
};
}

interface InspectOptions {
Expand Down
23 changes: 23 additions & 0 deletions src/interaction-handlers/unicode.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { getUnicodeInformationEmbeds } from '#lib/unicode';
import { displaySelectMenuIndex, makeActionRow } from '#lib/utilities/discord-utilities';
import { InteractionHandler, type Interactions } from '@skyra/http-framework';
import { getSupportedLanguageT } from '@skyra/http-framework-i18n';
import type { APIActionRowComponent, APIStringSelectComponent } from 'discord-api-types/v10';

export class UserHandler extends InteractionHandler {
public async run(interaction: Interactions.MessageComponentStringSelect) {
const parameters = interaction.values[0].split('.') as Parameters;
const pageIndex = Number(parameters[0]);
const characters = [...Buffer.from(parameters[1], 'base64').toString('utf8')];

const content = interaction.message.content;

Check failure on line 13 in src/interaction-handlers/unicode.ts

View workflow job for this annotation

GitHub Actions / Linting NodeJS

Use object destructuring
const row = interaction.message.components![0] as APIActionRowComponent<APIStringSelectComponent>;

const t = getSupportedLanguageT(interaction);
const component = displaySelectMenuIndex(row.components[0], pageIndex);
const embeds = getUnicodeInformationEmbeds(t, characters);
return interaction.update({ content, embeds, components: [makeActionRow([component])] });
}
}

type Parameters = [pageIndex: `${number}`, characters: string];
2 changes: 2 additions & 0 deletions src/lib/i18n/LanguageKeys/Commands/Unicode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ export const InformationComment = FT<{ value: string }>('commands/unicode:inform
export const TooManyCharacters = T('commands/unicode:tooManyCharacters');
export const UnknownCharacter = T('commands/unicode:unknownCharacter');

export const SelectMenuOptionLabel = FT<{ page: number; characters: string }>('commands/unicode:selectMenuOptionLabel');

export const CategoryControl = T('commands/unicode:categoryControl');
export const CategoryFormat = T('commands/unicode:categoryFormat');
export const CategoryPrivateUse = T('commands/unicode:categoryPrivateUse');
Expand Down
24 changes: 23 additions & 1 deletion src/lib/utilities/discord-utilities.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,27 @@
import type { APIChannel } from 'discord-api-types/v10';
import {
ComponentType,
type APIActionRowComponent,
type APIChannel,
type APIMessageActionRowComponent,
type APIStringSelectComponent
} from 'discord-api-types/v10';

export function isNsfwChannel(channel: Partial<APIChannel>): boolean {
return 'nsfw' in channel ? (channel.nsfw ?? false) : false;
}

export function makeActionRow<Component extends APIMessageActionRowComponent>(
components: Component[]
): APIActionRowComponent<APIMessageActionRowComponent> {
return { type: ComponentType.ActionRow, components };
}

export function displaySelectMenuIndex(component: APIStringSelectComponent, index: number): APIStringSelectComponent {
return {
...component,
options: component.options.map((option, optionIndex) => ({
...option,
default: optionIndex === index
}))
};
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { PathSrc } from '#lib/common/constants';
import { isNullish, isNullishOrEmpty } from '@sapphire/utilities';
import { readFile } from 'fs/promises';
import { readFile } from 'node:fs/promises';

const PathUnicode = new URL('./generated/data/unicode.json', PathSrc);
const unicode = new Map((JSON.parse(await readFile(PathUnicode, 'utf8')) as Unicode[]).map((data) => [data.id, data] as const));
Expand Down Expand Up @@ -234,47 +234,47 @@ export enum Category {
* @see {@link https://www.compart.com/en/unicode/combining}
*/
export enum Class {
NotReordered,
Overlay,
NotReordered = 0,
Overlay = 1,
Unnamed = 6,
Nukta,
KanaVoicing,
Virama,
CCC10,
CCC11,
CCC12,
CCC13,
CCC14,
CCC15,
CCC16,
CCC17,
CCC18,
CCC19,
CCC20,
CCC21,
CCC22,
CCC23,
CCC24,
CCC25,
CCC26,
CCC27,
CCC28,
CCC29,
CCC30,
CCC31,
CCC32,
CCC33,
CCC34,
CCC35,
CCC36,
Nukta = 7,
KanaVoicing = 8,
Virama = 9,
CCC10 = 10,
CCC11 = 11,
CCC12 = 12,
CCC13 = 13,
CCC14 = 14,
CCC15 = 15,
CCC16 = 16,
CCC17 = 17,
CCC18 = 18,
CCC19 = 19,
CCC20 = 20,
CCC21 = 21,
CCC22 = 22,
CCC23 = 23,
CCC24 = 24,
CCC25 = 25,
CCC26 = 26,
CCC27 = 27,
CCC28 = 28,
CCC29 = 29,
CCC30 = 30,
CCC31 = 31,
CCC32 = 32,
CCC33 = 33,
CCC34 = 34,
CCC35 = 35,
CCC36 = 36,
CCC84 = 84,
CCC91 = 91,
CCC103 = 103,
CCC107 = 107,
CCC118 = 118,
CCC122 = 122,
CCC129 = 129,
CCC130,
CCC130 = 130,
CCC132 = 132,
AttachedBelow = 202,
AttachedAbove = 214,
Expand All @@ -287,8 +287,8 @@ export enum Class {
AboveLeft = 228,
Above = 230,
AboveRight = 232,
DoubleBelow,
DoubleAbove,
DoubleBelow = 233,
DoubleAbove = 234,
IotaSubscript = 240
}

Expand Down
Loading

0 comments on commit ddafb15

Please sign in to comment.