From 3a6a2763f8d36992b361359a0ec09684cb85aaea Mon Sep 17 00:00:00 2001 From: rosefix7 Date: Sun, 17 Sep 2023 22:05:59 -0400 Subject: [PATCH 1/5] Added Launch.json and Tasks.json sources for run and build --- .gitignore | 133 +----- .vs/VSWorkspaceState.json | 10 + .vs/poixpixel-discord-bot-akhan/v16/.suo | Bin 0 -> 73728 bytes .vs/slnx.sqlite | Bin 0 -> 90112 bytes .vscode/launch.json | 27 ++ .vscode/tasks.json | 14 + build/api.js | 134 ++++++ build/compile.js | 12 + build/start.js | 18 + build/target.js | 7 + config/discord-bot.ts | 9 + package-lock.json | 572 +++++++++++++++++++++++ package.json | 15 +- source/discord-bot/commands/ping.ts | 0 source/discord-bot/config.ts | 10 + source/discord-bot/discord-bot.ts | 2 + source/discord-bot/discord.ts | 0 source/discord-bot/discord/command.ts | 0 src/commands/utility/ping.ts | 9 - src/config.json.example | 5 - src/deploy-command.ts | 56 --- src/index.ts | 67 --- tsconfig.json | 136 ++++-- yarn.lock | 311 ++---------- 24 files changed, 980 insertions(+), 567 deletions(-) create mode 100644 .vs/VSWorkspaceState.json create mode 100644 .vs/poixpixel-discord-bot-akhan/v16/.suo create mode 100644 .vs/slnx.sqlite create mode 100644 .vscode/launch.json create mode 100644 .vscode/tasks.json create mode 100644 build/api.js create mode 100644 build/compile.js create mode 100644 build/start.js create mode 100644 build/target.js create mode 100644 config/discord-bot.ts create mode 100644 package-lock.json create mode 100644 source/discord-bot/commands/ping.ts create mode 100644 source/discord-bot/config.ts create mode 100644 source/discord-bot/discord-bot.ts create mode 100644 source/discord-bot/discord.ts create mode 100644 source/discord-bot/discord/command.ts delete mode 100644 src/commands/utility/ping.ts delete mode 100644 src/config.json.example delete mode 100644 src/deploy-command.ts delete mode 100644 src/index.ts diff --git a/.gitignore b/.gitignore index 5de8608..2c45399 100644 --- a/.gitignore +++ b/.gitignore @@ -1,133 +1,2 @@ -src/config.json target/ - -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -lerna-debug.log* -.pnpm-debug.log* - -# Diagnostic reports (https://nodejs.org/api/report.html) -report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage -*.lcov - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# Snowpack dependency directory (https://snowpack.dev/) -web_modules/ - -# TypeScript cache -*.tsbuildinfo - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Optional stylelint cache -.stylelintcache - -# Microbundle cache -.rpt2_cache/ -.rts2_cache_cjs/ -.rts2_cache_es/ -.rts2_cache_umd/ - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variable files -.env -.env.development.local -.env.test.local -.env.production.local -.env.local - -# parcel-bundler cache (https://parceljs.org/) -.cache -.parcel-cache - -# Next.js build output -.next -out - -# Nuxt.js build / generate output -.nuxt -dist - -# Gatsby files -.cache/ -# Comment in the public line in if your project uses Gatsby and not Next.js -# https://nextjs.org/blog/next-9-1#public-directory-support -# public - -# vuepress build output -.vuepress/dist - -# vuepress v2.x temp and cache directory -.temp -.cache - -# Docusaurus cache and generated files -.docusaurus - -# Serverless directories -.serverless/ - -# FuseBox cache -.fusebox/ - -# DynamoDB Local files -.dynamodb/ - -# TernJS port file -.tern-port - -# Stores VSCode versions used for testing VSCode extensions -.vscode-test - -# yarn v2 -.yarn/cache -.yarn/unplugged -.yarn/build-state.yml -.yarn/install-state.gz -.pnp.* +node_modules/ \ No newline at end of file diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 0000000..386b3fa --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,10 @@ +{ + "ExpandedNodes": [ + "", + "\\config", + "\\source", + "\\source\\discord-bot" + ], + "SelectedNode": "\\.gitignore", + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/.vs/poixpixel-discord-bot-akhan/v16/.suo b/.vs/poixpixel-discord-bot-akhan/v16/.suo new file mode 100644 index 0000000000000000000000000000000000000000..864fc8903878521be174d70c096cfe7cbcc96d26 GIT binary patch literal 73728 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 Ip(;H5KT!NlL;wH) literal 0 HcmV?d00001 diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite new file mode 100644 index 0000000000000000000000000000000000000000..ab5fa811229b00e9d34600e555d86d1fabdf2a51 GIT binary patch literal 90112 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 literal 0 HcmV?d00001 diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..b6f94cc --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,27 @@ +{ + "version": "0.1.0", + "configurations": [ + { + "name": "Build and Run", + "type": "node", + "request": "launch", + "program": "${workspaceFolder}/target/_.js", + "preLaunchTask": "build", + "skipFiles": ["/**"], + "outFiles": ["${workspaceFolder}/target/**/*.js"] + } + ], + "tasks": [ + { + "label": "build", + "type": "shell", + "command": "node", + "args": ["${workspaceFolder}/build/compile.js"], + "group": { + "kind": "build", + "isDefault": true + } + } + ] +} + \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..d81aad7 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,14 @@ +{ + "tasks": [ + { + "label": "build", + "type": "shell", + "command": "node", + "args": ["${workspaceFolder}/build/compile.js"], + "group": { + "kind": "build", + "isDefault": true + } + } + ] +} \ No newline at end of file diff --git a/build/api.js b/build/api.js new file mode 100644 index 0000000..446bf20 --- /dev/null +++ b/build/api.js @@ -0,0 +1,134 @@ +import * as esbuild from "esbuild"; +import * as file_system from "fs"; +import * as path from "path"; +import * as child_process from "child_process"; +import * as events from "events"; +import * as url from "url"; + +const RunTargetError = { + TargetNotCompiled: "TargetNotCompiled", + TargetProgramError: "TargetProgramError", + TargetDirectoryMissing: "TargetDirectoryMissing" +} + +const TargetInitializationError = { + TargetDirectoryAlreadyExists: "TargetDirectoryAlreadyExists" +} + +const TargetProgramError = { + TargetNotRunning: "TargetNotRunning", + InvalidTargetPath: "InvalidTargetPath" +} + +const ProjectPackageError = { + PackageMissing: "PackageMissing", + InvalidJsonContents: "InvalidJsonContents" +} + +const CompileToTargetError = { + MissingPackageMainField: "MissingPackageMainField" +} + +export const __dirname = path.dirname(url.fileURLToPath(import.meta.url)); +export const target_directory_path = path.join(__dirname, "../target/"); +export const target_file_name = "_.js"; +export const target_path = path.join(target_directory_path, target_file_name); +export const package_path = path.join(__dirname, "../package.json"); + +class TargetProgram extends events.EventEmitter { + #child_process = null; + #terminated = false; + #error = 0; + + constructor(target_script_source) { + super(); + + if (!file_system.existsSync(target_script_source)) { + throw new Error(TargetProgramError.InvalidTargetPath); + } + + this.#child_process = child_process.spawn( + `node${process.platform == "win32" ? ".exe" : ""}`, + [ target_script_source ], + { stdio: "inherit" } + ); + + this.#child_process.on("exit", (code) => { + this.#terminated = true; + this.emit("terminate"); + + if (code != 0) { + this.#error = code; + this.emit("error", code); + } + }); + } + + halt() { + if (this.#terminated) { + throw new Error(TargetprogramError.TargetNotRunning); + } + + this.#child_process.kill('SIGINT'); + } + + get error() { + return this.#error; + } +} + +export function initialize_target_directory() { + if (!file_system.existsSync(target_directory_path)) { + throw new Error(TargetInitializationError.TargetDirectoryAlreadyExists); + } + + file_system.mkdirSync(target_directory_path, { recursive: true }); +} + +export function run_target() { + if (!file_system.existsSync(target_directory_path)) { + throw new Error(RunTargetError.TargetDirectoryMissing); + } + + if (!file_system.existsSync(target_path)) { + throw new Error(RunTargetError.TargetNotCompiled); + } + + return new TargetProgram(target_path); +} + +export function get_project_package() { + if (!file_system.existsSync(package_path)) { + throw new Error(ProjectPackageError.PackageMissing); + } + + const contents = file_system.readFileSync( + package_path, + + { + encoding: "utf8", + flag: "r" + } + ); + + try { + return JSON.parse(contents); + } catch (_) { + throw new Error(ProjectPackageError.InvalidJsonContents); + } +} + +export function compile_to_target() { + const package_json = get_project_package(); + + if (!package_json.main) { + throw new Error(CompileToTargetError.MissingPackageMainField); + } + + esbuild.buildSync({ + bundle: true, + entryPoints: [ package_json.main ], + outfile: target_path, + platform: "node" + }); +} \ No newline at end of file diff --git a/build/compile.js b/build/compile.js new file mode 100644 index 0000000..09ad29b --- /dev/null +++ b/build/compile.js @@ -0,0 +1,12 @@ +import * as api from "./api.js"; + +console.log("Compilation started"); + +try { + api.compile_to_target(); +} catch (error) { + console.error(`Failed to compile, Error: ${error}`); + process.exit(1); +} + +console.log("Compiled successfully"); \ No newline at end of file diff --git a/build/start.js b/build/start.js new file mode 100644 index 0000000..91db465 --- /dev/null +++ b/build/start.js @@ -0,0 +1,18 @@ +import * as api from "./api.js"; + +console.log("Compilation started"); + +try { + api.compile_to_target(); +} catch (error) { + console.error(`Failed to compile, Error: ${error}`); + process.exit(1); +} + +console.log("Compiled successfully"); + +try { + const target = api.run_target(); +} catch (fault) { + console.error(`Failed to run target, Error: ${fault}`); +} \ No newline at end of file diff --git a/build/target.js b/build/target.js new file mode 100644 index 0000000..2efddc5 --- /dev/null +++ b/build/target.js @@ -0,0 +1,7 @@ +import * as api from "./api.js"; + +try { + const target = api.run_target(); +} catch (fault) { + console.error(`Failed to run target, Error: ${fault}`); +} \ No newline at end of file diff --git a/config/discord-bot.ts b/config/discord-bot.ts new file mode 100644 index 0000000..1f98c49 --- /dev/null +++ b/config/discord-bot.ts @@ -0,0 +1,9 @@ +import * config from "../source/discord-bot/config"; + +export const data: config.Config_Interface = { + discord: { + api_key: "MTA1MjAxNzMyOTM3NjA3MTc4MQ.GFmCFK.hAEnQ2Qx7syQ4_CFuMRe4ajJ507bpjc21Isvlo", + application_client_id: "1052017329376071781", + guild_id: "1007735047039750214" + } +} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..a71e04c --- /dev/null +++ b/package-lock.json @@ -0,0 +1,572 @@ +{ + "name": "poixpixel-discord-bot", + "version": "1.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "poixpixel-discord-bot", + "version": "1.0.0", + "license": "ISC", + "dependencies": { + "@discordjs/builders": "^1.6.5", + "@discordjs/rest": "^2.0.1", + "discord.js": "^14.13.0", + "esbuild": "^0.19.3", + "mongoose": "^7.5.2" + }, + "devDependencies": { + "@types/node": "^20.6.1", + "typescript": "^5.2.2" + } + }, + "node_modules/@discordjs/builders": { + "version": "1.6.5", + "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-1.6.5.tgz", + "integrity": "sha512-SdweyCs/+mHj+PNhGLLle7RrRFX9ZAhzynHahMCLqp5Zeq7np7XC6/mgzHc79QoVlQ1zZtOkTTiJpOZu5V8Ufg==", + "dependencies": { + "@discordjs/formatters": "^0.3.2", + "@discordjs/util": "^1.0.1", + "@sapphire/shapeshift": "^3.9.2", + "discord-api-types": "0.37.50", + "fast-deep-equal": "^3.1.3", + "ts-mixer": "^6.0.3", + "tslib": "^2.6.1" + }, + "engines": { + "node": ">=16.11.0" + } + }, + "node_modules/@discordjs/collection": { + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-1.5.3.tgz", + "integrity": "sha512-SVb428OMd3WO1paV3rm6tSjM4wC+Kecaa1EUGX7vc6/fddvw/6lg90z4QtCqm21zvVe92vMMDt9+DkIvjXImQQ==", + "engines": { + "node": ">=16.11.0" + } + }, + "node_modules/@discordjs/formatters": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@discordjs/formatters/-/formatters-0.3.2.tgz", + "integrity": "sha512-lE++JZK8LSSDRM5nLjhuvWhGuKiXqu+JZ/DsOR89DVVia3z9fdCJVcHF2W/1Zxgq0re7kCzmAJlCMMX3tetKpA==", + "dependencies": { + "discord-api-types": "0.37.50" + }, + "engines": { + "node": ">=16.11.0" + } + }, + "node_modules/@discordjs/rest": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@discordjs/rest/-/rest-2.0.1.tgz", + "integrity": "sha512-/eWAdDRvwX/rIE2tuQUmKaxmWeHmGealttIzGzlYfI4+a7y9b6ZoMp8BG/jaohs8D8iEnCNYaZiOFLVFLQb8Zg==", + "dependencies": { + "@discordjs/collection": "^1.5.3", + "@discordjs/util": "^1.0.1", + "@sapphire/async-queue": "^1.5.0", + "@sapphire/snowflake": "^3.5.1", + "@vladfrangu/async_event_emitter": "^2.2.2", + "discord-api-types": "0.37.50", + "magic-bytes.js": "^1.0.15", + "tslib": "^2.6.1", + "undici": "5.22.1" + }, + "engines": { + "node": ">=16.11.0" + } + }, + "node_modules/@discordjs/util": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@discordjs/util/-/util-1.0.1.tgz", + "integrity": "sha512-d0N2yCxB8r4bn00/hvFZwM7goDcUhtViC5un4hPj73Ba4yrChLSJD8fy7Ps5jpTLg1fE9n4K0xBLc1y9WGwSsA==", + "engines": { + "node": ">=16.11.0" + } + }, + "node_modules/@discordjs/ws": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@discordjs/ws/-/ws-1.0.1.tgz", + "integrity": "sha512-avvAolBqN3yrSvdBPcJ/0j2g42ABzrv3PEL76e3YTp2WYMGH7cuspkjfSyNWaqYl1J+669dlLp+YFMxSVQyS5g==", + "dependencies": { + "@discordjs/collection": "^1.5.3", + "@discordjs/rest": "^2.0.1", + "@discordjs/util": "^1.0.1", + "@sapphire/async-queue": "^1.5.0", + "@types/ws": "^8.5.5", + "@vladfrangu/async_event_emitter": "^2.2.2", + "discord-api-types": "0.37.50", + "tslib": "^2.6.1", + "ws": "^8.13.0" + }, + "engines": { + "node": ">=16.11.0" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.19.3", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.3.tgz", + "integrity": "sha512-FbUN+0ZRXsypPyWE2IwIkVjDkDnJoMJARWOcFZn4KPPli+QnKqF0z1anvfaYe3ev5HFCpRDLLBDHyOALLppWHw==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@mongodb-js/saslprep": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.0.tgz", + "integrity": "sha512-Xfijy7HvfzzqiOAhAepF4SGN5e9leLkMvg/OPOF97XemjfVCYN/oWa75wnkc6mltMSTwY+XlbhWgUOJmkFspSw==", + "optional": true, + "dependencies": { + "sparse-bitfield": "^3.0.3" + } + }, + "node_modules/@sapphire/async-queue": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.5.0.tgz", + "integrity": "sha512-JkLdIsP8fPAdh9ZZjrbHWR/+mZj0wvKS5ICibcLrRI1j84UmLMshx5n9QmL8b95d4onJ2xxiyugTgSAX7AalmA==", + "engines": { + "node": ">=v14.0.0", + "npm": ">=7.0.0" + } + }, + "node_modules/@sapphire/shapeshift": { + "version": "3.9.2", + "resolved": "https://registry.npmjs.org/@sapphire/shapeshift/-/shapeshift-3.9.2.tgz", + "integrity": "sha512-YRbCXWy969oGIdqR/wha62eX8GNHsvyYi0Rfd4rNW6tSVVa8p0ELiMEuOH/k8rgtvRoM+EMV7Csqz77YdwiDpA==", + "dependencies": { + "fast-deep-equal": "^3.1.3", + "lodash": "^4.17.21" + }, + "engines": { + "node": ">=v14.0.0", + "npm": ">=7.0.0" + } + }, + "node_modules/@sapphire/snowflake": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/@sapphire/snowflake/-/snowflake-3.5.1.tgz", + "integrity": "sha512-BxcYGzgEsdlG0dKAyOm0ehLGm2CafIrfQTZGWgkfKYbj+pNNsorZ7EotuZukc2MT70E0UbppVbtpBrqpzVzjNA==", + "engines": { + "node": ">=v14.0.0", + "npm": ">=7.0.0" + } + }, + "node_modules/@types/node": { + "version": "20.6.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.6.2.tgz", + "integrity": "sha512-Y+/1vGBHV/cYk6OI1Na/LHzwnlNCAfU3ZNGrc1LdRe/LAIbdDPTTv/HU3M7yXN448aTVDq3eKRm2cg7iKLb8gw==" + }, + "node_modules/@types/webidl-conversions": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.0.tgz", + "integrity": "sha512-xTE1E+YF4aWPJJeUzaZI5DRntlkY3+BCVJi0axFptnjGmAoWxkyREIh/XMrfxVLejwQxMCfDXdICo0VLxThrog==" + }, + "node_modules/@types/whatwg-url": { + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-8.2.2.tgz", + "integrity": "sha512-FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA==", + "dependencies": { + "@types/node": "*", + "@types/webidl-conversions": "*" + } + }, + "node_modules/@types/ws": { + "version": "8.5.5", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz", + "integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@vladfrangu/async_event_emitter": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/@vladfrangu/async_event_emitter/-/async_event_emitter-2.2.2.tgz", + "integrity": "sha512-HIzRG7sy88UZjBJamssEczH5q7t5+axva19UbZLO6u0ySbYPrwzWiXBcC0WuHyhKKoeCyneH+FvYzKQq/zTtkQ==", + "engines": { + "node": ">=v14.0.0", + "npm": ">=7.0.0" + } + }, + "node_modules/bson": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/bson/-/bson-5.5.0.tgz", + "integrity": "sha512-B+QB4YmDx9RStKv8LLSl/aVIEV3nYJc3cJNNTK2Cd1TL+7P+cNpw9mAPeCgc5K+j01Dv6sxUzcITXDx7ZU3F0w==", + "engines": { + "node": ">=14.20.1" + } + }, + "node_modules/busboy": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz", + "integrity": "sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==", + "dependencies": { + "streamsearch": "^1.1.0" + }, + "engines": { + "node": ">=10.16.0" + } + }, + "node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/debug/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "node_modules/discord-api-types": { + "version": "0.37.50", + "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.37.50.tgz", + "integrity": "sha512-X4CDiMnDbA3s3RaUXWXmgAIbY1uxab3fqe3qwzg5XutR3wjqi7M3IkgQbsIBzpqBN2YWr/Qdv7JrFRqSgb4TFg==" + }, + "node_modules/discord.js": { + "version": "14.13.0", + "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-14.13.0.tgz", + "integrity": "sha512-Kufdvg7fpyTEwANGy9x7i4od4yu5c6gVddGi5CKm4Y5a6sF0VBODObI3o0Bh7TGCj0LfNT8Qp8z04wnLFzgnbA==", + "dependencies": { + "@discordjs/builders": "^1.6.5", + "@discordjs/collection": "^1.5.3", + "@discordjs/formatters": "^0.3.2", + "@discordjs/rest": "^2.0.1", + "@discordjs/util": "^1.0.1", + "@discordjs/ws": "^1.0.1", + "@sapphire/snowflake": "^3.5.1", + "@types/ws": "^8.5.5", + "discord-api-types": "0.37.50", + "fast-deep-equal": "^3.1.3", + "lodash.snakecase": "^4.1.1", + "tslib": "^2.6.1", + "undici": "5.22.1", + "ws": "^8.13.0" + }, + "engines": { + "node": ">=16.11.0" + } + }, + "node_modules/esbuild": { + "version": "0.19.3", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.3.tgz", + "integrity": "sha512-UlJ1qUUA2jL2nNib1JTSkifQTcYTroFqRjwCFW4QYEKEsixXD5Tik9xML7zh2gTxkYTBKGHNH9y7txMwVyPbjw==", + "hasInstallScript": true, + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=12" + }, + "optionalDependencies": { + "@esbuild/android-arm": "0.19.3", + "@esbuild/android-arm64": "0.19.3", + "@esbuild/android-x64": "0.19.3", + "@esbuild/darwin-arm64": "0.19.3", + "@esbuild/darwin-x64": "0.19.3", + "@esbuild/freebsd-arm64": "0.19.3", + "@esbuild/freebsd-x64": "0.19.3", + "@esbuild/linux-arm": "0.19.3", + "@esbuild/linux-arm64": "0.19.3", + "@esbuild/linux-ia32": "0.19.3", + "@esbuild/linux-loong64": "0.19.3", + "@esbuild/linux-mips64el": "0.19.3", + "@esbuild/linux-ppc64": "0.19.3", + "@esbuild/linux-riscv64": "0.19.3", + "@esbuild/linux-s390x": "0.19.3", + "@esbuild/linux-x64": "0.19.3", + "@esbuild/netbsd-x64": "0.19.3", + "@esbuild/openbsd-x64": "0.19.3", + "@esbuild/sunos-x64": "0.19.3", + "@esbuild/win32-arm64": "0.19.3", + "@esbuild/win32-ia32": "0.19.3", + "@esbuild/win32-x64": "0.19.3" + } + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + }, + "node_modules/ip": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", + "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==" + }, + "node_modules/kareem": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.5.1.tgz", + "integrity": "sha512-7jFxRVm+jD+rkq3kY0iZDJfsO2/t4BBPeEb2qKn2lR/9KhuksYk5hxzfRYWMPV8P/x2d0kHD306YyWLzjjH+uA==", + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + }, + "node_modules/lodash.snakecase": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz", + "integrity": "sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw==" + }, + "node_modules/magic-bytes.js": { + "version": "1.0.17", + "resolved": "https://registry.npmjs.org/magic-bytes.js/-/magic-bytes.js-1.0.17.tgz", + "integrity": "sha512-PEDpPzHpKe5AxkVmQrNPHFRvPN2ELkkj3eIg4IZO9JdhBiAY3aU53lgYXs9j8B7lpza+QiW0UA4QHCH7EskSeg==" + }, + "node_modules/memory-pager": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz", + "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==", + "optional": true + }, + "node_modules/mongodb": { + "version": "5.8.1", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-5.8.1.tgz", + "integrity": "sha512-wKyh4kZvm6NrCPH8AxyzXm3JBoEf4Xulo0aUWh3hCgwgYJxyQ1KLST86ZZaSWdj6/kxYUA3+YZuyADCE61CMSg==", + "dependencies": { + "bson": "^5.4.0", + "mongodb-connection-string-url": "^2.6.0", + "socks": "^2.7.1" + }, + "engines": { + "node": ">=14.20.1" + }, + "optionalDependencies": { + "@mongodb-js/saslprep": "^1.1.0" + }, + "peerDependencies": { + "@aws-sdk/credential-providers": "^3.188.0", + "@mongodb-js/zstd": "^1.0.0", + "kerberos": "^1.0.0 || ^2.0.0", + "mongodb-client-encryption": ">=2.3.0 <3", + "snappy": "^7.2.2" + }, + "peerDependenciesMeta": { + "@aws-sdk/credential-providers": { + "optional": true + }, + "@mongodb-js/zstd": { + "optional": true + }, + "kerberos": { + "optional": true + }, + "mongodb-client-encryption": { + "optional": true + }, + "snappy": { + "optional": true + } + } + }, + "node_modules/mongodb-connection-string-url": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.6.0.tgz", + "integrity": "sha512-WvTZlI9ab0QYtTYnuMLgobULWhokRjtC7db9LtcVfJ+Hsnyr5eo6ZtNAt3Ly24XZScGMelOcGtm7lSn0332tPQ==", + "dependencies": { + "@types/whatwg-url": "^8.2.1", + "whatwg-url": "^11.0.0" + } + }, + "node_modules/mongoose": { + "version": "7.5.2", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-7.5.2.tgz", + "integrity": "sha512-yEkmI1jfiog7QUvMWz3eB/XoA3/5DrVvSz+z3V5hnq8VtZIHC7ujEV0RKzRXwr8QNMOs+OTB7+aK7R/N/V3yXA==", + "dependencies": { + "bson": "^5.4.0", + "kareem": "2.5.1", + "mongodb": "5.8.1", + "mpath": "0.9.0", + "mquery": "5.0.0", + "ms": "2.1.3", + "sift": "16.0.1" + }, + "engines": { + "node": ">=14.20.1" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mongoose" + } + }, + "node_modules/mpath": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.9.0.tgz", + "integrity": "sha512-ikJRQTk8hw5DEoFVxHG1Gn9T/xcjtdnOKIU1JTmGjZZlg9LST2mBLmcX3/ICIbgJydT2GOc15RnNy5mHmzfSew==", + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/mquery": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/mquery/-/mquery-5.0.0.tgz", + "integrity": "sha512-iQMncpmEK8R8ncT8HJGsGc9Dsp8xcgYMVSbs5jgnm1lFHTZqMJTUWTDx1LBO8+mK3tPNZWFLBghQEIOULSTHZg==", + "dependencies": { + "debug": "4.x" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + }, + "node_modules/punycode": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", + "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", + "engines": { + "node": ">=6" + } + }, + "node_modules/sift": { + "version": "16.0.1", + "resolved": "https://registry.npmjs.org/sift/-/sift-16.0.1.tgz", + "integrity": "sha512-Wv6BjQ5zbhW7VFefWusVP33T/EM0vYikCaQ2qR8yULbsilAT8/wQaXvuQ3ptGLpoKx+lihJE3y2UTgKDyyNHZQ==" + }, + "node_modules/smart-buffer": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", + "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", + "engines": { + "node": ">= 6.0.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/socks": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz", + "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==", + "dependencies": { + "ip": "^2.0.0", + "smart-buffer": "^4.2.0" + }, + "engines": { + "node": ">= 10.13.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/sparse-bitfield": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", + "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==", + "optional": true, + "dependencies": { + "memory-pager": "^1.0.2" + } + }, + "node_modules/streamsearch": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", + "integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==", + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/tr46": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", + "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==", + "dependencies": { + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/ts-mixer": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/ts-mixer/-/ts-mixer-6.0.3.tgz", + "integrity": "sha512-k43M7uCG1AkTyxgnmI5MPwKoUvS/bRvLvUb7+Pgpdlmok8AoqmUaZxUUw8zKM5B1lqZrt41GjYgnvAi0fppqgQ==" + }, + "node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/typescript": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/undici": { + "version": "5.22.1", + "resolved": "https://registry.npmjs.org/undici/-/undici-5.22.1.tgz", + "integrity": "sha512-Ji2IJhFXZY0x/0tVBXeQwgPlLWw13GVzpsWPQ3rV50IFMMof2I55PZZxtm4P6iNq+L5znYN9nSTAq0ZyE6lSJw==", + "dependencies": { + "busboy": "^1.6.0" + }, + "engines": { + "node": ">=14.0" + } + }, + "node_modules/webidl-conversions": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", + "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", + "engines": { + "node": ">=12" + } + }, + "node_modules/whatwg-url": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz", + "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==", + "dependencies": { + "tr46": "^3.0.0", + "webidl-conversions": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/ws": { + "version": "8.14.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.1.tgz", + "integrity": "sha512-4OOseMUq8AzRBI/7SLMUwO+FEDnguetSk7KMb1sHwvF2w2Wv5Hoj0nlifx8vtGsftE/jWHojPy8sMMzYLJ2G/A==", + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + } + } +} diff --git a/package.json b/package.json index f6c2edb..2e72986 100644 --- a/package.json +++ b/package.json @@ -1,14 +1,14 @@ { "name": "poixpixel-discord-bot", "version": "1.0.0", - "main": "./src/index.ts", + "main": "./source/discord-bot/discord-bot.ts", "author": "Poixpixel", - "type": "module", "license": "ISC", + "type": "module", "scripts": { - "compile": "npx tsc", - "target": "node target/index.js", - "start": "yarn compile && yarn target" + "compile": "node ./build/compile.js", + "target": "node ./build/target.js", + "start": "pnpm run compile && pnpm run target" }, "dependencies": { "@discordjs/builders": "^1.6.5", @@ -18,8 +18,7 @@ "mongoose": "^7.5.2" }, "devDependencies": { - "@types/node": "^20.6.2", - "ts-node": "^10.9.1", + "@types/node": "^20.6.1", "typescript": "^5.2.2" } -} +} \ No newline at end of file diff --git a/source/discord-bot/commands/ping.ts b/source/discord-bot/commands/ping.ts new file mode 100644 index 0000000..e69de29 diff --git a/source/discord-bot/config.ts b/source/discord-bot/config.ts new file mode 100644 index 0000000..b82dab5 --- /dev/null +++ b/source/discord-bot/config.ts @@ -0,0 +1,10 @@ +export interface Config_Interface { + discord: { + api_key: string; + application_client_id: string; + guild_id: string; + }; + storage: { + + } +} diff --git a/source/discord-bot/discord-bot.ts b/source/discord-bot/discord-bot.ts new file mode 100644 index 0000000..9c34517 --- /dev/null +++ b/source/discord-bot/discord-bot.ts @@ -0,0 +1,2 @@ +import * as config from "./config"; +import * as discord from "./discord"; \ No newline at end of file diff --git a/source/discord-bot/discord.ts b/source/discord-bot/discord.ts new file mode 100644 index 0000000..e69de29 diff --git a/source/discord-bot/discord/command.ts b/source/discord-bot/discord/command.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/commands/utility/ping.ts b/src/commands/utility/ping.ts deleted file mode 100644 index abaddc7..0000000 --- a/src/commands/utility/ping.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { SlashCommandBuilder, CommandInteraction } from 'discord.js'; - -export const data = new SlashCommandBuilder() - .setName('ping') - .setDescription('Replies with Pong!'); - -export async function execute(interaction: CommandInteraction) { - return interaction.reply('Pong!'); -} \ No newline at end of file diff --git a/src/config.json.example b/src/config.json.example deleted file mode 100644 index 0e8d50b..0000000 --- a/src/config.json.example +++ /dev/null @@ -1,5 +0,0 @@ -{ - "token": "BOT-TOKEN", - "clientId": "BOT-ID", - "guildId": "SERVER-ID" -} diff --git a/src/deploy-command.ts b/src/deploy-command.ts deleted file mode 100644 index d04f4fa..0000000 --- a/src/deploy-command.ts +++ /dev/null @@ -1,56 +0,0 @@ -import * as fs from 'fs/promises'; -import path from 'path'; -import { REST } from '@discordjs/rest'; -import { fileURLToPath } from 'url'; - -const __filename = fileURLToPath(import.meta.url); -const __dirname = path.resolve(); - -// Define the path to the directory containing your command files -const foldersPath = path.join(__dirname, '\\target\\commands'); // Change 'commands' to your actual directory name - -export async function registerCommands(clientId: any, guildId: any, token: any) { - const commands = []; - - try { - const commandFolders = await fs.readdir(foldersPath); - - for (const folder of commandFolders) { - const commandsPath = path.join(foldersPath, folder); - const commandFiles = (await fs.readdir(commandsPath)).filter(file => file.endsWith('.js')); - - for (const file of commandFiles) { - const filePath = path.join('file://', commandsPath, file); - - // Import the module and handle any potential errors - let commandModule; - try { - commandModule = await import(filePath); - } catch (error) { - console.error(`Error importing module from ${filePath}: ${error}`); - continue; // Continue to the next module on error - } - - // Check if the imported module has 'data' and 'execute' properties - if ('data' in commandModule && 'execute' in commandModule) { - commands.push(commandModule.data.toJSON()); - } else { - console.log(`[WARNING] The command at ${filePath} is missing a required "data" or "execute" property.`); - } - } - } - - const rest = new REST({ version: '10' }).setToken(token); - - console.log(`Started refreshing ${commands.length} application (/) commands.`); - - const data: any = await rest.put( - `/applications/${clientId}/guilds/${guildId}/commands`, - { body: commands } - ); - - console.log(`Successfully reloaded ${data.length} application (/) commands.`); - } catch (error) { - console.error(error); - } -} diff --git a/src/index.ts b/src/index.ts deleted file mode 100644 index fc31c3b..0000000 --- a/src/index.ts +++ /dev/null @@ -1,67 +0,0 @@ -import fs from 'fs'; -import path from 'path'; -import { Client, Collection, GatewayIntentBits, Interaction } from 'discord.js'; -import { registerCommands } from './deploy-command.js'; -import config from './config.json' assert { type: 'json' }; - -const { clientId, guildId, token } = config; - -class CustomClient extends Client { - commands: Collection = new Collection(); -} - -const client = new CustomClient({ intents: [GatewayIntentBits.Guilds] }); - -function initializeCommands() { - const __dirname = path.resolve(); - const foldersPath = path.join(__dirname, '\\target\\commands'); - - console.log(`Folder Path Received: ${foldersPath}`); - - try { - const commandFiles = fs.readdirSync(foldersPath); - for (const file of commandFiles) { - if (file.endsWith('.js')) { - const command = require(path.join(foldersPath, file)); - console.log(command); - client.commands.set(command.name, command); - } - } - console.log('Commands initialized successfully!'); - } catch (error) { - console.error('Error initializing commands:', error); - } -} - -initializeCommands(); - -try { - await registerCommands(clientId, guildId, token); -} catch (error) { - console.error("Error registering slash commands:", error); -} - -client.once('ready', () => { - console.log('Ready!'); -}); - -client.on('interactionCreate', async (interaction: Interaction) => { - if (!interaction.isCommand()) return; - - const command = client.commands.get(interaction.commandName); - - if (!command) return; - - try { - await command.execute(interaction); - } catch (error) { - console.error(error); - if (interaction.replied || interaction.deferred) { - await interaction.followUp({ content: 'There was an error while executing this command!', ephemeral: true }); - } else { - await interaction.reply({ content: 'There was an error while executing this command!', ephemeral: true }); - } - } -}); - -client.login(token); \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index d5756b2..f4255fb 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,33 +1,109 @@ { "compilerOptions": { - "target": "ESNext", - "module": "ESnext", - "rootDir": "./src/", - "outDir": "./target/", - "strict": true, - "moduleResolution": "node", - "importHelpers": true, - "experimentalDecorators": true, - "esModuleInterop": true, - "skipLibCheck": true, - "allowSyntheticDefaultImports": true, - "resolveJsonModule": true, - "forceConsistentCasingInFileNames": true, - "removeComments": true, - "typeRoots": [ - "node_modules/@types" - ], - "sourceMap": false, - "baseUrl": "./" - }, - "files": [ - "src/index.ts" - ], - "include": [ - "./**/*.ts" - ], - "exclude": [ - "node_modules", - "target" - ], + /* Visit https://aka.ms/tsconfig to read more about this file */ + + /* Projects */ + // "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */ + // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ + // "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */ + // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */ + // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ + // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ + + /* Language and Environment */ + "target": "es2017", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */ + // "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ + // "jsx": "preserve", /* Specify what JSX code is generated. */ + // "experimentalDecorators": true, /* Enable experimental support for legacy experimental decorators. */ + // "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */ + // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */ + // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ + // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */ + // "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */ + // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ + // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ + // "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */ + + /* Modules */ + "module": "esnext", /* Specify what module code is generated. */ + "rootDir": "./src", /* Specify the root folder within your source files. */ + "moduleResolution": "node", /* Specify how TypeScript looks up a file from a given module specifier. */ + // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ + // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ + // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ + // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */ + // "types": [], /* Specify type package names to be included without being referenced in a source file. */ + // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ + // "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */ + // "allowImportingTsExtensions": true, /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */ + // "resolvePackageJsonExports": true, /* Use the package.json 'exports' field when resolving package imports. */ + // "resolvePackageJsonImports": true, /* Use the package.json 'imports' field when resolving imports. */ + // "customConditions": [], /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */ + "resolveJsonModule": true, /* Enable importing .json files. */ + // "allowArbitraryExtensions": true, /* Enable importing files with any extension, provided a declaration file is present. */ + // "noResolve": true, /* Disallow 'import's, 'require's or ''s from expanding the number of files TypeScript should add to a project. */ + + /* JavaScript Support */ + // "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */ + // "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */ + // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */ + + /* Emit */ + // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ + // "declarationMap": true, /* Create sourcemaps for d.ts files. */ + // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ + // "sourceMap": true, /* Create source map files for emitted JavaScript files. */ + // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ + // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */ + "outDir": "./dist", /* Specify an output folder for all emitted files. */ + // "removeComments": true, /* Disable emitting comments. */ + // "noEmit": true, /* Disable emitting files from a compilation. */ + // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ + // "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */ + // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ + // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ + // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ + // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ + // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ + // "newLine": "crlf", /* Set the newline character for emitting files. */ + // "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */ + // "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */ + // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ + // "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */ + // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ + // "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */ + + /* Interop Constraints */ + // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ + // "verbatimModuleSyntax": true, /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */ + // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ + "esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */ + // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ + "forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */ + + /* Type Checking */ + "strict": true, /* Enable all strict type-checking options. */ + // "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */ + // "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */ + // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ + // "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */ + // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ + // "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */ + // "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */ + // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ + // "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */ + // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */ + // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ + // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ + // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ + // "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */ + // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ + // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */ + // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ + // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ + + /* Completeness */ + // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ + "skipLibCheck": true /* Skip type checking all .d.ts files. */ + } } \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index e39974f..320ab8f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,16 +2,9 @@ # yarn lockfile v1 -"@cspotcode/source-map-support@^0.8.0": - version "0.8.1" - resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1" - integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw== - dependencies: - "@jridgewell/trace-mapping" "0.3.9" - "@discordjs/builders@^1.6.5": version "1.6.5" - resolved "https://registry.yarnpkg.com/@discordjs/builders/-/builders-1.6.5.tgz#3e23912eaab1d542b61ca0fa7202e5aaef2b7200" + resolved "https://registry.npmjs.org/@discordjs/builders/-/builders-1.6.5.tgz" integrity sha512-SdweyCs/+mHj+PNhGLLle7RrRFX9ZAhzynHahMCLqp5Zeq7np7XC6/mgzHc79QoVlQ1zZtOkTTiJpOZu5V8Ufg== dependencies: "@discordjs/formatters" "^0.3.2" @@ -24,19 +17,19 @@ "@discordjs/collection@^1.5.3": version "1.5.3" - resolved "https://registry.yarnpkg.com/@discordjs/collection/-/collection-1.5.3.tgz#5a1250159ebfff9efa4f963cfa7e97f1b291be18" + resolved "https://registry.npmjs.org/@discordjs/collection/-/collection-1.5.3.tgz" integrity sha512-SVb428OMd3WO1paV3rm6tSjM4wC+Kecaa1EUGX7vc6/fddvw/6lg90z4QtCqm21zvVe92vMMDt9+DkIvjXImQQ== "@discordjs/formatters@^0.3.2": version "0.3.2" - resolved "https://registry.yarnpkg.com/@discordjs/formatters/-/formatters-0.3.2.tgz#3ae054f7b3097cc0dc7645fade37a3f20fa1fb4b" + resolved "https://registry.npmjs.org/@discordjs/formatters/-/formatters-0.3.2.tgz" integrity sha512-lE++JZK8LSSDRM5nLjhuvWhGuKiXqu+JZ/DsOR89DVVia3z9fdCJVcHF2W/1Zxgq0re7kCzmAJlCMMX3tetKpA== dependencies: discord-api-types "0.37.50" "@discordjs/rest@^2.0.1": version "2.0.1" - resolved "https://registry.yarnpkg.com/@discordjs/rest/-/rest-2.0.1.tgz#100c208a964e54b8d7cd418bbaed279c816b8ec5" + resolved "https://registry.npmjs.org/@discordjs/rest/-/rest-2.0.1.tgz" integrity sha512-/eWAdDRvwX/rIE2tuQUmKaxmWeHmGealttIzGzlYfI4+a7y9b6ZoMp8BG/jaohs8D8iEnCNYaZiOFLVFLQb8Zg== dependencies: "@discordjs/collection" "^1.5.3" @@ -51,12 +44,12 @@ "@discordjs/util@^1.0.1": version "1.0.1" - resolved "https://registry.yarnpkg.com/@discordjs/util/-/util-1.0.1.tgz#7d6f97b65425d3a8b46ea1180150dee6991a88cf" + resolved "https://registry.npmjs.org/@discordjs/util/-/util-1.0.1.tgz" integrity sha512-d0N2yCxB8r4bn00/hvFZwM7goDcUhtViC5un4hPj73Ba4yrChLSJD8fy7Ps5jpTLg1fE9n4K0xBLc1y9WGwSsA== "@discordjs/ws@^1.0.1": version "1.0.1" - resolved "https://registry.yarnpkg.com/@discordjs/ws/-/ws-1.0.1.tgz#fab8aa4c1667040a95b5268a2875add27353d323" + resolved "https://registry.npmjs.org/@discordjs/ws/-/ws-1.0.1.tgz" integrity sha512-avvAolBqN3yrSvdBPcJ/0j2g42ABzrv3PEL76e3YTp2WYMGH7cuspkjfSyNWaqYl1J+669dlLp+YFMxSVQyS5g== dependencies: "@discordjs/collection" "^1.5.3" @@ -69,149 +62,26 @@ tslib "^2.6.1" ws "^8.13.0" -"@esbuild/android-arm64@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.19.3.tgz#91a3b1b4a68c01ffdd5d8ffffb0a83178a366ae0" - integrity sha512-w+Akc0vv5leog550kjJV9Ru+MXMR2VuMrui3C61mnysim0gkFCPOUTAfzTP0qX+HpN9Syu3YA3p1hf3EPqObRw== - -"@esbuild/android-arm@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.19.3.tgz#08bd09f2ebc312422f4e94ae954821f9cf37b39e" - integrity sha512-Lemgw4io4VZl9GHJmjiBGzQ7ONXRfRPHcUEerndjwiSkbxzrpq0Uggku5MxxrXdwJ+pTj1qyw4jwTu7hkPsgIA== - -"@esbuild/android-x64@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.19.3.tgz#b1dffec99ed5505fc57561e8758b449dba4924fe" - integrity sha512-FKQJKkK5MXcBHoNZMDNUAg1+WcZlV/cuXrWCoGF/TvdRiYS4znA0m5Il5idUwfxrE20bG/vU1Cr5e1AD6IEIjQ== - -"@esbuild/darwin-arm64@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.19.3.tgz#2e0db5ad26313c7f420f2cd76d9d263fc49cb549" - integrity sha512-kw7e3FXU+VsJSSSl2nMKvACYlwtvZB8RUIeVShIEY6PVnuZ3c9+L9lWB2nWeeKWNNYDdtL19foCQ0ZyUL7nqGw== - -"@esbuild/darwin-x64@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.19.3.tgz#ebe99f35049180023bb37999bddbe306b076a484" - integrity sha512-tPfZiwF9rO0jW6Jh9ipi58N5ZLoSjdxXeSrAYypy4psA2Yl1dAMhM71KxVfmjZhJmxRjSnb29YlRXXhh3GqzYw== - -"@esbuild/freebsd-arm64@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.3.tgz#cf8b58ba5173440ea6124a3d0278bfe4ce181c20" - integrity sha512-ERDyjOgYeKe0Vrlr1iLrqTByB026YLPzTytDTz1DRCYM+JI92Dw2dbpRHYmdqn6VBnQ9Bor6J8ZlNwdZdxjlSg== - -"@esbuild/freebsd-x64@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.3.tgz#3f283099810ef1b8468cd1a9400c042e3f12e2a7" - integrity sha512-nXesBZ2Ad1qL+Rm3crN7NmEVJ5uvfLFPLJev3x1j3feCQXfAhoYrojC681RhpdOph8NsvKBBwpYZHR7W0ifTTA== - -"@esbuild/linux-arm64@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.19.3.tgz#a8b3aa69653ac504a51aa73739fb06de3a04d1ff" - integrity sha512-qXvYKmXj8GcJgWq3aGvxL/JG1ZM3UR272SdPU4QSTzD0eymrM7leiZH77pvY3UetCy0k1xuXZ+VPvoJNdtrsWQ== - -"@esbuild/linux-arm@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.19.3.tgz#ff6a2f68d4fc3ab46f614bca667a1a81ed6eea26" - integrity sha512-zr48Cg/8zkzZCzDHNxXO/89bf9e+r4HtzNUPoz4GmgAkF1gFAFmfgOdCbR8zMbzFDGb1FqBBhdXUpcTQRYS1cQ== - -"@esbuild/linux-ia32@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.19.3.tgz#5813baf70e406304e8931b200e39d0293b488073" - integrity sha512-7XlCKCA0nWcbvYpusARWkFjRQNWNGlt45S+Q18UeS///K6Aw8bB2FKYe9mhVWy/XLShvCweOLZPrnMswIaDXQA== - -"@esbuild/linux-loong64@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.19.3.tgz#21110f29b5e31dc865c7253fde8a2003f7e8b6fd" - integrity sha512-qGTgjweER5xqweiWtUIDl9OKz338EQqCwbS9c2Bh5jgEH19xQ1yhgGPNesugmDFq+UUSDtWgZ264st26b3de8A== - -"@esbuild/linux-mips64el@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.3.tgz#4530fc416651eadeb1acc27003c00eac769eb8fd" - integrity sha512-gy1bFskwEyxVMFRNYSvBauDIWNggD6pyxUksc0MV9UOBD138dKTzr8XnM2R4mBsHwVzeuIH8X5JhmNs2Pzrx+A== - -"@esbuild/linux-ppc64@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.3.tgz#facf910b0d397e391b37b01a1b4f6e363b04e56b" - integrity sha512-UrYLFu62x1MmmIe85rpR3qou92wB9lEXluwMB/STDzPF9k8mi/9UvNsG07Tt9AqwPQXluMQ6bZbTzYt01+Ue5g== - -"@esbuild/linux-riscv64@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.3.tgz#4a67abe97a495430d5867340982f5424a64f2aac" - integrity sha512-9E73TfyMCbE+1AwFOg3glnzZ5fBAFK4aawssvuMgCRqCYzE0ylVxxzjEfut8xjmKkR320BEoMui4o/t9KA96gA== - -"@esbuild/linux-s390x@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.19.3.tgz#c5fb47474b9f816d81876c119dbccadf671cc5f6" - integrity sha512-LlmsbuBdm1/D66TJ3HW6URY8wO6IlYHf+ChOUz8SUAjVTuaisfuwCOAgcxo3Zsu3BZGxmI7yt//yGOxV+lHcEA== - -"@esbuild/linux-x64@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.19.3.tgz#f22d659969ab78dc422f1df8d9a79bc1e7b12ee3" - integrity sha512-ogV0+GwEmvwg/8ZbsyfkYGaLACBQWDvO0Kkh8LKBGKj9Ru8VM39zssrnu9Sxn1wbapA2qNS6BiLdwJZGouyCwQ== - -"@esbuild/netbsd-x64@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.3.tgz#e9b046934996991f46b8c1cadac815aa45f84fd4" - integrity sha512-o1jLNe4uzQv2DKXMlmEzf66Wd8MoIhLNO2nlQBHLtWyh2MitDG7sMpfCO3NTcoTMuqHjfufgUQDFRI5C+xsXQw== - -"@esbuild/openbsd-x64@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.3.tgz#b287ef4841fc1067bbbd9a60549e8f9cf1b7ee3a" - integrity sha512-AZJCnr5CZgZOdhouLcfRdnk9Zv6HbaBxjcyhq0StNcvAdVZJSKIdOiPB9az2zc06ywl0ePYJz60CjdKsQacp5Q== - -"@esbuild/sunos-x64@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.19.3.tgz#b2b8ba7d27907c7245f6e57dc62f3b88693f84b0" - integrity sha512-Acsujgeqg9InR4glTRvLKGZ+1HMtDm94ehTIHKhJjFpgVzZG9/pIcWW/HA/DoMfEyXmANLDuDZ2sNrWcjq1lxw== - -"@esbuild/win32-arm64@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.19.3.tgz#1974c8c180c9add4962235662c569fcc4c8f43dd" - integrity sha512-FSrAfjVVy7TifFgYgliiJOyYynhQmqgPj15pzLyJk8BUsnlWNwP/IAy6GAiB1LqtoivowRgidZsfpoYLZH586A== - -"@esbuild/win32-ia32@0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.19.3.tgz#b02cc2dd8b6aed042069680f01f45fdfd3de5bc4" - integrity sha512-xTScXYi12xLOWZ/sc5RBmMN99BcXp/eEf7scUC0oeiRoiT5Vvo9AycuqCp+xdpDyAU+LkrCqEpUS9fCSZF8J3Q== - "@esbuild/win32-x64@0.19.3": version "0.19.3" - resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.3.tgz#e5036be529f757e58d9a7771f2f1b14782986a74" + resolved "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.3.tgz" integrity sha512-FbUN+0ZRXsypPyWE2IwIkVjDkDnJoMJARWOcFZn4KPPli+QnKqF0z1anvfaYe3ev5HFCpRDLLBDHyOALLppWHw== -"@jridgewell/resolve-uri@^3.0.3": - version "3.1.1" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721" - integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA== - -"@jridgewell/sourcemap-codec@^1.4.10": - version "1.4.15" - resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" - integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== - -"@jridgewell/trace-mapping@0.3.9": - version "0.3.9" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9" - integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ== - dependencies: - "@jridgewell/resolve-uri" "^3.0.3" - "@jridgewell/sourcemap-codec" "^1.4.10" - "@mongodb-js/saslprep@^1.1.0": version "1.1.0" - resolved "https://registry.yarnpkg.com/@mongodb-js/saslprep/-/saslprep-1.1.0.tgz#022fa36620a7287d17acd05c4aae1e5f390d250d" + resolved "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.0.tgz" integrity sha512-Xfijy7HvfzzqiOAhAepF4SGN5e9leLkMvg/OPOF97XemjfVCYN/oWa75wnkc6mltMSTwY+XlbhWgUOJmkFspSw== dependencies: sparse-bitfield "^3.0.3" "@sapphire/async-queue@^1.5.0": version "1.5.0" - resolved "https://registry.yarnpkg.com/@sapphire/async-queue/-/async-queue-1.5.0.tgz#2f255a3f186635c4fb5a2381e375d3dfbc5312d8" + resolved "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.5.0.tgz" integrity sha512-JkLdIsP8fPAdh9ZZjrbHWR/+mZj0wvKS5ICibcLrRI1j84UmLMshx5n9QmL8b95d4onJ2xxiyugTgSAX7AalmA== "@sapphire/shapeshift@^3.9.2": version "3.9.2" - resolved "https://registry.yarnpkg.com/@sapphire/shapeshift/-/shapeshift-3.9.2.tgz#a9c12cd51e1bc467619bb56df804450dd14871ac" + resolved "https://registry.npmjs.org/@sapphire/shapeshift/-/shapeshift-3.9.2.tgz" integrity sha512-YRbCXWy969oGIdqR/wha62eX8GNHsvyYi0Rfd4rNW6tSVVa8p0ELiMEuOH/k8rgtvRoM+EMV7Csqz77YdwiDpA== dependencies: fast-deep-equal "^3.1.3" @@ -219,42 +89,22 @@ "@sapphire/snowflake@^3.5.1": version "3.5.1" - resolved "https://registry.yarnpkg.com/@sapphire/snowflake/-/snowflake-3.5.1.tgz#254521c188b49e8b2d4cc048b475fb2b38737fec" + resolved "https://registry.npmjs.org/@sapphire/snowflake/-/snowflake-3.5.1.tgz" integrity sha512-BxcYGzgEsdlG0dKAyOm0ehLGm2CafIrfQTZGWgkfKYbj+pNNsorZ7EotuZukc2MT70E0UbppVbtpBrqpzVzjNA== -"@tsconfig/node10@^1.0.7": - version "1.0.9" - resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2" - integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA== - -"@tsconfig/node12@^1.0.7": - version "1.0.11" - resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d" - integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag== - -"@tsconfig/node14@^1.0.0": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1" - integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow== - -"@tsconfig/node16@^1.0.2": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9" - integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA== - -"@types/node@*", "@types/node@^20.6.2": +"@types/node@*", "@types/node@^20.6.1": version "20.6.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.6.2.tgz#a065925409f59657022e9063275cd0b9bd7e1b12" + resolved "https://registry.npmjs.org/@types/node/-/node-20.6.2.tgz" integrity sha512-Y+/1vGBHV/cYk6OI1Na/LHzwnlNCAfU3ZNGrc1LdRe/LAIbdDPTTv/HU3M7yXN448aTVDq3eKRm2cg7iKLb8gw== "@types/webidl-conversions@*": version "7.0.0" - resolved "https://registry.yarnpkg.com/@types/webidl-conversions/-/webidl-conversions-7.0.0.tgz#2b8e60e33906459219aa587e9d1a612ae994cfe7" + resolved "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.0.tgz" integrity sha512-xTE1E+YF4aWPJJeUzaZI5DRntlkY3+BCVJi0axFptnjGmAoWxkyREIh/XMrfxVLejwQxMCfDXdICo0VLxThrog== "@types/whatwg-url@^8.2.1": version "8.2.2" - resolved "https://registry.yarnpkg.com/@types/whatwg-url/-/whatwg-url-8.2.2.tgz#749d5b3873e845897ada99be4448041d4cc39e63" + resolved "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-8.2.2.tgz" integrity sha512-FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA== dependencies: "@types/node" "*" @@ -262,68 +112,43 @@ "@types/ws@^8.5.5": version "8.5.5" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.5.tgz#af587964aa06682702ee6dcbc7be41a80e4b28eb" + resolved "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz" integrity sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg== dependencies: "@types/node" "*" "@vladfrangu/async_event_emitter@^2.2.2": version "2.2.2" - resolved "https://registry.yarnpkg.com/@vladfrangu/async_event_emitter/-/async_event_emitter-2.2.2.tgz#84c5a3f8d648842cec5cc649b88df599af32ed88" + resolved "https://registry.npmjs.org/@vladfrangu/async_event_emitter/-/async_event_emitter-2.2.2.tgz" integrity sha512-HIzRG7sy88UZjBJamssEczH5q7t5+axva19UbZLO6u0ySbYPrwzWiXBcC0WuHyhKKoeCyneH+FvYzKQq/zTtkQ== -acorn-walk@^8.1.1: - version "8.2.0" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" - integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== - -acorn@^8.4.1: - version "8.10.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5" - integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw== - -arg@^4.1.0: - version "4.1.3" - resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" - integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== - bson@^5.4.0: version "5.5.0" - resolved "https://registry.yarnpkg.com/bson/-/bson-5.5.0.tgz#a419cc69f368d2def3b8b22ea03ed1c9be40e53f" + resolved "https://registry.npmjs.org/bson/-/bson-5.5.0.tgz" integrity sha512-B+QB4YmDx9RStKv8LLSl/aVIEV3nYJc3cJNNTK2Cd1TL+7P+cNpw9mAPeCgc5K+j01Dv6sxUzcITXDx7ZU3F0w== busboy@^1.6.0: version "1.6.0" - resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893" + resolved "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz" integrity sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA== dependencies: streamsearch "^1.1.0" -create-require@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" - integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== - debug@4.x: version "4.3.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" -diff@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" - integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== - discord-api-types@0.37.50: version "0.37.50" - resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.50.tgz#6059eb8c0b784ad8194655a8b8b7f540fcfac428" + resolved "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.37.50.tgz" integrity sha512-X4CDiMnDbA3s3RaUXWXmgAIbY1uxab3fqe3qwzg5XutR3wjqi7M3IkgQbsIBzpqBN2YWr/Qdv7JrFRqSgb4TFg== discord.js@^14.13.0: version "14.13.0" - resolved "https://registry.yarnpkg.com/discord.js/-/discord.js-14.13.0.tgz#e7a00bdba70adb9e266a06884ca1acaf9a0b5c20" + resolved "https://registry.npmjs.org/discord.js/-/discord.js-14.13.0.tgz" integrity sha512-Kufdvg7fpyTEwANGy9x7i4od4yu5c6gVddGi5CKm4Y5a6sF0VBODObI3o0Bh7TGCj0LfNT8Qp8z04wnLFzgnbA== dependencies: "@discordjs/builders" "^1.6.5" @@ -343,7 +168,7 @@ discord.js@^14.13.0: esbuild@^0.19.3: version "0.19.3" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.19.3.tgz#d9268cd23358eef9d76146f184e0c55ff8da7bb6" + resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.19.3.tgz" integrity sha512-UlJ1qUUA2jL2nNib1JTSkifQTcYTroFqRjwCFW4QYEKEsixXD5Tik9xML7zh2gTxkYTBKGHNH9y7txMwVyPbjw== optionalDependencies: "@esbuild/android-arm" "0.19.3" @@ -371,47 +196,42 @@ esbuild@^0.19.3: fast-deep-equal@^3.1.3: version "3.1.3" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== ip@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" + resolved "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz" integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ== kareem@2.5.1: version "2.5.1" - resolved "https://registry.yarnpkg.com/kareem/-/kareem-2.5.1.tgz#7b8203e11819a8e77a34b3517d3ead206764d15d" + resolved "https://registry.npmjs.org/kareem/-/kareem-2.5.1.tgz" integrity sha512-7jFxRVm+jD+rkq3kY0iZDJfsO2/t4BBPeEb2qKn2lR/9KhuksYk5hxzfRYWMPV8P/x2d0kHD306YyWLzjjH+uA== lodash.snakecase@^4.1.1: version "4.1.1" - resolved "https://registry.yarnpkg.com/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz#39d714a35357147837aefd64b5dcbb16becd8f8d" + resolved "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz" integrity sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw== lodash@^4.17.21: version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== magic-bytes.js@^1.0.15: version "1.0.17" - resolved "https://registry.yarnpkg.com/magic-bytes.js/-/magic-bytes.js-1.0.17.tgz#6265d568df98c02b523c0defdd18b86cb2cae883" + resolved "https://registry.npmjs.org/magic-bytes.js/-/magic-bytes.js-1.0.17.tgz" integrity sha512-PEDpPzHpKe5AxkVmQrNPHFRvPN2ELkkj3eIg4IZO9JdhBiAY3aU53lgYXs9j8B7lpza+QiW0UA4QHCH7EskSeg== -make-error@^1.1.1: - version "1.3.6" - resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" - integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== - memory-pager@^1.0.2: version "1.5.0" - resolved "https://registry.yarnpkg.com/memory-pager/-/memory-pager-1.5.0.tgz#d8751655d22d384682741c972f2c3d6dfa3e66b5" + resolved "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz" integrity sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg== mongodb-connection-string-url@^2.6.0: version "2.6.0" - resolved "https://registry.yarnpkg.com/mongodb-connection-string-url/-/mongodb-connection-string-url-2.6.0.tgz#57901bf352372abdde812c81be47b75c6b2ec5cf" + resolved "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.6.0.tgz" integrity sha512-WvTZlI9ab0QYtTYnuMLgobULWhokRjtC7db9LtcVfJ+Hsnyr5eo6ZtNAt3Ly24XZScGMelOcGtm7lSn0332tPQ== dependencies: "@types/whatwg-url" "^8.2.1" @@ -419,7 +239,7 @@ mongodb-connection-string-url@^2.6.0: mongodb@5.8.1: version "5.8.1" - resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-5.8.1.tgz#dc201adfbd6c6d73401cdcf12ebdb75f14771faf" + resolved "https://registry.npmjs.org/mongodb/-/mongodb-5.8.1.tgz" integrity sha512-wKyh4kZvm6NrCPH8AxyzXm3JBoEf4Xulo0aUWh3hCgwgYJxyQ1KLST86ZZaSWdj6/kxYUA3+YZuyADCE61CMSg== dependencies: bson "^5.4.0" @@ -430,7 +250,7 @@ mongodb@5.8.1: mongoose@^7.5.2: version "7.5.2" - resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-7.5.2.tgz#1561cd1fe93c8453e65cea73203ce7eadc5deb7b" + resolved "https://registry.npmjs.org/mongoose/-/mongoose-7.5.2.tgz" integrity sha512-yEkmI1jfiog7QUvMWz3eB/XoA3/5DrVvSz+z3V5hnq8VtZIHC7ujEV0RKzRXwr8QNMOs+OTB7+aK7R/N/V3yXA== dependencies: bson "^5.4.0" @@ -443,44 +263,44 @@ mongoose@^7.5.2: mpath@0.9.0: version "0.9.0" - resolved "https://registry.yarnpkg.com/mpath/-/mpath-0.9.0.tgz#0c122fe107846e31fc58c75b09c35514b3871904" + resolved "https://registry.npmjs.org/mpath/-/mpath-0.9.0.tgz" integrity sha512-ikJRQTk8hw5DEoFVxHG1Gn9T/xcjtdnOKIU1JTmGjZZlg9LST2mBLmcX3/ICIbgJydT2GOc15RnNy5mHmzfSew== mquery@5.0.0: version "5.0.0" - resolved "https://registry.yarnpkg.com/mquery/-/mquery-5.0.0.tgz#a95be5dfc610b23862df34a47d3e5d60e110695d" + resolved "https://registry.npmjs.org/mquery/-/mquery-5.0.0.tgz" integrity sha512-iQMncpmEK8R8ncT8HJGsGc9Dsp8xcgYMVSbs5jgnm1lFHTZqMJTUWTDx1LBO8+mK3tPNZWFLBghQEIOULSTHZg== dependencies: debug "4.x" ms@2.1.2: version "2.1.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== ms@2.1.3: version "2.1.3" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== punycode@^2.1.1: version "2.3.0" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" + resolved "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz" integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== sift@16.0.1: version "16.0.1" - resolved "https://registry.yarnpkg.com/sift/-/sift-16.0.1.tgz#e9c2ccc72191585008cf3e36fc447b2d2633a053" + resolved "https://registry.npmjs.org/sift/-/sift-16.0.1.tgz" integrity sha512-Wv6BjQ5zbhW7VFefWusVP33T/EM0vYikCaQ2qR8yULbsilAT8/wQaXvuQ3ptGLpoKx+lihJE3y2UTgKDyyNHZQ== smart-buffer@^4.2.0: version "4.2.0" - resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" + resolved "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz" integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== socks@^2.7.1: version "2.7.1" - resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55" + resolved "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz" integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ== dependencies: ip "^2.0.0" @@ -488,77 +308,53 @@ socks@^2.7.1: sparse-bitfield@^3.0.3: version "3.0.3" - resolved "https://registry.yarnpkg.com/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz#ff4ae6e68656056ba4b3e792ab3334d38273ca11" + resolved "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz" integrity sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ== dependencies: memory-pager "^1.0.2" streamsearch@^1.1.0: version "1.1.0" - resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764" + resolved "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz" integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg== tr46@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9" + resolved "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz" integrity sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA== dependencies: punycode "^2.1.1" ts-mixer@^6.0.3: version "6.0.3" - resolved "https://registry.yarnpkg.com/ts-mixer/-/ts-mixer-6.0.3.tgz#69bd50f406ff39daa369885b16c77a6194c7cae6" + resolved "https://registry.npmjs.org/ts-mixer/-/ts-mixer-6.0.3.tgz" integrity sha512-k43M7uCG1AkTyxgnmI5MPwKoUvS/bRvLvUb7+Pgpdlmok8AoqmUaZxUUw8zKM5B1lqZrt41GjYgnvAi0fppqgQ== -ts-node@^10.9.1: - version "10.9.1" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b" - integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw== - dependencies: - "@cspotcode/source-map-support" "^0.8.0" - "@tsconfig/node10" "^1.0.7" - "@tsconfig/node12" "^1.0.7" - "@tsconfig/node14" "^1.0.0" - "@tsconfig/node16" "^1.0.2" - acorn "^8.4.1" - acorn-walk "^8.1.1" - arg "^4.1.0" - create-require "^1.1.0" - diff "^4.0.1" - make-error "^1.1.1" - v8-compile-cache-lib "^3.0.1" - yn "3.1.1" - tslib@^2.6.1: version "2.6.2" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" + resolved "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz" integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== typescript@^5.2.2: version "5.2.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78" + resolved "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz" integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w== undici@5.22.1: version "5.22.1" - resolved "https://registry.yarnpkg.com/undici/-/undici-5.22.1.tgz#877d512effef2ac8be65e695f3586922e1a57d7b" + resolved "https://registry.npmjs.org/undici/-/undici-5.22.1.tgz" integrity sha512-Ji2IJhFXZY0x/0tVBXeQwgPlLWw13GVzpsWPQ3rV50IFMMof2I55PZZxtm4P6iNq+L5znYN9nSTAq0ZyE6lSJw== dependencies: busboy "^1.6.0" -v8-compile-cache-lib@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf" - integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg== - webidl-conversions@^7.0.0: version "7.0.0" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a" + resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz" integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g== whatwg-url@^11.0.0: version "11.0.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018" + resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz" integrity sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ== dependencies: tr46 "^3.0.0" @@ -566,10 +362,5 @@ whatwg-url@^11.0.0: ws@^8.13.0: version "8.14.1" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.14.1.tgz#4b9586b4f70f9e6534c7bb1d3dc0baa8b8cf01e0" + resolved "https://registry.npmjs.org/ws/-/ws-8.14.1.tgz" integrity sha512-4OOseMUq8AzRBI/7SLMUwO+FEDnguetSk7KMb1sHwvF2w2Wv5Hoj0nlifx8vtGsftE/jWHojPy8sMMzYLJ2G/A== - -yn@3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" - integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== From 0dd6702e33eec2c9d86f41aa2274b15fade6f7d2 Mon Sep 17 00:00:00 2001 From: RoseFix7 Date: Mon, 18 Sep 2023 11:23:10 -0400 Subject: [PATCH 2/5] Updated bot source --- .gitignore | 3 +- .vscode/launch.json | 4 +- build/api.js | 6 ++- config/discord-bot.ts | 2 +- package-lock.json | 38 +++++++++++++++ package.json | 6 ++- source/config.ts | 27 +++++++++++ source/discord-bot.ts | 24 ++++++++++ source/discord-bot/commands/ping.ts | 0 source/discord-bot/config.ts | 21 +++++---- source/discord-bot/discord-bot.ts | 2 - source/discord-bot/discord.ts | 0 source/discord-bot/discord/command.ts | 0 source/discord.ts | 66 +++++++++++++++++++++++++++ source/util.ts | 17 +++++++ source/util/object.ts | 1 + source/util/object/merge.ts | 16 +++++++ tsconfig.json | 4 +- yarn.lock | 30 ++++++++++++ 19 files changed, 247 insertions(+), 20 deletions(-) create mode 100644 source/config.ts create mode 100644 source/discord-bot.ts delete mode 100644 source/discord-bot/commands/ping.ts delete mode 100644 source/discord-bot/discord-bot.ts delete mode 100644 source/discord-bot/discord.ts delete mode 100644 source/discord-bot/discord/command.ts create mode 100644 source/discord.ts create mode 100644 source/util.ts create mode 100644 source/util/object.ts create mode 100644 source/util/object/merge.ts diff --git a/.gitignore b/.gitignore index 2c45399..05833ae 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ target/ -node_modules/ \ No newline at end of file +node_modules/ +config/discord-bot.ts diff --git a/.vscode/launch.json b/.vscode/launch.json index b6f94cc..0ba7509 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -5,10 +5,10 @@ "name": "Build and Run", "type": "node", "request": "launch", - "program": "${workspaceFolder}/target/_.js", + "program": "${workspaceFolder}/target/_.cjs", "preLaunchTask": "build", "skipFiles": ["/**"], - "outFiles": ["${workspaceFolder}/target/**/*.js"] + "outFiles": ["${workspaceFolder}/target/**/*.cjs"] } ], "tasks": [ diff --git a/build/api.js b/build/api.js index 446bf20..afa6360 100644 --- a/build/api.js +++ b/build/api.js @@ -31,7 +31,7 @@ const CompileToTargetError = { export const __dirname = path.dirname(url.fileURLToPath(import.meta.url)); export const target_directory_path = path.join(__dirname, "../target/"); -export const target_file_name = "_.js"; +export const target_file_name = "_.cjs"; export const target_path = path.join(target_directory_path, target_file_name); export const package_path = path.join(__dirname, "../package.json"); @@ -129,6 +129,8 @@ export function compile_to_target() { bundle: true, entryPoints: [ package_json.main ], outfile: target_path, - platform: "node" + platform: "node", + format: "cjs", + external: [ "deasync" ] }); } \ No newline at end of file diff --git a/config/discord-bot.ts b/config/discord-bot.ts index 1f98c49..0ccf373 100644 --- a/config/discord-bot.ts +++ b/config/discord-bot.ts @@ -1,4 +1,4 @@ -import * config from "../source/discord-bot/config"; +import * as config from "../source/discord-bot/config"; export const data: config.Config_Interface = { discord: { diff --git a/package-lock.json b/package-lock.json index a71e04c..4e19b62 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,8 @@ "dependencies": { "@discordjs/builders": "^1.6.5", "@discordjs/rest": "^2.0.1", + "@types/deasync": "^0.1.2", + "deasync": "^0.1.28", "discord.js": "^14.13.0", "esbuild": "^0.19.3", "mongoose": "^7.5.2" @@ -157,6 +159,11 @@ "npm": ">=7.0.0" } }, + "node_modules/@types/deasync": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@types/deasync/-/deasync-0.1.2.tgz", + "integrity": "sha512-sCBFlGCEmZMPS06wdnQELcYzyUYio2K1Hp6g0fjJSKP1jkGKQpIdjRNUQAvdSCCJCWxIMCkX2CL7pi4BCm8Ydg==" + }, "node_modules/@types/node": { "version": "20.6.2", "resolved": "https://registry.npmjs.org/@types/node/-/node-20.6.2.tgz", @@ -193,6 +200,14 @@ "npm": ">=7.0.0" } }, + "node_modules/bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "dependencies": { + "file-uri-to-path": "1.0.0" + } + }, "node_modules/bson": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/bson/-/bson-5.5.0.tgz", @@ -212,6 +227,19 @@ "node": ">=10.16.0" } }, + "node_modules/deasync": { + "version": "0.1.28", + "resolved": "https://registry.npmjs.org/deasync/-/deasync-0.1.28.tgz", + "integrity": "sha512-QqLF6inIDwiATrfROIyQtwOQxjZuek13WRYZ7donU5wJPLoP67MnYxA6QtqdvdBy2mMqv5m3UefBVdJjvevOYg==", + "hasInstallScript": true, + "dependencies": { + "bindings": "^1.5.0", + "node-addon-api": "^1.7.1" + }, + "engines": { + "node": ">=0.11.0" + } + }, "node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -303,6 +331,11 @@ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, + "node_modules/file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==" + }, "node_modules/ip": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", @@ -431,6 +464,11 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, + "node_modules/node-addon-api": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz", + "integrity": "sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==" + }, "node_modules/punycode": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", diff --git a/package.json b/package.json index 2e72986..abf21a4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "poixpixel-discord-bot", "version": "1.0.0", - "main": "./source/discord-bot/discord-bot.ts", + "main": "./source/discord-bot.ts", "author": "Poixpixel", "license": "ISC", "type": "module", @@ -13,6 +13,8 @@ "dependencies": { "@discordjs/builders": "^1.6.5", "@discordjs/rest": "^2.0.1", + "@types/deasync": "^0.1.2", + "deasync": "^0.1.28", "discord.js": "^14.13.0", "esbuild": "^0.19.3", "mongoose": "^7.5.2" @@ -21,4 +23,4 @@ "@types/node": "^20.6.1", "typescript": "^5.2.2" } -} \ No newline at end of file +} diff --git a/source/config.ts b/source/config.ts new file mode 100644 index 0000000..e6679b7 --- /dev/null +++ b/source/config.ts @@ -0,0 +1,27 @@ +import * as l_util from "./util"; + +export class Config { + public readonly defaulted: Config_Interface; + #real: Config_Interface; + + public events = { + change: [] as unknown as (() => {})[] + }; + + constructor( + defaulted: Config_Interface, + real: Config_Interface + ) { + this.defaulted = defaulted; + this.#real = l_util.object.merge.recursive_merge(defaulted, real); + } + + public set real(new_real: Config_Interface) { + this.#real = l_util.object.merge.recursive_merge(this.defaulted, new_real); + this.events.change.forEach((event_callback: any) => event_callback()); + } + + public get real() { + return this.#real; + } +} \ No newline at end of file diff --git a/source/discord-bot.ts b/source/discord-bot.ts new file mode 100644 index 0000000..fc2be33 --- /dev/null +++ b/source/discord-bot.ts @@ -0,0 +1,24 @@ +import * as config from "./discord-bot/config"; +import * as l_config from "./config"; +import * as l_discord from "./discord"; +import * as l_util from "./util"; +import * as c_discord_bot from "../config/discord-bot"; + +export class DiscordBot extends l_discord.Bot { + public static config: l_config.Config; + public static discord_bot: l_discord.Bot; + + static main( + p_config: config.Config_Interface + ) { + this.config = new l_config.Config( + config.defaulted, + p_config + ); + + this.discord_bot = new l_discord.Bot(this.config.real.discord); + this.discord_bot.running = true; + } +} + +DiscordBot.main(c_discord_bot.data); \ No newline at end of file diff --git a/source/discord-bot/commands/ping.ts b/source/discord-bot/commands/ping.ts deleted file mode 100644 index e69de29..0000000 diff --git a/source/discord-bot/config.ts b/source/discord-bot/config.ts index b82dab5..7fcd9ce 100644 --- a/source/discord-bot/config.ts +++ b/source/discord-bot/config.ts @@ -1,10 +1,15 @@ +import * as l_discord from "../discord"; + export interface Config_Interface { - discord: { - api_key: string; - application_client_id: string; - guild_id: string; - }; - storage: { - - } + discord: l_discord.Config_Interface; + storage?: {} } + +export const defaulted: Config_Interface = { + discord: { + api_key: "", + application_client_id: "", + guild_id: "" + }, + storage: {} +} \ No newline at end of file diff --git a/source/discord-bot/discord-bot.ts b/source/discord-bot/discord-bot.ts deleted file mode 100644 index 9c34517..0000000 --- a/source/discord-bot/discord-bot.ts +++ /dev/null @@ -1,2 +0,0 @@ -import * as config from "./config"; -import * as discord from "./discord"; \ No newline at end of file diff --git a/source/discord-bot/discord.ts b/source/discord-bot/discord.ts deleted file mode 100644 index e69de29..0000000 diff --git a/source/discord-bot/discord/command.ts b/source/discord-bot/discord/command.ts deleted file mode 100644 index e69de29..0000000 diff --git a/source/discord.ts b/source/discord.ts new file mode 100644 index 0000000..002479d --- /dev/null +++ b/source/discord.ts @@ -0,0 +1,66 @@ +import * as discord from "discord.js"; +import * as l_config from "./config"; +import * as l_util from "./util"; +import * as deasync from "deasync"; + +export interface Config_Interface { + api_key?: string; + application_client_id?: string; + guild_id?: string; +} + +const defaulted_config: Config_Interface = { + api_key: "", + application_client_id: "", + guild_id: "" +} + +export class Bot extends l_util.Runable { + public readonly config: l_config.Config; + public readonly client: discord.Client; + + constructor( + config: Config_Interface + ) { + super(); + + this.config = new l_config.Config( + defaulted_config, + config + ); + + let intents: discord.GatewayIntentBits[] = []; + Object.keys(discord.GatewayIntentBits).forEach((intent_key: any) => intents.push(discord.GatewayIntentBits[intent_key] as any)); + + this.client = new discord.Client({ + intents + }); + } + + on_run(): void { + let done = false; + let error = false; + + this.client.once(discord.Events.ClientReady, () => { + done = true; + }); + + this.client.login(this.config.real.api_key); + + while (!done) { deasync.sleep(100); } + + if (error) { + console.error("FAILED TO LOGIN"); + } else { + console.log("ONLINE"); + } + } + + on_terminate(): void { + + } +} + +export class Command { + +} \ No newline at end of file diff --git a/source/util.ts b/source/util.ts new file mode 100644 index 0000000..57cd6b5 --- /dev/null +++ b/source/util.ts @@ -0,0 +1,17 @@ +export * as object from "./util/object"; + +export abstract class Runable { + #running = false; + + abstract on_run(): void; + abstract on_terminate(): void; + + public set running(value: boolean) { + if (value && !this.#running) this.on_run(); + else if (!value && this.#running) this.on_terminate(); + } + + public get running() { + return this.#running; + } +} \ No newline at end of file diff --git a/source/util/object.ts b/source/util/object.ts new file mode 100644 index 0000000..2dd1d6c --- /dev/null +++ b/source/util/object.ts @@ -0,0 +1 @@ +export * as merge from "./object/merge"; \ No newline at end of file diff --git a/source/util/object/merge.ts b/source/util/object/merge.ts new file mode 100644 index 0000000..28d8696 --- /dev/null +++ b/source/util/object/merge.ts @@ -0,0 +1,16 @@ +export function recursive_merge( + defaulted: any, + target: any +) { + let output = defaulted; + + Object.keys(target).forEach((target_key) => { + if (typeof target_key != "object") { + output[target_key] = target[target_key]; + } else { + output[target_key] = recursive_merge(defaulted[target_key], target[target_key]); + } + }); + + return output; +} \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index f4255fb..54a61c8 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -26,7 +26,7 @@ /* Modules */ "module": "esnext", /* Specify what module code is generated. */ - "rootDir": "./src", /* Specify the root folder within your source files. */ + // "rootDir": "./", /* Specify the root folder within your source files. */ "moduleResolution": "node", /* Specify how TypeScript looks up a file from a given module specifier. */ // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ @@ -55,7 +55,7 @@ // "sourceMap": true, /* Create source map files for emitted JavaScript files. */ // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */ - "outDir": "./dist", /* Specify an output folder for all emitted files. */ + // "outDir": "./dist", /* Specify an output folder for all emitted files. */ // "removeComments": true, /* Disable emitting comments. */ // "noEmit": true, /* Disable emitting files from a compilation. */ // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ diff --git a/yarn.lock b/yarn.lock index 320ab8f..c395e6c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -92,6 +92,11 @@ resolved "https://registry.npmjs.org/@sapphire/snowflake/-/snowflake-3.5.1.tgz" integrity sha512-BxcYGzgEsdlG0dKAyOm0ehLGm2CafIrfQTZGWgkfKYbj+pNNsorZ7EotuZukc2MT70E0UbppVbtpBrqpzVzjNA== +"@types/deasync@^0.1.2": + version "0.1.2" + resolved "https://registry.npmjs.org/@types/deasync/-/deasync-0.1.2.tgz" + integrity sha512-sCBFlGCEmZMPS06wdnQELcYzyUYio2K1Hp6g0fjJSKP1jkGKQpIdjRNUQAvdSCCJCWxIMCkX2CL7pi4BCm8Ydg== + "@types/node@*", "@types/node@^20.6.1": version "20.6.2" resolved "https://registry.npmjs.org/@types/node/-/node-20.6.2.tgz" @@ -122,6 +127,13 @@ resolved "https://registry.npmjs.org/@vladfrangu/async_event_emitter/-/async_event_emitter-2.2.2.tgz" integrity sha512-HIzRG7sy88UZjBJamssEczH5q7t5+axva19UbZLO6u0ySbYPrwzWiXBcC0WuHyhKKoeCyneH+FvYzKQq/zTtkQ== +bindings@^1.5.0: + version "1.5.0" + resolved "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz" + integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== + dependencies: + file-uri-to-path "1.0.0" + bson@^5.4.0: version "5.5.0" resolved "https://registry.npmjs.org/bson/-/bson-5.5.0.tgz" @@ -134,6 +146,14 @@ busboy@^1.6.0: dependencies: streamsearch "^1.1.0" +deasync@^0.1.28: + version "0.1.28" + resolved "https://registry.npmjs.org/deasync/-/deasync-0.1.28.tgz" + integrity sha512-QqLF6inIDwiATrfROIyQtwOQxjZuek13WRYZ7donU5wJPLoP67MnYxA6QtqdvdBy2mMqv5m3UefBVdJjvevOYg== + dependencies: + bindings "^1.5.0" + node-addon-api "^1.7.1" + debug@4.x: version "4.3.4" resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" @@ -199,6 +219,11 @@ fast-deep-equal@^3.1.3: resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== +file-uri-to-path@1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz" + integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== + ip@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz" @@ -283,6 +308,11 @@ ms@2.1.3: resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== +node-addon-api@^1.7.1: + version "1.7.2" + resolved "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz" + integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg== + punycode@^2.1.1: version "2.3.0" resolved "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz" From d7b331213a1f48b3490d1eb20520e0c2ab1be0b7 Mon Sep 17 00:00:00 2001 From: RoseFix7 Date: Mon, 18 Sep 2023 17:37:31 -0400 Subject: [PATCH 3/5] Small changes --- config/discord-bot.ts | 4 ++-- source/discord-bot.ts | 7 +++++++ source/discord.ts | 9 ++++++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/config/discord-bot.ts b/config/discord-bot.ts index 0ccf373..df11cf0 100644 --- a/config/discord-bot.ts +++ b/config/discord-bot.ts @@ -2,8 +2,8 @@ import * as config from "../source/discord-bot/config"; export const data: config.Config_Interface = { discord: { - api_key: "MTA1MjAxNzMyOTM3NjA3MTc4MQ.GFmCFK.hAEnQ2Qx7syQ4_CFuMRe4ajJ507bpjc21Isvlo", - application_client_id: "1052017329376071781", + api_key: "MTE1MzM5MDU1NzQ4NjM4MzEwNA.Gybr-t.R3LdqcF6_PWTC10J-6Sbx9d8c6oDbgyUA4Rxfc", + application_client_id: "1153390557486383104", guild_id: "1007735047039750214" } } \ No newline at end of file diff --git a/source/discord-bot.ts b/source/discord-bot.ts index fc2be33..e4c93e8 100644 --- a/source/discord-bot.ts +++ b/source/discord-bot.ts @@ -17,7 +17,14 @@ export class DiscordBot extends l_discord.Bot { ); this.discord_bot = new l_discord.Bot(this.config.real.discord); + console.log("Starting"); this.discord_bot.running = true; + console.log("READY") + + setTimeout(() => { + this.discord_bot.running = false; + console.log("offline"); + }, 2000); } } diff --git a/source/discord.ts b/source/discord.ts index 002479d..0d0e4d0 100644 --- a/source/discord.ts +++ b/source/discord.ts @@ -57,7 +57,14 @@ export class Bot extends l_util.Runable { } on_terminate(): void { - + let done = false; + + this.client.destroy() + .then(() => { + done = true; + }); + + while (!done) { deasync.sleep(100); } } } From 444c90872a3f047e9af00f2cc049ab19bfe09354 Mon Sep 17 00:00:00 2001 From: RoseFix <144444996+RoseFix7@users.noreply.github.com> Date: Mon, 18 Sep 2023 20:07:00 -0400 Subject: [PATCH 4/5] Delete config directory --- config/discord-bot.ts | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 config/discord-bot.ts diff --git a/config/discord-bot.ts b/config/discord-bot.ts deleted file mode 100644 index df11cf0..0000000 --- a/config/discord-bot.ts +++ /dev/null @@ -1,9 +0,0 @@ -import * as config from "../source/discord-bot/config"; - -export const data: config.Config_Interface = { - discord: { - api_key: "MTE1MzM5MDU1NzQ4NjM4MzEwNA.Gybr-t.R3LdqcF6_PWTC10J-6Sbx9d8c6oDbgyUA4Rxfc", - application_client_id: "1153390557486383104", - guild_id: "1007735047039750214" - } -} \ No newline at end of file From 7293076ce9e003da5dd7a1f7d112d71a8ea08dba Mon Sep 17 00:00:00 2001 From: RoseFix7 Date: Wed, 20 Sep 2023 17:24:51 -0400 Subject: [PATCH 5/5] Stuff --- .vs/VSWorkspaceState.json | 10 - .vs/poixpixel-discord-bot-akhan/v16/.suo | Bin 73728 -> 0 bytes .vs/slnx.sqlite | Bin 90112 -> 0 bytes source/discord-bot.ts | 61 +++++- source/discord-bot/ping.ts | 7 + source/discord.ts | 268 ++++++++++++++++++++++- 6 files changed, 321 insertions(+), 25 deletions(-) delete mode 100644 .vs/VSWorkspaceState.json delete mode 100644 .vs/poixpixel-discord-bot-akhan/v16/.suo delete mode 100644 .vs/slnx.sqlite create mode 100644 source/discord-bot/ping.ts diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json deleted file mode 100644 index 386b3fa..0000000 --- a/.vs/VSWorkspaceState.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "ExpandedNodes": [ - "", - "\\config", - "\\source", - "\\source\\discord-bot" - ], - "SelectedNode": "\\.gitignore", - "PreviewInSolutionExplorer": false -} \ No newline at end of file diff --git a/.vs/poixpixel-discord-bot-akhan/v16/.suo b/.vs/poixpixel-discord-bot-akhan/v16/.suo deleted file mode 100644 index 864fc8903878521be174d70c096cfe7cbcc96d26..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 73728 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 Ip(;H5KT!NlL;wH) diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite deleted file mode 100644 index ab5fa811229b00e9d34600e555d86d1fabdf2a51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 90112 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 diff --git a/source/discord-bot.ts b/source/discord-bot.ts index e4c93e8..0beb679 100644 --- a/source/discord-bot.ts +++ b/source/discord-bot.ts @@ -7,24 +7,71 @@ import * as c_discord_bot from "../config/discord-bot"; export class DiscordBot extends l_discord.Bot { public static config: l_config.Config; public static discord_bot: l_discord.Bot; + public static polling_interval: 50; // ms + public static guild: l_discord.Guild; static main( p_config: config.Config_Interface ) { + console.log("Running bot tasks") + + console.log("-- Loading configuration"); this.config = new l_config.Config( config.defaulted, p_config ); this.discord_bot = new l_discord.Bot(this.config.real.discord); - console.log("Starting"); - this.discord_bot.running = true; - console.log("READY") - setTimeout(() => { - this.discord_bot.running = false; - console.log("offline"); - }, 2000); + try { + console.log("-- Logging into bot API"); + this.discord_bot.running = true; + } catch (error: any) { + DiscordBot.error_stop(error); + } + + try { + console.log("-- Fetching guild"); + this.guild = this.discord_bot.get_guild({ + id: this.config.real.discord.guild_id + })[0]; + } catch (error: any) { + DiscordBot.error_stop(error); + } + + try { + const channel_id = "1043280866744488067"; + console.log("-- Fetching test channel"); + + const channel = this.guild.get_channel({ + id: channel_id + })[0]; + + console.log(channel, this.guild); + const msg = new l_discord.Message(); + msg.text = "HELLO TEXT"; + + const message_stream = channel.messages; + + const embed = new l_discord.Embed(); + embed.title = "Hello"; + embed.description = "IDK"; + msg.embeds = [ embed ]; + + message_stream.push(msg); + } catch (error: any) { + DiscordBot.error_stop(error); + } + + + console.log("All tasks completed"); + } + + static error_stop(error: Error) { + console.error("Fatal Error: Failed to execute bot tasks"); + console.error(error); + + process.exit(1); } } diff --git a/source/discord-bot/ping.ts b/source/discord-bot/ping.ts new file mode 100644 index 0000000..9849fe3 --- /dev/null +++ b/source/discord-bot/ping.ts @@ -0,0 +1,7 @@ +import * as l_discord from "../discord"; + +export class Ping extends l_discord.Command { + constructor() { + super("ping"); + } +} \ No newline at end of file diff --git a/source/discord.ts b/source/discord.ts index 0d0e4d0..9bb0e22 100644 --- a/source/discord.ts +++ b/source/discord.ts @@ -2,6 +2,7 @@ import * as discord from "discord.js"; import * as l_config from "./config"; import * as l_util from "./util"; import * as deasync from "deasync"; +import * as discord_bot from "./discord-bot"; export interface Config_Interface { api_key?: string; @@ -9,15 +10,43 @@ export interface Config_Interface { guild_id?: string; } -const defaulted_config: Config_Interface = { +export interface RecordFilter { + id?: string; // First ->-v + name?: string; // Second <-v + filter?: (element: Guild | Channel) => boolean; // Third <- +} + +export const defaulted_config: Config_Interface = { api_key: "", application_client_id: "", guild_id: "" } +export class InvalidToken_Error extends Error { + constructor() { + super("The token provided is invalid"); + this.name = "InvalidToken_Error" + } +} + +export class BotNotReady_Error extends Error { + constructor() { + super("The bot is not ready for API actions"); + this.name = "BotNotReady_Error" + } +} + +export class InvalidNetwork_Error extends Error { + constructor() { + super("The bot failed to perform any actions that relied on the network. Possible reasons are no network is connected, the API URL has changed, or the OS firewall is blocking the connection"); + this.name = "InvalidNetwork_Error" + } +} + export class Bot extends l_util.Runable { public readonly config: l_config.Config; public readonly client: discord.Client; + #ready = false; constructor( config: Config_Interface @@ -39,21 +68,31 @@ export class Bot extends l_util.Runable { on_run(): void { let done = false; - let error = false; + let error = null as any; this.client.once(discord.Events.ClientReady, () => { done = true; }); - this.client.login(this.config.real.api_key); + this.client.login(this.config.real.api_key) + .catch((sub_error) => { + error = sub_error; + done = true; + }); - while (!done) { deasync.sleep(100); } + while (!done) { deasync.sleep(discord_bot.DiscordBot.polling_interval); } if (error) { - console.error("FAILED TO LOGIN"); - } else { - console.log("ONLINE"); + if (error.name == "Error [TokenInvalid]") { + throw new InvalidToken_Error(); + } else if (error.message.includes("getaddrinfo")) { + throw new InvalidNetwork_Error(); + } else { + throw error; + } } + + this.#ready = true; } on_terminate(): void { @@ -65,9 +104,222 @@ export class Bot extends l_util.Runable { }); while (!done) { deasync.sleep(100); } + this.#ready = false; + } + + public get ready() { + return this.#ready; + } + + public get_guild(filter: RecordFilter) { + if (!this.#ready) { + throw new BotNotReady_Error(); + } + + if ( + filter.id + && !filter.filter + && !filter.name + ) { + let guild = null as any; + let done = false; + let error = null as any; + + this.client.guilds.fetch(filter.id) + .then((api_build) => { + done = true; + guild = api_build; + }) + .catch((api_error) => { + done = true; + error = api_error; + }); + + while (!done) { deasync.sleep(discord_bot.DiscordBot.polling_interval); } + + if (guild) { + return [ new Guild(this, guild) ]; + } + + if (error) { + throw error; + } + } + + const api_guilds = this.client.guilds.cache; + + // Filter by name + let layer_1_filtered: discord.Guild[] = []; + + api_guilds.forEach((guild) => { + if (guild.name == filter.name) { + layer_1_filtered.push(guild); + } else if (!filter.name) { + layer_1_filtered.push(guild); + } + }); + + // Filter with function + let layer_2_filtered: Guild[] = []; + + layer_1_filtered.forEach((guild) => { + const custom_guild = new Guild(this, guild); + if (filter.filter && filter.filter(custom_guild)) { + layer_2_filtered.push(custom_guild) + } else if (!filter.filter) { + layer_2_filtered.push(custom_guild); + } + }); + + return layer_2_filtered; } } -export class Command { +export class Guild { + public readonly inner_guild: discord.Guild; + public readonly bot: Bot; + + constructor(bot: Bot, guild: discord.Guild) { + this.bot = bot; + this.inner_guild = guild; + } + + public get name() { + return this.inner_guild.name; + } + + public get_channel(filter: RecordFilter) { + if (!this.bot.ready) { + throw new BotNotReady_Error(); + } + + if ( + filter.id + && !filter.filter + && !filter.name + ) { + let channel = null as any; + let done = false; + let error = null as any; + + this.bot.client.channels.fetch(filter.id) + .then((api_build) => { + done = true; + channel = api_build; + }) + .catch((api_error) => { + done = true; + error = api_error; + }); + + while (!done) { deasync.sleep(discord_bot.DiscordBot.polling_interval); } + + if (channel) { + return [ new Channel(this, channel) ]; + } + + if (error) { + throw error; + } + } + + const api_channels = this.bot.client.channels.cache; + + // Filter by name + let layer_1_filtered: discord.Channel[] = []; + + api_channels.forEach((channel) => { + if ((channel as any).name == filter.name) { + layer_1_filtered.push(channel); + } else if (!filter.name) { + layer_1_filtered.push(channel); + } + }); + + // Filter with function + let layer_2_filtered: Channel[] = []; + + layer_1_filtered.forEach((channel) => { + const custom_channel = new Channel(this, channel); + if (filter.filter && filter.filter(custom_channel)) { + layer_2_filtered.push(custom_channel) + } else if (!filter.filter) { + layer_2_filtered.push(custom_channel); + } + }); + + return layer_2_filtered; + } +} + +export class Channel { + public readonly guild: Guild; + public readonly inner_channel: discord.Channel; + public readonly messages: Messages; + + constructor(guild: Guild, channel: discord.Channel) { + this.guild = guild; + this.inner_channel = channel; + this.messages = new Messages(channel); + } +} + +export class Embed { + public title = ""; + public description = ""; +} + +export class Messages { + public readonly inner_channel: discord.Channel; + + constructor(channel: discord.Channel) { + this.inner_channel = channel; + } + + public push(message: Message) { + const message_raw = { + content: message.text, + embeds: Message.transform_embeds(message.embeds) as any + }; + + console.log(message_raw, message); + (this.inner_channel as any).send(message_raw); + } +} + +export class Message { + public text = ""; + public embeds: Embed[] = []; + + public static transform_embeds(embeds: Embed[]) { + const embed_raw = [] as any[]; + + embeds.forEach((embed) => { + const raw = new discord.EmbedBuilder(); + + raw.setTitle(embed.title); + raw.setDescription(embed.description); + + embed_raw.push(raw); + }); + + return embed_raw; + } +} + +export interface CommandInteraction { + channel: Channel; +} + +export abstract class Command { + public readonly trigger: string; + public readonly description = ""; + constructor(trigger: string) { + this.trigger = trigger; + } + + abstract execute(interaction: CommandInteraction) { + + } } \ No newline at end of file