Skip to content
This repository has been archived by the owner on Dec 24, 2021. It is now read-only.

fix: replace resolveString with verifyString #402

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

fix: replace resolveString with verifyString #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b372e59
fix: replace resolveString with verifyString
monbrey Jun 4, 2021
152071c
fix: linting
monbrey Jun 4, 2021
e18983d
fix: straight swap, no extra features
monbrey Jun 4, 2021
ceea6c5
fix: dont copy paste things late at night
monbrey Jun 4, 2021
127cfb9
types: replace references to StringResolvable with string
monbrey Jun 9, 2021
937be2e
fix: destructure from util
monbrey Jun 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/extensions/message.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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');
Expand Down Expand Up @@ -283,7 +283,7 @@ module.exports = Structures.extend('Message', Message => {
}
}

content = resolveString(content);
content = verifyString(content);

switch(type) {
case 'plain':
Expand Down Expand Up @@ -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<Message|Message[]>}
*/
Expand All @@ -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<Message|Message[]>}
*/
Expand All @@ -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<Message|Message[]>}
*/
Expand All @@ -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<Message|Message[]>}
*/
Expand All @@ -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<Message|Message[]>}
*/
Expand All @@ -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<Message|Message[]>}
*/
Expand Down
4 changes: 0 additions & 4 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
14 changes: 7 additions & 7 deletions typings/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
Expand Down Expand Up @@ -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<CommandoMessage>;
public embed(embed: MessageEmbed, content?: StringResolvable, options?: (MessageOptions & { split: true | Exclude<MessageOptions['split'], boolean> }) | MessageAdditions): Promise<CommandoMessage[]>;
public embed(embed: MessageEmbed, content?: string, options?: (MessageOptions & { split?: false }) | MessageAdditions): Promise<CommandoMessage>;
public embed(embed: MessageEmbed, content?: string, options?: (MessageOptions & { split: true | Exclude<MessageOptions['split'], boolean> }) | MessageAdditions): Promise<CommandoMessage[]>;
public initCommand(command?: Command, argString?: string[], patternMatches?: string[]): this;
public parseArgs(): string | string[];
public replyEmbed: CommandoMessage['embed'];
public run(): Promise<null | CommandoMessage | CommandoMessage[]>;
public say(
content: StringResolvable | (MessageOptions & { split?: false }) | MessageAdditions,
content: string | (MessageOptions & { split?: false }) | MessageAdditions,
options?: (MessageOptions & { split?: false }) | MessageAdditions
): Promise<CommandoMessage>;
public say(
content: StringResolvable | (MessageOptions & { split: true | Exclude<MessageOptions['split'], boolean> }) | MessageAdditions,
content: string | (MessageOptions & { split: true | Exclude<MessageOptions['split'], boolean> }) | MessageAdditions,
options?: (MessageOptions & { split: true | Exclude<MessageOptions['split'], boolean> }) | MessageAdditions
): Promise<CommandoMessage[]>;
public usage(argString?: string, prefix?: string, user?: User): string;
Expand Down Expand Up @@ -486,15 +486,15 @@ 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;
type?: ResponseType;
}

interface RespondEditOptions {
content: StringResolvable | MessageEditOptions | Exclude<MessageAdditions, MessageAttachment>;
content: string | MessageEditOptions | Exclude<MessageAdditions, MessageAttachment>;
options?: MessageEditOptions | Exclude<MessageAdditions, MessageAttachment>;
type?: ResponseType;
}
Expand Down