Hessenuk/DiscordTickets
2
0
Fork 0
mirror of https://github.com/Hessenuk/DiscordTickets.git synced 2025-09-06 10:11:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge remote-tracking branch 'origin/main' into main"

Browse Source 
This reverts commit feb116b4df.
This commit is contained in:
Isaac
2021-10-26 23:25:38 +01:00
parent feb116b4df
commit f49a044340
15 changed files with 60 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/commands/add.js
View File

@@ -41,7 +41,7 @@ module.exports = class AddCommand extends Command {
const t_row = await this.client.tickets.resolve(channel.id, interaction.guild.id);
if (!t_row) {
return await interaction.editReply({
return await interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.error_colour)
@@ -56,7 +56,7 @@ module.exports = class AddCommand extends Command {
const member = interaction.options.getMember(default_i18n('commands.add.options.member.name'));
if (!member) {
return await interaction.editReply({
return await interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.error_colour)
@@ -69,7 +69,7 @@ module.exports = class AddCommand extends Command {
}
if (t_row.creator !== interaction.member.id && !await this.client.utils.isStaff(interaction.member)) {
return await interaction.editReply({
return await interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.error_colour)
@@ -81,7 +81,7 @@ module.exports = class AddCommand extends Command {
});
}
await interaction.editReply({
await interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.success_colour)

12
src/commands/blacklist.js
View File

@@ -65,7 +65,7 @@ module.exports = class BlacklistCommand extends Command {
const type = member_or_role instanceof Role ? 'role' : 'member';
if (type === 'member' && await this.client.utils.isStaff(member_or_role)) {
return await interaction.editReply({
return await interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.error_colour)
@@ -78,7 +78,7 @@ module.exports = class BlacklistCommand extends Command {
}
blacklist[type + 's'].push(member_or_role.id);
await interaction.editReply({
await interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.success_colour)
@@ -97,7 +97,7 @@ module.exports = class BlacklistCommand extends Command {
const index = blacklist[type + 's'].findIndex(element => element === member_or_role.id);
if (index === -1) {
return await interaction.editReply({
return await interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.error_colour)
@@ -110,7 +110,7 @@ module.exports = class BlacklistCommand extends Command {
}
blacklist[type + 's'].splice(index, 1);
await interaction.editReply({
await interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.success_colour)
@@ -125,7 +125,7 @@ module.exports = class BlacklistCommand extends Command {
}
case default_i18n('commands.blacklist.options.show.name'): {
if (blacklist.members.length === 0 && blacklist.roles.length === 0) {
return await interaction.editReply({
return await interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.colour)
@@ -138,7 +138,7 @@ module.exports = class BlacklistCommand extends Command {
} else {
const members = blacklist.members.map(id => `**·** <@${id}>`);
const roles = blacklist.roles.map(id => `**·** <@&${id}>`);
return await interaction.editReply({
return await interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.colour)

16
src/commands/close.js
View File

@@ -53,7 +53,7 @@ module.exports = class CloseCommand extends Command {
if (time) {
if (!await this.client.utils.isStaff(interaction.member)) {
return await interaction.editReply({
return await interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.error_colour)
@@ -69,7 +69,7 @@ module.exports = class CloseCommand extends Command {
try {
period = ms(time);
} catch {
return await interaction.editReply({
return await interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.error_colour)
@@ -89,7 +89,7 @@ module.exports = class CloseCommand extends Command {
});
if (tickets.count === 0) {
return await interaction.editReply({
return await interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.error_colour)
@@ -100,7 +100,7 @@ module.exports = class CloseCommand extends Command {
ephemeral: true
});
} else {
await interaction.editReply({
await interaction.reply({
components: [
new MessageActionRow()
.addComponents(
@@ -193,7 +193,7 @@ module.exports = class CloseCommand extends Command {
if (ticket) {
t_row = await this.client.tickets.resolve(ticket, interaction.guild.id);
if (!t_row) {
return await interaction.editReply({
return await interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.error_colour)
@@ -207,7 +207,7 @@ module.exports = class CloseCommand extends Command {
} else {
t_row = await this.client.db.models.Ticket.findOne({ where: { id: interaction.channel.id } });
if (!t_row) {
return await interaction.editReply({
return await interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.error_colour)
@@ -221,7 +221,7 @@ module.exports = class CloseCommand extends Command {
}
if (t_row.creator !== interaction.member.id && !await this.client.utils.isStaff(interaction.member)) {
return await interaction.editReply({
return await interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.error_colour)
@@ -233,7 +233,7 @@ module.exports = class CloseCommand extends Command {
});
}
await interaction.editReply({
await interaction.reply({
components: [
new MessageActionRow()
.addComponents(

2
src/commands/help.js
View File

@@ -34,7 +34,7 @@ module.exports = class HelpCommand extends Command {
: command.description;
return `**\`/${command.name}\` ·** ${description}`;
});
return await interaction.editReply({
return await interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.colour)

12
src/commands/new.js
View File

@@ -58,7 +58,7 @@ module.exports = class NewCommand extends Command {
],
ephemeral: true
};
await i ? i.editReply(response) : interaction.editReply(response);
await i ? i.editReply(response) : interaction.reply(response);
} else {
const list = tickets.rows.map(row => {
if (row.topic) {
@@ -81,7 +81,7 @@ module.exports = class NewCommand extends Command {
],
ephemeral: true
};
await i ? i.editReply(response) : interaction.editReply(response);
await i ? i.editReply(response) : interaction.reply(response);
}
} else {
try {
@@ -98,7 +98,7 @@ module.exports = class NewCommand extends Command {
],
ephemeral: true
};
await i ? i.editReply(response) : interaction.editReply(response);
await i ? i.editReply(response) : interaction.reply(response);
} catch (error) {
const response = {
components: [],
@@ -112,7 +112,7 @@ module.exports = class NewCommand extends Command {
],
ephemeral: true
};
await i ? i.editReply(response) : interaction.editReply(response);
await i ? i.editReply(response) : interaction.reply(response);
}
}
};
@@ -120,7 +120,7 @@ module.exports = class NewCommand extends Command {
const categories = await this.client.db.models.Category.findAndCountAll({ where: { guild: interaction.guild.id } });
if (categories.count === 0) {
return await interaction.editReply({
return await interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.error_colour)
@@ -133,7 +133,7 @@ module.exports = class NewCommand extends Command {
} else if (categories.count === 1) {
create(categories.rows[0]); // skip the category selection
} else {
await interaction.editReply({
await interaction.reply({
components: [
new MessageActionRow()
.addComponents(

6
src/commands/panel.js
View File

@@ -75,7 +75,7 @@ module.exports = class PanelCommand extends Command {
const thumbnail = interaction.options.getString(default_i18n('commands.panel.options.thumbnail.name'));
if (just_type && categories.length > 1) {
return await interaction.editReply({
return await interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.error_colour)
@@ -98,7 +98,7 @@ module.exports = class PanelCommand extends Command {
});
if (invalid_category) {
return await interaction.editReply({
return await interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.error_colour)
@@ -196,7 +196,7 @@ module.exports = class PanelCommand extends Command {
}
}
interaction.editReply({
interaction.reply({
content: `✅ ${panel_channel}`,
ephemeral: true
});

8
src/commands/remove.js
View File

@@ -41,7 +41,7 @@ module.exports = class RemoveCommand extends Command {
const t_row = await this.client.tickets.resolve(channel.id, interaction.guild.id);
if (!t_row) {
return await interaction.editReply({
return await interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.error_colour)
@@ -56,7 +56,7 @@ module.exports = class RemoveCommand extends Command {
const member = interaction.options.getMember(default_i18n('commands.remove.options.member.name'));
if (!member) {
return await interaction.editReply({
return await interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.error_colour)
@@ -69,7 +69,7 @@ module.exports = class RemoveCommand extends Command {
}
if (t_row.creator !== interaction.user.id && !await this.client.utils.isStaff(interaction.member)) {
return await interaction.editReply({
return await interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.error_colour)
@@ -81,7 +81,7 @@ module.exports = class RemoveCommand extends Command {
});
}
await interaction.editReply({
await interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.success_colour)

14
src/commands/settings.js
View File

@@ -233,7 +233,7 @@ module.exports = class SettingsCommand extends Command {
roles
});
await this.client.commands.updatePermissions(interaction.guild);
interaction.editReply({
interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.success_colour)
@@ -249,7 +249,7 @@ module.exports = class SettingsCommand extends Command {
const channel = this.client.channels.cache.get(interaction.options.getString(default_i18n('commands.settings.options.categories.options.delete.options.id.name')));
if (channel) channel.delete();
await category.destroy();
interaction.editReply({
interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.success_colour)
@@ -258,7 +258,7 @@ module.exports = class SettingsCommand extends Command {
ephemeral: true
});
} else {
interaction.editReply({
interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.error_colour)
@@ -272,7 +272,7 @@ module.exports = class SettingsCommand extends Command {
case default_i18n('commands.settings.options.categories.options.edit.name'): {
const category = await this.client.db.models.Category.findOne({ where: { id: interaction.options.getString(default_i18n('commands.settings.options.categories.options.delete.options.id.name')) } });
if (!category) {
return interaction.editReply({
return interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.error_colour)
@@ -304,7 +304,7 @@ module.exports = class SettingsCommand extends Command {
if (roles !== null) category.set('roles', roles.match(/\d{17,19}/g) ?? []);
if (survey !== null) category.set('survey', survey);
await category.save();
interaction.editReply({
interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.success_colour)
@@ -316,7 +316,7 @@ module.exports = class SettingsCommand extends Command {
}
case default_i18n('commands.settings.options.categories.options.list.name'): {
const categories = await this.client.db.models.Category.findAll({ where: { guild: interaction.guild.id } });
await interaction.editReply({
await interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.colour)
@@ -343,7 +343,7 @@ module.exports = class SettingsCommand extends Command {
if (log_messages !== null) settings.set('log_messages', log_messages);
if (success_colour !== null) settings.set('success_colour', success_colour.toUpperCase());
await settings.save();
interaction.editReply({
interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.success_colour)

2
src/commands/stats.js
View File

@@ -90,6 +90,6 @@ module.exports = class StatsCommand extends Command {
embeds.push(global_embed);
}
await interaction.editReply({ embeds });
await interaction.reply({ embeds });
}
};

4
src/commands/survey.js
View File

@@ -90,7 +90,7 @@ module.exports = class SurveyCommand extends Command {
`${survey.name}.html`
);
return await interaction.editReply({
return await interaction.reply({
ephemeral: true,
files: [attachment]
});
@@ -98,7 +98,7 @@ module.exports = class SurveyCommand extends Command {
const surveys = await this.client.db.models.Survey.findAll({ where: { guild: interaction.guild.id } });
const list = surveys.map(s => `❯ **\`${s.name}\`**`);
return await interaction.editReply({
return await interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.colour)

4
src/commands/tag.js
View File

@@ -46,7 +46,7 @@ module.exports = class TagCommand extends Command {
const arg = args.find(arg => arg.name === $1);
return arg ? arg.value : $;
});
return await interaction.editReply({
return await interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.colour)
@@ -56,7 +56,7 @@ module.exports = class TagCommand extends Command {
});
} catch {
const list = Object.keys(settings.tags).map(t => `❯ **\`${t}\`**`);
return await interaction.editReply({
return await interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.colour)

4
src/commands/topic.js
View File

@@ -36,7 +36,7 @@ module.exports = class TopicCommand extends Command {
const t_row = await this.client.db.models.Ticket.findOne({ where: { id: interaction.channel.id } });
if (!t_row) {
return await interaction.editReply({
return await interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.error_colour)
@@ -70,7 +70,7 @@ module.exports = class TopicCommand extends Command {
]
});
await interaction.editReply({
await interaction.reply({
embeds: [
new MessageEmbed()
.setColor(settings.success_colour)