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

Better Interaction

Browse Source
This commit is contained in:
yuzu
2021-09-18 06:28:41 -07:00
parent 95675d5d13
commit 2e59f94dcf
5 changed files with 200 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils/DiscordInteraction.ts
+49 -22
View File
@@ -7,9 +7,18 @@ export const GLOBAL_COMMANDS: Object[] = [];
export const GUILD_COMMANDS: Object[] = [];
GUILD_COMMANDS.push(new SlashCommandBuilder().setName('help').setDescription('Show help menu').toJSON());
GUILD_COMMANDS.push(new SlashCommandBuilder().setName('ping').setDescription('Measure network latency').toJSON());
GUILD_COMMANDS.push(new SlashCommandBuilder().setName('invite').setDescription('Invite me to your server!').toJSON());
GUILD_COMMANDS.push(new SlashCommandBuilder()
.setName('help')
.setDescription('Show help menu')
);
GUILD_COMMANDS.push(new SlashCommandBuilder()
.setName('ping')
.setDescription('Measure network latency')
);
GUILD_COMMANDS.push(new SlashCommandBuilder()
.setName('invite')
.setDescription('Invite me to your server!')
);
GUILD_COMMANDS.push(new SlashCommandBuilder()
.setName('say')
.setDescription('Make me say something')
@@ -19,39 +28,54 @@ GUILD_COMMANDS.push(new SlashCommandBuilder()
.setRequired(true)
)
);
GUILD_COMMANDS.push(new SlashCommandBuilder()
.setName('interaction')
.setDescription('[Developer Only] Manage interaction')
.addSubcommand(info => info
.setName('info')
.setDescription('[Developer Only] Interaction modules information')
)
.addSubcommand(reloadAll => reloadAll
.setName('reloadall')
.setDescription('[Developer Only] Reload interaction for global and all guilds')
)
);
GUILD_COMMANDS.push(new SlashCommandBuilder()
.setName('membershipscreening')
.setDescription('Membership screening')
.addSubcommand(info => info
.setName('info')
.setDescription('Show more information for membership screening')
)
.addSubcommand(enable => enable
.setName('enable')
.setDescription('Enable Membership screening')
.setDescription('Enable membership screening')
)
.addSubcommand(enable => enable
.setName('disable')
.setDescription('Disable Membership screening')
.setDescription('Disable membership screening')
)
.addSubcommand(setrole => setrole
.setName('setrole')
.setDescription('Configure role of Membership screening')
.setDescription('Set a role that user will be granted when approved to join')
.addRoleOption(option => option
.setName('role')
.setDescription('Role to give to user')
.setDescription('Select a role that user will be granted when approved to join')
.setRequired(true)
)
)
.addSubcommand(setchannel => setchannel
.setName('setchannel')
.setDescription('Configure channel of Membership screening')
.setDescription('Set channel where membership screening approval request will be sent')
.addChannelOption(option => option
.setName('channel')
.setDescription('Channel to send request to')
.setDescription('Select a channel where approval request will be sent')
.setRequired(true)
)
)
.addSubcommand(createmessage => createmessage
.setName('createmessage')
.setDescription('Create message for Membership screening')
.setDescription('Create greeting message for membership screening into the channel. A message for new commers to read')
)
);
@@ -61,15 +85,16 @@ export const registerAllGlobalCommands = async () => {
}
export const unregisterAllGlobalCommands = async () => {
const commands = await DiscordProvider.client.application?.commands.fetch();
//const commands = await DiscordProvider.client.application?.commands.fetch();
if(typeof commands === 'undefined') return;
if(commands.size === 0) return;
//if(typeof commands === 'undefined') return;
//if(commands.size === 0) return;
Logger.log('info', `Unregistering all global interaction commands`);
for(const command of commands) {
await DiscordProvider.client.application?.commands.set([]);
/*for(const command of commands) {
await DiscordProvider.client.application?.commands.delete(command[1]);
}
}*/
}
@@ -95,17 +120,19 @@ export const unregisterAllGuildsCommands = async () => {
if(!guildObject) continue;
const commands = await guildObject.commands.fetch();
if(commands.size === 0) continue;
Logger.log('info', `Unregistering all interaction commands on guild ${guildObject.name} (${guildObject.id})`);
for(const command of commands) {
await DiscordProvider.client.guilds.cache.get(guildObject.id)?.commands.set([]);
//const commands = await guildObject.commands.fetch();
//if(commands.size === 0) continue;
/*for(const command of commands) {
try {
await DiscordProvider.client.guilds.cache.get(guildObject.id)?.commands.delete(command[1]);
} catch(err) {
Logger.log('error', `Cannot unregister all interaction commands on guild ${guildObject.name} (${guildObject.id})`);
}
}
}*/
}
}
src/utils/DiscordMessage.ts
+7 -2
View File
@@ -86,7 +86,7 @@ export async function sendReply(rMessage: Message, options: string | MessagePayl
}
export async function sendMessageOrInteractionResponse(data: Message | Interaction, payload: MessageOptions | InteractionReplyOptions) {
export async function sendMessageOrInteractionResponse(data: Message | Interaction, payload: MessageOptions | InteractionReplyOptions, replace?: boolean) {
const isSlashCommand = data instanceof Interaction && data.isCommand();
const isMessage = data instanceof Message;
@@ -103,7 +103,12 @@ export async function sendMessageOrInteractionResponse(data: Message | Interacti
}
else {
let message;
try { return await data.followUp(payload); }
try {
if(replace)
return await data.editReply(payload);
else
return await data.followUp(payload);
}
catch(errorDM) {
Logger.error(`Cannot find available destinations to send the message CID: ${data.channel!.id} UID: ${data.user.id} DM_ERR: ${errorDM}`);
return;