All commands and some events finished
diff --git a/src/reflex/guide.ts b/src/reflex/guide.ts
index b539aac..6829ef2 100644
--- a/src/reflex/guide.ts
+++ b/src/reflex/guide.ts
@@ -3,45 +3,18 @@
ActionRowBuilder,
ButtonBuilder,
MessageComponentInteraction,
- MessageSelectOptionData,
+ StringSelectMenuInteraction,
Guild,
CommandInteraction,
GuildTextBasedChannel,
Message,
- SelectMenuInteraction,
- ButtonStyle
+ ButtonStyle,
+ ChannelType
} from "discord.js";
import EmojiEmbed from "../utils/generateEmojiEmbed.js";
import getEmojiByName from "../utils/getEmojiByName.js";
import createPageIndicator from "../utils/createPageIndicator.js";
-
-class Embed {
- embed: Discord.EmbedBuilder;
- title: string;
- description = "";
- pageId = 0;
-
- constructor() {
- this.embed = new Discord.EmbedBuilder();
- this.title = "";
- }
- setEmbed(embed: Discord.EmbedBuilder) {
- this.embed = embed;
- return this;
- }
- setTitle(title: string) {
- this.title = title;
- return this;
- }
- setDescription(description: string) {
- this.description = description;
- return this;
- }
- setPageId(pageId: number) {
- this.pageId = pageId;
- return this;
- }
-}
+import { Embed } from "../utils/defaults.js";
export default async (guild: Guild, interaction?: CommandInteraction) => {
let c: GuildTextBasedChannel | null = guild.publicUpdatesChannel ? guild.publicUpdatesChannel : guild.systemChannel;
@@ -50,14 +23,14 @@
: (guild.channels.cache.find(
(ch) =>
[
- "GUILD_TEXT",
- "GUILD_NEWS",
- "GUILD_NEWS_THREAD",
- "GUILD_PRIVATE_THREAD",
- "GUILD_PUBLIC_THREAD"
+ ChannelType.GuildText,
+ ChannelType.GuildAnnouncement,
+ ChannelType.PublicThread,
+ ChannelType.PrivateThread,
+ ChannelType.AnnouncementThread
].includes(ch.type) &&
- ch.permissionsFor(guild.roles.everyone).has("SEND_MESSAGES") &&
- ch.permissionsFor(guild.me!).has("EMBED_LINKS")
+ ch.permissionsFor(guild.roles.everyone).has("SendMessages") &&
+ ch.permissionsFor(guild.members.me!).has("EmbedLinks")
) as GuildTextBasedChannel | undefined) ?? null;
if (interaction) c = interaction.channel as GuildTextBasedChannel;
if (!c) {
@@ -226,7 +199,7 @@
let page = 0;
const publicFilter = async (component: MessageComponentInteraction) => {
- return (component.member as Discord.GuildMember).permissions.has("MANAGE_GUILD");
+ return (component.member as Discord.GuildMember).permissions.has("ManageGuild");
};
let selectPaneOpen = false;
@@ -234,20 +207,20 @@
let cancelled = false;
let timedOut = false;
while (!cancelled && !timedOut) {
- let selectPane: ActionRowBuilder[] = [];
+ let selectPane: ActionRowBuilder<Discord.StringSelectMenuBuilder | ButtonBuilder>[] = [];
if (selectPaneOpen) {
- const options: MessageSelectOptionData[] = [];
+ const options: Discord.StringSelectMenuOptionBuilder[] = [];
pages.forEach((embed) => {
- options.push({
- label: embed.title,
- value: embed.pageId.toString(),
- description: embed.description || ""
- });
+ options.push(new Discord.StringSelectMenuOptionBuilder()
+ .setLabel(embed.title)
+ .setValue(embed.pageId.toString())
+ .setDescription(embed.description || "")
+ );
});
selectPane = [
- new ActionRowBuilder().addComponents([
- new Discord.SelectMenuBuilder()
+ new ActionRowBuilder<Discord.StringSelectMenuBuilder>().addComponents([
+ new Discord.StringSelectMenuBuilder()
.addOptions(options)
.setCustomId("page")
.setMaxValues(1)
@@ -255,8 +228,8 @@
])
];
}
- const components = selectPane.concat([
- new ActionRowBuilder().addComponents([
+ const components: ActionRowBuilder<ButtonBuilder | Discord.StringSelectMenuBuilder>[] = selectPane.concat([
+ new ActionRowBuilder<ButtonBuilder>().addComponents(
new ButtonBuilder()
.setCustomId("left")
.setEmoji(getEmojiByName("CONTROL.LEFT", "id"))
@@ -272,18 +245,18 @@
.setEmoji(getEmojiByName("CONTROL.RIGHT", "id"))
.setStyle(ButtonStyle.Secondary)
.setDisabled(page === pages.length - 1)
- ])
+ )
]);
if (interaction) {
const em = new Discord.EmbedBuilder(pages[page]!.embed);
- em.setDescription(em.description + "\n\n" + createPageIndicator(pages.length, page));
+ em.setDescription(em.data.description + "\n\n" + createPageIndicator(pages.length, page));
await interaction.editReply({
embeds: [em],
components: components
});
} else {
const em = new Discord.EmbedBuilder(pages[page]!.embed);
- em.setDescription(em.description + "\n\n" + createPageIndicator(pages.length, page));
+ em.setDescription(em.data.description + "\n\n" + createPageIndicator(pages.length, page));
(await m.edit({
embeds: [em],
components: components
@@ -313,7 +286,7 @@
} else if (i.component.customId === "select") {
selectPaneOpen = !selectPaneOpen;
} else if (i.component.customId === "page") {
- page = parseInt((i as SelectMenuInteraction).values[0]!);
+ page = parseInt((i as StringSelectMenuInteraction).values[0]!);
selectPaneOpen = false;
} else {
cancelled = true;
@@ -322,7 +295,7 @@
if (timedOut) {
if (interaction) {
const em = new Discord.EmbedBuilder(pages[page]!.embed);
- em.setDescription(em.description + "\n\n" + createPageIndicator(pages.length, page)).setFooter({
+ em.setDescription(em.data.description + "\n\n" + createPageIndicator(pages.length, page)).setFooter({
text: "Message timed out"
});
await interaction.editReply({
@@ -331,7 +304,7 @@
});
} else {
const em = new Discord.EmbedBuilder(pages[page]!.embed);
- em.setDescription(em.description + "\n\n" + createPageIndicator(pages.length, page)).setFooter({
+ em.setDescription(em.data.description + "\n\n" + createPageIndicator(pages.length, page)).setFooter({
text: "Message timed out"
});
await m.edit({
@@ -342,7 +315,7 @@
} else {
if (interaction) {
const em = new Discord.EmbedBuilder(pages[page]!.embed);
- em.setDescription(em.description + "\n\n" + createPageIndicator(pages.length, page));
+ em.setDescription(em.data.description + "\n\n" + createPageIndicator(pages.length, page));
em.setFooter({ text: "Message closed" });
interaction.editReply({
embeds: [em],
diff --git a/src/reflex/statsChannelUpdate.ts b/src/reflex/statsChannelUpdate.ts
index 2e12429..db705d9 100644
--- a/src/reflex/statsChannelUpdate.ts
+++ b/src/reflex/statsChannelUpdate.ts
@@ -1,3 +1,4 @@
+import { getCommandMentionByName } from '../utils/getCommandMentionByName.js';
import type { Guild, User } from "discord.js";
import type { NucleusClient } from "../utils/client.js";
import type { GuildMember } from "discord.js";
@@ -31,7 +32,7 @@
return singleNotify(
"statsChannelDeleted",
guild!.id,
- "One or more of your stats channels have been deleted. Please use `/settings stats` if you wish to add the channel again.\n" +
+ `One or more of your stats channels have been deleted. You can use ${await getCommandMentionByName("settings/stats")}.\n` +
`The channels name was: ${deleted!.name}`,
"Critical"
);
diff --git a/src/reflex/welcome.ts b/src/reflex/welcome.ts
index 7722086..87bb81a 100644
--- a/src/reflex/welcome.ts
+++ b/src/reflex/welcome.ts
@@ -1,3 +1,4 @@
+import { getCommandMentionByName } from './../utils/getCommandMentionByName.js';
import type { NucleusClient } from "../utils/client.js";
import convertCurlyBracketString from "../utils/convertCurlyBracketString.js";
import client from "../utils/client.js";
@@ -26,7 +27,7 @@
});
} else {
const channel: GuildChannel | null = await member.guild.channels.fetch(config.welcome.channel) as GuildChannel | null;
- if (!channel) return; // TODO: SEN
+ if (!channel) return await singleNotify("welcomeChannelDeleted", member.guild.id, `The welcome channel has been deleted or is no longer accessible. Use ${await getCommandMentionByName("settings/welcome")} to set a new one`, "Warning")
if (!(channel instanceof BaseGuildTextChannel)) return;
if (channel.guild.id !== member.guild.id) return;
try {
@@ -38,7 +39,7 @@
singleNotify(
"welcomeChannelDeleted",
member.guild.id,
- "The welcome channel has been deleted or is no longer accessible. Use /settings welcome to set a new one",
+ `The welcome channel has been deleted or is no longer accessible. Use ${await getCommandMentionByName("settings/welcome")} to set a new one`,
"Warning"
)
}