diff --git a/src/structures/ClientPresence.js b/src/structures/ClientPresence.js index 9b0217deb..0a1e45c16 100644 --- a/src/structures/ClientPresence.js +++ b/src/structures/ClientPresence.js @@ -49,10 +49,10 @@ class ClientPresence extends Presence { if (activities?.length) { for (const [i, activity] of activities.entries()) { if (typeof activity.name !== 'string') throw new TypeError('INVALID_TYPE', `activities[${i}].name`, 'string'); - + activity.type ??= ActivityTypes.PLAYING; - if (activity.type === ActivityType.CUSTOM && !activity.state) { + if (activity.type === ActivityTypes.CUSTOM && !activity.state) { activity.state = activity.name; activity.name = 'Custom Status'; } @@ -69,7 +69,7 @@ class ClientPresence extends Presence { ...this.activities.map(a => ({ name: a.name, type: ActivityTypes[a.type], - state: activity.state ?? undefined, + state: a.state ?? undefined, url: a.url ?? undefined, })), ); diff --git a/src/structures/Role.js b/src/structures/Role.js index 793633cb9..b4e85b815 100644 --- a/src/structures/Role.js +++ b/src/structures/Role.js @@ -4,8 +4,8 @@ const process = require('node:process'); const Base = require('./Base'); const { Error } = require('../errors'); const Permissions = require('../util/Permissions'); -const SnowflakeUtil = require('../util/SnowflakeUtil'); const RoleFlags = require('../util/RoleFlags'); +const SnowflakeUtil = require('../util/SnowflakeUtil'); let deprecationEmittedForComparePositions = false; diff --git a/src/util/AttachmentFlags.js b/src/util/AttachmentFlags.js index 3295ba1b9..fa9435156 100644 --- a/src/util/AttachmentFlags.js +++ b/src/util/AttachmentFlags.js @@ -15,6 +15,7 @@ class AttachmentFlags extends BitField {} * @param {BitFieldResolvable} [bits=0] Bit(s) to read from */ +/* eslint-disable max-len */ /** * Numeric guild member flags. All available properties: * * `IS_REMIX` diff --git a/typings/index.d.ts b/typings/index.d.ts index ac06046d7..2317322e2 100644 --- a/typings/index.d.ts +++ b/typings/index.d.ts @@ -1572,27 +1572,27 @@ export class LimitedCollection extends Collection { public static filterByLifetime(options?: LifetimeFilterOptions): SweepFilter; } -export type MessageCollectorOptionsParams = - | { - componentType?: T; - } & MessageComponentCollectorOptions[T]>; +export type MessageCollectorOptionsParams< + T extends MessageComponentTypeResolvable, + Cached extends boolean = boolean, +> = { + componentType?: T; +} & MessageComponentCollectorOptions[T]>; export type MessageChannelCollectorOptionsParams< T extends MessageComponentTypeResolvable, Cached extends boolean = boolean, -> = - | { - componentType?: T; - } & MessageChannelComponentCollectorOptions[T]>; +> = { + componentType?: T; +} & MessageChannelComponentCollectorOptions[T]>; export type AwaitMessageCollectorOptionsParams< T extends MessageComponentTypeResolvable, Cached extends boolean = boolean, -> = - | { componentType?: T } & Pick< - InteractionCollectorOptions[T]>, - keyof AwaitMessageComponentOptions - >; +> = { componentType?: T } & Pick< + InteractionCollectorOptions[T]>, + keyof AwaitMessageComponentOptions +>; export interface StringMappedInteractionTypes { BUTTON: ButtonInteraction; @@ -1737,8 +1737,7 @@ export class AttachmentFlags extends BitField { public static resolve(bit?: BitFieldResolvable): number; } -export type AttachmentFlagsString = - | 'IS_REMIX'; +export type AttachmentFlagsString = 'IS_REMIX'; export class MessageButton extends BaseMessageComponent { public constructor(data?: MessageButton | MessageButtonOptions | APIButtonComponent); @@ -2209,8 +2208,7 @@ export class RoleFlags extends BitField { public static resolve(bit?: BitFieldResolvable): number; } -export type RoleFlagsString = - | 'IN_PROMPT'; +export type RoleFlagsString = 'IN_PROMPT'; export class SelectMenuInteraction extends MessageComponentInteraction { public constructor(client: Client, data: RawMessageSelectMenuInteractionData);