diff --git a/package.json b/package.json index 2efef48..9cd9007 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "axios": "^0.19.0", "body-parser": "^1.19.0", "eris": "^0.11.2", - "eris-pagination": "bsian03/eris-pagination", + "eris-pagination": "bsian03/eris-pagination#dev", "express": "^4.17.1", "fs-extra": "^8.1.0", "helmet": "^3.21.2", diff --git a/src/commands/cwg_data.ts b/src/commands/cwg_data.ts index 79e5b6c..58c947f 100644 --- a/src/commands/cwg_data.ts +++ b/src/commands/cwg_data.ts @@ -48,7 +48,7 @@ export default class CWG_Data extends Command { }); this.client.signale.log(embeds); if (embeds.length === 1) return message.channel.createMessage({ embed: embeds[0] }); - return createPaginationEmbed(message, this.client, embeds, {}); + return createPaginationEmbed(message, embeds); } catch (error) { return this.client.util.handleError(error, message, this); } diff --git a/src/commands/help.ts b/src/commands/help.ts index ac915e1..e28b118 100644 --- a/src/commands/help.ts +++ b/src/commands/help.ts @@ -41,7 +41,7 @@ export default class Help extends Command { return cmdPages.push(embed); }); if (cmdPages.length === 1) return message.channel.createMessage({ embed: cmdPages[0] }); - return createPaginationEmbed(message, this.client, cmdPages); + return createPaginationEmbed(message, cmdPages); } const resolved = await this.client.util.resolveCommand(args, message); if (!resolved) return message.channel.createMessage(`${this.client.stores.emojis.error} **Command not found!**`); diff --git a/src/commands/modlogs.ts b/src/commands/modlogs.ts index fd974ed..da620c2 100644 --- a/src/commands/modlogs.ts +++ b/src/commands/modlogs.ts @@ -55,7 +55,7 @@ export default class Modlogs extends Command { if (embeds.length === 1) { msg.edit({ content: '', embed: embeds[0] }); } else { - createPaginationEmbed(message, this.client, embeds, {}, msg); + createPaginationEmbed(message, embeds, {}); } return msg; } catch (error) { diff --git a/src/commands/securesign_account.ts b/src/commands/securesign_account.ts index 0ec1efc..e520df2 100644 --- a/src/commands/securesign_account.ts +++ b/src/commands/securesign_account.ts @@ -9,7 +9,7 @@ export default class SecureSign_Account extends Command { this.name = 'account'; this.description = 'Provides SecureSign account details for currently logged in user'; this.usage = `${this.client.config.prefix}securesign account`; - this.enabled = true; + this.enabled = false; this.guildOnly = false; } diff --git a/src/commands/securesign_createcrt.ts b/src/commands/securesign_createcrt.ts index 9b34e0b..655921b 100644 --- a/src/commands/securesign_createcrt.ts +++ b/src/commands/securesign_createcrt.ts @@ -15,7 +15,6 @@ export default class SecureSign_Init extends Command { public async run(message: Message, args: string[]) { try { - return; const account = await this.client.db.Account.findOne({ userID: message.author.id }); if (!account) return message.channel.createMessage(`${this.client.stores.emojis.error} ***Account not found***`); if (!account.hash) return message.channel.createMessage(`${this.client.stores.emojis.error} ***Account not initialized***`); diff --git a/tsconfig.json b/tsconfig.json index 32e6546..10493bf 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,7 +4,7 @@ // "incremental": true, /* Enable incremental compilation */ "target": "ES2020", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */ "module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */ - "lib": ["ESNext", "ES2020", "ES2019.Object"], /* Specify library files to be included in the compilation. */ + "lib": ["ES2019.Object", "ES2020.Promise"], /* Specify library files to be included in the compilation. */ // "allowJs": true, /* Allow javascript files to be compiled. */ // "checkJs": true, /* Report errors in .js files. */ // "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */ diff --git a/types/global.d.ts b/types/global.d.ts deleted file mode 100644 index 04a9dd5..0000000 --- a/types/global.d.ts +++ /dev/null @@ -1,31 +0,0 @@ - -interface PromiseFulfilledResult { - status: 'fulfilled'; - value: T; -} - -interface PromiseRejectedResult { - status: 'rejected'; - reason: any; -} - -type PromiseSettledResult = PromiseFulfilledResult | PromiseRejectedResult; - -interface PromiseConstructor { - /** - * Creates a Promise that is resolved with an array of results when all - * of the provided Promises resolve or reject. - * @param values An array of Promises. - * @returns A new Promise. - */ - allSettled(values: T): - Promise<{ -readonly [P in keyof T]: PromiseSettledResult ? U : T[P]> }>; - - /** - * Creates a Promise that is resolved with an array of results when all - * of the provided Promises resolve or reject. - * @param values An array of Promises. - * @returns A new Promise. - */ - allSettled(values: Iterable): Promise ? U : T>[]>; -}