Split long passive/constellation descriptions

Author: Tibowl

src/HuTaoClient.ts

@@ -1,5 +1,4 @@
 import Discord, { ActivityType, ClientEvents, GatewayIntentBits, Partials } from "discord.js"
-import Enmap from "enmap"
 import fs from "fs"
 import { join } from "path"
 
@@ -36,7 +35,7 @@ export default class HuTaoClient extends Discord.Client {
     newsManager: NewsManager = new NewsManager()
     webManager: WebManager = new WebManager()
 
-    commands: Enmap<string, Command> = new Enmap()
+    commands: Map<string, Command> = new Map()
     recentMessages: Discord.Message[] = []
 
     constructor() {
@@ -76,8 +75,7 @@ export default class HuTaoClient extends Discord.Client {
         fs.readdir(join(__dirname, "./events/"), (err, files) => {
             if (err) return Logger.error(err)
             files.forEach(file => {
-                // eslint-disable-next-line @typescript-eslint/no-var-requires
-                const event = require(`./events/${file}`)
+                const event: any = require(`./events/${file}`)
                 const eventName = file.split(".")[0] as keyof ClientEvents
                 this.on(eventName, event.handle)
             })
@@ -89,8 +87,7 @@ export default class HuTaoClient extends Discord.Client {
                 if (err) return Logger.error(err)
                 files.forEach(file => {
                     if (!(file.endsWith(".js") || file.endsWith(".ts"))) return readDir(dir + file + "/")
-                    // eslint-disable-next-line @typescript-eslint/no-var-requires
-                    const props = require(`${dir}${file}`)
+                    const props: any = require(`${dir}${file}`)
                     const commandName = file.split(".")[0]
                     Logger.info(`Loading ${commandName}`)
 

src/commands/characters/character.ts

@@ -3,7 +3,7 @@ import config from "../../data/config.json"
 import client from "../../main"
 import Command from "../../utils/Command"
 import { BotEmoji, Character, CharacterFull, CommandSource, SendMessage, Skill, TalentTable, TalentValue } from "../../utils/Types"
-import { addArg, Bookmarkable, Colors, createTable, findFuzzyBestCandidatesForAutocomplete, getLink, getLinkToGuide, PAD_END, PAD_START, paginator, sendMessage, simplePaginator, urlify } from "../../utils/Utils"
+import { Bookmarkable, Colors, PAD_END, PAD_START, addArg, createTable, findFuzzyBestCandidatesForAutocomplete, getLink, getLinkToGuide, paginator, sendMessage, simplePaginator, splitByLength, urlify } from "../../utils/Utils"
 
 
 const elementTypes = client.data.getCharacters()
@@ -519,7 +519,6 @@ ${          Object
 
             if (skill.video && talentMode == "LITTLE") {
                 embed.setImage(getLink(skill.video))
-                    .setThumbnail("")
             }
         }
 
@@ -543,12 +542,18 @@ ${          Object
                 embed.setTitle(`${char.name}: Passives`)
                     .setURL(`${data.baseURL}characters/${urlify(char.name, false)}#${urlify(skills.passive[0].name, false)}`)
                 for (const passive of skills.passive) {
-                    if (passive.minAscension)
-                        embed.addFields({ name: passive.name, value:  `${passive.desc}
+                    const descText = passive.minAscension ? `${passive.desc}
     
-*${passive.minAscension > 0 ? `Unlocks at ascension **${passive.minAscension}**` : "Unlocked by **default**"}*` })
-                    else
-                        embed.addFields({ name: passive.name, value:  passive.desc })
+*${passive.minAscension > 0 ? `Unlocks at ascension **${passive.minAscension}**` : "Unlocked by **default**"}*` : passive.desc
+
+                    const splitted = descText.split("\n\n").flatMap(x => splitByLength(x, 1000, "\n"))
+                    for (let i = 0; i < splitted.length; i++) {
+                        const line = splitted[i]
+                        if (i == 0)
+                            embed.addFields({ name: `${passive.minAscension ? "*" : ""}${passive.name}`, value: line })
+                        else
+                            embed.addFields({ name: ` `, value: line })
+                    }
                 }
                 return embed
             }
@@ -558,8 +563,17 @@ ${          Object
                     .setURL(`${data.baseURL}characters/${urlify(char.name, false)}#${urlify(skills.constellations[0].name, false)}`)
                     .setThumbnail(getLink(skills.constellations[0]?.icon))
                 let c = 0
-                for (const constellation of skills.constellations)
-                    embed.addFields({ name: `C${++c}: ${constellation.name}`, value: constellation.desc })
+                for (const constellation of skills.constellations) {
+                    const splitted = constellation.desc.split("\n\n").flatMap(x => splitByLength(x, 1000, "\n"))
+
+                    for (let i = 0; i < splitted.length; i++) {
+                        const line = splitted[i]
+                        if (i == 0)
+                            embed.addFields({ name: `C${++c}: ${constellation.name}`, value: line })
+                        else
+                            embed.addFields({ name: ` `, value: line })
+                    }
+                }
 
                 return embed
             }

src/commands/meta/help.ts

@@ -29,7 +29,7 @@ export default class Help extends Command {
     }
 
     async autocomplete(source: AutocompleteInteraction): Promise<void> {
-        const targetNames = client.commands.keyArray()
+        const targetNames = [...client.commands.keys()]
         const search = source.options.getFocused().toString()
 
         if (search == "") {
@@ -61,7 +61,7 @@ export default class Help extends Command {
     }
 
     async run(source: CommandSource, name?: string | null): Promise<SendMessage | undefined> {
-        const { commands } = client
+        const commands = [...client.commands.values()]
         if (!name) {
             return this.sendCommands(source)
         }

src/events/ready.ts

@@ -18,7 +18,7 @@ export async function handle(): Promise<void> {
     client.newsManager.fetchNews().catch(e => Logger.error(e))
 
     if (!client.application?.owner) await client.application?.fetch()
-    const cmds = client.commands.array()
+    const cmds = [...client.commands.values()]
 
     try {
         if (config.production) {

src/utils/CommandHandler.ts

@@ -18,7 +18,7 @@ export function getCommand(command: string): ParsedCommand | false {
 
     // If that command doesn't exist, try to find an alias
     if (!cmd) {
-        cmd = client.commands.find((cmd: Command) => cmd.aliases.includes(command))
+        cmd = [...client.commands.values()].find((cmd: Command) => cmd.aliases.includes(command))
 
         // If that command doesn't exist, silently exit and do nothing
         if (!cmd)

src/utils/Utils.ts

@@ -107,6 +107,24 @@ function limitIndex(words: string[], maxLength = 50): number {
     return end
 }
 
+export function splitByLength(text: string, maxLength: number, splitOn: string): string[] {
+    const splitted = text.split(splitOn)
+    const result: string[] = []
+    let currentLine = ""
+
+    for (const line of splitted) {
+        if (currentLine.length + line.length >= maxLength) {
+            result.push(currentLine)
+            currentLine = line
+        } else
+            currentLine += splitOn + line
+    }
+    if (currentLine.length > 0)
+        result.push(currentLine)
+
+    return result
+}
+
 export function truncate(text: string, maxLength = 50): string {
     const words = text.split(" ")
     const end = limitIndex(words, maxLength)