mirror of
https://github.com/JonnyBro/JaBa.git
synced 2024-12-29 14:53:03 +05:00
feat: added instance support to client class
This commit is contained in:
parent
f20c7a5550
commit
f3d85c3ec2
8 changed files with 61 additions and 26 deletions
|
@ -1,4 +1,26 @@
|
||||||
import path from "node:path";
|
import path from "node:path";
|
||||||
|
import { GatewayIntentBits } from "discord.js";
|
||||||
|
import { AsyncLocalStorage } from "node:async_hooks";
|
||||||
|
|
||||||
export const PROJECT_ROOT = path.join(import.meta.dirname, "..");
|
export const PROJECT_ROOT = path.join(import.meta.dirname, "..");
|
||||||
export const CONFIG_PATH = path.join(PROJECT_ROOT, "..", "config.json");
|
export const CONFIG_PATH = path.join(PROJECT_ROOT, "..", "config.json");
|
||||||
|
export const CLIENT_INTENTS = [
|
||||||
|
GatewayIntentBits.Guilds,
|
||||||
|
GatewayIntentBits.GuildMembers,
|
||||||
|
GatewayIntentBits.GuildModeration,
|
||||||
|
GatewayIntentBits.GuildEmojisAndStickers,
|
||||||
|
GatewayIntentBits.GuildIntegrations,
|
||||||
|
GatewayIntentBits.GuildInvites,
|
||||||
|
GatewayIntentBits.GuildVoiceStates,
|
||||||
|
GatewayIntentBits.GuildPresences,
|
||||||
|
GatewayIntentBits.GuildMessages,
|
||||||
|
GatewayIntentBits.GuildMessageReactions,
|
||||||
|
GatewayIntentBits.GuildMessageTyping,
|
||||||
|
GatewayIntentBits.MessageContent,
|
||||||
|
GatewayIntentBits.DirectMessageTyping,
|
||||||
|
GatewayIntentBits.DirectMessages,
|
||||||
|
GatewayIntentBits.DirectMessageReactions,
|
||||||
|
];
|
||||||
|
export const CLIENT_ALLOWED_MENTIONS = { parse: ["everyone", "roles", "users"] };
|
||||||
|
|
||||||
|
export const SUPER_CONTEXT = new AsyncLocalStorage();
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import { resolve } from "node:path";
|
import { resolve } from "node:path";
|
||||||
import logger from "../../helpers/logger.js";
|
import logger from "../../helpers/logger.js";
|
||||||
import { client } from "../../index.js";
|
import useClient from "../../utils/use-client.js";
|
||||||
import { getFilePaths } from "../../utils/index.js";
|
import { getFilePaths } from "../../utils/index.js";
|
||||||
import { toFileURL } from "../../utils/resolve-file.js";
|
import { toFileURL } from "../../utils/resolve-file.js";
|
||||||
import registerCommands from "./functions/registerCommands.js";
|
import registerCommands from "./functions/registerCommands.js";
|
||||||
|
@ -8,6 +8,7 @@ import registerCommands from "./functions/registerCommands.js";
|
||||||
export const commands = [];
|
export const commands = [];
|
||||||
|
|
||||||
export const init = async () => {
|
export const init = async () => {
|
||||||
|
const client = useClient();
|
||||||
await buildCommands();
|
await buildCommands();
|
||||||
|
|
||||||
await registerCommands({
|
await registerCommands({
|
||||||
|
@ -17,6 +18,7 @@ export const init = async () => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const buildCommands = async () => {
|
const buildCommands = async () => {
|
||||||
|
const client = useClient();
|
||||||
const cmdPath = resolve(client.configService.get("paths.commands"));
|
const cmdPath = resolve(client.configService.get("paths.commands"));
|
||||||
const commandFilePaths = (await getFilePaths(cmdPath, true)).filter(path => path.endsWith(".js"));
|
const commandFilePaths = (await getFilePaths(cmdPath, true)).filter(path => path.endsWith(".js"));
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import { resolve } from "node:path";
|
import { resolve } from "node:path";
|
||||||
import logger from "../../helpers/logger.js";
|
import logger from "../../helpers/logger.js";
|
||||||
import { client } from "../../index.js";
|
import useClient from "../../utils/use-client.js";
|
||||||
import { getFilePaths } from "../../utils/index.js";
|
import { getFilePaths } from "../../utils/index.js";
|
||||||
import { toFileURL } from "../../utils/resolve-file.js";
|
import { toFileURL } from "../../utils/resolve-file.js";
|
||||||
|
|
||||||
|
@ -12,6 +12,7 @@ export const init = async () => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const buildEvents = async () => {
|
const buildEvents = async () => {
|
||||||
|
const client = useClient();
|
||||||
try {
|
try {
|
||||||
const eventPath = resolve(client.configService.get("paths.events"));
|
const eventPath = resolve(client.configService.get("paths.events"));
|
||||||
const eventFilePaths = (await getFilePaths(eventPath, true)).filter(path => path.endsWith(".js"));
|
const eventFilePaths = (await getFilePaths(eventPath, true)).filter(path => path.endsWith(".js"));
|
||||||
|
@ -37,6 +38,7 @@ const buildEvents = async () => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const registerEvents = async () => {
|
const registerEvents = async () => {
|
||||||
|
const client = useClient();
|
||||||
for (const { data, run } of events) {
|
for (const { data, run } of events) {
|
||||||
if (data.once) client.once(data.name, run);
|
if (data.once) client.once(data.name, run);
|
||||||
else client.on(data.name, run);
|
else client.on(data.name, run);
|
||||||
|
|
24
src/index.js
24
src/index.js
|
@ -1,26 +1,10 @@
|
||||||
import { GatewayIntentBits } from "discord.js";
|
|
||||||
import { ExtendedClient } from "./structures/client.js";
|
import { ExtendedClient } from "./structures/client.js";
|
||||||
import logger from "./helpers/logger.js";
|
import logger from "./helpers/logger.js";
|
||||||
|
import { CLIENT_INTENTS, CLIENT_ALLOWED_MENTIONS } from "./constants/index.js";
|
||||||
|
|
||||||
export const client = new ExtendedClient({
|
const client = new ExtendedClient({
|
||||||
intents: [
|
intents: CLIENT_INTENTS,
|
||||||
GatewayIntentBits.Guilds,
|
allowedMentions: CLIENT_ALLOWED_MENTIONS,
|
||||||
GatewayIntentBits.GuildMembers,
|
|
||||||
GatewayIntentBits.GuildModeration,
|
|
||||||
GatewayIntentBits.GuildEmojisAndStickers,
|
|
||||||
GatewayIntentBits.GuildIntegrations,
|
|
||||||
GatewayIntentBits.GuildInvites,
|
|
||||||
GatewayIntentBits.GuildVoiceStates,
|
|
||||||
GatewayIntentBits.GuildPresences,
|
|
||||||
GatewayIntentBits.GuildMessages,
|
|
||||||
GatewayIntentBits.GuildMessageReactions,
|
|
||||||
GatewayIntentBits.GuildMessageTyping,
|
|
||||||
GatewayIntentBits.MessageContent,
|
|
||||||
GatewayIntentBits.DirectMessageTyping,
|
|
||||||
GatewayIntentBits.DirectMessages,
|
|
||||||
GatewayIntentBits.DirectMessageReactions,
|
|
||||||
],
|
|
||||||
allowedMentions: { parse: ["everyone", "roles", "users"] },
|
|
||||||
});
|
});
|
||||||
|
|
||||||
client.init();
|
client.init();
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
import { model, Schema } from "mongoose";
|
import { model, Schema } from "mongoose";
|
||||||
import { client } from "../index.js";
|
import useClient from "../utils/use-client.js";
|
||||||
|
|
||||||
|
const client = useClient();
|
||||||
|
|
||||||
export default model(
|
export default model(
|
||||||
"Guild",
|
"Guild",
|
||||||
|
|
|
@ -5,17 +5,23 @@ import { init as initEvents } from "../handlers/event-handler/index.js";
|
||||||
import logger from "../helpers/logger.js";
|
import logger from "../helpers/logger.js";
|
||||||
import ConfigService from "../services/config/index.js";
|
import ConfigService from "../services/config/index.js";
|
||||||
import InternationalizationService from "../services/languages/index.js";
|
import InternationalizationService from "../services/languages/index.js";
|
||||||
|
import { SUPER_CONTEXT } from "../constants/index.js";
|
||||||
|
|
||||||
export class ExtendedClient extends Client {
|
export class ExtendedClient extends Client {
|
||||||
/**
|
/**
|
||||||
* @param {import("discord.js").ClientOptions} options
|
* @param {import("discord.js").ClientOptions} options
|
||||||
*/
|
*/
|
||||||
constructor(options) {
|
constructor(options) {
|
||||||
|
if (SUPER_CONTEXT.getStore()) {
|
||||||
|
return SUPER_CONTEXT.getStore();
|
||||||
|
}
|
||||||
super(options);
|
super(options);
|
||||||
|
|
||||||
this.configService = new ConfigService();
|
this.configService = new ConfigService();
|
||||||
this.adapter = new MongooseAdapter(this.configService.get("mongoDB"));
|
this.adapter = new MongooseAdapter(this.configService.get("mongoDB"));
|
||||||
this.i18n = new InternationalizationService(this);
|
this.i18n = new InternationalizationService(this);
|
||||||
|
|
||||||
|
SUPER_CONTEXT.enterWith(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
async init() {
|
async init() {
|
||||||
|
|
|
@ -1,14 +1,15 @@
|
||||||
import { EmbedBuilder } from "discord.js";
|
import { EmbedBuilder } from "discord.js";
|
||||||
import { client } from "../index.js";
|
import useClient from "../utils/use-client.js";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @param {import("discord.js").EmbedData} data - embed data
|
* @param {import("discord.js").EmbedData} data - embed data
|
||||||
* @returns The generated EmbedBuilder instance.
|
* @returns The generated EmbedBuilder instance.
|
||||||
*/
|
*/
|
||||||
export const createEmbed = data =>
|
export const createEmbed = data => {
|
||||||
|
const client = useClient();
|
||||||
new EmbedBuilder({
|
new EmbedBuilder({
|
||||||
footer: typeof data.footer === "object" ? data.footer : data.footer ? { text: data.footer } : client.configService.get("embed.footer"),
|
footer: typeof data.footer === "object" ? data.footer : data.footer ? { text: data.footer } : client.configService.get("embed.footer"),
|
||||||
color: data.color ?? client.configService.get("embed.color"),
|
color: data.color ?? client.configService.get("embed.color"),
|
||||||
...data,
|
...data,
|
||||||
});
|
});
|
||||||
|
};
|
||||||
|
|
16
src/utils/use-client.js
Normal file
16
src/utils/use-client.js
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
import { SUPER_CONTEXT } from "../constants/index.js";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the instance of the client.
|
||||||
|
*
|
||||||
|
* @throws {Error} Client is not initialized. Please initialize it first.
|
||||||
|
*
|
||||||
|
* @returns {import("../structures/client.js").ExtendedClient} The client instance.
|
||||||
|
*/
|
||||||
|
export default function useClient() {
|
||||||
|
const store = SUPER_CONTEXT.getStore();
|
||||||
|
if (!store) {
|
||||||
|
throw new Error("Client is not initialized. Please initialize it first.");
|
||||||
|
}
|
||||||
|
return store;
|
||||||
|
}
|
Loading…
Reference in a new issue