toast/Daggerbot-TS
toast/Daggerbot-TS
1
0
Fork 0
mirror of https://github.com/toast-ts/Daggerbot-TS.git synced 2024-12-29 05:35:38 -05:00
Code Activity

Revamp punishments system

Browse Source
This commit is contained in:
TÆMBØ 2022-12-01 14:53:57 -08:00
parent 1decd09ac9
commit 5dc5dcd82c
3 changed files with 118 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

237
src/client.ts
View File

@ -179,21 +179,17 @@ export class TClient extends Client {
} }
async punish(client: TClient, interaction: Discord.ChatInputCommandInteraction<'cached'>, type: string){ async punish(client: TClient, interaction: Discord.ChatInputCommandInteraction<'cached'>, type: string){
let result: any; if (!client.isStaff(interaction.member as Discord.GuildMember)) return client.youNeedRole(interaction, "dcmod");
if (!client.isStaff(interaction.member as Discord.GuildMember)) return this.youNeedRole(interaction, 'dcmod')
const time = interaction.options.getString('time') as string; const time = interaction.options.getString('time') as string;
const reason = interaction.options.getString('reason') ?? 'Reason unspecified'; const reason = interaction.options.getString('reason') ?? 'Unspecified';
if (type == 'ban'){ const GuildMember = interaction.options.getMember('member') as Discord.GuildMember;
const user = interaction.options.getUser('member') as Discord.User; const User = interaction.options.getUser('member') as Discord.User;
if (interaction.user.id == user.id) return interaction.reply(`You cannot ${type} yourself!`);
result = await this.punishments.addPunishment(type, user, {time,reason,interaction}, interaction.user.id); if (interaction.user.id == User.id) return interaction.reply(`You cannot ${type} yourself.`);
} else { if (!GuildMember && type != 'ban') return interaction.reply(`You cannot ${type} someone who is not in the server.`);
const member = interaction.options.getMember('member') as Discord.GuildMember;
if (interaction.user.id == member.id) return interaction.reply(`You cannot ${type} yourself!`); await client.punishments.addPunishment(type, { time, interaction }, interaction.user.id, reason, User, GuildMember);
if (this.isStaff(member)) return interaction.reply(`You cannot ${type} other staff!`);
result = await this.punishments.addPunishment(type, member, {time,reason,interaction}, interaction.user.id);
}
(typeof result == 'string' ? interaction.reply({content: `${result}`}) : interaction.reply({embeds: [result]}))
}; };
async unPunish(client: TClient, interaction: Discord.ChatInputCommandInteraction<'cached'>){ async unPunish(client: TClient, interaction: Discord.ChatInputCommandInteraction<'cached'>){
if (!client.isStaff(interaction.member as Discord.GuildMember)) return this.youNeedRole(interaction, 'dcmod'); if (!client.isStaff(interaction.member as Discord.GuildMember)) return this.youNeedRole(interaction, 'dcmod');
@ -245,115 +241,112 @@ class punishments extends Database {
createId(){ createId(){
return Math.max(...this.client.punishments._content.map((x:Punishment)=>x.id), 0)+1; return Math.max(...this.client.punishments._content.map((x:Punishment)=>x.id), 0)+1;
} }
async addPunishment(type: string, member: any, options: punOpt, moderator: string){ makeModlogEntry(data: Punishment) {
const now = Date.now(); const cancels = data.cancels ? this.client.punishments._content.find((x: Punishment) => x.id === data.cancels) : null;
const {time, reason, interaction}=options;
const ms = require('ms'); // format data into embed
let timeInMillis: number; const embed = new this.client.embed()
if(type !== 'mute'){ .setTitle(`${this.client.formatPunishmentType(data, this.client, cancels)} | Case #${data.id}`)
timeInMillis = time ? ms(time) : null; .addFields(
} else { {name: '🔹 User', value: `<@${data.member}> \`${data.member}\``, inline: true},
timeInMillis = time ? ms(time) : 2419200000; {name: '🔹 Moderator', value: `<@${data.moderator}> \`${data.moderator}\``, inline: true},
{name: '\u200b', value: '\u200b', inline: true},
{name: '🔹 Reason', value: `\`${data.reason}\``, inline: true})
.setColor(this.client.config.embedColor)
.setTimestamp(data.time)
if (data.duration) {
embed.addFields(
{name: '🔹 Duration', value: this.client.formatTime(data.duration, 100), inline: true},
{name: '\u200b', value: '\u200b', inline: true}
)
} }
switch (type) { if (data.cancels) embed.addFields({name: '🔹 Overwrites', value: `This case overwrites Case #${cancels.id} \`${cancels.reason}\``});
case 'ban':
const banData:Punishment={type, id: this.createId(), member: member.id, moderator, time: now}; // send embed in modlog channel
const dm1: Discord.Message = await member.send(`You've been banned from ${interaction.guild.name} ${timeInMillis ? `for ${this.client.formatTime(timeInMillis, 4, {longNames: true, commas: true})}` : 'forever'} for reason \`${reason || 'Reason unspecified'}\` (Case #${banData.id})`).catch(()=>{return interaction.channel.send('Failed to DM user.')}) (this.client.channels.cache.get(this.client.config.mainServer.channels.staffreports) as Discord.TextChannel).send({embeds: [embed]});
const banResult = await interaction.guild.bans.create(member.id, {reason: `${reason || 'Reason unspecified'} | Case #${banData.id}`}).catch((err:Error)=>err.message); };
if (typeof banResult === 'string'){ getTense(type: string) { // Get past tense form of punishment type, grammar yes
dm1.delete() switch (type) {
return `Ban was unsuccessful: ${banResult}` case 'ban':
} else { return 'banned';
if (timeInMillis){ case 'softban':
banData.endTime = now + timeInMillis; return 'softbanned';
banData.duration = timeInMillis case 'kick':
} return 'kicked';
if (reason) banData.reason = reason; case 'mute':
this.client.makeModlogEntry(banData, this.client); return 'muted';
this.addData(banData).forceSave(); case 'warn':
return new this.client.embed().setColor(this.client.config.embedColor).setTitle(`Case #${banData.id}: Ban`).setDescription(`${member?.user?.tag ?? member?.tag}\n<@${member.id}>\n(\`${member.id}\`)`).addFields( return 'warned';
{name: 'Reason', value: `\`${reason || 'Reason unspecified'}\``}, }
{name: 'Duration', value: `${timeInMillis ? `for ${this.client.formatTime(timeInMillis, 4, {longNames: true, commas: true})}` : 'forever'}`} }
) async addPunishment(type: string, options: punOpt, moderator: string, reason: string, User: Discord.User, GuildMember?: Discord.GuildMember) {
} const { time, interaction } = options;
case 'softban': const ms = require('ms');
const guild = member.guild; const now = Date.now();
const softbanData:Punishment={type, id: this.createId(), member: member.user.id, moderator, time: now}; const guild = this.client.guilds.cache.get(this.client.config.mainServer.id) as Discord.Guild;
const dm2 = Discord.Message = await member.send(`You've been softbanned from ${member.guild.name} ${timeInMillis ? `for ${this.client.formatTime(timeInMillis, 4, {longNames: true, commas: true})}` : 'forever'} for reason \`${reason || 'Reason unspecified'}\` (Case #${softbanData.id})`).catch(()=>{return interaction.channel.send('Failed to DM user.')}) const punData: Punishment = { type, id: this.createId(), member: User.id, reason, moderator, time: now }
const softbanResult = await member.ban({deleteMessageSeconds: 345600, reason: `${reason || 'Reason unspecified'} | Case #${softbanData.id}`}).catch((err:Error)=>err.message); const embed = new this.client.embed()
if (typeof softbanResult === 'string') { .setColor(this.client.config.embedColor)
dm2.delete(); .setTitle(`Case #${punData.id}: ${type[0].toUpperCase() + type.slice(1)}`)
return `Softban was unsuccessful: ${softbanResult}`; .setDescription(`${User.tag}\n<@${User.id}>\n(\`${User.id}\`)`)
} else { .addFields({name: 'Reason', value: reason})
const unbanResult = guild.members.unban(softbanData.member, `${reason || 'Reason unspecified'} | Case #${softbanData.id}`).catch((err:Error)=>err.message); let punResult: any;
if (typeof unbanResult === 'string'){ let timeInMillis: number;
return `Softban (unban) was unsuccessful: ${softbanResult}` let DM: Discord.Message<false> | undefined;
} else {
if (reason) softbanData.reason = reason; if (type == "mute") {
this.client.makeModlogEntry(softbanData, this.client); timeInMillis = time ? ms(time) : 2419140000; // Timeouts have a limit of 4 weeks
this.addData(softbanData).forceSave(); } else {
return new this.client.embed().setColor(this.client.config.embedColor).setTitle(`Case #${softbanData.id}: Softban`).setDescription(`${member.user.tag}\n<@${member.user.tag}>\n(\`${member.user.id}\`)`).addFields( timeInMillis = time ? ms(time) : null;
{name: 'Reason', value: `\`${reason || 'Reason unspecified'}\``} }
)
} // Add field for duration if time is specified
} if (time) embed.addFields({name: 'Duration', value: `${timeInMillis ? `for ${this.client.formatTime(timeInMillis, 4, { longNames: true, commas: true })}` : "forever"}`})
case 'kick':
const kickData:Punishment={type, id: this.createId(), member: member.user.id, moderator, time: now}; if (GuildMember) {
const dm3: Discord.Message = await member.send(`You've been kicked from ${member.guild.name} for reason \`${reason || 'Reason unspecified'}\` (Case #${kickData.id})`).catch(()=>{interaction.channel.send(`Failed to DM <@${member.user.id}>.`); return null}); try {
const kickResult = await member.kick(`${reason || 'Reason unspecified'} | Case #${kickData.id}`).catch((err:Error)=>err.message) DM = await GuildMember.send(`You've been ${this.getTense(type)} ${['warn', 'mute'].includes(type) ? 'in' : 'from'} ${guild.name}${time ? (timeInMillis ? ` for ${this.client.formatTime(timeInMillis, 4, { longNames: true, commas: true })}` : 'forever') : ''} for reason \`${reason}\` (case #${punData.id})`);
if (typeof kickResult === 'string'){ } catch (err: any) {
if (dm3) dm3.delete(); embed.setFooter({text: 'Failed to DM member of punishment'});
return `Kick was unsuccessful: ${kickResult}` }
} else { }
if (reason) kickData.reason = reason;
this.client.makeModlogEntry(kickData, this.client); if (['ban', 'softban'].includes(type)) {
this.addData(kickData).forceSave(); punResult = await guild.bans.create(User.id, {reason: `${reason} | Case #${punData.id}`}).catch((err: Error) => err.message);
return new this.client.embed().setColor(this.client.config.embedColor).setTitle(`Case #${kickData.id}: Kick`).setDescription(`${member.user.tag}\n<@${member.user.id}>\n(\`${member.user.id}\`)`).addFields( } else if (type == 'kick') {
{name: 'Reason', value: `\`${reason || 'Reason unspecified'}\``} punResult = await GuildMember?.kick(`${reason} | Case #${punData.id}`).catch((err: Error) => err.message);
) } else if (type == 'mute') {
} punResult = await GuildMember?.timeout(timeInMillis, `${reason} | Case #${punData.id}`).catch((err: Error) => err.message);
case 'warn': }
const warnData:Punishment={type, id: this.createId(), member: member.user.id, moderator, time: now};
const warnResult: Discord.Message = await member.send(`You've been warned in ${member.guild.name} for reason \`${reason || 'Reason unspecified'}\` (Case #${warnData.id})`).catch(()=>{interaction.channel.send(`Failed to DM <@${member.user.id}>`); return null;}) if (type == 'softban' && typeof punResult != 'string') { // If type was softban and it was successful, continue with softban (unban)
if (typeof warnResult === 'string'){ punResult = await guild.bans.remove(User.id, `${reason} | Case #${punData.id}`).catch((err: Error) => err.message);
return `Warn was unsuccessful: ${warnResult}` }
} else {
if (reason) warnData.reason = reason; if (timeInMillis && ['mute', 'ban'].includes(type)) { // If type is mute or ban, specify duration and endTime
this.client.makeModlogEntry(warnData, this.client); punData.endTime = now + timeInMillis;
this.addData(warnData).forceSave(); punData.duration = timeInMillis;
const embedw = new this.client.embed().setColor(this.client.config.embedColor).setTitle(`Case #${warnData.id}: Warn`).setDescription(`${member.user.tag}\n<@${member.user.id}>\n(\`${member.user.id}\`)`).addFields( }
{name: 'Reason', value: `\`${reason || 'Reason unspecified'}\``}
) if (typeof punResult == 'string') { // Punishment was unsuccessful
if (moderator !== this.client.user.id) {return embedw} if (DM) DM.delete();
} if (interaction) {
case 'mute': return interaction.reply(punResult);
const muteData:Punishment={type, id: this.createId(), member: member.user.id, moderator, time: now}; } else {
let muteResult; return punResult;
if (this.client.isStaff(member)) return 'Staff cannot be muted.' }
const dm4: Discord.Message = await member.send(`You've been muted in ${member.guild.name} ${timeInMillis ? `for ${this.client.formatTime(timeInMillis, 4, {longNames: true, commas: true})}` : 'forever'} for reason \`${reason || 'Reason unspecified'}\` (Case #${muteData.id})`).catch(()=>{interaction.channel.send('Failed to DM user.'); return null}); } else { // Punishment was successful
if (timeInMillis) { this.makeModlogEntry(punData);
muteResult = await member.timeout(timeInMillis, `${reason || 'Reason unspecified'} | Case #${muteData.id}`).catch((err:Error)=>err.message); this.client.punishments.addData(punData).forceSave();
} else {
muteResult = await member.timeout(2419200000, `${reason || 'Reason unspecified'} | Case #${muteData.id}`).catch((err:Error)=>err.message); if (interaction) {
} return interaction.reply({embeds: [embed]});
if (typeof muteResult === 'string'){ } else {
if (dm4) dm4.delete(); return punResult;
return `Mute was unsuccessful: ${muteResult}`; }
} else { }
if (timeInMillis) {
muteData.endTime = now + timeInMillis; }
muteData.duration = timeInMillis;
}
if (reason) muteData.reason = reason;
this.client.makeModlogEntry(muteData, this.client);
this.addData(muteData).forceSave();
const embedm = new this.client.embed().setColor(this.client.config.embedColor).setTitle(`Case #${muteData.id}: Mute`).setDescription(`${member.user.tag}\n<@${member.user.id}>\n(\`${member.user.id}\`)`).addFields(
{name: 'Reason', value: `\`${reason || 'Reason unspecified'}\``},
{name: 'Duration', value: `${this.client.formatTime(timeInMillis, 4, {longNames: true, commas: true})}`})
if (moderator !== this.client.user.id) {return embedm};
}
}
}
async removePunishment(caseId:number, moderator:any, reason:string):Promise<any>{ async removePunishment(caseId:number, moderator:any, reason:string):Promise<any>{
const now = Date.now() const now = Date.now()
const punishment = this._content.find((x:Punishment)=>x.id === caseId); const punishment = this._content.find((x:Punishment)=>x.id === caseId);

2
src/events/messageCreate.ts
View File

@ -44,7 +44,7 @@ export default {
// if a spammed message exists; // if a spammed message exists;
if (spammedMessage){ if (spammedMessage){
// mute // mute
const muteResult = await client.punishments.addPunishment('mute', message.member, {reason: 'Automod; banned words', time: '30m'}, client.user.id); const muteResult = await client.punishments.addPunishment('mute', { time: '30m' }, (client.user as Discord.User).id, 'Automod; Banned words', message.author, message.member as Discord.GuildMember);
// and clear their list of long messages // and clear their list of long messages
delete client.repeatedMessages[message.author.id]; delete client.repeatedMessages[message.author.id];
} }

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

@ -22,8 +22,8 @@ export interface Punishment {
member: string; member: string;
moderator: string; moderator: string;
expired?: boolean; expired?: boolean;
time?: number; time: number;
reason?: string; reason: string;
endTime?: number; endTime?: number;
cancels?: number; cancels?: number;
duration?: number; duration?: number;