toast/Daggerbot-TS
toast/Daggerbot-TS
1
0
Fork 0
mirror of https://github.com/toast-ts/Daggerbot-TS.git synced 2024-11-17 00:10:58 -05:00
Code Activity

DeferReply punishments & use two log channels

Browse Source
This commit is contained in:
toast-ts 2022-12-03 15:35:14 -08:00
parent ad388e4498
commit 388a8dbf1c
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/client.ts
View File

@ -167,6 +167,8 @@ export class TClient extends Client {
if (interaction.user.id == User.id) return interaction.reply(`You cannot ${type} yourself.`); if (interaction.user.id == User.id) return interaction.reply(`You cannot ${type} yourself.`);
if (!GuildMember && type != 'ban') return interaction.reply(`You cannot ${type} someone who is not in the server.`); if (!GuildMember && type != 'ban') return interaction.reply(`You cannot ${type} someone who is not in the server.`);
await interaction.deferReply();
await client.punishments.addPunishment(type, { time, interaction }, interaction.user.id, reason, User, GuildMember); await client.punishments.addPunishment(type, { time, interaction }, interaction.user.id, reason, User, GuildMember);
}; };
async unPunish(client: TClient, interaction: Discord.ChatInputCommandInteraction<'cached'>){ async unPunish(client: TClient, interaction: Discord.ChatInputCommandInteraction<'cached'>){
@ -221,6 +223,7 @@ class punishments extends Database {
} }
makeModlogEntry(data: Punishment) { makeModlogEntry(data: Punishment) {
const cancels = data.cancels ? this.client.punishments._content.find((x: Punishment) => x.id === data.cancels) : null; const cancels = data.cancels ? this.client.punishments._content.find((x: Punishment) => x.id === data.cancels) : null;
const channelId = ['kick', 'ban'].includes(data.type) ? '1048341961901363352' : this.client.config.mainServer.channels.logs;
// format data into embed // format data into embed
const embed = new this.client.embed() const embed = new this.client.embed()
@ -241,7 +244,7 @@ class punishments extends Database {
if (data.cancels) embed.addFields({name: '🔹 Overwrites', value: `This case overwrites Case #${cancels.id} \`${cancels.reason}\``}); if (data.cancels) embed.addFields({name: '🔹 Overwrites', value: `This case overwrites Case #${cancels.id} \`${cancels.reason}\``});
// send embed in modlog channel // send embed in modlog channel
(this.client.channels.cache.get(this.client.config.mainServer.channels.logs) as Discord.TextChannel).send({embeds: [embed]}); (this.client.channels.cache.get(channelId) as Discord.TextChannel).send({embeds: [embed]});
}; };
getTense(type: string) { // Get past tense form of punishment type, grammar yes getTense(type: string) { // Get past tense form of punishment type, grammar yes
switch (type) { switch (type) {
@ -314,7 +317,7 @@ class punishments extends Database {
if (typeof punResult == 'string') { // Punishment was unsuccessful if (typeof punResult == 'string') { // Punishment was unsuccessful
if (DM) DM.delete(); if (DM) DM.delete();
if (interaction) { if (interaction) {
return interaction.reply(punResult); return interaction.editReply(punResult);
} else { } else {
return punResult; return punResult;
} }
@ -323,7 +326,7 @@ class punishments extends Database {
this.client.punishments.addData(punData).forceSave(); this.client.punishments.addData(punData).forceSave();
if (interaction) { if (interaction) {
return interaction.reply({embeds: [embed]}); return interaction.editReply({embeds: [embed]});
} else { } else {
return punResult; return punResult;
} }

4
src/typings/interfaces.d.ts vendored
View File

@ -1,3 +1,5 @@
import Discord from 'discord.js';
export interface UserLevels { export interface UserLevels {
messages: number, messages: number,
level: number level: number
@ -14,7 +16,7 @@ export interface createTableOpt {
export interface punOpt { export interface punOpt {
time?: string, time?: string,
reason?: string, reason?: string,
interaction?: any interaction?: Discord.ChatInputCommandInteraction<"cached">
} }
export interface Punishment { export interface Punishment {
id: number; id: number;