kirameki-cafe-mirror/Yumi
1
0
Fork 0
mirror of https://github.com/kirameki-cafe/Yumi.git synced 2026-09-14 03:09:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed discord.js v14 breaking changes

Browse Source
This commit is contained in:
yuzu
2022-06-29 15:27:42 +07:00
parent 5c70395f50
commit 0f73f8f464
21 changed files with 340 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/discord/Developer/Debug.ts
+8 -8
View File
@@ -1,11 +1,11 @@
import { User as PrismaUser, Guild as PrismaGuild } from '@prisma/client';
import {
Message,
Interaction,
ActionRowBuilder,
CommandInteraction,
MessageActionRow,
MessageButton,
ButtonInteraction
ButtonInteraction,
ButtonBuilder,
ButtonStyle
} from 'discord.js';
import DiscordModule, { HybridInteractionMessage } from '../../utils/DiscordModule';
@@ -162,14 +162,14 @@ export default class Debug extends DiscordModule {
});
},
invalidInteraction: async (data: HybridInteractionMessage) => {
const row = new MessageActionRow().addComponents(
new MessageButton()
const row = new ActionRowBuilder<ButtonBuilder>().addComponents(
new ButtonBuilder()
.setEmoji('😥')
.setLabel(
' Make invalid interaction (Wait 7 seconds, check error in console or logs)'
)
.setCustomId('dev_make_invalid_interaction')
.setStyle('PRIMARY')
.setStyle(ButtonStyle.Primary)
);
await sendHybridInteractionMessageResponse(data, {
embeds: [EMBEDS.INVALID_TEST(data)],
@@ -187,7 +187,7 @@ export default class Debug extends DiscordModule {
});
query = args[0].toLowerCase();
} else if (data.isSlashCommand()) {
} else if (data.isApplicationCommand()) {
query = args.getSubcommand();
}
src/discord/Developer/ServiceAnnouncement.ts
+19 -19
View File
@@ -1,4 +1,4 @@
import { Message, MessageEmbed, Interaction, CommandInteraction, TextChannel } from 'discord.js';
import { Message, EmbedBuilder, Interaction, CommandInteraction, TextChannel, BaseInteraction } from 'discord.js';
import { Promise } from 'bluebird';
import fs from 'fs';
import path from 'path';
@@ -22,7 +22,7 @@ import Prisma from '../../providers/Prisma';
import Users from '../../services/Users';
const EMBEDS = {
ANNOUNCEMENT_INFO: (data: Message | Interaction) => {
ANNOUNCEMENT_INFO: (data: Message | BaseInteraction) => {
return makeInfoEmbed({
title: 'Service Announcement',
description: `This module contains management tool for announcement feed\n The announcement message is located in \`\`configs/ServiceAnnouncement.json\`\``,
@@ -32,14 +32,14 @@ const EMBEDS = {
value: '``reload`` ``previewNews`` ``sendNews`` ``previewMaintenance`` ``sendMaintenance`` ``previewMessage`` ``sendMessage`` ``previewAlert`` ``sendAlert``'
}
],
user: data instanceof Interaction ? data.user : data.author
user: data instanceof BaseInteraction ? data.user : data.author
});
},
NOT_DEVELOPER: (data: Message | Interaction) => {
NOT_DEVELOPER: (data: Message | BaseInteraction) => {
return makeErrorEmbed({
title: 'Developer only',
description: `This command is restricted to the developers only`,
user: data instanceof Interaction ? data.user : data.author
user: data instanceof BaseInteraction ? data.user : data.author
});
},
MAKE_PAYLOAD: (payload: any) => {
@@ -60,40 +60,40 @@ const EMBEDS = {
if (payload.description)
payload.description = payload.description.replaceAll('{bot_username}', user?.username);
return new MessageEmbed(payload);
return new EmbedBuilder(payload);
},
RELOADED: (data: Message | Interaction) => {
RELOADED: (data: Message | BaseInteraction) => {
return makeSuccessEmbed({
title: 'Service Announcement Configuration Reloaded',
user: data instanceof Interaction ? data.user : data.author
user: data instanceof BaseInteraction ? data.user : data.author
});
},
RELOAD_ERROR: (data: Message | Interaction, error: string) => {
RELOAD_ERROR: (data: Message | BaseInteraction, error: string) => {
return makeErrorEmbed({
title: 'Unable to reload Service Announcement Configuration',
description: `\`\`\`${error}\`\`\``,
user: data instanceof Interaction ? data.user : data.author
user: data instanceof BaseInteraction ? data.user : data.author
});
},
SENDING_SERVICE_ANNOUNCEMENT: (data: Message | Interaction) => {
SENDING_SERVICE_ANNOUNCEMENT: (data: Message | BaseInteraction) => {
return makeProcessingEmbed({
title: 'Service Announcement',
description: `Broadcasting Service Announcement`,
user: data instanceof Interaction ? data.user : data.author
user: data instanceof BaseInteraction ? data.user : data.author
});
},
SERVICE_ANNOUNCEMENT_SENT: (data: Message | Interaction) => {
SERVICE_ANNOUNCEMENT_SENT: (data: Message | BaseInteraction) => {
return makeSuccessEmbed({
title: 'Service Announcement',
description: `Broadcasted Service Announcement`,
user: data instanceof Interaction ? data.user : data.author
user: data instanceof BaseInteraction ? data.user : data.author
});
},
SERVICE_ANNOUNCEMENT_SENT_WITH_ERRORS: (data: Message | Interaction) => {
SERVICE_ANNOUNCEMENT_SENT_WITH_ERRORS: (data: Message | BaseInteraction) => {
return makeWarningEmbed({
title: 'Service Announcement',
description: `Broadcasted Service Announcement with errors, check console for more info`,
user: data instanceof Interaction ? data.user : data.author
user: data instanceof BaseInteraction ? data.user : data.author
});
}
};
@@ -298,7 +298,7 @@ export default class ServiceAnnouncement extends DiscordModule {
EMBEDS.SERVICE_ANNOUNCEMENT_SENT_WITH_ERRORS(data.getRaw())
]
});
else if (data.isSlashCommand())
else if (data.isApplicationCommand())
return await sendHybridInteractionMessageResponse(
data,
{
@@ -313,7 +313,7 @@ export default class ServiceAnnouncement extends DiscordModule {
return placeholder
.getMessage()
.edit({ embeds: [EMBEDS.SERVICE_ANNOUNCEMENT_SENT(data.getRaw())] });
else if (data.isSlashCommand())
else if (data.isApplicationCommand())
return await sendHybridInteractionMessageResponse(
data,
{ embeds: [EMBEDS.SERVICE_ANNOUNCEMENT_SENT(data.getRaw())] },
@@ -331,7 +331,7 @@ export default class ServiceAnnouncement extends DiscordModule {
embeds: [EMBEDS.ANNOUNCEMENT_INFO(data.getRaw())]
});
query = args[0].toLowerCase();
} else if (data.isSlashCommand()) {
} else if (data.isApplicationCommand()) {
query = args.getSubcommand();
}