diff --git a/src/extensions/message.js b/src/extensions/message.js index 077af915..bdf5ac44 100644 --- a/src/extensions/message.js +++ b/src/extensions/message.js @@ -1,4 +1,4 @@ -const { Structures, escapeMarkdown, splitMessage, resolveString } = require('discord.js'); +const { Structures, Util: { escapeMarkdown, splitMessage, verifyString } } = require('discord.js'); const { oneLine } = require('common-tags'); const Command = require('../commands/base'); const FriendlyError = require('../errors/friendly'); @@ -283,7 +283,7 @@ module.exports = Structures.extend('Message', Message => { } } - content = resolveString(content); + content = verifyString(content); switch(type) { case 'plain': @@ -363,7 +363,7 @@ module.exports = Structures.extend('Message', Message => { /** * Responds with a plain message - * @param {StringResolvable} content - Content for the message + * @param {string} content - Content for the message * @param {MessageOptions} [options] - Options for the message * @return {Promise} */ @@ -377,7 +377,7 @@ module.exports = Structures.extend('Message', Message => { /** * Responds with a reply message - * @param {StringResolvable} content - Content for the message + * @param {string} content - Content for the message * @param {MessageOptions} [options] - Options for the message * @return {Promise} */ @@ -391,7 +391,7 @@ module.exports = Structures.extend('Message', Message => { /** * Responds with a direct message - * @param {StringResolvable} content - Content for the message + * @param {string} content - Content for the message * @param {MessageOptions} [options] - Options for the message * @return {Promise} */ @@ -406,7 +406,7 @@ module.exports = Structures.extend('Message', Message => { /** * Responds with a code message * @param {string} lang - Language for the code block - * @param {StringResolvable} content - Content for the message + * @param {string} content - Content for the message * @param {MessageOptions} [options] - Options for the message * @return {Promise} */ @@ -423,7 +423,7 @@ module.exports = Structures.extend('Message', Message => { /** * Responds with an embed * @param {RichEmbed|Object} embed - Embed to send - * @param {StringResolvable} [content] - Content for the message + * @param {string} [content] - Content for the message * @param {MessageOptions} [options] - Options for the message * @return {Promise} */ @@ -436,7 +436,7 @@ module.exports = Structures.extend('Message', Message => { /** * Responds with a mention + embed * @param {RichEmbed|Object} embed - Embed to send - * @param {StringResolvable} [content] - Content for the message + * @param {string} [content] - Content for the message * @param {MessageOptions} [options] - Options for the message * @return {Promise} */ diff --git a/src/index.js b/src/index.js index 3f5c05a8..647185bb 100644 --- a/src/index.js +++ b/src/index.js @@ -85,10 +85,6 @@ module.exports = { * @external Role * @see {@link https://discord.js.org/#/docs/main/master/class/Role} */ -/** - * @external StringResolvable - * @see {@link https://discord.js.org/#/docs/main/master/typedef/StringResolvable} - */ /** * @external TextChannel * @see {@link https://discord.js.org/#/docs/main/master/class/TextChannel} diff --git a/typings/index.d.ts b/typings/index.d.ts index cf8092b3..255edcaa 100644 --- a/typings/index.d.ts +++ b/typings/index.d.ts @@ -1,5 +1,5 @@ declare module 'discord.js-commando' { - import { Client, ClientEvents, ClientOptions, Collection, Guild, GuildResolvable, Message, MessageAttachment, MessageEditOptions, MessageEmbed, MessageOptions, MessageAdditions, MessageReaction, PermissionResolvable, PermissionString, StringResolvable, User, UserResolvable } from 'discord.js'; + import { Client, ClientEvents, ClientOptions, Collection, Guild, GuildResolvable, Message, MessageAttachment, MessageEditOptions, MessageEmbed, MessageOptions, MessageAdditions, MessageReaction, PermissionResolvable, PermissionString, User, UserResolvable } from 'discord.js'; export class Argument { private constructor(client: CommandoClient, info: ArgumentInfo); @@ -172,18 +172,18 @@ declare module 'discord.js-commando' { public anyUsage(argString?: string, prefix?: string, user?: User): string; public code: CommandoMessage['say']; public direct: CommandoMessage['say']; - public embed(embed: MessageEmbed, content?: StringResolvable, options?: (MessageOptions & { split?: false }) | MessageAdditions): Promise; - public embed(embed: MessageEmbed, content?: StringResolvable, options?: (MessageOptions & { split: true | Exclude }) | MessageAdditions): Promise; + public embed(embed: MessageEmbed, content?: string, options?: (MessageOptions & { split?: false }) | MessageAdditions): Promise; + public embed(embed: MessageEmbed, content?: string, options?: (MessageOptions & { split: true | Exclude }) | MessageAdditions): Promise; public initCommand(command?: Command, argString?: string[], patternMatches?: string[]): this; public parseArgs(): string | string[]; public replyEmbed: CommandoMessage['embed']; public run(): Promise; public say( - content: StringResolvable | (MessageOptions & { split?: false }) | MessageAdditions, + content: string | (MessageOptions & { split?: false }) | MessageAdditions, options?: (MessageOptions & { split?: false }) | MessageAdditions ): Promise; public say( - content: StringResolvable | (MessageOptions & { split: true | Exclude }) | MessageAdditions, + content: string | (MessageOptions & { split: true | Exclude }) | MessageAdditions, options?: (MessageOptions & { split: true | Exclude }) | MessageAdditions ): Promise; public usage(argString?: string, prefix?: string, user?: User): string; @@ -486,7 +486,7 @@ declare module 'discord.js-commando' { type ResponseType = 'reply' | 'plain' | 'direct' | 'code'; interface RespondOptions { - content: StringResolvable | MessageOptions; + content: string | MessageOptions; fromEdit?: boolean; options?: MessageOptions; lang?: string; @@ -494,7 +494,7 @@ declare module 'discord.js-commando' { } interface RespondEditOptions { - content: StringResolvable | MessageEditOptions | Exclude; + content: string | MessageEditOptions | Exclude; options?: MessageEditOptions | Exclude; type?: ResponseType; }