Fix long guide names preventing Discord autocomplete from working

Tibowl · Tibowl · commit 8c3cd7b1a9b3 · 2023-11-18T15:33:55.000+01:00
diff --git a/src/commands/artifacts/artifact.ts b/src/commands/artifacts/artifact.ts
@@ -4,7 +4,7 @@ import config from "../../data/config.json"
 import client from "../../main"
 import Command from "../../utils/Command"
 import { Artifact, CommandSource, SendMessage } from "../../utils/Types"
-import { Colors, createTable, findFuzzyBestCandidates, getLink, getLinkToGuide, sendMessage, simplePaginator, urlify } from "../../utils/Utils"
+import { Colors, createTable, findFuzzyBestCandidatesForAutocomplete, getLink, getLinkToGuide, sendMessage, simplePaginator, urlify } from "../../utils/Utils"
 
 export default class ArtifactCommand extends Command {
     constructor(name: string) {
@@ -39,7 +39,7 @@ Note: this command supports fuzzy search.`,
             ])
         }
 
-        await source.respond(findFuzzyBestCandidates(targetNames, search, 20).map(value => {
+        await source.respond(findFuzzyBestCandidatesForAutocomplete(targetNames, search, 20).map(value => {
             return { name: value, value }
         }))
     }
diff --git a/src/commands/characters/character.ts b/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, findFuzzyBestCandidates, getLink, getLinkToGuide, PAD_END, PAD_START, paginator, sendMessage, simplePaginator, urlify } from "../../utils/Utils"
+import { addArg, Bookmarkable, Colors, createTable, findFuzzyBestCandidatesForAutocomplete, getLink, getLinkToGuide, PAD_END, PAD_START, paginator, sendMessage, simplePaginator, urlify } from "../../utils/Utils"
 
 
 const elementTypes = client.data.getCharacters()
@@ -76,13 +76,13 @@ Note: this command supports fuzzy search.`,
                 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 targets = [...elementTypes.filter(elem => this.getElementIcons(client.data.getCharacterByName("Traveler")!).includes(elem)).map(x => `-${x.toLowerCase()}`), ...targets]
 
-            return await source.respond(findFuzzyBestCandidates(targets, lastWord, 20).map(value => {
+            return await source.respond(findFuzzyBestCandidatesForAutocomplete(targets, lastWord, 20).map(value => {
                 value = `${args.join(" ")} ${value}`
                 return { name: value, value }
             }))
         }
 
-        await source.respond(findFuzzyBestCandidates(targetNames, search, 20).map(value => {
+        await source.respond(findFuzzyBestCandidatesForAutocomplete(targetNames, search, 20).map(value => {
             return { name: value, value }
         }))
     }
diff --git a/src/commands/characters/charstats.ts b/src/commands/characters/charstats.ts
@@ -4,7 +4,7 @@ import config from "../../data/config.json"
 import client from "../../main"
 import Command from "../../utils/Command"
 import { CharacterFull, CommandSource, SendMessage } from "../../utils/Types"
-import { createTable, findFuzzyBestCandidates, PAD_START, sendMessage } from "../../utils/Utils"
+import { createTable, findFuzzyBestCandidatesForAutocomplete, PAD_START, sendMessage } from "../../utils/Utils"
 
 export default class CharacterStatsCommand extends Command {
     constructor(name: string) {
@@ -43,7 +43,7 @@ Note: this command supports fuzzy search.`,
         const targetNames = client.data.getReleasedCharacters().map(c => c.name)
         const search = source.options.getFocused().toString()
 
-        await source.respond(findFuzzyBestCandidates(targetNames, search, 20).map(value => {
+        await source.respond(findFuzzyBestCandidatesForAutocomplete(targetNames, search, 20).map(value => {
             return { name: value, value }
         }))
     }
diff --git a/src/commands/meta/help.ts b/src/commands/meta/help.ts
@@ -3,7 +3,7 @@ import config from "../../data/config.json"
 import client from "../../main"
 import Command, { CommandCategory } from "../../utils/Command"
 import { CommandSource, SendMessage } from "../../utils/Types"
-import { findFuzzyBestCandidates, getUserID, sendMessage } from "../../utils/Utils"
+import { findFuzzyBestCandidatesForAutocomplete, getUserID, sendMessage } from "../../utils/Utils"
 
 const requiredPermissions: PermissionResolvable[] = [
     PermissionFlagsBits.AttachFiles,
@@ -41,7 +41,7 @@ export default class Help extends Command {
             ])
         }
 
-        await source.respond(findFuzzyBestCandidates(targetNames, search, 20).map(value => {
+        await source.respond(findFuzzyBestCandidatesForAutocomplete(targetNames, search, 20).map(value => {
             return { name: value, value }
         }))
     }
diff --git a/src/commands/misc/abyss.ts b/src/commands/misc/abyss.ts
@@ -4,7 +4,7 @@ import config from "../../data/config.json"
 import client from "../../main"
 import Command from "../../utils/Command"
 import { AbyssSchedule, CommandSource, SendMessage } from "../../utils/Types"
-import { Colors, findFuzzyBestCandidates, getDate, sendMessage, simplePaginator } from "../../utils/Utils"
+import { Colors, findFuzzyBestCandidatesForAutocomplete, getDate, sendMessage, simplePaginator } from "../../utils/Utils"
 
 const names: Record<string, string> = {
     "1/1": "Enemies",
@@ -42,7 +42,7 @@ Old abyss floors/buffs can be accessed by giving the cycle (like \`${config.pref
         const targetNames = client.data.getAbyssSchedules().map(s => s.start.substring(0, 7)).flatMap((s, i, arr) => `${s}-${i - arr.indexOf(s) + 1}`).reverse()
         const search = source.options.getFocused().toString()
 
-        await source.respond(findFuzzyBestCandidates(targetNames, search, 20).map(value => {
+        await source.respond(findFuzzyBestCandidatesForAutocomplete(targetNames, search, 20).map(value => {
             return { name: value, value }
         }))
     }
@@ -108,7 +108,7 @@ Old abyss floors/buffs can be accessed by giving the cycle (like \`${config.pref
             embed.setTitle(`Spiral Abyss: ${abyss.buff}`)
                 .setDescription(abyss.buffDesc)
                 .addFields(
-                    { name: "Starts", value: abyss.start, inline: true }, 
+                    { name: "Starts", value: abyss.start, inline: true },
                     { name: "Ends", value: abyss.end, inline: true }
                 )
             return embed
diff --git a/src/commands/misc/banners.ts b/src/commands/misc/banners.ts
@@ -4,7 +4,7 @@ import config from "../../data/config.json"
 import client from "../../main"
 import Command from "../../utils/Command"
 import { CommandSource, SendMessage, StoredNews } from "../../utils/Types"
-import { Colors, findFuzzy, findFuzzyBestCandidates, getLink, parseNewsContent, sendMessage, simplePaginator } from "../../utils/Utils"
+import { Colors, findFuzzy, findFuzzyBestCandidatesForAutocomplete, getLink, parseNewsContent, sendMessage, simplePaginator } from "../../utils/Utils"
 
 
 const Logger = log4js.getLogger("main")
@@ -229,7 +229,7 @@ Note: this command supports fuzzy search.`,
         const targetNames = eventWishes.flatMap(w => [...w.other, ...w.main]).filter((v, i, arr) => arr.indexOf(v) == i)
         const search = source.options.getFocused().toString()
 
-        await source.respond(findFuzzyBestCandidates(targetNames, search, 20).map(value => {
+        await source.respond(findFuzzyBestCandidatesForAutocomplete(targetNames, search, 20).map(value => {
             return { name: value, value }
         }))
     }
diff --git a/src/commands/misc/enemy.ts b/src/commands/misc/enemy.ts
@@ -3,7 +3,7 @@ import config from "../../data/config.json"
 import client from "../../main"
 import Command from "../../utils/Command"
 import { CommandSource, Enemy, SendMessage } from "../../utils/Types"
-import { Bookmarkable, Colors, createTable, findFuzzyBestCandidates, getLink, getLinkToGuide, PAD_END, PAD_START, paginator, sendMessage, simplePaginator, urlify } from "../../utils/Utils"
+import { Bookmarkable, Colors, createTable, findFuzzyBestCandidatesForAutocomplete, getLink, getLinkToGuide, PAD_END, PAD_START, paginator, sendMessage, simplePaginator, urlify } from "../../utils/Utils"
 
 export default class EnemyCommand extends Command {
     constructor(name: string) {
@@ -38,7 +38,7 @@ Note: this command supports fuzzy search.`,
             ])
         }
 
-        await source.respond(findFuzzyBestCandidates(targetNames, search, 20).map(value => {
+        await source.respond(findFuzzyBestCandidatesForAutocomplete(targetNames, search, 20).map(value => {
             return { name: value, value }
         }))
     }
diff --git a/src/commands/misc/guide.ts b/src/commands/misc/guide.ts
@@ -3,7 +3,7 @@ import config from "../../data/config.json"
 import client from "../../main"
 import Command from "../../utils/Command"
 import { CommandSource, Guide, SendMessage } from "../../utils/Types"
-import { Colors, findFuzzy, findFuzzyBestCandidates, getLink, sendMessage, simplePaginator, urlify } from "../../utils/Utils"
+import { Colors, findFuzzy, findFuzzyBestCandidatesForAutocomplete, getLink, sendMessage, simplePaginator, urlify } from "../../utils/Utils"
 
 
 export default class GuideCommand extends Command {
@@ -41,7 +41,7 @@ Note: this command supports fuzzy search.`,
             ])
         }
 
-        await source.respond(findFuzzyBestCandidates(this.targetNames, search, 20).map(value => {
+        await source.respond(findFuzzyBestCandidatesForAutocomplete(this.targetNames, search, 20).map(value => {
             return { name: value, value }
         }))
     }
diff --git a/src/commands/misc/material.ts b/src/commands/misc/material.ts
@@ -3,7 +3,7 @@ import config from "../../data/config.json"
 import client from "../../main"
 import Command from "../../utils/Command"
 import { Character, CommandSource, Material, SendMessage, Weapon } from "../../utils/Types"
-import { Bookmarkable, Colors, findFuzzyBestCandidates, getLink, getLinkToGuide, joinMulti, paginator, sendMessage, simplePaginator, urlify } from "../../utils/Utils"
+import { Bookmarkable, Colors, findFuzzyBestCandidatesForAutocomplete, getLink, getLinkToGuide, joinMulti, paginator, sendMessage, simplePaginator, urlify } from "../../utils/Utils"
 
 export default class MaterialCommand extends Command {
     constructor(name: string) {
@@ -38,7 +38,7 @@ Note: this command supports fuzzy search.`,
             ])
         }
 
-        await source.respond(findFuzzyBestCandidates(targetNames, search, 20).map(value => {
+        await source.respond(findFuzzyBestCandidatesForAutocomplete(targetNames, search, 20).map(value => {
             return { name: value, value }
         }))
     }
diff --git a/src/commands/news/news.ts b/src/commands/news/news.ts
@@ -4,7 +4,7 @@ import config from "../../data/config.json"
 import client from "../../main"
 import Command from "../../utils/Command"
 import { CommandSource, NewsLang, SendMessage } from "../../utils/Types"
-import { Colors, findFuzzy, findFuzzyBestCandidates, getNewsEmbed, parseNewsContent, sendMessage, simplePaginator } from "../../utils/Utils"
+import { Colors, findFuzzy, findFuzzyBestCandidatesForAutocomplete, getNewsEmbed, parseNewsContent, sendMessage, simplePaginator } from "../../utils/Utils"
 
 export default class News extends Command {
     constructor(name: string) {
@@ -44,7 +44,7 @@ Supported languages: ${client.newsManager.getLanguages().map(l => `\`${l}\``).jo
             ])
         }
 
-        await source.respond(findFuzzyBestCandidates(targetNames, search, 20).map(value => {
+        await source.respond(findFuzzyBestCandidatesForAutocomplete(targetNames, search, 20).map(value => {
             return { name: value, value }
         }))
     }
diff --git a/src/commands/weapons/weapon.ts b/src/commands/weapons/weapon.ts
@@ -4,7 +4,7 @@ import config from "../../data/config.json"
 import client from "../../main"
 import Command from "../../utils/Command"
 import { CommandSource, SendMessage, Weapon } from "../../utils/Types"
-import { addArg, Bookmarkable, Colors, createTable, findFuzzyBestCandidates, getLink, getLinkToGuide, PAD_START, paginator, sendMessage, simplePaginator, urlify } from "../../utils/Utils"
+import { addArg, Bookmarkable, Colors, createTable, findFuzzyBestCandidatesForAutocomplete, getLink, getLinkToGuide, PAD_START, paginator, sendMessage, simplePaginator, urlify } from "../../utils/Utils"
 
 const weaponTypes = Object.values(client.data.weapons)
     .map(c => c.weaponType)
@@ -63,13 +63,13 @@ Note: this command supports fuzzy search.`,
             if (foundChar == "")
                 targets = [...weaponTypes, ...possibleStars.map(n => `${n}*`)].map(x => `-${x.toLowerCase()}`)
 
-            return await source.respond(findFuzzyBestCandidates(targets, lastWord, 20).map(value => {
+            return await source.respond(findFuzzyBestCandidatesForAutocomplete(targets, lastWord, 20).map(value => {
                 value = `${args.join(" ")} ${value}`
                 return { name: value, value }
             }))
         }
 
-        await source.respond(findFuzzyBestCandidates(targetNames, search, 20).map(value => {
+        await source.respond(findFuzzyBestCandidatesForAutocomplete(targetNames, search, 20).map(value => {
             return { name: value, value }
         }))
     }
@@ -217,22 +217,22 @@ Note: this command supports fuzzy search.`,
         const maxAscension = weapon.ascensions?.[weapon.ascensions.length - 1]
         if (weapon.weaponCurve && maxAscension)
             embed
-                .addFields({ 
-                    name: "Base stats", 
+                .addFields({
+                    name: "Base stats",
                     value: Object.entries(data.getWeaponStatsAt(weapon, 1, 0))
                         .map(([name, value]) => `**${name}**: ${data.stat(name, value)}`)
-                        .join("\n"), 
+                        .join("\n"),
                     inline: true
-                }, { 
-                    name: `Lv. ${maxAscension.maxLevel} A${maxAscension.level} stats`, 
+                }, {
+                    name: `Lv. ${maxAscension.maxLevel} A${maxAscension.level} stats`,
                     value: Object.entries(data.getWeaponStatsAt(weapon, maxAscension.maxLevel, maxAscension.level))
                         .map(([name, value]) => `**${name}**: ${data.stat(name, value)}`)
-                        .join("\n"), 
+                        .join("\n"),
                     inline: true
                 })
         else if (weapon.placeholderStats) {
             embed.addFields({
-                name: `Lv. ${weapon.placeholderStats.level} stats`, 
+                name: `Lv. ${weapon.placeholderStats.level} stats`,
                 value: Object.entries(weapon.placeholderStats.stats)
                     .map(([name, value]) => `**${name}**: ${data.stat(name, value)}`)
                     .join("\n"),
diff --git a/src/commands/weapons/weaponstats.ts b/src/commands/weapons/weaponstats.ts
@@ -4,7 +4,7 @@ import config from "../../data/config.json"
 import client from "../../main"
 import Command from "../../utils/Command"
 import { CommandSource, SendMessage, Weapon } from "../../utils/Types"
-import { createTable, findFuzzyBestCandidates, PAD_START, sendMessage } from "../../utils/Utils"
+import { createTable, findFuzzyBestCandidatesForAutocomplete, PAD_START, sendMessage } from "../../utils/Utils"
 
 export default class WeaponStatsCommand extends Command {
     constructor(name: string) {
@@ -43,7 +43,7 @@ Note: this command supports fuzzy search.`,
         const targetNames = Object.keys(client.data.weapons)
         const search = source.options.getFocused().toString()
 
-        await source.respond(findFuzzyBestCandidates(targetNames, search, 20).map(value => {
+        await source.respond(findFuzzyBestCandidatesForAutocomplete(targetNames, search, 20).map(value => {
             return { name: value, value }
         }))
     }
diff --git a/src/utils/Utils.ts b/src/utils/Utils.ts
@@ -750,7 +750,13 @@ export function findFuzzy(target: string[], search: string): string | undefined
     const min = Math.min(...lengths)
     return candidates[lengths.indexOf(min)]
 }
-
+export function findFuzzyBestCandidatesForAutocomplete(target: string[], search: string, amount: number): string[] {
+    return findFuzzyBestCandidates(target, search, amount).map(e => {
+        if (e.length < 100) return e
+        if (e.match(/\(.*\)/)) return e.replace(/\(.*\)/, "")
+        return e
+    }).map(e => e.substring(0, 99).trim().replace(/ :/g, ""))
+}
 export function findFuzzyBestCandidates(target: string[], search: string, amount: number): string[] {
     const cleaned = searchClean(search)
     const found = target.find(t => searchClean(t) == search)

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import config from "../../data/config.json"`
`3`	`3`	`import client from "../../main"`
`4`	`4`	`import Command from "../../utils/Command"`
`5`	`5`	`import { CommandSource, Guide, SendMessage } from "../../utils/Types"`
`6`		`-import { Colors, findFuzzy, findFuzzyBestCandidates, getLink, sendMessage, simplePaginator, urlify } from "../../utils/Utils"`
	`6`	`+import { Colors, findFuzzy, findFuzzyBestCandidatesForAutocomplete, getLink, sendMessage, simplePaginator, urlify } from "../../utils/Utils"`
`7`	`7`
`8`	`8`
`9`	`9`	`export default class GuideCommand extends Command {`
@@ -41,7 +41,7 @@ Note: this command supports fuzzy search.`,
`41`	`41`	`])`
`42`	`42`	`}`
`43`	`43`
`44`		`- await source.respond(findFuzzyBestCandidates(this.targetNames, search, 20).map(value => {`
	`44`	`+ await source.respond(findFuzzyBestCandidatesForAutocomplete(this.targetNames, search, 20).map(value => {`
`45`	`45`	`return { name: value, value }`
`46`	`46`	`}))`
`47`	`47`	`}`