Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-15 02:53:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(Message): #system non-zero message types are not guaranteed to be system (#5108)

Browse Source 
* fix(Message): #system not all nonzero message types are system

* feat(Message): introduce system message types

* refactor(Constants): change SystemMessageTypes to be exclusionary

* fix(Constants): only need to check if type exists

Co-authored-by: Jan <66554238+Vaporox@users.noreply.github.com>

* fix(Constants): lint

* fix(Typings): add SystemMessageTypees to Constants

Co-authored-by: Jan <66554238+Vaporox@users.noreply.github.com>
This commit is contained in:
X-Classified
2020-12-12 13:40:39 -08:00
committed by GitHub
parent 5b51392724
commit bb78120283
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/structures/Message.js
View File

@@ -10,7 +10,7 @@ const ReactionCollector = require('./ReactionCollector');
const { Error, TypeError } = require('../errors'); const { Error, TypeError } = require('../errors');
const ReactionManager = require('../managers/ReactionManager'); const ReactionManager = require('../managers/ReactionManager');
const Collection = require('../util/Collection'); const Collection = require('../util/Collection');
const { MessageTypes } = require('../util/Constants'); const { MessageTypes, SystemMessageTypes } = require('../util/Constants');
const MessageFlags = require('../util/MessageFlags'); const MessageFlags = require('../util/MessageFlags');
const Permissions = require('../util/Permissions'); const Permissions = require('../util/Permissions');
const SnowflakeUtil = require('../util/Snowflake'); const SnowflakeUtil = require('../util/Snowflake');
@@ -62,7 +62,7 @@ class Message extends Base {
* Whether or not this message was sent by Discord, not actually a user (e.g. pin notifications) * Whether or not this message was sent by Discord, not actually a user (e.g. pin notifications)
* @type {?boolean} * @type {?boolean}
*/ */
this.system = data.type !== 0; this.system = SystemMessageTypes.includes(this.type);
} else if (typeof this.type !== 'string') { } else if (typeof this.type !== 'string') {
this.system = null; this.system = null;
this.type = null; this.type = null;

8
src/util/Constants.js
View File

@@ -429,6 +429,14 @@ exports.MessageTypes = [
'REPLY', 'REPLY',
]; ];
/**
* The types of messages that are `System`. The available types are `MessageTypes` excluding:
* * DEFAULT
* * REPLY
* @typedef {string} SystemMessageType
*/
exports.SystemMessageTypes = exports.MessageTypes.filter(type => type && type !== 'DEFAULT' && type !== 'REPLY');
/** /**
* <info>Bots cannot set a `CUSTOM_STATUS`, it is only for custom statuses received from users</info> * <info>Bots cannot set a `CUSTOM_STATUS`, it is only for custom statuses received from users</info>
* The type of an activity of a users presence, e.g. `PLAYING`. Here are the available types: * The type of an activity of a users presence, e.g. `PLAYING`. Here are the available types:

3
typings/index.d.ts vendored
View File

@@ -516,6 +516,7 @@ declare module 'discord.js' {
BIG: 2; BIG: 2;
}; };
MessageTypes: MessageType[]; MessageTypes: MessageType[];
SystemMessageTypes: SystemMessageType[];
ActivityTypes: ActivityType[]; ActivityTypes: ActivityType[];
ExplicitContentFilterLevels: ExplicitContentFilterLevel[]; ExplicitContentFilterLevels: ExplicitContentFilterLevel[];
DefaultMessageNotifications: DefaultMessageNotifications[]; DefaultMessageNotifications: DefaultMessageNotifications[];
@@ -3147,6 +3148,8 @@ declare module 'discord.js' {
type SystemChannelFlagsResolvable = BitFieldResolvable<SystemChannelFlagsString>; type SystemChannelFlagsResolvable = BitFieldResolvable<SystemChannelFlagsString>;
type SystemMessageType = Exclude<MessageType, 'DEFAULT' | 'REPLY'>;
type TargetUser = number; type TargetUser = number;
interface TypingData { interface TypingData {