Skip to content

Commit b0d77c1

Browse files
committed
fix: custom ID overflow with Create from message (closes #494)
1 parent f9a7f0c commit b0d77c1

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

src/commands/message/create.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ module.exports = class CreateMessageCommand extends MessageCommand {
1818
* @param {import("discord.js").MessageContextMenuCommandInteraction} interaction
1919
*/
2020
async run(interaction) {
21-
await useGuild(this.client, interaction, { referencesMessage: interaction.targetMessage.channelId + '/' + interaction.targetId });
21+
await useGuild(this.client, interaction, { referencesMessageId: interaction.targetId });
2222
}
23-
};
23+
};

src/lib/tickets/manager.js

+8-9
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ module.exports = class TicketManager {
155155
* @param {string?} [data.topic]
156156
*/
157157
async create({
158-
categoryId, interaction, topic, referencesMessage, referencesTicketId,
158+
categoryId, interaction, topic, referencesMessageId, referencesTicketId,
159159
}) {
160160
categoryId = Number(categoryId);
161161
const category = await this.getCategory(categoryId);
@@ -276,7 +276,7 @@ module.exports = class TicketManager {
276276
.setCustomId(JSON.stringify({
277277
action: 'questions',
278278
categoryId,
279-
referencesMessage,
279+
referencesMessageId,
280280
referencesTicketId,
281281
}))
282282
.setTitle(category.name)
@@ -324,7 +324,7 @@ module.exports = class TicketManager {
324324
.setCustomId(JSON.stringify({
325325
action: 'topic',
326326
categoryId,
327-
referencesMessage,
327+
referencesMessageId,
328328
referencesTicketId,
329329
}))
330330
.setTitle(category.name)
@@ -346,7 +346,7 @@ module.exports = class TicketManager {
346346
await this.postQuestions({
347347
categoryId,
348348
interaction,
349-
referencesMessage,
349+
referencesMessageId,
350350
referencesTicketId,
351351
topic,
352352
});
@@ -360,7 +360,7 @@ module.exports = class TicketManager {
360360
* @param {string?} [data.topic]
361361
*/
362362
async postQuestions({
363-
action, categoryId, interaction, topic, referencesMessage, referencesTicketId,
363+
action, categoryId, interaction, topic, referencesMessageId, referencesTicketId,
364364
}) {
365365
const [, category] = await Promise.all([
366366
interaction.deferReply({ ephemeral: true }),
@@ -540,14 +540,13 @@ module.exports = class TicketManager {
540540

541541
/** @type {import("discord.js").Message|undefined} */
542542
let message;
543-
if (referencesMessage) {
544-
referencesMessage = referencesMessage.split('/');
543+
if (referencesMessageId) {
545544
/** @type {import("discord.js").Message} */
546-
message = await (await this.client.channels.fetch(referencesMessage[0]))?.messages.fetch(referencesMessage[1]);
545+
message = await interaction.channel.messages.fetch(referencesMessageId);
547546
if (message) {
548547
// not worth the effort of making system messages work atm
549548
if (message.system) {
550-
referencesMessage = null;
549+
referencesMessageId = null;
551550
message = null;
552551
} else {
553552
if (!message.member) {

src/lib/tickets/utils.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ module.exports = {
1212
* @param {import("discord.js").ButtonInteraction|import("discord.js").SelectMenuInteraction} interaction
1313
*/
1414
async useGuild(client, interaction, {
15-
referencesMessage,
15+
referencesMessageId,
1616
referencesTicketId,
1717
topic,
1818
}) {
@@ -41,7 +41,7 @@ module.exports = {
4141
await client.tickets.create({
4242
categoryId: settings.categories[0].id,
4343
interaction,
44-
referencesMessage,
44+
referencesMessageId,
4545
referencesTicketId,
4646
topic,
4747
});
@@ -53,7 +53,7 @@ module.exports = {
5353
new StringSelectMenuBuilder()
5454
.setCustomId(JSON.stringify({
5555
action: 'create',
56-
referencesMessage,
56+
referencesMessageId,
5757
referencesTicketId,
5858
topic,
5959
}))

0 commit comments

Comments
 (0)