illegitimate/illegitimate-bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'main'

Browse Source 
Dev

See merge request illegitimate/illegitimate-bot!283
This commit is contained in:
Taken
2024-09-13 16:33:19 +00:00
parent 1b4699c9db 957536fb62
commit 371f481210
9 changed files with 46 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dprint.json
View File

@@ -1,9 +1,9 @@
{
"$schema": "https://plugins.dprint.dev/dprint/dprint-plugin-typescript/latest/schema.json",
"typescript": {
"lineWidth": 150,
"indentWidth": 4,
"lineWidth": 150,
"useTabs": false,
"typescript": {
"semiColons": "asi",
"quoteStyle": "alwaysDouble",
"newLineKind": "lf",
@@ -14,7 +14,6 @@
"typeLiteral.separatorKind.multiLine": "semiColon"
},
"json": {
"indentWidth": "4"
},
"markdown": {
},

30
src/utils/Autodeploy.ts
View File

@@ -1,28 +1,34 @@
import { RESTPostAPIChatInputApplicationCommandsJSONBody } from "discord.js"
import { RESTPostAPIChatInputApplicationCommandsJSONBody, RESTPostAPIContextMenuApplicationCommandsJSONBody } from "discord.js"
import fs from "fs"
import { ICommand } from "interfaces"
import { ICommand, IContextMenu } from "interfaces"
import { ExtendedClient } from "./Client.js"
import env from "./Env.js"
import { color } from "./functions/colors.js"
type FileType = "js" | "ts"
export default async function autoDeployCommands(fileType: FileType, client: ExtendedClient) {
const commands: RESTPostAPIChatInputApplicationCommandsJSONBody[] = []
type CommandsType = RESTPostAPIChatInputApplicationCommandsJSONBody | RESTPostAPIContextMenuApplicationCommandsJSONBody
const commands: CommandsType[] = []
let commandFiles: string[] = []
// let contentMenuCommands: string[] = []
let contentMenuCommands: string[] = []
if (fileType === "js") {
commandFiles = fs.readdirSync("./dist/commands/").filter(file => file.endsWith(fileType))
// contentMenuCommands = fs.readdirSync("./dist/commands-contextmenu/").filter(file => file.endsWith(fileType))
contentMenuCommands = fs.readdirSync("./dist/commands-contextmenu/").filter(file => file.endsWith(fileType))
} else if (fileType === "ts") {
commandFiles = fs.readdirSync("./src/commands/").filter(file => file.endsWith(fileType))
// contentMenuCommands = fs.readdirSync("./src/commands-contextmenu/").filter(file => file.endsWith(fileType))
contentMenuCommands = fs.readdirSync("./src/commands-contextmenu/").filter(file => file.endsWith(fileType))
}
for (const file of commandFiles) {
// const command: ICommand = require(`../commands/${file}`)
const { default: commandImport } = await import(`../commands/${file}`)
const command: ICommand = commandImport
const { default: command } = await import(`../commands/${file}`) as { default: ICommand }
if (command.dev) {
commands.push(command.data.toJSON())
}
}
for (const file of contentMenuCommands) {
const { default: command } = await import(`../commands-contextmenu/${file}`) as { default: IContextMenu }
if (command.dev) {
commands.push(command.data.toJSON())
}
@@ -31,27 +37,25 @@ export default async function autoDeployCommands(fileType: FileType, client: Ext
const commandData = commands.map(command => {
return {
name: command.name,
description: command.description,
options: command.options?.map(option => {
return {
name: option.name,
description: option.description,
type: option.type
}
}),
}) ?? [],
defaultPermission: command.default_member_permissions ?? null
}
}).sort((a, b) => a.name > b.name ? 1 : -1)
client.on("ready", async (c) => {
const guildclient = c.guilds.cache.get(env.dev.guildid)!
const currentCommands = await guildclient.commands.fetch()
const currentCommands = await guildclient.commands.fetch({})
if (!currentCommands) return
const currentCommandsData = currentCommands.map(command => {
return {
name: command.name,
description: command.description,
options: command.options?.map(option => {
return {
name: option.name,

11
src/utils/Events/autocomplete.ts
View File

@@ -4,7 +4,6 @@ import fs from "fs"
import { IAutocomplete } from "interfaces"
import path from "path"
import { ExtendedClient as Client } from "utils/Client.js"
import { color } from "utils/functions/colors.js"
import logToChannel from "utils/functions/logtochannel.js"
type FileType = "js" | "ts"
const __dirname = import.meta.dirname
@@ -16,17 +15,7 @@ export default async function loadAutocompleteEvents(client: Client, ft: FileTyp
for (const file of autocompleteFiles) {
const filePath = path.join(autocompletePath, file)
const { default: autocomplete } = await import("file://" + filePath) as { default: IAutocomplete }
if ("name" in autocomplete && "execute" in autocomplete) {
client.autocomplete.set(autocomplete.name, autocomplete)
} else {
console.log(
color(
`[WARNING] The autocomplete at ${filePath} is missing a required "name", "execute" or "type" property.`,
"red"
)
)
}
}
client.on(Events.InteractionCreate, async interaction => {

15
src/utils/Events/button.ts
View File

@@ -4,7 +4,6 @@ import fs from "fs"
import { IButton } from "interfaces"
import path from "path"
import { ExtendedClient as Client } from "utils/Client.js"
import { color } from "utils/functions/colors.js"
import logToChannel from "utils/functions/logtochannel.js"
type FileType = "js" | "ts"
const __dirname = import.meta.dirname
@@ -16,17 +15,7 @@ export default async function loadButtonEvents(client: Client, ft: FileType) {
for (const file of btnFiles) {
const filePath = path.join(btnPath, file)
const { default: btn } = await import("file://" + filePath) as { default: IButton }
if ("name" in btn && "execute" in btn) {
client.buttons.set(btn.name, btn)
} else {
console.log(
color(
`[WARNING] The button at ${filePath} is missing a required "name", "execute" or "type" property.`,
"red"
)
)
}
}
client.on(Events.InteractionCreate, async interaction => {
@@ -38,6 +27,10 @@ export default async function loadButtonEvents(client: Client, ft: FileType) {
const button = client.buttons.get(customId)
if (!button) {
interaction.reply({
content: "Button logic not implemented. This is most likely an old button",
ephemeral: true
})
console.error(`No event matching ${interaction.customId} was found.`)
return
}

19
src/utils/Events/command.ts
View File

@@ -4,7 +4,6 @@ import fs from "fs"
import { ICommand } from "interfaces"
import path from "path"
import { ExtendedClient as Client } from "utils/Client.js"
import { color } from "utils/functions/colors.js"
import logToChannel from "utils/functions/logtochannel.js"
type FileType = "js" | "ts"
const __dirname = import.meta.dirname
@@ -16,17 +15,7 @@ export default async function loadSlashCommandsEvents(client: Client, ft: FileTy
for (const file of cmdFiles) {
const filePath = path.join(cmdPath, file)
const { default: cmd } = await import("file://" + filePath) as { default: ICommand }
if ("data" in cmd && "execute" in cmd) {
client.commands.set(cmd.data.name, cmd)
} else {
console.log(
color(
`[WARNING] The command at ${filePath} is missing a required "data", "execute" or "type" property.`,
"red"
)
)
}
}
// ! command handler
@@ -36,9 +25,11 @@ export default async function loadSlashCommandsEvents(client: Client, ft: FileTy
const command = client.commands.get(interaction.commandName)
if (!command) {
console.error(
`No command matching ${interaction.commandName} was found.`
)
interaction.reply({
content: "Command logic not implemented. This is most likely an old command",
ephemeral: true
})
console.error(`No command matching ${interaction.commandName} was found.`)
return
}

15
src/utils/Events/contextmenu.ts
View File

@@ -4,7 +4,6 @@ import fs from "fs"
import { IContextMenu } from "interfaces"
import path from "path"
import { ExtendedClient as Client } from "utils/Client.js"
import { color } from "utils/functions/colors.js"
import logToChannel from "utils/functions/logtochannel.js"
type FileType = "js" | "ts"
const __dirname = import.meta.dirname
@@ -16,17 +15,7 @@ export default async function loadContextMenuEvents(client: Client, ft: FileType
for (const file of contextMenuFiles) {
const filePath = path.join(contextMenuPath, file)
const { default: cmd } = await import("file://" + filePath) as { default: IContextMenu }
if ("data" in cmd && "execute" in cmd) {
client.contextmenus.set(cmd.data.name, cmd)
} else {
console.log(
color(
`[WARNING] The command at ${filePath} is missing a required "data", "execute" or "type" property.`,
"red"
)
)
}
}
// ! context menu command handler
@@ -36,6 +25,10 @@ export default async function loadContextMenuEvents(client: Client, ft: FileType
const command = client.contextmenus.get(interaction.commandName)
if (!command) {
interaction.reply({
content: "Command logic not implemented. This is most likely an old command",
ephemeral: true
})
console.error(`No command matching ${interaction.commandName} was found.`)
return
}

5
src/utils/Events/cron.ts
View File

@@ -2,11 +2,12 @@ import { CronJob } from "cron"
import fs from "fs"
import { ICron } from "interfaces"
import path from "path"
type FileType = "js" | "ts"
const __dirname = import.meta.dirname
export default async function loadCronEvents() {
export default async function loadCronEvents(ft: FileType) {
const cronPath = path.join(__dirname, "..", "..", "events", "cron")
const cronFiles = fs.readdirSync(cronPath).filter(file => file.endsWith(".js"))
const cronFiles = fs.readdirSync(cronPath).filter(file => file.endsWith(ft))
for (const file of cronFiles) {
const filePath = path.join(cronPath, file)

2
src/utils/Events/loadevents.ts
View File

@@ -14,5 +14,5 @@ export default async function loadAllEvents(client: Client, ft: "js" | "ts") {
await loadContextMenuEvents(client, ft)
await loadModalEvents(client, ft)
await loadAutocompleteEvents(client, ft)
await loadCronEvents()
await loadCronEvents(ft)
}

15
src/utils/Events/modal.ts
View File

@@ -4,7 +4,6 @@ import fs from "fs"
import { IModal } from "interfaces"
import path from "path"
import { ExtendedClient as Client } from "utils/Client.js"
import { color } from "utils/functions/colors.js"
import logToChannel from "utils/functions/logtochannel.js"
type FileType = "js" | "ts"
const __dirname = import.meta.dirname
@@ -16,17 +15,7 @@ export default async function loadModalEvents(client: Client, ft: FileType) {
for (const file of modalFiles) {
const filePath = path.join(modalPath, file)
const { default: modal } = await import("file://" + filePath) as { default: IModal }
if ("name" in modal && "execute" in modal) {
client.modals.set(modal.name, modal)
} else {
console.log(
color(
`[WARNING] The modal at ${filePath} is missing a required "name", "execute" or "type" property.`,
"red"
)
)
}
}
client.on(Events.InteractionCreate, async interaction => {
@@ -35,6 +24,10 @@ export default async function loadModalEvents(client: Client, ft: FileType) {
const modal = client.modals.get(interaction.customId)
if (!modal) {
interaction.reply({
content: "Modal logic not implemented. This is most likely an old modal",
ephemeral: true
})
console.error(`No modal matching ${interaction.customId} was found.`)
return
}