Skip to content

Commit

Permalink
feat(ClientOptions): allow setting default allowedMentions (discordjs…
Browse files Browse the repository at this point in the history
…#4085)

* feat(ClientOptions): add default allowedMentions

* feat(ClientOptions): use default allowedMentions when not provided

* Update src/structures/APIMessage.js

Co-Authored-By: SpaceEEC <spaceeec@yahoo.com>

* Update src/structures/APIMessage.js

Co-Authored-By: SpaceEEC <spaceeec@yahoo.com>

* fix(ClientOptions): default allowedMentions should be undefined

Co-authored-by: SpaceEEC <spaceeec@yahoo.com>
  • Loading branch information
monbrey and SpaceEEC authored Apr 17, 2020
1 parent a88b723 commit 7c6000c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/structures/APIMessage.js
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,11 @@ class APIMessage {
flags = this.options.flags != null ? new MessageFlags(this.options.flags).bitfield : this.target.flags.bitfield;
}

const allowedMentions =
typeof this.options.allowedMentions === 'undefined'
? this.target.client.options.allowedMentions
: this.options.allowedMentions;

this.data = {
content,
tts,
Expand All @@ -184,7 +189,7 @@ class APIMessage {
embeds,
username,
avatar_url: avatarURL,
allowed_mentions: this.options.allowedMentions,
allowed_mentions: allowedMentions,
flags,
};
return this;
Expand Down
1 change: 1 addition & 0 deletions src/util/Constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ const browser = (exports.browser = typeof window !== 'undefined');
* @property {boolean} [fetchAllMembers=false] Whether to cache all guild members and users upon startup, as well as
* upon joining a guild (should be avoided whenever possible)
* @property {DisableMentionType} [disableMentions='none'] Default value for {@link MessageOptions#disableMentions}
* @property {MessageMentionOptions} [allowedMentions] Default value for {@link MessageOptions#allowedMentions}
* @property {PartialType[]} [partials] Structures allowed to be partial. This means events can be emitted even when
* they're missing all the data for a particular structure. See the "Partials" topic listed in the sidebar for some
* important usage information, as partials require you to put checks in place when handling data.
Expand Down
1 change: 1 addition & 0 deletions typings/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2233,6 +2233,7 @@ declare module 'discord.js' {
messageSweepInterval?: number;
fetchAllMembers?: boolean;
disableMentions?: 'none' | 'all' | 'everyone';
allowedMentions?: MessageMentionOptions;
partials?: PartialTypes[];
restWsBridgeTimeout?: number;
restTimeOffset?: number;
Expand Down

0 comments on commit 7c6000c

Please sign in to comment.