reciple 7.5.1 → 7.6.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/bin.mjs +28 -12
- package/bin/bin.mjs.map +1 -1
- package/bin/utils/cli.js +2 -0
- package/bin/utils/cli.js.map +1 -1
- package/bin/utils/logger.d.ts +1 -0
- package/bin/utils/logger.js +16 -12
- package/bin/utils/logger.js.map +1 -1
- package/bin/utils/modules.d.ts +1 -0
- package/bin/utils/modules.js +7 -1
- package/bin/utils/modules.js.map +1 -1
- package/package.json +3 -3
- package/static/config.yml +7 -0
package/bin/bin.mjs
CHANGED
|
@@ -1,15 +1,17 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { ContextMenuCommandBuilder, MessageCommandBuilder, SlashCommandBuilder, realVersion, version } from '@reciple/client';
|
|
3
|
-
import { getModules } from './utils/modules.js';
|
|
3
|
+
import { getJsConfig, getModules } from './utils/modules.js';
|
|
4
4
|
import { createLogger, eventLogger } from './utils/logger.js';
|
|
5
5
|
import { existsSync, mkdirSync, readdirSync } from 'fs';
|
|
6
|
-
import { Config } from './classes/Config.js';
|
|
7
6
|
import { command, cli } from './utils/cli.js';
|
|
7
|
+
import { setTimeout } from 'timers/promises';
|
|
8
|
+
import { Config } from './classes/Config.js';
|
|
8
9
|
import { RecipleClient } from './index.js';
|
|
9
10
|
import micromatch from 'micromatch';
|
|
10
11
|
import prompts from 'prompts';
|
|
11
12
|
import semver from 'semver';
|
|
12
13
|
import path from 'path';
|
|
14
|
+
import kleur from 'kleur';
|
|
13
15
|
command.parse();
|
|
14
16
|
const allowedFiles = ['node_modules', 'reciple.yml', 'package.json', '.*'];
|
|
15
17
|
const configPath = cli.options.config
|
|
@@ -36,6 +38,9 @@ if (cli.options.setup)
|
|
|
36
38
|
process.exit(0);
|
|
37
39
|
if (cli.options.shardmode)
|
|
38
40
|
config.applicationCommandRegister = { ...config.applicationCommandRegister, enabled: false };
|
|
41
|
+
const processErrorHandler = (err) => logger?.error(err);
|
|
42
|
+
process.once('uncaughtException', processErrorHandler);
|
|
43
|
+
process.once('unhandledRejection', processErrorHandler);
|
|
39
44
|
/**
|
|
40
45
|
* !! BREAKING !!
|
|
41
46
|
* TODO: use reciple cli version instead of client version when checking
|
|
@@ -44,12 +49,14 @@ if (!semver.satisfies(version, config.version)) {
|
|
|
44
49
|
logger?.error(`Your config version doesn't support Reciple client v${version}`);
|
|
45
50
|
process.exit(1);
|
|
46
51
|
}
|
|
52
|
+
logger?.info(`Starting Reciple client v${realVersion} - ${new Date()}`);
|
|
47
53
|
const client = new RecipleClient({
|
|
48
54
|
recipleOptions: config,
|
|
49
55
|
...config.client,
|
|
50
|
-
logger
|
|
56
|
+
logger,
|
|
57
|
+
makeCache: cli.options.cacheConfig ? await getJsConfig(cli.options.cacheConfig) : undefined,
|
|
58
|
+
sweepers: cli.options.sweeperConfig ? await getJsConfig(cli.options.sweeperConfig) : undefined,
|
|
51
59
|
});
|
|
52
|
-
client.logger?.info(`Starting Reciple client v${realVersion} - ${new Date()}`);
|
|
53
60
|
eventLogger(client);
|
|
54
61
|
const moduleFilesFilter = (file) => file.endsWith('.js') || file.endsWith('.cjs') || file.endsWith('.mjs');
|
|
55
62
|
await client.modules.startModules({
|
|
@@ -57,29 +64,38 @@ await client.modules.startModules({
|
|
|
57
64
|
addToModulesCollection: true
|
|
58
65
|
});
|
|
59
66
|
client.once('ready', async () => {
|
|
67
|
+
process.removeListener('uncaughtException', processErrorHandler);
|
|
68
|
+
process.removeListener('unhandledRejection', processErrorHandler);
|
|
60
69
|
const loadedModules = await client.modules.loadModules({
|
|
61
70
|
modules: client.modules.modules.toJSON(),
|
|
62
71
|
resolveCommands: true
|
|
63
72
|
});
|
|
64
73
|
client.modules.modules.sweep(m => !loadedModules.some(s => s.id == m.id));
|
|
74
|
+
let stopping = false;
|
|
65
75
|
const unloadModulesAndStopProcess = async (signal) => {
|
|
76
|
+
if (stopping)
|
|
77
|
+
return;
|
|
78
|
+
stopping = true;
|
|
66
79
|
await client.modules.unloadModules({
|
|
67
80
|
reason: 'ProcessExit',
|
|
68
81
|
modules: client.modules.modules.toJSON(),
|
|
69
82
|
removeCommandsFromClient: false,
|
|
70
83
|
removeFromModulesCollection: true
|
|
71
84
|
});
|
|
72
|
-
client.
|
|
85
|
+
client.destroy();
|
|
86
|
+
const signalString = signal === 'SIGINT' ? 'keyboard interrupt' : signal === 'SIGTERM' ? 'terminate' : String(signal);
|
|
87
|
+
client.logger?.warn(`Process exited: ${kleur.yellow(signalString)}`);
|
|
88
|
+
await setTimeout(10);
|
|
73
89
|
process.exit(0);
|
|
74
90
|
};
|
|
75
|
-
process.once('SIGINT',
|
|
76
|
-
process.once('SIGTERM',
|
|
77
|
-
|
|
91
|
+
process.once('SIGINT', signal => unloadModulesAndStopProcess(signal));
|
|
92
|
+
process.once('SIGTERM', signal => unloadModulesAndStopProcess(signal));
|
|
93
|
+
process.once('SIGHUP', signal => unloadModulesAndStopProcess(signal));
|
|
78
94
|
await client.commands.registerApplicationCommands();
|
|
79
|
-
client.logger?.warn(`Logged in as ${client.user
|
|
80
|
-
client.logger?.log(`Loaded ${client.commands.contextMenuCommands.size} context menu
|
|
81
|
-
client.logger?.log(`Loaded ${client.commands.messageCommands.size} message
|
|
82
|
-
client.logger?.log(`Loaded ${client.commands.slashCommands.size} slash
|
|
95
|
+
client.logger?.warn(`Logged in as ${kleur.bold().cyan(client.user.tag)} ${kleur.magenta('(' + client.user.id + ')')}`);
|
|
96
|
+
client.logger?.log(`Loaded ${client.commands.contextMenuCommands.size} context menu command(s)`);
|
|
97
|
+
client.logger?.log(`Loaded ${client.commands.messageCommands.size} message command(s)`);
|
|
98
|
+
client.logger?.log(`Loaded ${client.commands.slashCommands.size} slash command(s)`);
|
|
83
99
|
client.on('interactionCreate', interaction => {
|
|
84
100
|
if (interaction.isContextMenuCommand()) {
|
|
85
101
|
ContextMenuCommandBuilder.execute(client, interaction);
|
package/bin/bin.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bin.mjs","sourceRoot":"","sources":["../src/bin.mts"],"names":[],"mappings":";AAEA,OAAO,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC9H,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"bin.mjs","sourceRoot":"","sources":["../src/bin.mts"],"names":[],"mappings":"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"}
|
package/bin/utils/cli.js
CHANGED
|
@@ -21,6 +21,8 @@ exports.command = new commander_1.Command()
|
|
|
21
21
|
.option('--env <file>', '.env file location')
|
|
22
22
|
.option('--shardmode', 'Modifies some functionalities to support sharding')
|
|
23
23
|
.option('--setup', 'Create required config without starting the bot')
|
|
24
|
+
.option('--cache-config <file>', 'Add custom caching config')
|
|
25
|
+
.option('--sweeper-config <file>', 'Add custom sweeper config')
|
|
24
26
|
.allowUnknownOption(true);
|
|
25
27
|
exports.cli = {
|
|
26
28
|
get args() { return exports.command.args; },
|
package/bin/utils/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/utils/cli.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA8C;AAC9C,yCAAoC;AACpC,2BAAkC;AAClC,gDAAwB;AAExB,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;AAEpG,QAAA,OAAO,GAAG,IAAI,mBAAO,EAAE;KAC7B,IAAI,CAAC,SAAS,CAAC;KACf,WAAW,CAAC,WAAW,CAAC;KACxB,OAAO,CAAC,gBAAgB,OAAO,qBAAqB,oBAAW,EAAE,EAAE,eAAe,CAAC;KACnF,QAAQ,CAAC,OAAO,EAAE,sCAAsC,CAAC;KACzD,MAAM,CAAC,qBAAqB,EAAE,wBAAwB,CAAC;KACvD,MAAM,CAAC,oBAAoB,EAAE,4BAA4B,CAAC;KAC1D,MAAM,CAAC,iBAAiB,EAAE,mBAAmB,CAAC;KAC9C,MAAM,CAAC,WAAW,EAAE,2CAA2C,CAAC;KAChE,MAAM,CAAC,cAAc,EAAE,oBAAoB,CAAC;KAC5C,MAAM,CAAC,aAAa,EAAE,mDAAmD,CAAC;KAC1E,MAAM,CAAC,SAAS,EAAE,iDAAiD,CAAC;KACpE,kBAAkB,CAAC,IAAI,CAAC,CAAC;AAEjB,QAAA,GAAG,GAAG;IACf,IAAI,IAAI,KAAK,OAAO,eAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACnC,IAAI,OAAO,KAAK,OAAO,eAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACxC,IAAI,GAAG,KAAK,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;CAClF,CAAC;AAEF;;GAEG;AACU,QAAA,KAAK,GAAG,WAAG,CAAC,OAAO,CAAC;AAEjC;;GAEG;AACI,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,WAAG,CAAC,OAAO,CAAC;AAAhC,QAAA,WAAW,eAAqB;AAE7C;;GAEG;AACU,QAAA,GAAG,GAAG,WAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,cAAI,CAAC,OAAO,CAAC,WAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC"}
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/utils/cli.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA8C;AAC9C,yCAAoC;AACpC,2BAAkC;AAClC,gDAAwB;AAExB,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;AAEpG,QAAA,OAAO,GAAG,IAAI,mBAAO,EAAE;KAC7B,IAAI,CAAC,SAAS,CAAC;KACf,WAAW,CAAC,WAAW,CAAC;KACxB,OAAO,CAAC,gBAAgB,OAAO,qBAAqB,oBAAW,EAAE,EAAE,eAAe,CAAC;KACnF,QAAQ,CAAC,OAAO,EAAE,sCAAsC,CAAC;KACzD,MAAM,CAAC,qBAAqB,EAAE,wBAAwB,CAAC;KACvD,MAAM,CAAC,oBAAoB,EAAE,4BAA4B,CAAC;KAC1D,MAAM,CAAC,iBAAiB,EAAE,mBAAmB,CAAC;KAC9C,MAAM,CAAC,WAAW,EAAE,2CAA2C,CAAC;KAChE,MAAM,CAAC,cAAc,EAAE,oBAAoB,CAAC;KAC5C,MAAM,CAAC,aAAa,EAAE,mDAAmD,CAAC;KAC1E,MAAM,CAAC,SAAS,EAAE,iDAAiD,CAAC;KACpE,MAAM,CAAC,uBAAuB,EAAE,2BAA2B,CAAC;KAC5D,MAAM,CAAC,yBAAyB,EAAE,2BAA2B,CAAC;KAC9D,kBAAkB,CAAC,IAAI,CAAC,CAAC;AAEjB,QAAA,GAAG,GAAG;IACf,IAAI,IAAI,KAAK,OAAO,eAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACnC,IAAI,OAAO,KAAK,OAAO,eAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACxC,IAAI,GAAG,KAAK,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;CAClF,CAAC;AAEF;;GAEG;AACU,QAAA,KAAK,GAAG,WAAG,CAAC,OAAO,CAAC;AAEjC;;GAEG;AACI,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,WAAG,CAAC,OAAO,CAAC;AAAhC,QAAA,WAAW,eAAqB;AAE7C;;GAEG;AACU,QAAA,GAAG,GAAG,WAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,cAAI,CAAC,OAAO,CAAC,WAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC"}
|
package/bin/utils/logger.d.ts
CHANGED
|
@@ -3,4 +3,5 @@ import { Logger, LoggerLevel, PartialDeep } from 'fallout-utility';
|
|
|
3
3
|
import { RecipleClient } from '../';
|
|
4
4
|
export declare function formatLogMessage(message: string, logger: Logger, config: PartialDeep<IConfig['logger']>, level: LoggerLevel): string;
|
|
5
5
|
export declare function createLogger(config: PartialDeep<IConfig['logger']>): Logger;
|
|
6
|
+
export declare function quoteString(string: string, quote?: string): string;
|
|
6
7
|
export declare function eventLogger(client: RecipleClient): void;
|
package/bin/utils/logger.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.eventLogger = exports.createLogger = exports.formatLogMessage = void 0;
|
|
6
|
+
exports.eventLogger = exports.quoteString = exports.createLogger = exports.formatLogMessage = void 0;
|
|
7
7
|
const fallout_utility_1 = require("fallout-utility");
|
|
8
8
|
const cli_1 = require("./cli");
|
|
9
9
|
const path_1 = __importDefault(require("path"));
|
|
@@ -44,19 +44,23 @@ function createLogger(config) {
|
|
|
44
44
|
return logger;
|
|
45
45
|
}
|
|
46
46
|
exports.createLogger = createLogger;
|
|
47
|
+
function quoteString(string, quote = "'") {
|
|
48
|
+
return `${quote}${string}${quote}`;
|
|
49
|
+
}
|
|
50
|
+
exports.quoteString = quoteString;
|
|
47
51
|
function eventLogger(client) {
|
|
48
52
|
client.on('recipleDebug', debug => client.logger?.debug(debug));
|
|
49
|
-
client.modules.on('resolveModuleFileError', (file, error) => client.logger?.err(`Failed to resolve module
|
|
50
|
-
client.modules.on('preStartModule', (module_) => client.logger?.debug(`Starting module
|
|
51
|
-
client.modules.on('postStartModule', (module_) => client.logger?.log(`Started module
|
|
52
|
-
client.modules.on('startModuleFailed', (module_) => client.logger?.error(`Failed to
|
|
53
|
-
client.modules.on('startModuleError', (module_, err) => client.logger?.error(`An error occured while starting module
|
|
54
|
-
client.modules.on('preLoadModule', (module_) => client.logger?.debug(`Loading module
|
|
55
|
-
client.modules.on('postLoadModule', (module_) => client.logger?.log(`Loaded module
|
|
56
|
-
client.modules.on('loadModuleError', (module_, err) => client.logger?.error(`An error occured while loading module
|
|
57
|
-
client.modules.on('preUnloadModule', (module_) => client.logger?.debug(`Unloading module
|
|
58
|
-
client.modules.on('postUnloadModule', (module_) => client.logger?.log(`Unloaded module
|
|
59
|
-
client.modules.on('unloadModuleError', (module_, err) => client.logger?.error(`An error occured while unloading module
|
|
53
|
+
client.modules.on('resolveModuleFileError', (file, error) => client.logger?.err(`Failed to resolve module ${kleur_1.default.yellow(quoteString(file))}:`, error));
|
|
54
|
+
client.modules.on('preStartModule', (module_) => client.logger?.debug(`Starting module ${kleur_1.default.cyan(quoteString(module_.displayName))}`));
|
|
55
|
+
client.modules.on('postStartModule', (module_) => client.logger?.log(`Started module ${kleur_1.default.cyan(quoteString(module_.displayName))}`));
|
|
56
|
+
client.modules.on('startModuleFailed', (module_) => client.logger?.error(`Failed to start module ${kleur_1.default.yellow(quoteString(module_.displayName))}: ${kleur_1.default.red('Module returned false')}`));
|
|
57
|
+
client.modules.on('startModuleError', (module_, err) => client.logger?.error(`An error occured while starting module ${kleur_1.default.yellow(quoteString(module_.displayName))}:`, err));
|
|
58
|
+
client.modules.on('preLoadModule', (module_) => client.logger?.debug(`Loading module ${kleur_1.default.cyan(quoteString(module_.displayName))}`));
|
|
59
|
+
client.modules.on('postLoadModule', (module_) => client.logger?.log(`Loaded module ${kleur_1.default.cyan(quoteString(module_.displayName))}`));
|
|
60
|
+
client.modules.on('loadModuleError', (module_, err) => client.logger?.error(`An error occured while loading module ${kleur_1.default.yellow(quoteString(module_.displayName))}:`, err));
|
|
61
|
+
client.modules.on('preUnloadModule', (module_) => client.logger?.debug(`Unloading module ${kleur_1.default.cyan(quoteString(module_.displayName))}`));
|
|
62
|
+
client.modules.on('postUnloadModule', (module_) => client.logger?.log(`Unloaded module ${kleur_1.default.cyan(quoteString(module_.displayName))}`));
|
|
63
|
+
client.modules.on('unloadModuleError', (module_, err) => client.logger?.error(`An error occured while unloading module ${kleur_1.default.yellow(quoteString(module_.displayName))}:`, err));
|
|
60
64
|
client.on('recipleRegisterApplicationCommands', (commands, guild) => client.logger?.log(`Registered (${commands?.size || 0}) application commands ${guild ? 'to ' + guild : 'globally'}`));
|
|
61
65
|
}
|
|
62
66
|
exports.eventLogger = eventLogger;
|
package/bin/utils/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/utils/logger.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/utils/logger.ts"],"names":[],"mappings":"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"}
|
package/bin/utils/modules.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import { Awaitable } from 'fallout-utility';
|
|
2
2
|
import { IConfig } from '../classes/Config';
|
|
3
3
|
export declare function getModules(config: IConfig['modules'], filter?: (filename: string) => Awaitable<boolean>): Promise<string[]>;
|
|
4
|
+
export declare function getJsConfig<T>(file: string): Promise<T | undefined>;
|
package/bin/utils/modules.js
CHANGED
|
@@ -3,8 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.getModules = void 0;
|
|
6
|
+
exports.getJsConfig = exports.getModules = void 0;
|
|
7
7
|
const fs_1 = require("fs");
|
|
8
|
+
const client_1 = require("@reciple/client");
|
|
8
9
|
const micromatch_1 = __importDefault(require("micromatch"));
|
|
9
10
|
const cli_1 = require("./cli");
|
|
10
11
|
const path_1 = __importDefault(require("path"));
|
|
@@ -36,4 +37,9 @@ async function getModules(config, filter) {
|
|
|
36
37
|
return modules;
|
|
37
38
|
}
|
|
38
39
|
exports.getModules = getModules;
|
|
40
|
+
async function getJsConfig(file) {
|
|
41
|
+
file = path_1.default.resolve(path_1.default.isAbsolute(file) ? file : path_1.default.join(cli_1.cli.cwd, file));
|
|
42
|
+
return (0, client_1.recursiveDefaults)(await import(`file://${file}`));
|
|
43
|
+
}
|
|
44
|
+
exports.getJsConfig = getJsConfig;
|
|
39
45
|
//# sourceMappingURL=modules.js.map
|
package/bin/utils/modules.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modules.js","sourceRoot":"","sources":["../../src/utils/modules.ts"],"names":[],"mappings":";;;;;;AAAA,2BAAmE;
|
|
1
|
+
{"version":3,"file":"modules.js","sourceRoot":"","sources":["../../src/utils/modules.ts"],"names":[],"mappings":";;;;;;AAAA,2BAAmE;AACnE,4CAAoD;AAGpD,4DAAoC;AACpC,+BAA4B;AAC5B,gDAAwB;AAEjB,KAAK,UAAU,UAAU,CAAC,MAA0B,EAAE,MAAiD;IAC1G,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE5D,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,cAAc,EAAE;QACxC,MAAM,GAAG,GAAG,cAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,cAAI,CAAC,IAAI,CAAC,SAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAE1E,IAAI,gBAAgB,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,SAAG,CAAC,GAAG,EAAE,CAAC,EAAE;YAC5C,IAAI,cAAc,GAAG,MAAM,MAAM,CAAC,MAAM,EAAE;gBAClC,GAAG,EAAE,SAAG,CAAC,GAAG;gBACZ,eAAe,EAAE,IAAI;gBACrB,QAAQ,EAAE,IAAI;aACjB,CAAC,CAAC;YAEH,cAAc,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,oBAAU,CAAC,OAAO,CAAC,cAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;YAEvG,OAAO,CAAC,IAAI,CAAC,GAAG,MAAM,UAAU,CAAC;gBAC7B,GAAG,MAAM;gBACT,cAAc;aACjB,CAAC,CAAC,CAAC;YAEJ,SAAS;SACZ;QAED,IAAI,CAAC,IAAA,eAAU,EAAC,GAAG,CAAC;YAAE,IAAA,cAAS,EAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,IAAA,cAAS,EAAC,GAAG,CAAC,CAAC,WAAW,EAAE;YAAE,SAAS;QAE5C,MAAM,KAAK,GAAG,IAAA,gBAAW,EAAC,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,oBAAU,CAAC,OAAO,CAAC,cAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QACpI,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;KACzF;IAED,OAAO,OAAO,CAAC;AACnB,CAAC;AAhCD,gCAgCC;AAEM,KAAK,UAAU,WAAW,CAAI,IAAY;IAC7C,IAAI,GAAG,cAAI,CAAC,OAAO,CAAC,cAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,cAAI,CAAC,IAAI,CAAC,SAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;IAE7E,OAAO,IAAA,0BAAiB,EAAI,MAAM,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,CAAC;AAChE,CAAC;AAJD,kCAIC"}
|
package/package.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"description": "Reciple is a Discord.js bot framework",
|
|
4
4
|
"homepage": "https://reciple.js.org/docs/reciple",
|
|
5
5
|
"license": "GPL-3.0",
|
|
6
|
-
"version": "7.
|
|
6
|
+
"version": "7.6.1",
|
|
7
7
|
"main": "./bin/index.js",
|
|
8
8
|
"module": "./bin/esm.mjs",
|
|
9
9
|
"types": "./bin/index.d.ts",
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
"README.md"
|
|
38
38
|
],
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"@reciple/client": "^7.
|
|
40
|
+
"@reciple/client": "^7.5.0",
|
|
41
41
|
"commander": "^10.0.1",
|
|
42
42
|
"dotenv": "^16.0.3",
|
|
43
43
|
"fallout-utility": "^2.4.3",
|
|
@@ -59,5 +59,5 @@
|
|
|
59
59
|
"peerDependencies": {
|
|
60
60
|
"discord.js": "^14.7.1"
|
|
61
61
|
},
|
|
62
|
-
"gitHead": "
|
|
62
|
+
"gitHead": "86192f1167c39826f1ab3406f9bb3b176f2ba989"
|
|
63
63
|
}
|
package/static/config.yml
CHANGED
|
@@ -93,6 +93,13 @@ modules:
|
|
|
93
93
|
# If false, the client will still load unsupported modules
|
|
94
94
|
disableModuleVersionCheck: false
|
|
95
95
|
|
|
96
|
+
# Cooldown sweeper
|
|
97
|
+
cooldownSweeper:
|
|
98
|
+
# Enables cooldown sweeper
|
|
99
|
+
enabled: true
|
|
100
|
+
# Run sweeper every given milleseconds
|
|
101
|
+
interval: 3600000
|
|
102
|
+
|
|
96
103
|
# Discord.js client options
|
|
97
104
|
client:
|
|
98
105
|
intents:
|