Hessenuk/DiscordTickets
Hessenuk/DiscordTickets
2
0
Fork 0
mirror of https://github.com/Hessenuk/DiscordTickets.git synced 2024-12-23 00:03:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix command options & types

Browse Source 
and start on closing
This commit is contained in:
Isaac 2022-10-11 21:24:09 +01:00
parent 4469aa4920
commit 83ab003db5
No known key found for this signature in database
GPG Key ID: 0DE40AE37BBA5C33
14 changed files with 267 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/buttons/close.js
View File

@ -8,5 +8,14 @@ module.exports = class CloseButton extends Button {
});
}
async run(id, interaction) { }
/**
* @param {*} id
* @param {import("discord.js").ButtonInteraction} interaction
*/
async run(id, interaction) {
/** @type {import("client")} */
const client = this.client;
await interaction.deferReply();
}
};

2
src/commands/slash/add.js
View File

@ -19,7 +19,7 @@ module.exports = class AddSlashCommand extends SlashCommand {
autocomplete: true,
name: 'ticket',
required: false,
type: ApplicationCommandOptionType.Integer,
type: ApplicationCommandOptionType.String,
},
];
opts = opts.map(o => {

5
src/commands/slash/claim.js
View File

@ -1,5 +1,4 @@
const { SlashCommand } = require('@eartharoid/dbf');
const { ApplicationCommandOptionType } = require('discord.js');
module.exports = class ClaimSlashCommand extends SlashCommand {
constructor(client, options) {
@ -19,5 +18,7 @@ module.exports = class ClaimSlashCommand extends SlashCommand {
});
}
async run(interaction) { }
async run(interaction) {
// tickets/manager.js
}
};

12
src/commands/slash/close.js
View File

@ -19,11 +19,6 @@ module.exports = class CloseSlashCommand extends SlashCommand {
autocomplete: true,
name: 'ticket',
required: false,
type: ApplicationCommandOptionType.Integer,
},
{
name: 'time',
required: false,
type: ApplicationCommandOptionType.String,
},
];
@ -53,5 +48,10 @@ module.exports = class CloseSlashCommand extends SlashCommand {
});
}
async run(interaction) { }
/**
* @param {import("discord.js").ChatInputCommandInteraction} interaction
*/
async run(interaction) {
}
};

193
src/commands/slash/force-close.js
View File

@ -1,5 +1,14 @@
const { SlashCommand } = require('@eartharoid/dbf');
const { ApplicationCommandOptionType } = require('discord.js');
const {
ApplicationCommandOptionType,
ActionRowBuilder,
ButtonBuilder,
ButtonStyle,
ComponentType,
} = require('discord.js');
const ExtendedEmbedBuilder = require('../../lib/embed');
const { isStaff } = require('../../lib/users');
const ms = require('ms');
module.exports = class ForceCloseSlashCommand extends SlashCommand {
constructor(client, options) {
@ -19,7 +28,7 @@ module.exports = class ForceCloseSlashCommand extends SlashCommand {
autocomplete: true,
name: 'ticket',
required: false,
type: ApplicationCommandOptionType.Integer,
type: ApplicationCommandOptionType.String,
},
{
name: 'time',
@ -53,5 +62,183 @@ module.exports = class ForceCloseSlashCommand extends SlashCommand {
});
}
async run(interaction) { }
/**
* @param {import("discord.js").ChatInputCommandInteraction} interaction
*/
async run(interaction) {
/** @type {import("client")} */
const client = this.client;
await interaction.deferReply();
const settings = await client.prisma.guild.findUnique({ where: { id: interaction.guild.id } });
const getMessage = this.client.i18n.getLocale(settings.locale);
let ticket;
if (!isStaff(interaction.guild, interaction.user.id)) { // if user is not staff
return await interaction.editReply({
embeds: [
new ExtendedEmbedBuilder({
iconURL: interaction.guild.iconURL(),
text: settings.footer,
})
.setColor(settings.errorColour)
.setTitle(getMessage('commands.slash.force-close.not_staff.title'))
.setDescription(getMessage('commands.slash.force-close.not_staff.description')),
],
});
}
if (interaction.options.getString('time', false)) { // if time option is passed
const time = ms(interaction.options.getString('time', false));
if (!time) {
return await interaction.editReply({
embeds: [
new ExtendedEmbedBuilder({
iconURL: interaction.guild.iconURL(),
text: settings.footer,
})
.setColor(settings.errorColour)
.setTitle(getMessage('commands.slash.close.invalid_time.title'))
.setDescription(getMessage('commands.slash.close.invalid_time.description', { input: interaction.options.getString('time', false) })),
],
});
}
const tickets = await client.prisma.ticket.findMany({
where: {
lastMessageAt: { lte: new Date(Date.now() - time) },
open: true,
},
});
if (tickets.length === 0) {
return await interaction.editReply({
embeds: [
new ExtendedEmbedBuilder({
iconURL: interaction.guild.iconURL(),
text: settings.footer,
})
.setColor(settings.errorColour)
.setTitle(getMessage('commands.slash.force-close.no_tickets.title'))
.setDescription(getMessage('commands.slash.force-close.no_tickets.description', { time: ms(time, { long: true }) })),
],
});
}
let confirmed = false;
const collectorTime = ms('15s');
const confirmationM = await interaction.editReply({
components: [
new ActionRowBuilder()
.addComponents([
new ButtonBuilder()
.setCustomId(JSON.stringify({
action: 'custom',
id: 'close',
}))
.setStyle(ButtonStyle.Danger)
.setEmoji(getMessage('buttons.close.emoji'))
.setLabel(getMessage('buttons.close.text')),
new ButtonBuilder()
.setCustomId(JSON.stringify({
action: 'custom',
id: 'cancel',
}))
.setStyle(ButtonStyle.Secondary)
.setEmoji(getMessage('buttons.cancel.emoji'))
.setLabel(getMessage('buttons.cancel.text')),
]),
],
embeds: [
new ExtendedEmbedBuilder({
iconURL: interaction.guild.iconURL(),
text: getMessage('misc.expires_in', { time: ms(collectorTime, { long: true }) }),
})
.setColor(settings.primaryColour)
.setTitle(getMessage('commands.slash.force-close.confirm_multiple.title'))
.setDescription(getMessage('commands.slash.force-close.confirm_multiple.description', {
count: tickets.length,
tickets: tickets.map(t => `> <#${t.id}>`).join('\n'),
time: ms(time, { long: true }),
})),
],
});
confirmationM.awaitMessageComponent({
componentType: ComponentType.Button,
filter: i => {
i.deferUpdate();
return i.user.id === interaction.user.id;
},
time: collectorTime,
})
.then(i => {
if (JSON.parse(i.customId).id === 'close') {
confirmed = true;
// TODO: i.editReply
} else {
// TODO: cancelled
}
})
.catch(() => interaction.editReply({
components: [],
embeds: [
new ExtendedEmbedBuilder({
iconURL: interaction.guild.iconURL(),
text: settings.footer,
})
.setColor(settings.errorColour)
.setTitle(getMessage('misc.expired.title'))
.setDescription(getMessage('misc.expired.description', { time: ms(time, { long: true }) })),
],
}));
if (!confirmed) return;
// TODO: tickets: for each, close (check reason)
} else if (interaction.options.getString('ticket', false)) { // if ticket option is passed
ticket = await client.prisma.ticket.findUnique({
include: { category: true },
where: { id: interaction.options.getString('ticket', false) },
});
if (!ticket) {
return await interaction.editReply({
embeds: [
new ExtendedEmbedBuilder({
iconURL: interaction.guild.iconURL(),
text: settings.footer,
})
.setColor(settings.errorColour)
.setTitle(getMessage('misc.invalid_ticket.title'))
.setDescription(getMessage('misc.invalid_ticket.description')),
],
});
}
} else {
ticket = await client.prisma.ticket.findUnique({
include: { category: true },
where: { id: interaction.channel.id },
});
if (!ticket) {
return await interaction.editReply({
embeds: [
new ExtendedEmbedBuilder({
iconURL: interaction.guild.iconURL(),
text: settings.footer,
})
.setColor(settings.errorColour)
.setTitle(getMessage('misc.not_ticket.title'))
.setDescription(getMessage('misc.not_ticket.description')),
],
});
}
}
// TODO: close (reason)
}
};

1
src/commands/slash/release.js
View File

@ -1,5 +1,4 @@
const { SlashCommand } = require('@eartharoid/dbf');
const { ApplicationCommandOptionType } = require('discord.js');
module.exports = class ReleaseSlashCommand extends SlashCommand {
constructor(client, options) {

2
src/commands/slash/remove.js
View File

@ -19,7 +19,7 @@ module.exports = class RemoveSlashCommand extends SlashCommand {
autocomplete: true,
name: 'ticket',
required: false,
type: ApplicationCommandOptionType.Integer,
type: ApplicationCommandOptionType.String,
},
];
opts = opts.map(o => {

2
src/commands/slash/transcript.js
View File

@ -14,7 +14,7 @@ module.exports = class TranscriptSlashCommand extends SlashCommand {
autocomplete: true,
name: 'ticket',
required: true,
type: ApplicationCommandOptionType.Integer,
type: ApplicationCommandOptionType.String,
},
];
opts = opts.map(o => {

2
src/commands/slash/transfer.js
View File

@ -14,7 +14,7 @@ module.exports = class TransferSlashCommand extends SlashCommand {
autocomplete: true,
name: 'category',
required: true,
type: ApplicationCommandOptionType.String,
type: ApplicationCommandOptionType.Integer,
},
];
opts = opts.map(o => {

2
src/commands/user/create.js
View File

@ -14,6 +14,8 @@ module.exports = class CreateUserCommand extends UserCommand {
}
async run(interaction) {
// TODO: isStaff?
// TODO: user->create
// select category
// send button
}

3
src/i18n/en-GB.yml
View File

@ -259,6 +259,9 @@ misc:
not_ticket:
description: You can only use this command in tickets.
title: ❌ This isn't a ticket channel
invalid_ticket:
description: Please specify a valid ticket.
title: ❌ Invalid ticket
ratelimited:
description: Try again in a few seconds.
title: 🐢 Please slow down

2
src/lib/sync.js
View File

@ -30,7 +30,7 @@ module.exports = async client => {
const guild = client.guilds.cache.get(ticket.guildId);
if (guild && guild.available && !client.channels.cache.has(ticket.id)) {
deleted += 0;
await client.tickets.close(ticket.id);
await client.tickets.close(ticket.id, true, 'channel deleted');
}
}

30
src/lib/tickets/manager.js
View File

@ -91,7 +91,7 @@ module.exports = class TicketManager {
/**
* @param {object} data
* @param {string} data.categoryId
* @param {import("discord.js").ButtonInteraction|import("discord.js").SelectMenuInteraction} data.interaction
* @param {import("discord.js").ChatInputCommandInteraction|import("discord.js").ButtonInteraction|import("discord.js").SelectMenuInteraction} data.interaction
* @param {string?} [data.topic]
*/
async create({
@ -634,4 +634,32 @@ module.exports = class TicketManager {
});
}
}
/**
* @param {import("discord.js").ChatInputCommandInteraction|import("discord.js").ButtonInteraction} interaction
*/
async preClose(interaction) {
const ticket = await this.client.prisma.ticket.findUnique({
include: {
category: true,
guild: true,
},
where: { id: interaction.channel.id },
});
const getMessage = this.client.i18n.getLocale(ticket.guild.locale);
}
/**
* close a ticket
* @param {string} ticketId
* @param {boolean} skip
* @param {string} reason
*/
async close(ticketId, skip, reason) {
// TODO: update cache/cat count
// TODO: update cache/member count
// TODO: set messageCount on ticket
// delete
}
};

21
src/listeners/client/guildMemberRemove.js
View File

@ -9,7 +9,24 @@ module.exports = class extends Listener {
});
}
run(member) {
// TODO: close tickets
/**
*
* @param {import("discord.js").GuildMember} member
*/
async run(member) {
/** @type {import("client")} */
const client = this.client;
const tickets = await client.prisma.ticket.findMany({
where: {
createdById: member.id,
guildId: member.guild.id,
open: true,
},
});
for (const ticket of tickets) {
await client.tickets.close(ticket.id, true, 'user left server');
}
}
};