ConfrerieDuKassoulait/Botanique
ConfrerieDuKassoulait/Botanique
2
0
Fork 0
Code Issues 21 Pull requests 4 Projects 1 Releases Packages 1 Activity Actions

fix: don't use default bad value, assert instead (#166)
Some checks failed
Publish latest version / build (push) Has been cancelled
Details

Browse source 
- no longer fallback to known-bad values
- fix build (related to typescript update finding new quirks)

Reviewed-on: #166
Co-authored-by: Mylloon <kennel.anri@tutanota.com>
Co-committed-by: Mylloon <kennel.anri@tutanota.com>
This commit is contained in:
Mylloon 2024-09-17 11:36:24 +02:00 committed by Mylloon
parent d1e7d82488
commit dad41d3932
Signed by: Forgejo
GPG key ID: E72245C752A07631
17 changed files with 97 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CONTRIBUTING.md
View file

@ -124,9 +124,7 @@ export default {
const filename = getFilename(__filename);
return new SlashCommandBuilder()
.setName(filename.toLowerCase())
.setDescription(
client.locales.get(client.config.default_lang)?.get(`c_${filename}_desc`) ?? ""
)
.setDescription(client.locales.get(client.config.default_lang)!.get(`c_${filename}_desc`)!)
.setNameLocalizations(getLocalizations(client, `c_${filename}_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_desc`));
},

2
src/buttons/music/queueList-next.ts
View file

@ -31,7 +31,7 @@ export default {
}
// Get queue
const queue = useQueue(interaction.guildId ?? "");
const queue = useQueue(interaction.guildId!);
const embed = new EmbedBuilder();
const rows = [];

2
src/buttons/music/queueList-prec.ts
View file

@ -31,7 +31,7 @@ export default {
}
// Get queue
const queue = useQueue(interaction.guildId ?? "");
const queue = useQueue(interaction.guildId!);
const embed = new EmbedBuilder();
const rows = [];

2
src/commands/loader.ts
View file

@ -6,7 +6,7 @@ import { removeExtension } from "../utils/misc";
/** Load all the commands */
export default async (client: Client) => {
const rest = new REST({ version: "10" }).setToken(client.token ?? "");
const rest = new REST({ version: "10" }).setToken(client.token!);
const command_categories = (await readdir(__dirname)).filter(
(element) => !element.endsWith(".js") && !element.endsWith(".ts"),

12
src/commands/misc/archive.ts
View file

@ -19,9 +19,7 @@ export default {
return (
new SlashCommandBuilder()
.setName(filename.toLowerCase())
.setDescription(
client.locales.get(client.config.default_lang)?.get(`c_${filename}_desc`) ?? "",
)
.setDescription(client.locales.get(client.config.default_lang)!.get(`c_${filename}_desc`)!)
.setNameLocalizations(getLocalizations(client, `c_${filename}_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_desc`))
@ -29,10 +27,10 @@ export default {
.addStringOption((option) =>
option
.setName(
client.locales.get(client.config.default_lang)?.get(`c_${filename}_opt1_name`) ?? "",
client.locales.get(client.config.default_lang)!.get(`c_${filename}_opt1_name`)!,
)
.setDescription(
client.locales.get(client.config.default_lang)?.get(`c_${filename}_opt1_desc`) ?? "",
client.locales.get(client.config.default_lang)!.get(`c_${filename}_opt1_desc`)!,
)
.setNameLocalizations(getLocalizations(client, `c_${filename}_opt1_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_opt1_desc`)),
@ -44,8 +42,8 @@ export default {
const loc = getLocale(client, interaction.locale);
const desiredCat = interaction.options.get(
client.locales
.get(client.config.default_lang)
?.get(`c_${getFilename(__filename)}_opt1_name`) ?? "",
.get(client.config.default_lang)!
.get(`c_${getFilename(__filename)}_opt1_name`)!,
)?.value as string;
// If a category isn't specified

12
src/commands/misc/help.ts
View file

@ -13,9 +13,7 @@ export default {
return (
new SlashCommandBuilder()
.setName(filename.toLowerCase())
.setDescription(
client.locales.get(client.config.default_lang)?.get(`c_${filename}_desc`) ?? "",
)
.setDescription(client.locales.get(client.config.default_lang)!.get(`c_${filename}_desc`)!)
.setNameLocalizations(getLocalizations(client, `c_${filename}_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_desc`))
@ -23,10 +21,10 @@ export default {
.addStringOption((option) =>
option
.setName(
client.locales.get(client.config.default_lang)?.get(`c_${filename}_opt1_name`) ?? "",
client.locales.get(client.config.default_lang)!.get(`c_${filename}_opt1_name`)!,
)
.setDescription(
client.locales.get(client.config.default_lang)?.get(`c_${filename}_opt1_desc`) ?? "",
client.locales.get(client.config.default_lang)!.get(`c_${filename}_opt1_desc`)!,
)
.setNameLocalizations(getLocalizations(client, `c_${filename}_opt1_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_opt1_desc`)),
@ -38,8 +36,8 @@ export default {
const loc = getLocale(client, interaction.locale);
const desired_command = interaction.options.getString(
client.locales
.get(client.config.default_lang)
?.get(`c_${getFilename(__filename)}_opt1_name`) ?? "",
.get(client.config.default_lang)!
.get(`c_${getFilename(__filename)}_opt1_name`)!,
);
// If a command isn't specified

4
src/commands/misc/ping.ts
View file

@ -10,9 +10,7 @@ export default {
const filename = getFilename(__filename);
return new SlashCommandBuilder()
.setName(filename.toLowerCase())
.setDescription(
client.locales.get(client.config.default_lang)?.get(`c_${filename}_desc`) ?? "",
)
.setDescription(client.locales.get(client.config.default_lang)!.get(`c_${filename}_desc`)!)
.setNameLocalizations(getLocalizations(client, `c_${filename}_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_desc`));
},

12
src/commands/misc/prep.ts
View file

@ -12,9 +12,7 @@ export default {
return (
new SlashCommandBuilder()
.setName(filename.toLowerCase())
.setDescription(
client.locales.get(client.config.default_lang)?.get(`c_${filename}_desc`) ?? "",
)
.setDescription(client.locales.get(client.config.default_lang)!.get(`c_${filename}_desc`)!)
.setNameLocalizations(getLocalizations(client, `c_${filename}_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_desc`))
@ -22,10 +20,10 @@ export default {
.addStringOption((option) =>
option
.setName(
client.locales.get(client.config.default_lang)?.get(`c_${filename}_opt1_name`) ?? "",
client.locales.get(client.config.default_lang)!.get(`c_${filename}_opt1_name`)!,
)
.setDescription(
client.locales.get(client.config.default_lang)?.get(`c_${filename}_opt1_desc`) ?? "",
client.locales.get(client.config.default_lang)!.get(`c_${filename}_opt1_desc`)!,
)
.setNameLocalizations(getLocalizations(client, `c_${filename}_opt1_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_opt1_desc`)),
@ -37,8 +35,8 @@ export default {
const loc = getLocale(client, interaction.locale);
const desired_cat = interaction.options.get(
client.locales
.get(client.config.default_lang)
?.get(`c_${getFilename(__filename)}_opt1_name`) ?? "",
.get(client.config.default_lang)!
.get(`c_${getFilename(__filename)}_opt1_name`)!,
)?.value as string;
// If a category isn't specified

40
src/commands/misc/reminder.ts
View file

@ -35,23 +35,23 @@ export default {
new SlashCommandBuilder()
// Command
.setName(filename.toLowerCase())
.setDescription(loc_default.get(`c_${filename}_desc`) ?? "")
.setDescription(loc_default.get(`c_${filename}_desc`)!)
.setNameLocalizations(getLocalizations(client, `c_${filename}_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_desc`))
// New reminder
.addSubcommand((subcommand) =>
subcommand
.setName(loc_default.get(`c_${filename}_sub1_name`)?.toLowerCase() ?? "")
.setDescription(loc_default.get(`c_${filename}_sub1_desc`) ?? "")
.setName(loc_default.get(`c_${filename}_sub1_name`)!.toLowerCase())
.setDescription(loc_default.get(`c_${filename}_sub1_desc`)!)
.setNameLocalizations(getLocalizations(client, `c_${filename}_sub1_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_sub1_desc`))
// Specified Time
.addStringOption((option) =>
option
.setName(loc_default.get(`c_${filename}_sub1_opt1_name`)?.toLowerCase() ?? "")
.setDescription(loc_default.get(`c_${filename}_sub1_opt1_desc`) ?? "")
.setName(loc_default.get(`c_${filename}_sub1_opt1_name`)!.toLowerCase())
.setDescription(loc_default.get(`c_${filename}_sub1_opt1_desc`)!)
.setNameLocalizations(
getLocalizations(client, `c_${filename}_sub1_opt1_name`, true),
)
@ -63,8 +63,8 @@ export default {
// Specified message (not required)
.addStringOption((option) =>
option
.setName(loc_default.get(`c_${filename}_sub1_opt2_name`)?.toLowerCase() ?? "")
.setDescription(loc_default.get(`c_${filename}_sub1_opt2_desc`) ?? "")
.setName(loc_default.get(`c_${filename}_sub1_opt2_name`)!.toLowerCase())
.setDescription(loc_default.get(`c_${filename}_sub1_opt2_desc`)!)
.setNameLocalizations(
getLocalizations(client, `c_${filename}_sub1_opt2_name`, true),
)
@ -77,16 +77,16 @@ export default {
// List reminders
.addSubcommand((subcommand) =>
subcommand
.setName(loc_default.get(`c_${filename}_sub2_name`)?.toLowerCase() ?? "")
.setDescription(loc_default.get(`c_${filename}_sub2_desc`) ?? "")
.setName(loc_default.get(`c_${filename}_sub2_name`)!.toLowerCase())
.setDescription(loc_default.get(`c_${filename}_sub2_desc`)!)
.setNameLocalizations(getLocalizations(client, `c_${filename}_sub2_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_sub2_desc`))
// User
.addUserOption((option) =>
option
.setName(loc_default.get(`c_${filename}_sub2_opt1_name`)?.toLowerCase() ?? "")
.setDescription(loc_default.get(`c_${filename}_sub2_opt1_desc`) ?? "")
.setName(loc_default.get(`c_${filename}_sub2_opt1_name`)!.toLowerCase())
.setDescription(loc_default.get(`c_${filename}_sub2_opt1_desc`)!)
.setNameLocalizations(
getLocalizations(client, `c_${filename}_sub2_opt1_name`, true),
)
@ -98,8 +98,8 @@ export default {
// Page
.addIntegerOption((option) =>
option
.setName(loc_default.get(`c_${filename}_sub2_opt2_name`)?.toLowerCase() ?? "")
.setDescription(loc_default.get(`c_${filename}_sub2_opt2_desc`) ?? "")
.setName(loc_default.get(`c_${filename}_sub2_opt2_name`)!.toLowerCase())
.setDescription(loc_default.get(`c_${filename}_sub2_opt2_desc`)!)
.setNameLocalizations(
getLocalizations(client, `c_${filename}_sub2_opt2_name`, true),
)
@ -112,16 +112,16 @@ export default {
// Delete a reminder
.addSubcommand((subcommand) =>
subcommand
.setName(loc_default.get(`c_${filename}_sub3_name`)?.toLowerCase() ?? "")
.setDescription(loc_default.get(`c_${filename}_sub3_desc`) ?? "")
.setName(loc_default.get(`c_${filename}_sub3_name`)!.toLowerCase())
.setDescription(loc_default.get(`c_${filename}_sub3_desc`)!)
.setNameLocalizations(getLocalizations(client, `c_${filename}_sub3_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_sub3_desc`))
// ID
.addIntegerOption((option) =>
option
.setName(loc_default.get(`c_${filename}_sub3_opt1_name`)?.toLowerCase() ?? "")
.setDescription(loc_default.get(`c_${filename}_sub3_opt1_desc`) ?? "")
.setName(loc_default.get(`c_${filename}_sub3_opt1_name`)!.toLowerCase())
.setDescription(loc_default.get(`c_${filename}_sub3_opt1_desc`)!)
.setNameLocalizations(
getLocalizations(client, `c_${filename}_sub3_opt1_name`, true),
)
@ -142,7 +142,7 @@ export default {
const subcommand = interaction.options.getSubcommand();
switch (subcommand) {
// New reminder
case loc_default?.get(`c_${filename}_sub1_name`)?.toLowerCase() ?? "": {
case loc_default?.get(`c_${filename}_sub1_name`)?.toLowerCase(): {
// If time is already renseigned
const time = interaction.options.getString(
loc_default?.get(`c_${filename}_sub1_opt1_name`) as string,
@ -193,7 +193,7 @@ export default {
}
}
// List reminders
case loc_default?.get(`c_${filename}_sub2_name`)?.toLowerCase() ?? "": {
case loc_default?.get(`c_${filename}_sub2_name`)?.toLowerCase(): {
// Which user to show
let user = interaction.options.getUser(
loc_default?.get(`c_${filename}_sub2_opt1_name`) as string,
@ -244,7 +244,7 @@ export default {
return;
}
// Delete a reminder
case loc_default?.get(`c_${filename}_sub3_name`)?.toLowerCase() ?? "": {
case loc_default?.get(`c_${filename}_sub3_name`)?.toLowerCase(): {
const id = interaction.options.getInteger(
loc_default?.get(`c_${filename}_sub3_opt1_name`) as string,
);

30
src/commands/music/lyrics.ts
View file

@ -17,23 +17,23 @@ export default {
return (
new SlashCommandBuilder()
.setName(filename.toLowerCase())
.setDescription(loc_default.get(`c_${filename}_desc`) ?? "")
.setDescription(loc_default.get(`c_${filename}_desc`)!)
.setNameLocalizations(getLocalizations(client, `c_${filename}_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_desc`))
// Normal
.addSubcommand((subcommand) =>
subcommand
.setName(loc_default.get(`c_${filename}_sub1_name`)?.toLowerCase() ?? "")
.setDescription(loc_default.get(`c_${filename}_sub1_desc`) ?? "")
.setName(loc_default.get(`c_${filename}_sub1_name`)!.toLowerCase())
.setDescription(loc_default.get(`c_${filename}_sub1_desc`)!)
.setNameLocalizations(getLocalizations(client, `c_${filename}_sub1_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_sub1_desc`))
// Command option
.addStringOption((option) =>
option
.setName(loc_default.get(`c_${filename}_opt1_name`)?.toLowerCase() ?? "")
.setDescription(loc_default.get(`c_${filename}_opt1_desc`) ?? "")
.setName(loc_default.get(`c_${filename}_opt1_name`)!.toLowerCase())
.setDescription(loc_default.get(`c_${filename}_opt1_desc`)!)
.setNameLocalizations(getLocalizations(client, `c_${filename}_opt1_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_opt1_desc`)),
),
@ -42,16 +42,16 @@ export default {
// Romanized
.addSubcommand((subcommand) =>
subcommand
.setName(loc_default.get(`c_${filename}_sub2_name`)?.toLowerCase() ?? "")
.setDescription(loc_default.get(`c_${filename}_sub2_desc`) ?? "")
.setName(loc_default.get(`c_${filename}_sub2_name`)!.toLowerCase())
.setDescription(loc_default.get(`c_${filename}_sub2_desc`)!)
.setNameLocalizations(getLocalizations(client, `c_${filename}_sub2_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_sub2_desc`))
// Command option
.addStringOption((option) =>
option
.setName(loc_default.get(`c_${filename}_opt1_name`)?.toLowerCase() ?? "")
.setDescription(loc_default.get(`c_${filename}_opt1_desc`) ?? "")
.setName(loc_default.get(`c_${filename}_opt1_name`)!.toLowerCase())
.setDescription(loc_default.get(`c_${filename}_opt1_desc`)!)
.setNameLocalizations(getLocalizations(client, `c_${filename}_opt1_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_opt1_desc`)),
),
@ -60,8 +60,8 @@ export default {
// Synced
.addSubcommand((subcommand) =>
subcommand
.setName(loc_default.get(`c_${filename}_sub3_name`)?.toLowerCase() ?? "")
.setDescription(loc_default.get(`c_${filename}_sub3_desc`) ?? "")
.setName(loc_default.get(`c_${filename}_sub3_name`)!.toLowerCase())
.setDescription(loc_default.get(`c_${filename}_sub3_desc`)!)
.setNameLocalizations(getLocalizations(client, `c_${filename}_sub3_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_sub3_desc`)),
)
@ -82,12 +82,11 @@ export default {
await interaction.deferReply();
const player = useMainPlayer() as Player;
const queue = useQueue(interaction.guildId ?? "");
const queue = useQueue(interaction.guildId!);
if (request) {
if (
interaction.options.getSubcommand() ==
loc_default?.get(`c_${filename}_sub2_name`)?.toLowerCase() ??
""
loc_default?.get(`c_${filename}_sub2_name`)?.toLowerCase()
) {
// Romanized
request += " romanized";
@ -113,8 +112,7 @@ export default {
if (
interaction.options.getSubcommand() ==
loc_default?.get(`c_${filename}_sub3_name`)?.toLowerCase() ??
""
loc_default?.get(`c_${filename}_sub3_name`)?.toLowerCase()
) {
if (queue === null) {
return await interaction.followUp(`❌ | ${loc.get("c_lyrics1")}`);

4
src/commands/music/pause.ts
View file

@ -16,14 +16,14 @@ export default {
return new SlashCommandBuilder()
.setName(filename.toLowerCase())
.setDescription(loc_default.get(`c_${filename}_desc`) ?? "")
.setDescription(loc_default.get(`c_${filename}_desc`)!)
.setNameLocalizations(getLocalizations(client, `c_${filename}_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_desc`));
},
interaction: async (interaction: ChatInputCommandInteraction, client: Client) => {
const loc = getLocale(client, interaction.locale);
const queue = useQueue(interaction.guildId ?? "");
const queue = useQueue(interaction.guildId!);
if (queue) {
const embed = new EmbedBuilder();

12
src/commands/music/play.ts
View file

@ -25,15 +25,15 @@ export default {
return (
new SlashCommandBuilder()
.setName(filename.toLowerCase())
.setDescription(loc_default.get(`c_${filename}_desc`) ?? "")
.setDescription(loc_default.get(`c_${filename}_desc`)!)
.setNameLocalizations(getLocalizations(client, `c_${filename}_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_desc`))
// Command option
.addStringOption((option) =>
option
.setName(loc_default.get(`c_${filename}_opt1_name`)?.toLowerCase() ?? "")
.setDescription(loc_default.get(`c_${filename}_opt1_desc`) ?? "")
.setName(loc_default.get(`c_${filename}_opt1_name`)!.toLowerCase())
.setDescription(loc_default.get(`c_${filename}_opt1_desc`)!)
.setNameLocalizations(getLocalizations(client, `c_${filename}_opt1_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_opt1_desc`))
.setAutocomplete(true),
@ -47,8 +47,8 @@ export default {
const filename = getFilename(__filename);
const member = client.guilds.cache
.get(interaction.guildId ?? "")
?.members.cache.get(interaction.member?.user.id ?? "");
.get(interaction.guildId!)
?.members.cache.get(interaction.member!.user.id);
if (!member?.voice.channelId) {
return await interaction.reply({
@ -75,7 +75,7 @@ export default {
if (!query) {
// Now playing
const queue = useQueue(interaction.guildId ?? "");
const queue = useQueue(interaction.guildId!);
if (queue) {
const track = queue.history.currentTrack;

30
src/commands/music/queue.ts
View file

@ -27,23 +27,23 @@ export default {
return (
new SlashCommandBuilder()
.setName(filename.toLowerCase())
.setDescription(loc_default.get(`c_${filename}_desc`) ?? "")
.setDescription(loc_default.get(`c_${filename}_desc`)!)
.setNameLocalizations(getLocalizations(client, `c_${filename}_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_desc`))
// Show the queue
.addSubcommand((subcommand) =>
subcommand
.setName(loc_default.get(`c_${filename}_sub1_name`)?.toLowerCase() ?? "")
.setDescription(loc_default.get(`c_${filename}_sub1_desc`) ?? "")
.setName(loc_default.get(`c_${filename}_sub1_name`)!.toLowerCase())
.setDescription(loc_default.get(`c_${filename}_sub1_desc`)!)
.setNameLocalizations(getLocalizations(client, `c_${filename}_sub1_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_sub1_desc`))
// Specified Page
.addNumberOption((option) =>
option
.setName(loc_default.get(`c_${filename}_sub1_opt1_name`)?.toLowerCase() ?? "")
.setDescription(loc_default.get(`c_${filename}_sub1_opt1_desc`) ?? "")
.setName(loc_default.get(`c_${filename}_sub1_opt1_name`)!.toLowerCase())
.setDescription(loc_default.get(`c_${filename}_sub1_opt1_desc`)!)
.setNameLocalizations(
getLocalizations(client, `c_${filename}_sub1_opt1_name`, true),
)
@ -56,8 +56,8 @@ export default {
// Shuffle Queue
.addSubcommand((subcommand) =>
subcommand
.setName(loc_default.get(`c_${filename}_sub2_name`)?.toLowerCase() ?? "")
.setDescription(loc_default.get(`c_${filename}_sub2_desc`) ?? "")
.setName(loc_default.get(`c_${filename}_sub2_name`)!.toLowerCase())
.setDescription(loc_default.get(`c_${filename}_sub2_desc`)!)
.setNameLocalizations(getLocalizations(client, `c_${filename}_sub2_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_sub2_desc`)),
)
@ -65,8 +65,8 @@ export default {
// Remove <ID>
.addSubcommand((subcommand) =>
subcommand
.setName(loc_default.get(`c_${filename}_sub3_name`)?.toLowerCase() ?? "")
.setDescription(loc_default.get(`c_${filename}_sub3_desc`) ?? "")
.setName(loc_default.get(`c_${filename}_sub3_name`)!.toLowerCase())
.setDescription(loc_default.get(`c_${filename}_sub3_desc`)!)
.setNameLocalizations(getLocalizations(client, `c_${filename}_sub3_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_sub3_desc`))
@ -74,8 +74,8 @@ export default {
// TODO?: ID range -> as a string: 5-8 remove 5, 6, 7, 8
.addNumberOption((option) =>
option
.setName(loc_default.get(`c_${filename}_sub3_opt1_name`)?.toLowerCase() ?? "")
.setDescription(loc_default.get(`c_${filename}_sub3_opt1_desc`) ?? "")
.setName(loc_default.get(`c_${filename}_sub3_opt1_name`)!.toLowerCase())
.setDescription(loc_default.get(`c_${filename}_sub3_opt1_desc`)!)
.setNameLocalizations(
getLocalizations(client, `c_${filename}_sub3_opt1_name`, true),
)
@ -93,7 +93,7 @@ export default {
const filename = getFilename(__filename);
const loc = getLocale(client, interaction.locale);
const queue = useQueue(interaction.guildId ?? "");
const queue = useQueue(interaction.guildId!);
const embed = new EmbedBuilder();
@ -101,7 +101,7 @@ export default {
const subcommand = interaction.options.getSubcommand();
switch (subcommand) {
// Show the queue
case loc_default?.get(`c_${filename}_sub1_name`)?.toLowerCase() ?? "": {
case loc_default?.get(`c_${filename}_sub1_name`)?.toLowerCase(): {
const page =
interaction.options.getNumber(
loc_default?.get(`c_${filename}_sub1_opt1_name`) as string,
@ -142,7 +142,7 @@ export default {
}
// Shuffle Queue
case loc_default?.get(`c_${filename}_sub2_name`)?.toLowerCase() ?? "": {
case loc_default?.get(`c_${filename}_sub2_name`)?.toLowerCase(): {
queue.tracks.shuffle();
embed.setDescription(loc.get("c_queue3"));
@ -150,7 +150,7 @@ export default {
}
// Remove <ID>
case loc_default?.get(`c_${filename}_sub3_name`)?.toLowerCase() ?? "": {
case loc_default?.get(`c_${filename}_sub3_name`)?.toLowerCase(): {
const id = interaction.options.getNumber(
loc_default?.get(`c_${filename}_sub3_opt1_name`) as string,
) as number;

28
src/commands/music/repeat.ts
View file

@ -17,15 +17,15 @@ export default {
return (
new SlashCommandBuilder()
.setName(filename.toLowerCase())
.setDescription(loc_default.get(`c_${filename}_desc`) ?? "")
.setDescription(loc_default.get(`c_${filename}_desc`)!)
.setNameLocalizations(getLocalizations(client, `c_${filename}_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_desc`))
// Disable repeat
.addSubcommand((subcommand) =>
subcommand
.setName(loc_default.get(`c_${filename}_sub1_name`)?.toLowerCase() ?? "")
.setDescription(loc_default.get(`c_${filename}_sub1_desc`) ?? "")
.setName(loc_default.get(`c_${filename}_sub1_name`)!.toLowerCase())
.setDescription(loc_default.get(`c_${filename}_sub1_desc`)!)
.setNameLocalizations(getLocalizations(client, `c_${filename}_sub1_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_sub1_desc`)),
)
@ -33,8 +33,8 @@ export default {
// Repeat current track
.addSubcommand((subcommand) =>
subcommand
.setName(loc_default.get(`c_${filename}_sub2_name`)?.toLowerCase() ?? "")
.setDescription(loc_default.get(`c_${filename}_sub2_desc`) ?? "")
.setName(loc_default.get(`c_${filename}_sub2_name`)!.toLowerCase())
.setDescription(loc_default.get(`c_${filename}_sub2_desc`)!)
.setNameLocalizations(getLocalizations(client, `c_${filename}_sub2_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_sub2_desc`)),
)
@ -42,8 +42,8 @@ export default {
// Repeat queue
.addSubcommand((subcommand) =>
subcommand
.setName(loc_default.get(`c_${filename}_sub3_name`)?.toLowerCase() ?? "")
.setDescription(loc_default.get(`c_${filename}_sub3_desc`) ?? "")
.setName(loc_default.get(`c_${filename}_sub3_name`)!.toLowerCase())
.setDescription(loc_default.get(`c_${filename}_sub3_desc`)!)
.setNameLocalizations(getLocalizations(client, `c_${filename}_sub3_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_sub3_desc`)),
)
@ -51,8 +51,8 @@ export default {
// Enable autoplay
.addSubcommand((subcommand) =>
subcommand
.setName(loc_default.get(`c_${filename}_sub4_name`)?.toLowerCase() ?? "")
.setDescription(loc_default.get(`c_${filename}_sub4_desc`) ?? "")
.setName(loc_default.get(`c_${filename}_sub4_name`)!.toLowerCase())
.setDescription(loc_default.get(`c_${filename}_sub4_desc`)!)
.setNameLocalizations(getLocalizations(client, `c_${filename}_sub4_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_sub4_desc`)),
)
@ -64,31 +64,31 @@ export default {
const filename = getFilename(__filename);
const loc = getLocale(client, interaction.locale);
const queue = useQueue(interaction.guildId ?? "");
const queue = useQueue(interaction.guildId!);
if (queue) {
const subcommand = interaction.options.getSubcommand();
switch (subcommand) {
// Disable
case loc_default?.get(`c_${filename}_sub1_name`)?.toLowerCase() ?? "": {
case loc_default?.get(`c_${filename}_sub1_name`)?.toLowerCase(): {
queue.setRepeatMode(QueueRepeatMode.OFF);
return interaction.reply(loc.get("c_repeat2") + ".");
}
// Queue Repeat
case loc_default?.get(`c_${filename}_sub3_name`)?.toLowerCase() ?? "": {
case loc_default?.get(`c_${filename}_sub3_name`)?.toLowerCase(): {
queue.setRepeatMode(QueueRepeatMode.QUEUE);
return interaction.reply(`${loc.get("c_repeat3")} ${loc.get("c_repeat6")}.`);
}
// Autoplay
case loc_default?.get(`c_${filename}_sub4_name`)?.toLowerCase() ?? "": {
case loc_default?.get(`c_${filename}_sub4_name`)?.toLowerCase(): {
queue.setRepeatMode(QueueRepeatMode.AUTOPLAY);
return interaction.reply(`${loc.get("c_repeat4")} ${loc.get("c_repeat6")}.`);
}
// Track repeat
case loc_default?.get(`c_${filename}_sub2_name`)?.toLowerCase() ?? "": {
case loc_default?.get(`c_${filename}_sub2_name`)?.toLowerCase(): {
queue.setRepeatMode(QueueRepeatMode.TRACK);
return interaction.reply(
`${loc.get("c_repeat5")} ${queue.history.currentTrack?.title} ${loc.get("c_repeat6")}.`,

8
src/commands/music/skip.ts
View file

@ -17,15 +17,15 @@ export default {
return (
new SlashCommandBuilder()
.setName(filename.toLowerCase())
.setDescription(loc_default.get(`c_${filename}_desc`) ?? "")
.setDescription(loc_default.get(`c_${filename}_desc`)!)
.setNameLocalizations(getLocalizations(client, `c_${filename}_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_desc`))
// Command option
.addNumberOption((option) =>
option
.setName(loc_default.get(`c_${filename}_opt1_name`)?.toLowerCase() ?? "")
.setDescription(loc_default.get(`c_${filename}_opt1_desc`) ?? "")
.setName(loc_default.get(`c_${filename}_opt1_name`)!.toLowerCase())
.setDescription(loc_default.get(`c_${filename}_opt1_desc`)!)
.setNameLocalizations(getLocalizations(client, `c_${filename}_opt1_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_opt1_desc`)),
)
@ -37,7 +37,7 @@ export default {
const filename = getFilename(__filename);
const loc = getLocale(client, interaction.locale);
const queue = useQueue(interaction.guildId ?? "");
const queue = useQueue(interaction.guildId!);
const id = interaction.options.getNumber(loc_default?.get(`c_${filename}_opt1_name`) as string);

2
src/commands/music/stop.ts
View file

@ -17,7 +17,7 @@ export default {
return new SlashCommandBuilder()
.setName(filename.toLowerCase())
.setDescription(loc_default.get(`c_${filename}_desc`) ?? "")
.setDescription(loc_default.get(`c_${filename}_desc`)!)
.setNameLocalizations(getLocalizations(client, `c_${filename}_name`, true))
.setDescriptionLocalizations(getLocalizations(client, `c_${filename}_desc`));
},

2
src/utils/reminder.ts
View file

@ -168,7 +168,7 @@ export const sendReminder = (client: Client, info: infoReminder, option: OptionR
}
} else {
// Channel
client.channels.fetch(info.channelId ?? "").then((channel) => {
client.channels.fetch(info.channelId!).then((channel) => {
if (channel?.isSendable()) {
let content = `<@${info.userId}>`;
embed.setFooter({