Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(Message): added string type for message nonce #4782

Merged
merged 14 commits into from
Nov 22, 2020
Merged

feat(Message): added string type for message nonce #4782

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b7b802e
feat: nonce type is integer or string
wonderlandpark Sep 3, 2020
0f9c8f1
fix: error message
wonderlandpark Sep 3, 2020
a73ca31
feat: added number for message nonce
wonderlandpark Sep 3, 2020
148813b
docs: typo changes at Error Message
wonderlandpark Sep 3, 2020
fe13925
fix: for throwing 0
wonderlandpark Sep 3, 2020
03d4a4c
fix(Typing): added number type
wonderlandpark Sep 3, 2020
5714297
fix: throwing not integer
wonderlandpark Sep 3, 2020
60c78fd
fix: duped code
wonderlandpark Sep 3, 2020
2735604
Fix(Message): fixed type check logic
wonderlandpark Sep 21, 2020
7d5fd94
docs(Message): fixed type display in error message
wonderlandpark Sep 21, 2020
776586f
Merge branch 'master' into master
wonderlandpark Sep 21, 2020
3efbe0a
docs(Message): fixed eslint lint errors
wonderlandpark Sep 21, 2020
087a752
fix(APIMessage): fix eslint
wonderlandpark Sep 22, 2020
cb5db0b
typo(Errors): Fixed Typo error for Messages error
wonderlandpark Sep 26, 2020
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
2 changes: 1 addition & 1 deletion src/errors/Messages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const Messages = {
IMAGE_SIZE: size => `Invalid image size: ${size}`,

MESSAGE_BULK_DELETE_TYPE: 'The messages must be an Array, Collection, or number.',
MESSAGE_NONCE_TYPE: 'Message nonce must fit in an unsigned 64-bit integer.',
MESSAGE_NONCE_TYPE: 'Message nonce must be a number or a string.',
wonderlandpark marked this conversation as resolved.
Show resolved Hide resolved
wonderlandpark marked this conversation as resolved.
Show resolved Hide resolved

TYPING_COUNT: 'Count must be at least 1',

Expand Down
4 changes: 2 additions & 2 deletions src/structures/APIMessage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,8 @@ class APIMessage {

let nonce;
if (typeof this.options.nonce !== 'undefined') {
nonce = parseInt(this.options.nonce);
if (isNaN(nonce) || nonce < 0) throw new RangeError('MESSAGE_NONCE_TYPE');
nonce = typeof this.options.nonce === 'string' ? this.options.nonce : parseInt(this.options.nonce);
if (isNaN(nonce) && !nonce) throw new RangeError('MESSAGE_NONCE_TYPE');
wonderlandpark marked this conversation as resolved.
Show resolved Hide resolved
wonderlandpark marked this conversation as resolved.
Show resolved Hide resolved
}

const embedLikes = [];
Expand Down
6 changes: 3 additions & 3 deletions typings/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -999,7 +999,7 @@ declare module 'discord.js' {
public id: Snowflake;
public readonly member: GuildMember | null;
public mentions: MessageMentions;
public nonce: string | null;
public nonce: string | number | null;
wonderlandpark marked this conversation as resolved.
Show resolved Hide resolved
public readonly partial: false;
public readonly pinnable: boolean;
public pinned: boolean;
Expand Down Expand Up @@ -2808,7 +2808,7 @@ declare module 'discord.js' {

interface MessageOptions {
tts?: boolean;
nonce?: string;
nonce?: string | number;
content?: StringResolvable;
embed?: MessageEmbed | MessageEmbedOptions;
disableMentions?: 'none' | 'all' | 'everyone';
Expand Down Expand Up @@ -3164,7 +3164,7 @@ declare module 'discord.js' {
username?: string;
avatarURL?: string;
tts?: boolean;
nonce?: string;
nonce?: string | number;
embeds?: readonly (MessageEmbed | object)[];
disableMentions?: 'none' | 'all' | 'everyone';
allowedMentions?: MessageMentionOptions;
Expand Down