Updated imports and formating

Signed-off-by: Taken <taken@mairimashita.org>
This commit is contained in:
2024-01-16 17:05:15 +01:00
parent ee0250ed5e
commit 5661bc66bb
49 changed files with 819 additions and 491 deletions

View File

@@ -7,7 +7,7 @@ import {
RESTPutAPIApplicationGuildCommandsJSONBody,
Routes,
} from "discord.js"
import fs = require("fs")
import fs from "fs"
type FileType = "js" | "ts"
export default async function autoDeployCommands(fileType: FileType) {
@@ -17,10 +17,10 @@ export default async function autoDeployCommands(fileType: FileType) {
if (fileType === "js") {
commandFiles = fs
.readdirSync("./dist/src/commands/")
.readdirSync("./dist/commands/")
.filter(file => file.endsWith(fileType))
contentMenuCommands = fs
.readdirSync("./dist/src/commands-contextmenu/")
.readdirSync("./dist/commands-contextmenu/")
.filter(file => file.endsWith(fileType))
} else if (fileType === "ts") {
commandFiles = fs
@@ -93,9 +93,7 @@ export default async function autoDeployCommands(fileType: FileType) {
}
try {
console.log(
color("Commands are different, starting deploy.", "red"),
)
console.log(color("Commands are different, starting deploy.", "red"))
console.log(color(currentCmds, "red"))
console.log(
`Started refreshing ${commands.length} application (/) commands.`,
@@ -114,4 +112,4 @@ export default async function autoDeployCommands(fileType: FileType) {
} catch (error) {
console.error(error)
}
}
}

View File

@@ -34,7 +34,9 @@ export class ExtendedClient extends Client {
async start() {
let token: string
if (process.env.NODE_ENV === "dev" && process.env.TYPESCRIPT) {
console.log(color("Running in development mode. [ts-node]", "lavender"))
console.log(
color("Running in development mode. [ts-node]", "lavender"),
)
loadAllEvents(this, "ts")
token = env.dev.devtoken!
autoDeployCommands("ts")

View File

@@ -3,8 +3,8 @@ import { color } from "config/options.json"
import { Autocomplete } from "interfaces"
import { Events } from "discord.js"
import colorLog from "utils/functions/colors"
import path = require("path")
import fs = require("fs")
import path from "path"
import fs from "fs"
import logToChannel from "utils/functions/logtochannel"
type FileType = "js" | "ts"
const embedColor = Number(color.replace("#", "0x"))
@@ -32,10 +32,12 @@ export default function loadAutocompleteEvents(client: Client, ft: FileType) {
) {
client.autocomplete.set(autocomplete.name, autocomplete)
} else {
console.log(colorLog(
`[WARNING] The autocomplete at ${filePath} is missing a required "name", "execute" or "type" property.`,
"red"
))
console.log(
colorLog(
`[WARNING] The autocomplete at ${filePath} is missing a required "name", "execute" or "type" property.`,
"red",
),
)
}
}
@@ -55,7 +57,6 @@ export default function loadAutocompleteEvents(client: Client, ft: FileType) {
await autocomplete.execute(interaction)
} catch (error) {
if (process.env.NODE_ENV !== "dev") {
await logToChannel("error", {
embeds: [
{
@@ -63,7 +64,8 @@ export default function loadAutocompleteEvents(client: Client, ft: FileType) {
description: String(error),
color: embedColor,
footer: {
icon_url: interaction.guild!.iconURL() || undefined,
icon_url:
interaction.guild!.iconURL() || undefined,
text:
interaction.user.username +
" | " +

View File

@@ -3,8 +3,8 @@ import colorLog from "utils/functions/colors"
import { color } from "config/options.json"
import { Button } from "interfaces"
import { Events } from "discord.js"
import path = require("path")
import fs = require("fs")
import path from "path"
import fs from "fs"
import logToChannel from "utils/functions/logtochannel"
type FileType = "js" | "ts"
const embedColor = Number(color.replace("#", "0x"))
@@ -20,10 +20,12 @@ export default function loadButtonEvents(client: Client, ft: FileType) {
if ("name" in btn && "execute" in btn && btn.type === "button") {
client.buttons.set(btn.name, btn)
} else {
console.log(colorLog(
`[WARNING] The button at ${filePath} is missing a required "name", "execute" or "type" property.`,
"red"
))
console.log(
colorLog(
`[WARNING] The button at ${filePath} is missing a required "name", "execute" or "type" property.`,
"red",
),
)
}
}
@@ -50,7 +52,8 @@ export default function loadButtonEvents(client: Client, ft: FileType) {
description: "```" + error + "```",
color: embedColor,
footer: {
icon_url: interaction.guild!.iconURL() || undefined,
icon_url:
interaction.guild!.iconURL() || undefined,
text:
interaction.user.username +
" | " +
@@ -64,18 +67,24 @@ export default function loadButtonEvents(client: Client, ft: FileType) {
console.error(error)
if (!interaction.deferred) {
await interaction.reply({
embeds: [{
description: "There was an error while executing this button!",
color: embedColor,
}],
embeds: [
{
description:
"There was an error while executing this button!",
color: embedColor,
},
],
ephemeral: true,
})
} else {
await interaction.editReply({
embeds: [{
description: "There was an error while executing this button! 2",
color: embedColor,
}]
embeds: [
{
description:
"There was an error while executing this button! 2",
color: embedColor,
},
],
})
}
}

View File

@@ -3,8 +3,8 @@ import colorLog from "utils/functions/colors"
import { color } from "config/options.json"
import { Command } from "interfaces"
import { Events } from "discord.js"
import path = require("path")
import fs = require("fs")
import path from "path"
import fs from "fs"
import logToChannel from "utils/functions/logtochannel"
type FileType = "js" | "ts"
const embedColor = Number(color.replace("#", "0x"))
@@ -20,10 +20,12 @@ export default function loadSlashCommandsEvents(client: Client, ft: FileType) {
if ("data" in cmd && "execute" in cmd && cmd.type === "slash") {
client.commands.set(cmd.data.name, cmd)
} else {
console.log(colorLog(
`[WARNING] The command at ${filePath} is missing a required "data", "execute" or "type" property.`,
"red"
))
console.log(
colorLog(
`[WARNING] The command at ${filePath} is missing a required "data", "execute" or "type" property.`,
"red",
),
)
}
}
@@ -51,7 +53,8 @@ export default function loadSlashCommandsEvents(client: Client, ft: FileType) {
description: "```" + error + "```",
color: embedColor,
footer: {
icon_url: interaction.guild!.iconURL() || undefined,
icon_url:
interaction.guild!.iconURL() || undefined,
text:
interaction.user.username +
" | " +
@@ -65,18 +68,24 @@ export default function loadSlashCommandsEvents(client: Client, ft: FileType) {
console.error(error)
if (!interaction.deferred) {
await interaction.reply({
embeds: [{
description: "There was an error while executing this command!",
color: embedColor,
}],
embeds: [
{
description:
"There was an error while executing this command!",
color: embedColor,
},
],
ephemeral: true,
})
} else {
await interaction.editReply({
embeds: [{
description: "There was an error while executing this command!",
color: embedColor,
}]
embeds: [
{
description:
"There was an error while executing this command!",
color: embedColor,
},
],
})
}
}

View File

@@ -3,8 +3,8 @@ import colorLog from "utils/functions/colors"
import { ContextMenu } from "interfaces"
import { color } from "config/options.json"
import { Events } from "discord.js"
import path = require("path")
import fs = require("fs")
import path from "path"
import fs from "fs"
import logToChannel from "utils/functions/logtochannel"
type FileType = "js" | "ts"
const embedColor = Number(color.replace("#", "0x"))
@@ -27,10 +27,12 @@ export default function loadContextMenuEvents(client: Client, ft: FileType) {
if ("data" in cmd && "execute" in cmd && cmd.type === "contextmenu") {
client.contextmenus.set(cmd.data.name, cmd)
} else {
console.log(colorLog(
`[WARNING] The command at ${filePath} is missing a required "data", "execute" or "type" property.`,
"red"
))
console.log(
colorLog(
`[WARNING] The command at ${filePath} is missing a required "data", "execute" or "type" property.`,
"red",
),
)
}
}
@@ -58,7 +60,8 @@ export default function loadContextMenuEvents(client: Client, ft: FileType) {
description: "```" + error + "```",
color: embedColor,
footer: {
icon_url: interaction.guild!.iconURL() || undefined,
icon_url:
interaction.guild!.iconURL() || undefined,
text:
interaction.user.username +
" | " +
@@ -72,18 +75,24 @@ export default function loadContextMenuEvents(client: Client, ft: FileType) {
console.error(error)
if (!interaction.deferred) {
await interaction.reply({
embeds: [{
description: "There was an error while executing this contextmenu command!",
color: embedColor,
}],
embeds: [
{
description:
"There was an error while executing this contextmenu command!",
color: embedColor,
},
],
ephemeral: true,
})
} else {
await interaction.editReply({
embeds: [{
description: "There was an error while executing this contextmenu command!",
color: embedColor,
}]
embeds: [
{
description:
"There was an error while executing this contextmenu command!",
color: embedColor,
},
],
})
}
}

View File

@@ -1,7 +1,7 @@
import { ExtendedClient as Client } from "utils/Client"
import { Event } from "interfaces"
import path = require("path")
import fs = require("fs")
import path from "path"
import fs from "fs"
export default function loadEvents(client: Client) {
const serverDir = path.join(__dirname, "..", "..", "events", "server")

View File

@@ -3,8 +3,8 @@ import colorLog from "utils/functions/colors"
import { color } from "config/options.json"
import { Modal } from "interfaces"
import { Events } from "discord.js"
import path = require("path")
import fs = require("fs")
import path from "path"
import fs from "fs"
import logToChannel from "utils/functions/logtochannel"
type FileType = "js" | "ts"
const embedColor = Number(color.replace("#", "0x"))
@@ -22,10 +22,12 @@ export default function loadModalEvents(client: Client, ft: FileType) {
if ("name" in modal && "execute" in modal && modal.type === "modal") {
client.modals.set(modal.name, modal)
} else {
console.log(colorLog(
`[WARNING] The modal at ${filePath} is missing a required "name", "execute" or "type" property.`,
"red"
))
console.log(
colorLog(
`[WARNING] The modal at ${filePath} is missing a required "name", "execute" or "type" property.`,
"red",
),
)
}
}
@@ -52,7 +54,8 @@ export default function loadModalEvents(client: Client, ft: FileType) {
description: "```" + error + "```",
color: embedColor,
footer: {
icon_url: interaction.guild!.iconURL() || undefined,
icon_url:
interaction.guild!.iconURL() || undefined,
text:
interaction.user.username +
" | " +
@@ -66,19 +69,25 @@ export default function loadModalEvents(client: Client, ft: FileType) {
console.error(error)
if (!interaction.deferred) {
await interaction.reply({
embeds: [{
description: "There was an error while executing this modal!",
color: embedColor
}]
embeds: [
{
description:
"There was an error while executing this modal!",
color: embedColor,
},
],
})
} else {
await interaction.editReply({
embeds: [{
description: "There was an error while executing this modal!",
color: embedColor
}]
embeds: [
{
description:
"There was an error while executing this modal!",
color: embedColor,
},
],
})
}
}
})
}
}

View File

@@ -10,14 +10,14 @@ function getExpForLevel(level: number): number {
}
switch (respectedLevel) {
case 1:
return 500
case 2:
return 1000
case 3:
return 2000
case 4:
return 3500
case 1:
return 500
case 2:
return 1000
case 3:
return 2000
case 4:
return 3500
}
return 5000
}

View File

@@ -12,10 +12,10 @@ function getLevel(exp: number): number {
return exp <= 1
? 1
: Math.floor(
1 +
1 +
REVERSE_PQ_PREFIX +
Math.sqrt(REVERSE_CONST + GROWTH_DIVIDES_2 * exp),
)
)
}
function hypixelLevel(exp: number): number {

View File

@@ -3,10 +3,4 @@ export { bedwarsLevel } from "./bedwars"
export { hypixelLevel } from "./hypixel"
export { formatUuid } from "./uuid"
export { guildLevel, scaledGEXP } from "./guild"
export {
getUUID,
getIGN,
getPlayer,
getGuild,
getHeadURL,
} from "./account"
export { getUUID, getIGN, getPlayer, getGuild, getHeadURL } from "./account"

View File

@@ -4,7 +4,7 @@ const colors = {
red: "#f38ba8",
lavender: "#b4befe",
green: "#a6e3a1",
pink: "#f5c2e7"
pink: "#f5c2e7",
}
export default function color(text: string, type: keyof typeof colors) {
@@ -41,4 +41,4 @@ export default function color(text: string, type: keyof typeof colors) {
export default function colorize(text: string, color: keyof typeof colors) {
return colors[color] + text + colors.reset
} */
} */

View File

@@ -1,4 +1,12 @@
import { guildid, onlineLogChannel, botLogChannel, guildLogChannel, errorLogChannel, moderationLogChannel, devLogChannel } from "config/options.json"
import {
guildid,
onlineLogChannel,
botLogChannel,
guildLogChannel,
errorLogChannel,
moderationLogChannel,
devLogChannel,
} from "config/options.json"
import { Guild, MessageCreateOptions, TextChannel } from "discord.js"
import Illegitimate from "utils/Illegitimate"
@@ -8,12 +16,15 @@ const channels = {
guild: guildLogChannel,
error: errorLogChannel,
mod: moderationLogChannel,
dev: devLogChannel
dev: devLogChannel,
}
type Channel = keyof typeof channels
export default async function logToChannel(channel: Channel, message: MessageCreateOptions): Promise<void|null> {
export default async function logToChannel(
channel: Channel,
message: MessageCreateOptions,
): Promise<void | null> {
const guild = Illegitimate.client.guilds.cache.get(guildid) as Guild
let logChannel: TextChannel
@@ -24,9 +35,11 @@ export default async function logToChannel(channel: Channel, message: MessageCre
}
if (!logChannel) {
console.log(`[ERROR] Could not find channel used for ${channel} logging.`)
console.log(
`[ERROR] Could not find channel used for ${channel} logging.`,
)
return
}
await logChannel.send(message)
}
}

View File

@@ -7,7 +7,7 @@ import {
member,
guildStaff,
guildRole,
defaultMember
defaultMember,
} from "config/roles.json"
const roles = [
gm,