diff --git a/Addons/hello.js b/Addons/hello.js
index e87b181..692eff3 100644
--- a/Addons/hello.js
+++ b/Addons/hello.js
@@ -10,8 +10,8 @@ const supportbot = yaml.load(
);
const cmdconfig = yaml.load(fs.readFileSync("./Configs/commands.yml", "utf8"));
-// Your Addon Config file! Saved in /Addons/Settings/YourAddonConfig.yml
-// const exampleaddon = yaml.load(fs.readFileSync('./Addons/Settings/YourAddonConfig.yml', 'utf8'));
+// Your Addon Config file! Saved in /Addons/Configs/YourAddonConfig.yml
+// const exampleaddon = yaml.load(fs.readFileSync('./Addons/Configs/YourAddonConfig.yml', 'utf8'));
const Command = require("../Structures/Command.js");
diff --git a/Commands/add.js b/Commands/add.js
index 5aee916..6fef2da 100644
--- a/Commands/add.js
+++ b/Commands/add.js
@@ -32,19 +32,18 @@ module.exports = new Command({
permission: "SEND_MESSAGES",
async run(interaction) {
- let SupportStaff =
- interaction.guild.roles.cache.find(
- (SupportTeam) => SupportTeam.name === supportbot.Staff
- ) ||
- interaction.guild.roles.cache.find(
- (SupportTeam) => SupportTeam.id === supportbot.Staff
- );
- let Admins =
- interaction.guild.roles.cache.find(
- (AdminUser) => AdminUser.name === supportbot.Admin
- ) ||
- interaction.guild.roles.cache.find(
- (AdminUser) => AdminUser.id === supportbot.Admin
+ let SupportStaff = interaction.guild.roles.cache.find(
+ (SupportTeam) =>
+ SupportTeam.name == supportbot.Staff ||
+ SupportTeam.id == supportbot.Staff
+ );
+ let Admins = interaction.guild.roles.cache.find(
+ (AdminUser) =>
+ AdminUser.name == supportbot.Admin || AdminUser.id == supportbot.Admin
+ );
+ if (!SupportStaff || !Admins)
+ return interaction.reply(
+ "Some roles seem to be missing!\nPlease check for errors when starting the bot."
);
const NoPerms = new Discord.MessageEmbed()
diff --git a/Commands/close.js b/Commands/close.js
index 2a29c8a..296dd8a 100644
--- a/Commands/close.js
+++ b/Commands/close.js
@@ -11,13 +11,6 @@ const supportbot = yaml.load(
const cmdconfig = yaml.load(fs.readFileSync("./Configs/commands.yml", "utf8"));
const Command = require("../Structures/Command.js");
-const TicketNumberID = require("../Structures/TicketID.js");
-
-async function asyncForEach(array, callback) {
- for (let index = 0; index < array.length; index++) {
- await callback(array[index], index, array);
- }
-}
module.exports = new Command({
name: cmdconfig.CloseTicket,
@@ -32,14 +25,35 @@ module.exports = new Command({
permission: "SEND_MESSAGES",
async run(interaction) {
- if (!interaction.channel.name.startsWith(`${supportbot.TicketPrefix}`)) {
+ let TicketData = await JSON.parse(
+ fs.readFileSync("./Data/TicketData.json", "utf8")
+ ).tickets.find((t) => t.id === interaction.channel.id);
+ if (
+ !TicketData ||
+ !interaction.channel.name.startsWith(supportbot.TicketPrefix)
+ ) {
const Exists = new Discord.MessageEmbed()
.setTitle("No Ticket Found!")
.setDescription(`${supportbot.NoValidTicket}`)
.setColor(supportbot.WarningColour);
- return interaction.reply({ embed: Exists });
+ return interaction.reply({ embeds: [Exists] });
}
+ let tUser = interaction.client.users.cache.get(TicketData.user);
+ let transcriptChannel = await interaction.guild.channels.cache.find(
+ (channel) =>
+ channel.name == supportbot.TranscriptLog ||
+ channel.id == supportbot.TranscriptLog
+ );
+ let logChannel = await interaction.guild.channels.cache.find(
+ (channel) =>
+ channel.name == supportbot.TicketLog ||
+ channel.id == supportbot.TicketLog
+ );
+ let reason =
+ (await interaction.options?.getString("reason")) || "No Reason Provided.";
+ if (!transcriptChannel || !logChannel)
+ return interaction.reply("Some Channels seem to be missing!");
if (supportbot.CloseConfirmation) {
const CloseTicketRequest = new Discord.MessageEmbed()
.setTitle(`**${supportbot.ClosingTicket}**`)
@@ -48,184 +62,98 @@ module.exports = new Command({
)
.setColor(supportbot.EmbedColour);
- interaction
- .reply(CloseTicketRequest)
- .then((m) => {
- interaction.channel
- .awaitMessages(
- (response) =>
- response.content.toLowerCase() ===
- supportbot.ClosingConfirmation_Word,
- {
- max: 1,
- time: 20000,
- errors: ["time"],
- }
- )
- .then((collected) => {
- let logChannel =
- interaction.guild.channels.cache.find(
- (channel) => channel.name === supportbot.TranscriptLog
- ) ||
- interaction.guild.channels.cache.find(
- (channel) => channel.id === supportbot.TranscriptLog
- );
- let user = interaction.user;
- let reason =
- interaction.options.getString("reason") ||
- "No Reason Provided.";
-
- let name = interaction.channel.name;
- let ticketChannel = interaction.channel;
-
- interaction
- .reply(`**${supportbot.ClosingTicket}**`)
-
- .then(() => {
- const logEmbed = new Discord.MessageEmbed()
- .setTitle(supportbot.TranscriptTitle)
- .setColor(supportbot.EmbedColour)
- .setFooter(supportbot.EmbedFooter)
- .addField("Closed By", interaction.user.tag)
- .addField("Reason", reason);
-
- interaction.channel.interactions
- .fetch({ limit: 100 })
- .then((msgs) => {
- let html = "";
-
- msgs = msgs.sort(
- (a, b) => a.createdTimestamp - b.createdTimestamp
- );
- html += ``;
- html += `Server Name: ${interaction.guild.name}
`;
- html += `Ticket: ${ticketChannel.name}
`;
- html += `Message: ${msgs.size} Messages
`;
-
- msgs.forEach((msg) => {
- if (msg.content) {
- html += `User: ${msg.author.tag}
`;
- html += `Message: ${msg.content}
`;
- html += `-----
`;
- }
- });
-
- logChannel.send({ embeds: [logEmbed] }).catch((err) => {
- interaction.reply(err);
- });
-
- let file = new Discord.MessageAttachment(
- Buffer.from(html),
- `${name}.html`
- );
- logChannel
- .send({ embeds: [logEmbed], files: [file] })
- .catch((err) => {
- interaction.reply(err);
- });
-
- interaction.channel.delete().catch((error) => {
- if (
- error.code !==
- Discord.Constants.APIErrors.UNKNOWN_CHANNEL
- ) {
- console.error(
- "Failed to delete the interaction:",
- error
- );
- }
- });
- });
- });
- });
- })
- .catch(() => {
- interaction
- .followUp({
- content: "The request to close the ticket has timed out.",
- })
- .then((m2) => setTimeout(() => interaction.channel.delete(3000)));
- });
+ await interaction.reply(CloseTicketRequest);
+ await interaction.channel.awaitMessages(
+ (r) =>
+ r.content.toLowerCase() === supportbot.ClosingConfirmation_Word &&
+ r.author.id === interaction.author.id,
+ {
+ max: 1,
+ time: 20000,
+ errors: ["time"],
+ }
+ );
}
+ try {
+ await interaction.reply(`**${supportbot.ClosingTicket}**`);
+ const transcriptEmbed = new Discord.MessageEmbed()
+ .setTitle(supportbot.TranscriptTitle)
+ .setColor(supportbot.EmbedColour)
+ .setFooter(supportbot.EmbedFooter)
+ .addField(
+ "Ticket",
+ `${interaction.channel.name} (${interaction.channel.id})`
+ )
+ .addField(
+ "User",
+ `${tUser.username}#${tUser.discriminator} (${tUser.id})`
+ )
+ .addField("Closed By", interaction.user.tag)
+ .addField("Reason", reason);
+ const logEmbed = new Discord.MessageEmbed()
+ .setTitle(supportbot.TicketLog_Title)
+ .setColor(supportbot.EmbedColour)
+ .setFooter(supportbot.EmbedFooter)
+ .addField(
+ "Ticket",
+ `${interaction.channel.name} (${interaction.channel.id})`
+ )
+ .addField(
+ "User",
+ `${tUser.username}#${tUser.discriminator} (${tUser.id})`
+ )
+ .addField("Closed By", interaction.user.tag)
+ .addField("Reason", reason);
+ let msgs = await interaction.channel.messages.fetch();
+ let html = "";
- if (!supportbot.CloseConfirmation) {
- let logChannel =
- interaction.guild.channels.cache.find(
- (channel) => channel.name === supportbot.TranscriptLog
- ) ||
- interaction.guild.channels.cache.find(
- (channel) => channel.id === supportbot.TranscriptLog
- );
- let user = interaction.user;
- let reason =
- (await interaction.options.getString("reason")) ||
- "No Reason Provided.";
+ msgs = msgs.sort((a, b) => a.createdTimestamp - b.createdTimestamp);
+ html += ``;
+ html += `Server Name: ${interaction.guild.name}
`;
+ html += `Ticket: ${interaction.channel.name}
`;
+ html += `Message: ${msgs.size} Messages
`;
- let name = interaction.channel.name;
- let ticketChannel = interaction.channel;
+ await msgs.forEach((msg) => {
+ if (msg.content) {
+ html += `User: ${msg.author.tag}
`;
+ html += `Message: ${msg.content}
`;
+ html += `-----
`;
+ }
+ });
- interaction
- .reply(`**${supportbot.ClosingTicket}**`)
+ await logChannel.send({ embeds: [logEmbed] }).catch((err) => {
+ console.error(err);
+ });
- .then(() => {
- const logEmbed = new Discord.MessageEmbed()
- .setTitle(supportbot.TranscriptTitle)
- .setColor(supportbot.EmbedColour)
- .setFooter(supportbot.EmbedFooter)
- .addField("Closed By", interaction.user.tag)
- .addField("Reason", reason);
-
- interaction.channel.interactions
- .fetch({ limit: 100 })
- .then((msgs) => {
- let html = "";
-
- msgs = msgs.sort(
- (a, b) => a.createdTimestamp - b.createdTimestamp
- );
- html += ``;
- html += `Server Name: ${interaction.guild.name}
`;
- html += `Ticket: ${ticketChannel.name}
`;
- html += `Message: ${msgs.size} Messages
`;
-
- msgs.forEach((msg) => {
- if (msg.content) {
- html += `User: ${msg.author.tag}
`;
- html += `Message: ${msg.content}
`;
- html += `-----
`;
- }
- });
-
- logChannel.send({ embeds: [logEmbed] }).catch((err) => {
- interaction.reply(err);
- });
-
- let file = new Discord.MessageAttachment(
- Buffer.from(html),
- `${name}.html`
- );
- logChannel
- .send({ embeds: [logEmbed], files: [file] })
- .catch((err) => {
- interaction.reply(err);
- });
-
- interaction.channel.delete().catch((error) => {
- if (
- error.code !== Discord.Constants.APIErrors.UNKNOWN_CHANNEL
- ) {
- console.error("Failed to delete the interaction:", error);
- }
- });
- });
- })
- .catch(() => {
- interaction
- .followUp({
- content: "The request to close the ticket has timed out.",
- })
- .then((m2) => setTimeout(() => interaction.channel.delete(3000)));
+ let file = new Discord.MessageAttachment(
+ Buffer.from(html),
+ `${interaction.channel.name}.html`
+ );
+ await transcriptChannel
+ .send({ embeds: [transcriptEmbed], files: [file] })
+ .catch(async (err) => {
+ console.error(err);
});
+ await tUser
+ .send({ embeds: [transcriptEmbed], files: [file] })
+ .catch(async (err) => {
+ console.error(err);
+ });
+
+ await interaction.channel.delete().catch(async (error) => {
+ console.error(error);
+ if (error.code !== Discord.Constants.APIErrors.UNKNOWN_CHANNEL) {
+ console.error("Failed to delete the interaction:", error);
+ }
+ });
+ } catch (error) {
+ console.error(error);
+ /*
+ await interaction.followUp({
+ content: "The request to close the ticket has timed out.",
+ });
+ setTimeout(() => interaction.channel.delete(3000));
+ */
}
},
});
diff --git a/Commands/embed.js b/Commands/embed.js
index 9bff3a8..278a777 100644
--- a/Commands/embed.js
+++ b/Commands/embed.js
@@ -31,21 +31,20 @@ module.exports = new Command({
permission: "SEND_MESSAGES",
async run(interaction) {
- let SupportStaff =
- interaction.guild.roles.cache.find(
- (SupportTeam) => SupportTeam.name === supportbot.Staff
- ) ||
- interaction.guild.roles.cache.find(
- (SupportTeam) => SupportTeam.id === supportbot.Staff
- );
- let Admins =
- interaction.guild.roles.cache.find(
- (AdminUser) => AdminUser.name === supportbot.Admin
- ) ||
- interaction.guild.roles.cache.find(
- (AdminUser) => AdminUser.id === supportbot.Admin
- );
+ let SupportStaff = interaction.guild.roles.cache.find(
+ (SupportTeam) =>
+ SupportTeam.name === supportbot.Staff ||
+ SupportTeam.id === supportbot.Staff
+ );
+ let Admins = interaction.guild.roles.cache.find(
+ (AdminUser) =>
+ AdminUser.name === supportbot.Admin || AdminUser.id === supportbot.Admin
+ );
+ if (!SupportStaff || !Admins)
+ return interaction.reply(
+ "Some roles seem to be missing!\nPlease check for errors when starting the bot."
+ );
const NoPerms = new Discord.MessageEmbed()
.setTitle("Invalid Permissions!")
.setDescription(
diff --git a/Commands/help.js b/Commands/help.js
index 1b41fcf..6187134 100644
--- a/Commands/help.js
+++ b/Commands/help.js
@@ -26,17 +26,20 @@ module.exports = new Command({
async run(interaction) {
let SupportStaff = interaction.guild.roles.cache.find(
+
(SupportTeam) =>
SupportTeam.name === supportbot.Staff || SupportTeam.id === supportbot.Staff
);
let Admins = interaction.guild.roles.cache.find(
(AdminUser) =>
AdminUser.name === supportbot.Admin || AdminUser.id === supportbot.Admin
+
);
if (!SupportStaff || !Admins)
return interaction.reply(
"Some roles seem to be missing!\nPlease check for errors when starting the bot."
);
+
let botCommands = "";
botCommands += `**/${cmdconfig.HelpCommand}** ${cmdconfig.HelpCommandDesc}\n`;
botCommands += `**/${cmdconfig.InfoCommand}** ${cmdconfig.InfoCommandDesc}\n`;
@@ -90,4 +93,4 @@ module.exports = new Command({
});
}
},
-});
+});
\ No newline at end of file
diff --git a/Commands/remove.js b/Commands/remove.js
index d062584..c90e0a1 100644
--- a/Commands/remove.js
+++ b/Commands/remove.js
@@ -32,19 +32,18 @@ module.exports = new Command({
permission: "SEND_MESSAGES",
async run(interaction) {
- let SupportStaff =
- interaction.guild.roles.cache.find(
- (SupportTeam) => SupportTeam.name === supportbot.Staff
- ) ||
- interaction.guild.roles.cache.find(
- (SupportTeam) => SupportTeam.id === supportbot.Staff
- );
- let Admins =
- interaction.guild.roles.cache.find(
- (AdminUser) => AdminUser.name === supportbot.Admin
- ) ||
- interaction.guild.roles.cache.find(
- (AdminUser) => AdminUser.id === supportbot.Admin
+ let SupportStaff = interaction.guild.roles.cache.find(
+ (SupportTeam) =>
+ SupportTeam.name == supportbot.Staff ||
+ SupportTeam.id == supportbot.Staff
+ );
+ let Admins = interaction.guild.roles.cache.find(
+ (AdminUser) =>
+ AdminUser.name == supportbot.Admin || AdminUser.id == supportbot.Admin
+ );
+ if (!SupportStaff || !Admins)
+ return interaction.reply(
+ "Some roles seem to be missing!\nPlease check for errors when starting the bot."
);
const NoPerms = new Discord.MessageEmbed()
diff --git a/Commands/suggest.js b/Commands/suggest.js
index 99a99bc..f06db63 100644
--- a/Commands/suggest.js
+++ b/Commands/suggest.js
@@ -25,13 +25,11 @@ module.exports = new Command({
permission: "SEND_MESSAGES",
async run(interaction) {
- const suggestChannel =
- interaction.guild.channels.cache.find(
- (channel) => channel.name === supportbot.SuggestionChannel
- ) ||
- interaction.guild.channels.cache.find(
- (channel) => channel.id === supportbot.SuggestionChannel
- );
+ const suggestChannel = interaction.guild.channels.cache.find(
+ (channel) =>
+ channel.name === supportbot.SuggestionChannel ||
+ channel.id === supportbot.SuggestionChannel
+ );
const NoChannel = new Discord.MessageEmbed()
.setTitle("Missing Channel!")
diff --git a/Commands/ticket.js b/Commands/ticket.js
index 27329fd..db4bf7e 100644
--- a/Commands/ticket.js
+++ b/Commands/ticket.js
@@ -36,10 +36,9 @@ module.exports = new Command({
if (
reactionUser.roles.cache.find(
- (role) => role.name === supportbot.TicketBlackListRole
- ) ||
- reactionUser.roles.cache.find(
- (role) => role.id === supportbot.TicketBlackListRole
+ (role) =>
+ role.name == supportbot.TicketBlackListRole ||
+ role.id == supportbot.TicketBlackListRole
)
) {
return interaction
@@ -52,7 +51,11 @@ module.exports = new Command({
}
// Ticket ID
- let ticketNumberID = TicketNumberID.pad(interaction.guild.id);
+ let ticketNumberID = await TicketNumberID.pad();
+
+ let TicketData = await JSON.parse(
+ fs.readFileSync("./Data/TicketData.json", "utf8")
+ );
// Ticket Subject
const TicketSubject =
@@ -70,47 +73,36 @@ module.exports = new Command({
) {
return interaction.reply({ embeds: [TicketExists] });
}
- const Staff =
- interaction.guild.roles.cache.find(
- (SupportTeam) => SupportTeam.name === supportbot.Staff
- ) ||
- interaction.guild.roles.cache.find(
- (SupportTeam) => SupportTeam.id === supportbot.Staff
- );
- const Admins =
- interaction.guild.roles.cache.find(
- (AdminUser) => AdminUser.name === supportbot.Admin
- ) ||
- interaction.guild.roles.cache.find(
- (AdminUser) => AdminUser.id === supportbot.Admin
- );
- const DeptRole1 =
- interaction.guild.roles.cache.find(
- (DepartmentRole) =>
- DepartmentRole.name === `${supportbot.DepartmentRole_1}`
- ) ||
- interaction.guild.roles.cache.find(
- (DepartmentRole) =>
- DepartmentRole.id === `${supportbot.DepartmentRole_1}`
- );
- const DeptRole2 =
- interaction.guild.roles.cache.find(
- (DepartmentRole) =>
- DepartmentRole.name === `${supportbot.DepartmentRole_2}`
- ) ||
- interaction.guild.roles.cache.find(
- (DepartmentRole) =>
- DepartmentRole.id === `${supportbot.DepartmentRole_2}`
- );
- const DeptRole3 =
- interaction.guild.roles.cache.find(
- (DepartmentRole) =>
- DepartmentRole.name === `${supportbot.DepartmentRole_3}`
- ) ||
- interaction.guild.roles.cache.find(
- (DepartmentRole) =>
- DepartmentRole.id === `${supportbot.DepartmentRole_3}`
- );
+ const Staff = interaction.guild.roles.cache.find(
+ (SupportTeam) =>
+ SupportTeam.name === supportbot.Staff ||
+ SupportTeam.id === supportbot.Staff
+ );
+ const Admins = interaction.guild.roles.cache.find(
+ (AdminUser) =>
+ AdminUser.name === supportbot.Admin || AdminUser.id === supportbot.Admin
+ );
+ const DeptRole1 = interaction.guild.roles.cache.find(
+ (DepartmentRole) =>
+ DepartmentRole.name === supportbot.DepartmentRole_1 ||
+ DepartmentRole.id === supportbot.DepartmentRole_1
+ );
+ const DeptRole2 = interaction.guild.roles.cache.find(
+ (DepartmentRole) =>
+ DepartmentRole.name === supportbot.DepartmentRole_2 ||
+ DepartmentRole.id === supportbot.DepartmentRole_2
+ );
+ const DeptRole3 = interaction.guild.roles.cache.find(
+ (DepartmentRole) =>
+ DepartmentRole.name === supportbot.DepartmentRole_3 ||
+ DepartmentRole.id === supportbot.DepartmentRole_3
+ );
+ if (!Staff || !Admins || !DeptRole1 || !DeptRole2 || !DeptRole3)
+ return interaction.reply({
+ content:
+ "Some roles seem to be missing!\nPlease check for errors when starting the bot.",
+ ephemeral: true,
+ });
const Author = interaction.user;
const Everyone = interaction.guild.id;
const ticketChannel = await interaction.guild.channels.create(
@@ -119,6 +111,20 @@ module.exports = new Command({
type: "GUILD_TEXT",
}
);
+ await TicketData.tickets.push({
+ id: ticketChannel.id,
+ name: ticketChannel.name,
+ user: Author.id,
+ number: ticketNumberID,
+ reason: TicketSubject,
+ });
+ fs.writeFileSync(
+ "./Data/TicketData.json",
+ JSON.stringify(TicketData, null, 4),
+ (err) => {
+ if (err) console.error(err);
+ }
+ );
if (
interaction.channel.name === supportbot.ReactionChannel ||
@@ -158,13 +164,11 @@ module.exports = new Command({
ticketChannel.permissionOverwrites.create(index, { VIEW_CHANNEL: false });
});
- let TicketCategory =
- interaction.guild.channels.cache.find(
- (category) => category.name === supportbot.TicketCategory
- ) ||
- interaction.guild.channels.cache.find(
- (category) => category.id === supportbot.TicketCategory
- );
+ let TicketCategory = interaction.guild.channels.cache.find(
+ (category) =>
+ category.name === supportbot.TicketCategory ||
+ category.id === supportbot.TicketCategory
+ );
if (TicketCategory) {
ticketChannel.setParent(TicketCategory.id);
}
@@ -232,19 +236,19 @@ module.exports = new Command({
});
const Department1Button = new Discord.MessageButton()
.setCustomId("Department1")
- .setLabel(`${supportbot.DepartmentTitle_1}`)
+ .setLabel(supportbot.DepartmentTitle_1)
.setStyle(supportbot.TicketDept1Colour)
.setEmoji(supportbot.TicketDept1Emoji);
const Department2Button = new Discord.MessageButton()
.setCustomId("Department2")
- .setLabel(`${supportbot.DepartmentTitle_2}`)
+ .setLabel(supportbot.DepartmentTitle_2)
.setStyle(supportbot.TicketDept2Colour)
.setEmoji(supportbot.TicketDept2Emoji);
const Department3Button = new Discord.MessageButton()
.setCustomId("Department3")
- .setLabel(`${supportbot.DepartmentTitle_3}`)
+ .setLabel(supportbot.DepartmentTitle_3)
.setStyle(supportbot.TicketDept3Colour)
.setEmoji(supportbot.TicketDept3Emoji);
diff --git a/Configs/supportbot.yml b/Configs/supportbot.yml
index 55b4355..78732c8 100644
--- a/Configs/supportbot.yml
+++ b/Configs/supportbot.yml
@@ -10,7 +10,7 @@
# Discord Support: https://emeraldsrv.dev/discord
# Community Resources: https://emeraldsrv.dev/resources
-SupportBot_Version: "7.3"
+SupportBot_Version: "7.4.0"
# -------------------------
# General Configuration
@@ -19,6 +19,8 @@ SupportBot_Version: "7.3"
Name: "SupportBot"
# No Prefix, as everything uses the new Slash (/) Commands feature!
Token: "BOT_TOKEN"
+# Guild ID Ex: 123456789123456789
+Guild: ""
# -------------------------
# Activity Configuration
@@ -58,7 +60,6 @@ InfoColour: "#f74343"
# Help Configuration
# -------------------------
-HelpMenu: true # Do not change!
SendHelpPage: "channel" # Set to channel or dm
# -------------------------
@@ -67,7 +68,6 @@ SendHelpPage: "channel" # Set to channel or dm
AutoRole: true
AutoRole_Role: "Member"
-LockdownRole: "@everyone"
Staff: "Staff"
Admin: "Admin"
@@ -92,7 +92,7 @@ TicketLog: "logs"
TranscriptLog: "transcripts"
TranscriptTitle: "Ticket Transcript"
-TicketLog_Title: "Ticket Log"
+TicketLog_Title: "Ticket Closed"
TicketBlackListMessage: "You are not allowed to open a ticket"
TicketSubject: "description"
@@ -132,8 +132,6 @@ RemovedUser: "👍 <@%user%> has been removed from this ticket"
# SUCCESS - Green
# Secondary - Grey
-TicketLockReaction: "🔒"
-TicketDeleteReaction: "⛔"
LockTicketCategory: "Archive"
TicketCloseEmoji: "❌"
diff --git a/Data/TicketData.json b/Data/TicketData.json
index 0967ef4..f97612b 100644
--- a/Data/TicketData.json
+++ b/Data/TicketData.json
@@ -1 +1,4 @@
-{}
+{
+ "id": 0,
+ "tickets": []
+}
diff --git a/Data/ticket-panel-id.json b/Data/ticket-panel-id.json
index b2367c6..ad5728f 100644
--- a/Data/ticket-panel-id.json
+++ b/Data/ticket-panel-id.json
@@ -1,3 +1 @@
-{
- "TicketPanelID": ""
-}
+{"TicketPanelID":""}
\ No newline at end of file
diff --git a/Events/guildCreate.js b/Events/guildCreate.js
new file mode 100644
index 0000000..16bd038
--- /dev/null
+++ b/Events/guildCreate.js
@@ -0,0 +1,9 @@
+const Event = require("../Structures/Event.js");
+module.exports = new Event("guildCreate", async (client) => {
+ console.log(
+ `\u001b[31m`,
+ `${client.user.username} is not in the correct server set in your config. Please leave all other servers and restart the bot.`
+ );
+ console.log(`\u001b[31m`, `${client.user.username} will now exit.`);
+ return process.exit(1);
+});
diff --git a/Events/guildDelete.js b/Events/guildDelete.js
new file mode 100644
index 0000000..d3cfbd2
--- /dev/null
+++ b/Events/guildDelete.js
@@ -0,0 +1,10 @@
+const Event = require("../Structures/Event.js");
+
+module.exports = new Event("guildDelete", async (client) => {
+ console.log(
+ `\u001b[31m`,
+ `${client.user.username} is not in the correct server set in your config. Please join the server and restart the bot.`
+ );
+ console.log(`\u001b[31m`, `${client.user.username} will now exit.`);
+ return process.exit(1);
+});
diff --git a/Events/interactionCreate.js b/Events/interactionCreate.js
index d7e67a1..32672e3 100644
--- a/Events/interactionCreate.js
+++ b/Events/interactionCreate.js
@@ -12,14 +12,13 @@ const cmdconfig = yaml.load(fs.readFileSync("./Configs/commands.yml", "utf8"));
const Event = require("../Structures/Event.js");
-module.exports = new Event("interactionCreate", (client, interaction) => {
+module.exports = new Event("interactionCreate", async (client, interaction) => {
if (interaction.isCommand()) {
const command = client.commands.find(
(cmd) => cmd.name.toLowerCase() == interaction.commandName
);
- if (interaction.user.bot || !interaction.isCommand() || !interaction.guild)
- return;
+ if (interaction.user.bot || !interaction.guild) return;
const NotValid = new Discord.MessageEmbed()
.setDescription(`:x: \`Invalid Command\` `)
@@ -57,79 +56,17 @@ module.exports = new Event("interactionCreate", (client, interaction) => {
}
if (interaction.customId === "ticketclose") {
- if (interaction.channel.name.startsWith(`${supportbot.TicketPrefix}`)) {
- interaction.message.fetch();
- interaction.deferUpdate();
- const DeleteTicketEmbed = new Discord.MessageEmbed()
- .setDescription(supportbot.TicketDeleteMessage)
- .setColor(supportbot.EmbedColour);
- interaction.channel.send({ embeds: [DeleteTicketEmbed] });
-
- let logChannel =
- interaction.guild.channels.cache.find(
- (channel) => channel.name === supportbot.TranscriptLog
- ) ||
- interaction.guild.channels.cache.find(
- (channel) => channel.id === supportbot.TranscriptLog
- );
-
- let user = interaction.user;
- let name = interaction.channel.name;
- let ticketChannel = interaction.channel;
- let reason = "No Reason Provided.";
-
- interaction.channel
- .send({ content: `**${supportbot.ClosingTicket}**` })
- .then(() => {
- const logEmbed = new Discord.MessageEmbed()
- .setTitle(supportbot.TranscriptTitle)
- .setColor(supportbot.EmbedColour)
- .setFooter(supportbot.EmbedFooter)
- .addField("Closed By", user.username)
- .addField("Reason", reason);
-
- interaction.channel.messages.fetch({ limit: 100 }).then((msgs) => {
- let html = "";
-
- msgs = msgs.sort(
- (a, b) => a.createdTimestamp - b.createdTimestamp
- );
- html += ``;
- html += `Server Name: ${interaction.guild.name}
`;
- html += `Ticket: ${ticketChannel.name}
`;
- html += `Message: ${msgs.size} Messages
`;
-
- msgs.forEach((msg) => {
- if (msg.content) {
- html += `User: ${msg.author.tag}
`;
- html += `Message: ${msg.content}
`;
- html += `-----
`;
- }
- });
-
- const TranscriptSavedEmbed = new Discord.MessageEmbed()
- .setDescription(supportbot.TranscriptSavedMessage)
- .setColor(supportbot.SuccessColour);
- interaction.channel.send({ embeds: [TranscriptSavedEmbed] });
-
- let file = new Discord.MessageAttachment(
- Buffer.from(html),
- `${name}.html`
- );
- logChannel.send({ embeds: [logEmbed], files: [file] });
-
- setTimeout(
- () => interaction.channel.delete(),
- supportbot.TicketDeleteTime
- );
- });
- });
+ try {
+ const cmd = client.commands.get(cmdconfig.CloseTicket);
+ if (!cmd) return;
+ cmd.run(interaction);
+ } catch (error) {
+ console.error(error);
}
}
if (interaction.customId === "ticketlock") {
if (interaction.channel.name.startsWith(`${supportbot.TicketPrefix}`)) {
interaction.message.fetch();
- interaction.deferUpdate();
let Admin =
interaction.guild.roles.cache.find(
(AdminUser) => AdminUser.name === supportbot.Admin
@@ -137,6 +74,12 @@ module.exports = new Event("interactionCreate", (client, interaction) => {
interaction.guild.roles.cache.find(
(AdminUser) => AdminUser.id === supportbot.Admin
);
+ if (!interaction.member.roles.cache.has(Admin.id)) {
+ return await interaction.reply({
+ content: "You don't have permission to do that.",
+ ephemeral: true,
+ });
+ }
let all = interaction.channel.permissionOverwrites.cache;
let parent =
@@ -175,7 +118,7 @@ module.exports = new Event("interactionCreate", (client, interaction) => {
.setDescription(`Archived ${interaction.channel.name}`)
.setColor(`${supportbot.SuccessColour}`);
- interaction.channel.send({ embeds: [ArchiveEmbed] });
+ interaction.reply({ embeds: [ArchiveEmbed] });
interaction.message.edit({ components: [row] });
}
}
diff --git a/Events/ready.js b/Events/ready.js
index 24bfa7f..bbf436d 100644
--- a/Events/ready.js
+++ b/Events/ready.js
@@ -14,7 +14,7 @@ const panelconfig = yaml.load(
const Event = require("../Structures/Event.js");
-module.exports = new Event("ready", (client) => {
+module.exports = new Event("ready", async (client) => {
client.user.setActivity(supportbot.BotActivity, {
type: supportbot.ActivityType,
url: supportbot.StreamingURL,
@@ -65,7 +65,66 @@ module.exports = new Event("ready", (client) => {
console.log(`\u001b[37m`, `SupportBot proudly created by Emerald Services`);
console.log(` `);
console.log(`\u001b[31m`, `――――――――――――――――――――――――――――――――――――――――――――`);
+ if (
+ !supportbot.Guild ||
+ (await client.guilds.cache.size) !== 1 ||
+ (await client.guilds.cache.first().id) !== supportbot.Guild
+ ) {
+ console.log(
+ `\u001b[31m`,
+ `${client.user.username} is not in the correct server set in your config. Please join the server and restart the bot.`
+ );
+ console.log(`\u001b[31m`, `${client.user.username} will now exit.`);
+ return process.exit(1);
+ }
+ const roles = [
+ supportbot.Admin,
+ supportbot.Staff,
+ supportbot.TicketBlackListRole,
+ supportbot.DepartmentRole_1,
+ supportbot.DepartmentRole_2,
+ supportbot.DepartmentRole_3,
+ ];
+ if (supportbot.AutoRole) roles.push(supportbot.AutoRole_Role);
+ const channels = [
+ supportbot.SuggestionChannel,
+ supportbot.TicketLog,
+ supportbot.TranscriptLog,
+ panelconfig.Channel,
+ ];
+ const missingR = [];
+ const missingC = [];
+ for (let c of channels) {
+ const find = await client.channels.cache.find(
+ (channel) => channel.name === c || channel.id === c
+ );
+ if (!find) missingC.push(c);
+ }
+ for (let r of roles) {
+ const find = await client.guilds.cache
+ .first()
+ .roles.cache.find((role) => role.name === r || role.id === r);
+ if (!find) missingR.push(r);
+ }
+
+ if (missingR.length > 0) {
+ console.log(
+ "\u001b[33m",
+ `[WARN] The following Roles could not be found! Please check your configs!\n${missingR.join(
+ ", "
+ )}`
+ );
+ }
+
+ if (missingC.length > 0) {
+ console.log(
+ "\u001b[33m",
+ `[WARN] The following Channels could not be found! Please check your configs!\n${missingC.join(
+ ", "
+ )}`
+ );
+ }
if (panelconfig.TicketPanel) {
let chan1 = client.channels.cache.find(
(channel) => channel.name === panelconfig.Channel
@@ -104,7 +163,8 @@ module.exports = new Event("ready", (client) => {
let button = new Discord.MessageButton()
.setLabel(panelconfig.ButtonLabel)
.setCustomId("openticket")
- .setStyle(panelconfig.ButtonColour);
+ .setStyle(panelconfig.ButtonColour)
+ .setEmoji(panelconfig.ButtonEmoji);
let row = new Discord.MessageActionRow().addComponents(button);
diff --git a/README.md b/README.md
index 01cd9e6..8e9e13e 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
## What is SupportBot?
-SupportBot is an open-sourced support system for discord. It's completely free to use with high amounts of customisation to match your own brand.
+SupportBot is an open-sourced support system for discord. It's completely free to use with high amounts of customization to match your own brand.
## Quick Links
diff --git a/Structures/Client.js b/Structures/Client.js
index e70422d..f04bc30 100644
--- a/Structures/Client.js
+++ b/Structures/Client.js
@@ -76,10 +76,9 @@ class Client extends Discord.Client {
this.on("ready", async () => {
const allCommands = slashCommands.concat(slashCommands1);
- await this.application?.commands.set(allCommands);
-
+ await this.application?.commands.set(allCommands, supportbot.Guild);
console.log(" ");
- console.log(`\u001b[34;1m`, "▬▬▬▬▬▬▬ Slash Command ▬▬▬▬▬▬▬"),
+ console.log(`\u001b[34;1m`, "▬▬▬▬▬▬▬ Slash Commands ▬▬▬▬▬▬▬"),
console.log(" ");
slashCommands.forEach((cmd) =>
diff --git a/Structures/TicketID.js b/Structures/TicketID.js
index 11c9d9f..6725b8c 100644
--- a/Structures/TicketID.js
+++ b/Structures/TicketID.js
@@ -14,74 +14,66 @@ const supportbot = yaml.load(
);
class TicketNumberID {
- static pad(guildId) {
- let n = this.get(guildId) + "";
+ static async pad() {
+ let n = this.get() + "";
let z = "0";
let width = 4;
- setTimeout(() => {
- this.set(guildId, this.get(guildId) + 1);
- }, 50);
+ await this.set(this.get() + 1);
return n.length >= width ? n : new Array(width - n.length + 1).join(z) + n;
}
- static get(guildId) {
+ static get() {
let ticketnumberID = JSON.parse(
fs.readFileSync("./Data/TicketData.json", "utf8")
);
- if (!ticketnumberID[guildId]) {
- ticketnumberID[guildId] = {
- id: 0,
- };
+ if (!ticketnumberID.id) {
+ ticketnumberID.id = 0;
fs.writeFileSync(
"./Data/TicketData.json",
JSON.stringify(ticketnumberID, null, 4),
(err) => {
- if (err) console.log(err);
+ if (err) console.error(err);
}
);
return 0;
} else {
- return ticketnumberID[guildId].id;
+ return ticketnumberID.id;
}
}
- static set(guildId, value) {
+ static set(value) {
let ticketnumberID = JSON.parse(
fs.readFileSync("./Data/TicketData.json", "utf8")
);
- ticketnumberID[guildId] = {
- id: value,
- };
+ ticketnumberID.id = value;
fs.writeFileSync(
"./Data/TicketData.json",
JSON.stringify(ticketnumberID, null, 4),
(err) => {
- if (err) console.log(err);
+ if (err) console.error(err);
}
);
return value;
}
- static reset(guildId) {
+ static reset() {
let ticketnumberID = JSON.parse(
fs.readFileSync("./Data/TicketData.json", "utf8")
);
- ticketnumberID[guildId] = {
- id: 0,
- };
+ ticketnumberID.id = 0;
fs.writeFileSync(
"./Data/TicketData.json",
JSON.stringify(ticketnumberID, null, 4),
(err) => {
- if (err) console.log(err);
+ if (err) console.error(err);
}
);
diff --git a/package-lock.json b/package-lock.json
index 96e00a2..f8b4d7a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,48 +1,41 @@
{
"name": "supportbot",
- "version": "7.3.0",
+ "version": "7.4.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "supportbot",
- "version": "7.3.0",
+ "version": "7.4.0",
"license": "MIT",
"dependencies": {
- "discord.js": "^13.2.0",
+ "discord.js": "^13.3.1",
"js-yaml": "^4.1.0"
}
},
"node_modules/@discordjs/builders": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-0.6.0.tgz",
- "integrity": "sha512-mH3Gx61LKk2CD05laCI9K5wp+a3NyASHDUGx83DGJFkqJlRlSV5WMJNY6RS37A5SjqDtGMF4wVR9jzFaqShe6Q==",
+ "version": "0.8.2",
+ "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-0.8.2.tgz",
+ "integrity": "sha512-/YRd11SrcluqXkKppq/FAVzLIPRVlIVmc6X8ZklspzMIHDtJ+A4W37D43SHvLdH//+NnK+SHW/WeOF4Ts54PeQ==",
"dependencies": {
- "@sindresorhus/is": "^4.0.1",
- "discord-api-types": "^0.22.0",
+ "@sindresorhus/is": "^4.2.0",
+ "discord-api-types": "^0.24.0",
"ow": "^0.27.0",
"ts-mixer": "^6.0.0",
"tslib": "^2.3.1"
},
"engines": {
- "node": ">=14.0.0",
+ "node": ">=16.0.0",
"npm": ">=7.0.0"
}
},
- "node_modules/@discordjs/builders/node_modules/discord-api-types": {
- "version": "0.22.0",
- "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.22.0.tgz",
- "integrity": "sha512-l8yD/2zRbZItUQpy7ZxBJwaLX/Bs2TGaCthRppk8Sw24LOIWg12t9JEreezPoYD0SQcC2htNNo27kYEpYW/Srg==",
- "engines": {
- "node": ">=12"
- }
- },
"node_modules/@discordjs/collection": {
- "version": "0.2.1",
- "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.2.1.tgz",
- "integrity": "sha512-vhxqzzM8gkomw0TYRF3tgx7SwElzUlXT/Aa41O7mOcyN6wIJfj5JmDWaO5XGKsGSsNx7F3i5oIlrucCCWV1Nog==",
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.3.2.tgz",
+ "integrity": "sha512-dMjLl60b2DMqObbH1MQZKePgWhsNe49XkKBZ0W5Acl5uVV43SN414i2QfZwRI7dXAqIn8pEWD2+XXQFn9KWxqg==",
"engines": {
- "node": ">=14.0.0"
+ "node": ">=16.0.0",
+ "npm": ">=7.0.0"
}
},
"node_modules/@discordjs/form-data": {
@@ -59,9 +52,9 @@
}
},
"node_modules/@sapphire/async-queue": {
- "version": "1.1.7",
- "resolved": "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.1.7.tgz",
- "integrity": "sha512-EBRERa9NqK/EV6DIPBVtjjdHBsu/DSdMuYAydmoIyIPONzp0UAxf2G6JGJ52WkiONtPRx6KNuqB5Q8dm14fwyw==",
+ "version": "1.1.9",
+ "resolved": "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.1.9.tgz",
+ "integrity": "sha512-CbXaGwwlEMq+l1TRu01FJCvySJ1CEFKFclHT48nIfNeZXaAAmmwwy7scUKmYHPUa3GhoMp6Qr1B3eAJux6XgOQ==",
"engines": {
"node": ">=v14.0.0",
"npm": ">=7.0.0"
@@ -79,9 +72,18 @@
}
},
"node_modules/@types/node": {
- "version": "16.11.4",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.4.tgz",
- "integrity": "sha512-TMgXmy0v2xWyuCSCJM6NCna2snndD8yvQF67J29ipdzMcsPa9u+o0tjF5+EQNdhcuZplYuouYqpc4zcd5I6amQ=="
+ "version": "16.11.10",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.10.tgz",
+ "integrity": "sha512-3aRnHa1KlOEEhJ6+CvyHKK5vE9BcLGjtUpwvqYLRvYNQKMfabu3BwfJaA/SLW8dxe28LsNDjtHwePTuzn3gmOA=="
+ },
+ "node_modules/@types/node-fetch": {
+ "version": "2.5.12",
+ "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.12.tgz",
+ "integrity": "sha512-MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw==",
+ "dependencies": {
+ "@types/node": "*",
+ "form-data": "^3.0.0"
+ }
},
"node_modules/@types/ws": {
"version": "8.2.0",
@@ -129,24 +131,25 @@
}
},
"node_modules/discord-api-types": {
- "version": "0.23.1",
- "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.23.1.tgz",
- "integrity": "sha512-igWmn+45mzXRWNEPU25I/pr8MwxHb767wAr51oy3VRLRcTlp5ADBbrBR0lq3SA1Rfw3MtM4TQu1xo3kxscfVdQ==",
+ "version": "0.24.0",
+ "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.24.0.tgz",
+ "integrity": "sha512-X0uA2a92cRjowUEXpLZIHWl4jiX1NsUpDhcEOpa1/hpO1vkaokgZ8kkPtPih9hHth5UVQ3mHBu/PpB4qjyfJ4A==",
"engines": {
"node": ">=12"
}
},
"node_modules/discord.js": {
- "version": "13.2.0",
- "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-13.2.0.tgz",
- "integrity": "sha512-nyxUvL8wuQG38zx13wUMkpcA8koFszyiXdkSLwwM9opKW2LC2H5gD0cTZxImeJ6GtEnKPWT8xBiE8lLBmbNIhw==",
+ "version": "13.3.1",
+ "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-13.3.1.tgz",
+ "integrity": "sha512-zn4G8tL5+tMV00+0aSsVYNYcIfMSdT2g0nudKny+Ikd+XKv7m6bqI7n3Vji0GIRqXDr5ArPaw+iYFM2I1Iw3vg==",
"dependencies": {
- "@discordjs/builders": "^0.6.0",
- "@discordjs/collection": "^0.2.1",
+ "@discordjs/builders": "^0.8.1",
+ "@discordjs/collection": "^0.3.2",
"@discordjs/form-data": "^3.0.1",
- "@sapphire/async-queue": "^1.1.5",
+ "@sapphire/async-queue": "^1.1.8",
+ "@types/node-fetch": "^2.5.12",
"@types/ws": "^8.2.0",
- "discord-api-types": "^0.23.1",
+ "discord-api-types": "^0.24.0",
"node-fetch": "^2.6.1",
"ws": "^8.2.3"
},
@@ -169,6 +172,19 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/form-data": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+ "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+ "dependencies": {
+ "asynckit": "^0.4.0",
+ "combined-stream": "^1.0.8",
+ "mime-types": "^2.1.12"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
"node_modules/is-obj": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
@@ -194,28 +210,28 @@
"integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA="
},
"node_modules/mime-db": {
- "version": "1.50.0",
- "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz",
- "integrity": "sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==",
+ "version": "1.51.0",
+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
+ "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
"engines": {
"node": ">= 0.6"
}
},
"node_modules/mime-types": {
- "version": "2.1.33",
- "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz",
- "integrity": "sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==",
+ "version": "2.1.34",
+ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
+ "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
"dependencies": {
- "mime-db": "1.50.0"
+ "mime-db": "1.51.0"
},
"engines": {
"node": ">= 0.6"
}
},
"node_modules/node-fetch": {
- "version": "2.6.5",
- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.5.tgz",
- "integrity": "sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==",
+ "version": "2.6.6",
+ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz",
+ "integrity": "sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==",
"dependencies": {
"whatwg-url": "^5.0.0"
},
@@ -291,9 +307,9 @@
}
},
"node_modules/ws": {
- "version": "8.2.3",
- "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
- "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
+ "version": "8.3.0",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.3.0.tgz",
+ "integrity": "sha512-Gs5EZtpqZzLvmIM59w4igITU57lrtYVFneaa434VROv4thzJyV6UjIL3D42lslWlI+D4KzLYnxSwtfuiO79sNw==",
"engines": {
"node": ">=10.0.0"
},
@@ -313,28 +329,21 @@
},
"dependencies": {
"@discordjs/builders": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-0.6.0.tgz",
- "integrity": "sha512-mH3Gx61LKk2CD05laCI9K5wp+a3NyASHDUGx83DGJFkqJlRlSV5WMJNY6RS37A5SjqDtGMF4wVR9jzFaqShe6Q==",
+ "version": "0.8.2",
+ "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-0.8.2.tgz",
+ "integrity": "sha512-/YRd11SrcluqXkKppq/FAVzLIPRVlIVmc6X8ZklspzMIHDtJ+A4W37D43SHvLdH//+NnK+SHW/WeOF4Ts54PeQ==",
"requires": {
- "@sindresorhus/is": "^4.0.1",
- "discord-api-types": "^0.22.0",
+ "@sindresorhus/is": "^4.2.0",
+ "discord-api-types": "^0.24.0",
"ow": "^0.27.0",
"ts-mixer": "^6.0.0",
"tslib": "^2.3.1"
- },
- "dependencies": {
- "discord-api-types": {
- "version": "0.22.0",
- "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.22.0.tgz",
- "integrity": "sha512-l8yD/2zRbZItUQpy7ZxBJwaLX/Bs2TGaCthRppk8Sw24LOIWg12t9JEreezPoYD0SQcC2htNNo27kYEpYW/Srg=="
- }
}
},
"@discordjs/collection": {
- "version": "0.2.1",
- "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.2.1.tgz",
- "integrity": "sha512-vhxqzzM8gkomw0TYRF3tgx7SwElzUlXT/Aa41O7mOcyN6wIJfj5JmDWaO5XGKsGSsNx7F3i5oIlrucCCWV1Nog=="
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.3.2.tgz",
+ "integrity": "sha512-dMjLl60b2DMqObbH1MQZKePgWhsNe49XkKBZ0W5Acl5uVV43SN414i2QfZwRI7dXAqIn8pEWD2+XXQFn9KWxqg=="
},
"@discordjs/form-data": {
"version": "3.0.1",
@@ -347,9 +356,9 @@
}
},
"@sapphire/async-queue": {
- "version": "1.1.7",
- "resolved": "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.1.7.tgz",
- "integrity": "sha512-EBRERa9NqK/EV6DIPBVtjjdHBsu/DSdMuYAydmoIyIPONzp0UAxf2G6JGJ52WkiONtPRx6KNuqB5Q8dm14fwyw=="
+ "version": "1.1.9",
+ "resolved": "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.1.9.tgz",
+ "integrity": "sha512-CbXaGwwlEMq+l1TRu01FJCvySJ1CEFKFclHT48nIfNeZXaAAmmwwy7scUKmYHPUa3GhoMp6Qr1B3eAJux6XgOQ=="
},
"@sindresorhus/is": {
"version": "4.2.0",
@@ -357,9 +366,18 @@
"integrity": "sha512-VkE3KLBmJwcCaVARtQpfuKcKv8gcBmUubrfHGF84dXuuW6jgsRYxPtzcIhPyK9WAPpRt2/xY6zkD9MnRaJzSyw=="
},
"@types/node": {
- "version": "16.11.4",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.4.tgz",
- "integrity": "sha512-TMgXmy0v2xWyuCSCJM6NCna2snndD8yvQF67J29ipdzMcsPa9u+o0tjF5+EQNdhcuZplYuouYqpc4zcd5I6amQ=="
+ "version": "16.11.10",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.10.tgz",
+ "integrity": "sha512-3aRnHa1KlOEEhJ6+CvyHKK5vE9BcLGjtUpwvqYLRvYNQKMfabu3BwfJaA/SLW8dxe28LsNDjtHwePTuzn3gmOA=="
+ },
+ "@types/node-fetch": {
+ "version": "2.5.12",
+ "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.12.tgz",
+ "integrity": "sha512-MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw==",
+ "requires": {
+ "@types/node": "*",
+ "form-data": "^3.0.0"
+ }
},
"@types/ws": {
"version": "8.2.0",
@@ -398,21 +416,22 @@
"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
},
"discord-api-types": {
- "version": "0.23.1",
- "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.23.1.tgz",
- "integrity": "sha512-igWmn+45mzXRWNEPU25I/pr8MwxHb767wAr51oy3VRLRcTlp5ADBbrBR0lq3SA1Rfw3MtM4TQu1xo3kxscfVdQ=="
+ "version": "0.24.0",
+ "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.24.0.tgz",
+ "integrity": "sha512-X0uA2a92cRjowUEXpLZIHWl4jiX1NsUpDhcEOpa1/hpO1vkaokgZ8kkPtPih9hHth5UVQ3mHBu/PpB4qjyfJ4A=="
},
"discord.js": {
- "version": "13.2.0",
- "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-13.2.0.tgz",
- "integrity": "sha512-nyxUvL8wuQG38zx13wUMkpcA8koFszyiXdkSLwwM9opKW2LC2H5gD0cTZxImeJ6GtEnKPWT8xBiE8lLBmbNIhw==",
+ "version": "13.3.1",
+ "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-13.3.1.tgz",
+ "integrity": "sha512-zn4G8tL5+tMV00+0aSsVYNYcIfMSdT2g0nudKny+Ikd+XKv7m6bqI7n3Vji0GIRqXDr5ArPaw+iYFM2I1Iw3vg==",
"requires": {
- "@discordjs/builders": "^0.6.0",
- "@discordjs/collection": "^0.2.1",
+ "@discordjs/builders": "^0.8.1",
+ "@discordjs/collection": "^0.3.2",
"@discordjs/form-data": "^3.0.1",
- "@sapphire/async-queue": "^1.1.5",
+ "@sapphire/async-queue": "^1.1.8",
+ "@types/node-fetch": "^2.5.12",
"@types/ws": "^8.2.0",
- "discord-api-types": "^0.23.1",
+ "discord-api-types": "^0.24.0",
"node-fetch": "^2.6.1",
"ws": "^8.2.3"
}
@@ -425,6 +444,16 @@
"is-obj": "^2.0.0"
}
},
+ "form-data": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+ "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+ "requires": {
+ "asynckit": "^0.4.0",
+ "combined-stream": "^1.0.8",
+ "mime-types": "^2.1.12"
+ }
+ },
"is-obj": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
@@ -444,22 +473,22 @@
"integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA="
},
"mime-db": {
- "version": "1.50.0",
- "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz",
- "integrity": "sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A=="
+ "version": "1.51.0",
+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
+ "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="
},
"mime-types": {
- "version": "2.1.33",
- "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz",
- "integrity": "sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==",
+ "version": "2.1.34",
+ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
+ "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
"requires": {
- "mime-db": "1.50.0"
+ "mime-db": "1.51.0"
}
},
"node-fetch": {
- "version": "2.6.5",
- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.5.tgz",
- "integrity": "sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==",
+ "version": "2.6.6",
+ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz",
+ "integrity": "sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==",
"requires": {
"whatwg-url": "^5.0.0"
}
@@ -517,9 +546,9 @@
}
},
"ws": {
- "version": "8.2.3",
- "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
- "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
+ "version": "8.3.0",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.3.0.tgz",
+ "integrity": "sha512-Gs5EZtpqZzLvmIM59w4igITU57lrtYVFneaa434VROv4thzJyV6UjIL3D42lslWlI+D4KzLYnxSwtfuiO79sNw==",
"requires": {}
}
}
diff --git a/package.json b/package.json
index d7e99f0..277c4e8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "supportbot",
- "version": "7.3.0",
+ "version": "7.4.0",
"description": "SupportBot is an open-sourced support system for discord. It's completely free to use with high amounts of customization to match your own brand.",
"main": "index.js",
"scripts": {
@@ -17,7 +17,7 @@
},
"homepage": "https://github.com/Emerald-Services/SupportBot#readme",
"dependencies": {
- "discord.js": "^13.2.0",
+ "discord.js": "^13.3.1",
"js-yaml": "^4.1.0"
}
}