Skip to content

Commit 42bc5d2

Browse files
almeidxJiralitekodiakhq[bot]
authored
fix: invert deletable message types list (#10093)
* fix: invert deletable message types list * docs: consistency Co-authored-by: Jiralite <[email protected]> --------- Co-authored-by: Jiralite <[email protected]> Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
1 parent f691658 commit 42bc5d2

File tree

3 files changed

+33
-2
lines changed

3 files changed

+33
-2
lines changed

packages/discord.js/src/structures/Message.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const { Sticker } = require('./Sticker');
2222
const { DiscordjsError, ErrorCodes } = require('../errors');
2323
const ReactionManager = require('../managers/ReactionManager');
2424
const { createComponent } = require('../util/Components');
25-
const { NonSystemMessageTypes, MaxBulkDeletableMessageAge, DeletableMessageTypes } = require('../util/Constants');
25+
const { NonSystemMessageTypes, MaxBulkDeletableMessageAge, UndeletableMessageTypes } = require('../util/Constants');
2626
const MessageFlagsBitField = require('../util/MessageFlagsBitField');
2727
const PermissionsBitField = require('../util/PermissionsBitField');
2828
const { cleanContent, resolvePartialEmoji, transformResolved } = require('../util/Util');
@@ -635,7 +635,7 @@ class Message extends Base {
635635
* @readonly
636636
*/
637637
get deletable() {
638-
if (!DeletableMessageTypes.includes(this.type)) return false;
638+
if (UndeletableMessageTypes.includes(this.type)) return false;
639639

640640
if (!this.guild) {
641641
return this.author.id === this.client.user.id;

packages/discord.js/src/util/Constants.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,25 @@ exports.SelectMenuTypes = [
155155
ComponentType.ChannelSelect,
156156
];
157157

158+
/**
159+
* The types of messages that cannot be deleted. The available types are:
160+
* * {@link MessageType.RecipientAdd}
161+
* * {@link MessageType.RecipientRemove}
162+
* * {@link MessageType.Call}
163+
* * {@link MessageType.ChannelNameChange}
164+
* * {@link MessageType.ChannelIconChange}
165+
* * {@link MessageType.ThreadStarterMessage}
166+
* @typedef {MessageType[]} UndeletableMessageTypes
167+
*/
168+
exports.UndeletableMessageTypes = [
169+
MessageType.RecipientAdd,
170+
MessageType.RecipientRemove,
171+
MessageType.Call,
172+
MessageType.ChannelNameChange,
173+
MessageType.ChannelIconChange,
174+
MessageType.ThreadStarterMessage,
175+
];
176+
158177
/**
159178
* The types of messages that can be deleted. The available types are:
160179
* * {@link MessageType.AutoModerationAction}
@@ -179,6 +198,7 @@ exports.SelectMenuTypes = [
179198
* * {@link MessageType.ThreadCreated}
180199
* * {@link MessageType.UserJoin}
181200
* @typedef {MessageType[]} DeletableMessageTypes
201+
* @deprecated This list will no longer be updated. Use {@link UndeletableMessageTypes} instead.
182202
*/
183203
exports.DeletableMessageTypes = [
184204
MessageType.AutoModerationAction,

packages/discord.js/typings/index.d.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3672,6 +3672,15 @@ export type NonSystemMessageType =
36723672
| MessageType.ChatInputCommand
36733673
| MessageType.ContextMenuCommand;
36743674

3675+
export type UndeletableMessageType =
3676+
| MessageType.RecipientAdd
3677+
| MessageType.RecipientRemove
3678+
| MessageType.Call
3679+
| MessageType.ChannelNameChange
3680+
| MessageType.ChannelIconChange
3681+
| MessageType.ThreadStarterMessage;
3682+
3683+
/** @deprecated This type will no longer be updated. Use {@link UndeletableMessageType} instead. */
36753684
export type DeletableMessageType =
36763685
| MessageType.AutoModerationAction
36773686
| MessageType.ChannelFollowAdd
@@ -3704,6 +3713,8 @@ export const Constants: {
37043713
ThreadChannelTypes: ThreadChannelType[];
37053714
VoiceBasedChannelTypes: VoiceBasedChannelTypes[];
37063715
SelectMenuTypes: SelectMenuType[];
3716+
UndeletableMessageTypes: UndeletableMessageType[];
3717+
/** @deprecated This list will no longer be updated. Use {@link Constants.UndeletableMessageTypes} instead. */
37073718
DeletableMessageTypes: DeletableMessageType[];
37083719
StickerFormatExtensionMap: Record<StickerFormatType, ImageFormat>;
37093720
};

0 commit comments

Comments
 (0)