Bug fixes and ~~performance~~ typing improvements
diff --git a/src/commands/mod/kick.ts b/src/commands/mod/kick.ts
index 59c2f81..f10563e 100644
--- a/src/commands/mod/kick.ts
+++ b/src/commands/mod/kick.ts
@@ -1,9 +1,4 @@
-import {
- CommandInteraction,
- GuildMember,
- MessageActionRow,
- MessageButton
-} from "discord.js";
+import { CommandInteraction, GuildMember, MessageActionRow, MessageButton } from "discord.js";
import humanizeDuration from "humanize-duration";
import { SlashCommandSubcommandBuilder } from "@discordjs/builders";
import confirmationMessage from "../../utils/confirmationMessage.js";
@@ -15,16 +10,9 @@
builder
.setName("kick")
.setDescription("Kicks a user from the server")
- .addUserOption((option) =>
- option
- .setName("user")
- .setDescription("The user to kick")
- .setRequired(true)
- );
+ .addUserOption((option) => option.setName("user").setDescription("The user to kick").setRequired(true));
-const callback = async (
- interaction: CommandInteraction
-): Promise<void | unknown> => {
+const callback = async (interaction: CommandInteraction): Promise<void | unknown> => {
const { renderUser } = client.logger;
// TODO:[Modals] Replace this with a modal
let reason = null;
@@ -37,15 +25,10 @@
.setDescription(
keyValueList({
user: renderUser(interaction.options.getUser("user")),
- reason: reason
- ? "\n> " + (reason ?? "").replaceAll("\n", "\n> ")
- : "*No reason provided*"
+ reason: reason ? "\n> " + (reason ?? "").replaceAll("\n", "\n> ") : "*No reason provided*"
}) +
`The user **will${notify ? "" : " not"}** be notified\n\n` +
- `Are you sure you want to kick <@!${
- (interaction.options.getMember("user") as GuildMember)
- .id
- }>?`
+ `Are you sure you want to kick <@!${(interaction.options.getMember("user") as GuildMember).id}>?`
)
.setColor("Danger")
.addReasonButton(reason ?? "")
@@ -64,9 +47,7 @@
const config = await client.database.guilds.read(interaction.guild.id);
try {
if (notify) {
- dm = await (
- interaction.options.getMember("user") as GuildMember
- ).send({
+ dm = await (interaction.options.getMember("user") as GuildMember).send({
embeds: [
new EmojiEmbed()
.setEmoji("PUNISH.KICK.RED")
@@ -96,19 +77,10 @@
dmd = false;
}
try {
- (interaction.options.getMember("user") as GuildMember).kick(
- reason ?? "No reason provided."
- );
+ (interaction.options.getMember("user") as GuildMember).kick(reason ?? "No reason provided.");
const member = interaction.options.getMember("user") as GuildMember;
- await client.database.history.create(
- "kick",
- interaction.guild.id,
- member.user,
- interaction.user,
- reason
- );
- const { log, NucleusColors, entry, renderUser, renderDelta } =
- client.logger;
+ await client.database.history.create("kick", interaction.guild.id, member.user, interaction.user, reason);
+ const { log, NucleusColors, entry, renderUser, renderDelta } = client.logger;
const data = {
meta: {
type: "memberKick",
@@ -121,35 +93,17 @@
list: {
memberId: entry(member.id, `\`${member.id}\``),
name: entry(member.id, renderUser(member.user)),
- joined: entry(
- member.joinedAt,
- renderDelta(member.joinedAt)
- ),
- kicked: entry(
- new Date().getTime(),
- renderDelta(new Date().getTime())
- ),
- kickedBy: entry(
- interaction.user.id,
- renderUser(interaction.user)
- ),
- reason: entry(
- reason,
- reason ? `\n> ${reason}` : "*No reason provided.*"
- ),
+ joined: entry(member.joinedAt, renderDelta(member.joinedAt)),
+ kicked: entry(new Date().getTime(), renderDelta(new Date().getTime())),
+ kickedBy: entry(interaction.user.id, renderUser(interaction.user)),
+ reason: entry(reason, reason ? `\n> ${reason}` : "*No reason provided.*"),
timeInServer: entry(
new Date().getTime() - member.joinedTimestamp,
- humanizeDuration(
- new Date().getTime() - member.joinedTimestamp,
- {
- round: true
- }
- )
+ humanizeDuration(new Date().getTime() - member.joinedTimestamp, {
+ round: true
+ })
),
- accountCreated: entry(
- member.user.createdAt,
- renderDelta(member.user.createdAt)
- ),
+ accountCreated: entry(member.user.createdAt, renderDelta(member.user.createdAt)),
serverMemberCount: member.guild.memberCount
},
hidden: {
@@ -163,9 +117,7 @@
new EmojiEmbed()
.setEmoji("PUNISH.KICK.RED")
.setTitle("Kick")
- .setDescription(
- "Something went wrong and the user was not kicked"
- )
+ .setDescription("Something went wrong and the user was not kicked")
.setStatus("Danger")
],
components: []
@@ -179,10 +131,7 @@
new EmojiEmbed()
.setEmoji(`PUNISH.KICK.${failed ? "YELLOW" : "GREEN"}`)
.setTitle("Kick")
- .setDescription(
- "The member was kicked" +
- (failed ? ", but could not be notified" : "")
- )
+ .setDescription("The member was kicked" + (failed ? ", but could not be notified" : ""))
.setStatus(failed ? "Warning" : "Success")
],
components: []
@@ -205,30 +154,24 @@
const member = interaction.member as GuildMember;
const me = interaction.guild.me!;
const apply = interaction.options.getMember("user") as GuildMember;
- if (member === null || me === null || apply === null)
- throw "That member is not in the server";
+ if (member === null || me === null || apply === null) throw "That member is not in the server";
const memberPos = member.roles ? member.roles.highest.position : 0;
const mePos = me.roles ? me.roles.highest.position : 0;
const applyPos = apply.roles ? apply.roles.highest.position : 0;
// Do not allow kicking the owner
- if (member.id === interaction.guild.ownerId)
- throw "You cannot kick the owner of the server";
+ if (member.id === interaction.guild.ownerId) throw "You cannot kick the owner of the server";
// Check if Nucleus can kick the member
- if (!(mePos > applyPos))
- throw "I do not have a role higher than that member";
+ if (!(mePos > applyPos)) throw "I do not have a role higher than that member";
// Check if Nucleus has permission to kick
- if (!me.permissions.has("KICK_MEMBERS"))
- throw "I do not have the *Kick Members* permission";
+ if (!me.permissions.has("KICK_MEMBERS")) throw "I do not have the *Kick Members* permission";
// Do not allow kicking Nucleus
if (member.id === interaction.guild.me.id) throw "I cannot kick myself";
// Allow the owner to kick anyone
if (member.id === interaction.guild.ownerId) return true;
// Check if the user has kick_members permission
- if (!member.permissions.has("KICK_MEMBERS"))
- throw "You do not have the *Kick Members* permission";
+ if (!member.permissions.has("KICK_MEMBERS")) throw "You do not have the *Kick Members* permission";
// Check if the user is below on the role list
- if (!(memberPos > applyPos))
- throw "You do not have a role higher than that member";
+ if (!(memberPos > applyPos)) throw "You do not have a role higher than that member";
// Allow kick
return true;
};