rockcord 4.0.0-dev.5 → 4.0.0

package/src/client/voice/player/MediaPlayer.js

@@ -38,7 +38,20 @@ const FFMPEG_INPUT_PREFIX = [
   '4294',
 ];
 const FFMPEG_PCM_ARGUMENTS = ['-f', 's16le', '-ar', '48000', '-ac', '2'];
-const FFMPEG_VP8_ARGUMENTS = ['-f', 'ivf', '-deadline', 'realtime', '-c:v', 'libvpx'];
+const FFMPEG_VP8_ARGUMENTS = options => [
+  '-f',
+  'ivf',
+  '-deadline',
+  'realtime',
+  '-c:v',
+  'libvpx',
+  '-g',
+  String(Math.max(1, Math.round(options?.fps || 30))),
+  '-lag-in-frames',
+  '0',
+  '-auto-alt-ref',
+  '0',
+];
 const FFMPEG_H264_ARGUMENTS = options => [
   '-c:v',
   'libx264',
@@ -209,7 +222,7 @@ class MediaPlayer extends EventEmitter {
 
     // Get stream type
     if (this.voiceConnection.videoCodec === 'VP8') {
-      args.push(...FFMPEG_VP8_ARGUMENTS);
+      args.push(...FFMPEG_VP8_ARGUMENTS(options));
       // Remove  '-speed', '5' bc bad quality
     }
 
@@ -271,7 +284,6 @@ class MediaPlayer extends EventEmitter {
     return dispatcher;
   }
 
-  // eslint-disable-next-line no-unused-vars
   playAnnexBVideo(stream, options, streams, type) {
     this.destroyVideoDispatcher();
     let videoStream;
@@ -310,6 +322,7 @@ class MediaPlayer extends EventEmitter {
           streams,
           options?.fps,
         ));
+        dispatcher.configureCongestion(options);
         return dispatcher;
       }
       case 'H264': {
@@ -319,6 +332,7 @@ class MediaPlayer extends EventEmitter {
           streams,
           options?.fps,
         ));
+        dispatcher.configureCongestion(options);
         return dispatcher;
       }
       case 'H265': {
@@ -328,6 +342,7 @@ class MediaPlayer extends EventEmitter {
           streams,
           options?.fps,
         ));
+        dispatcher.configureCongestion(options);
         return dispatcher;
       }
       default: {

package/src/client/voice/player/processing/AnnexBNalSplitter.js

@@ -147,7 +147,6 @@ class AnnexBNalSplitter extends Transform {
     const newData = Buffer.allocUnsafe(data.length);
     let newLength = 0;
 
-    // eslint-disable-next-line no-constant-condition
     while (true) {
       const epbsPos = data.indexOf(epbPrefix);
       if (epbsPos === -1) {

package/src/client/voice/receiver/AudioJitter.js

@@ -49,10 +49,13 @@ class AudioJitter {
 
   _schedule() {
     if (this.timer || !this.packets.size) return;
-    this.timer = setTimeout(() => {
-      this.timer = null;
-      this._play();
-    }, Math.max(0, this.next - performance.now())).unref();
+    this.timer = setTimeout(
+      () => {
+        this.timer = null;
+        this._play();
+      },
+      Math.max(0, this.next - performance.now()),
+    ).unref();
   }
 
   _play() {

package/src/client/voice/receiver/PacketHandler.js

@@ -23,7 +23,7 @@ const UNPADDED_NONCE_LENGTH = 4;
 const AUTH_TAG_LENGTH = 16;
 
 class Readable extends require('stream').Readable {
-  _read() {} // eslint-disable-line no-empty-function
+  _read() {}
 }
 
 /**
@@ -40,6 +40,7 @@ class PacketHandler extends EventEmitter {
     this.speakingTimeouts = new Map();
     this.videoFrames = new VideoFrames();
     this.videoSequences = new Map();
+    this.videoPictures = new Map();
     this.audioJitters = new Map();
     this.recovery = this.connection._mediaRecovery = new MediaRecovery(this.connection);
   }
@@ -74,9 +75,10 @@ class PacketHandler extends EventEmitter {
     return stream;
   }
 
-  makeVideoStream(user, output) {
+  makeVideoStream(user, output, options = {}) {
     if (this.videoStreams.has(user)) return this.videoStreams.get(user);
     const stream = new Recorder(this, {
+      ...options,
       userId: user,
       output,
     });
@@ -251,7 +253,9 @@ class PacketHandler extends EventEmitter {
         if (!frame) return;
         this.receiver.emit('videoFrame', userStat, plain, codec);
         if (streamInfo) {
-          const payloads = packetize(plain, codec);
+          const picture = this.videoPictures.get(ssrc) ?? 0;
+          const payloads = packetize(plain, codec, 1200, picture);
+          this.videoPictures.set(ssrc, (picture + 1) & 0x7fff);
           let sequence = this.videoSequences.get(ssrc) ?? packet.header.sequenceNumber;
           for (let i = 0; i < payloads.length; i++) {
             streamInfo.feed(
@@ -307,7 +311,7 @@ class PacketHandler extends EventEmitter {
         packet.header.sequenceNumber = packet.payload.readUInt16BE();
         packet.header.payloadType = codec.payload_type;
         packet.payload = packet.payload.subarray(2);
-        this.recovery.receive(packet);
+        this.recovery.receive(packet, true);
         this.videoReceiver(userStat.primarySsrc, userStat, packet);
       } else if (userStat.kind === 'video') {
         this.recovery.receive(packet);
@@ -350,6 +354,7 @@ class PacketHandler extends EventEmitter {
     this.audioJitters.delete(ssrc);
     this.recovery.sources.delete(ssrc);
     this.videoSequences.delete(ssrc);
+    this.videoPictures.delete(ssrc);
     clearTimeout(this.speakingTimeouts.get(ssrc));
     this.speakingTimeouts.delete(ssrc);
     for (const key of this.videoFrames.frames.keys()) {
@@ -366,6 +371,7 @@ class PacketHandler extends EventEmitter {
     this.videoFrames.frames.clear();
     this.videoFrames.completed.clear();
     this.videoSequences.clear();
+    this.videoPictures.clear();
     for (const stream of this.streams.values()) {
       stream.stream.destroy();
     }

package/src/client/voice/receiver/Receiver.js

@@ -92,16 +92,18 @@ class VoiceReceiver extends EventEmitter {
   /**
    * Creates a new video receiving stream. If a stream already exists for a user, then that stream will be returned
    * rather than generating a new one.
-   * Records received H264 video and Opus audio using FFmpeg.
+   * Records received H264, H265 or VP8 video and Opus audio using FFmpeg.
    * Wait for `ready` before sending media and await `stop()` to finalize the output.
    * @param {UserResolvable} user The user to start listening to.
    * @param {WritableStream|string} output Output stream or file path to write the video stream to.
+   * @param {Object} [options] Recording options
+   * @param {VideoCodec} [options.codec='H264'] The codec sent by the recorded participant
    * @returns {Recorder} The video stream for the specified user.
    */
-  createVideoStream(user, output) {
+  createVideoStream(user, output, options = {}) {
     user = this.connection.client.users.resolve(user);
     if (!user) throw new Error('VOICE_USER_MISSING');
-    const stream = this.packets.makeVideoStream(user.id, output);
+    const stream = this.packets.makeVideoStream(user.id, output, options);
     this._updateVideoSubscriptions();
     stream.once('closed', () => this._updateVideoSubscriptions());
     return stream;

package/src/client/voice/receiver/Recorder.js

@@ -21,9 +21,12 @@ const { StreamOutput } = require('../util/Socket');
  * @extends {EventEmitter}
  */
 class Recorder extends EventEmitter {
-  constructor(receiver, { userId, portUdpH264, portUdpOpus, output } = {}) {
+  constructor(receiver, { userId, codec = 'H264', portUdpVideo, portUdpH264, portUdpOpus, output } = {}) {
     super();
 
+    if (!['H264', 'H265', 'VP8'].includes(codec)) throw new RangeError('Unsupported recording codec');
+    this.codec = codec;
+
     Object.defineProperty(this, 'receiver', { value: receiver });
 
     /**
@@ -32,16 +35,15 @@ class Recorder extends EventEmitter {
      */
     this.userId = userId;
 
-    this.portUdpH264 = portUdpH264 || null;
-    this.portUdpH265 = null;
+    this.portUdpVideo = (portUdpVideo ?? portUdpH264) || null;
     this.portUdpOpus = portUdpOpus || null;
 
     this.promise = null;
 
-    if (!portUdpH264 || !portUdpOpus) {
+    if (!this.portUdpVideo || !portUdpOpus) {
       this.promise = (async () => {
-        const selected = new Set([this.portUdpH264, this.portUdpOpus].filter(Boolean));
-        const missing = Number(!this.portUdpH264) + Number(!this.portUdpOpus);
+        const selected = new Set([this.portUdpVideo, this.portUdpOpus].filter(Boolean));
+        const missing = Number(!this.portUdpVideo) + Number(!this.portUdpOpus);
         const ports = [];
         for (let attempt = 0; ports.length < missing && attempt < 64; attempt++) {
           const port = await randomPort('udp4');
@@ -51,7 +53,7 @@ class Recorder extends EventEmitter {
           }
         }
         if (ports.length < missing) throw new Error('Could not allocate recording ports');
-        this.portUdpH264 ??= ports.shift();
+        this.portUdpVideo ??= ports.shift();
         this.portUdpOpus ??= ports.shift();
       })();
     }
@@ -88,10 +90,25 @@ class Recorder extends EventEmitter {
     if (this.destroyed) return;
     // Keep stdin available for FFmpeg's graceful quit command. Reading SDP from
     // stdin and closing it leaves no way to write the Matroska trailer on Windows.
-    const sdpData = Util.getSDPCodecName(this.portUdpH264, this.portUdpH265, this.portUdpOpus).replace(
-      /;sprop-parameter-sets=[^;\r\n]+/,
+    this.portUdpH264 = this.codec === 'H264' ? this.portUdpVideo : null;
+    this.portUdpH265 = this.codec === 'H265' ? this.portUdpVideo : null;
+    this.portUdpVP8 = this.codec === 'VP8' ? this.portUdpVideo : null;
+    const videoType = Util.getPayloadType(this.codec);
+    const opusType = Util.getPayloadType('opus');
+    const sdpData = [
+      'v=0',
+      'o=- 0 0 IN IP4 127.0.0.1',
+      's=Rockcord recording',
+      'c=IN IP4 127.0.0.1',
+      't=0 0',
+      `m=video ${this.portUdpVideo} RTP/AVP ${videoType}`,
+      `a=rtpmap:${videoType} ${this.codec}/90000`,
+      ...(this.codec === 'H264' ? [`a=fmtp:${videoType} packetization-mode=1`] : []),
+      `m=audio ${this.portUdpOpus} RTP/AVP ${opusType}`,
+      `a=rtpmap:${opusType} opus/48000/2`,
+      `a=fmtp:${opusType} minptime=10;useinbandfec=1`,
       '',
-    );
+    ].join('\r\n');
     this._directory = fs.mkdtempSync(path.join(os.tmpdir(), 'rockcord-recorder-'));
     this._sdpPath = path.join(this._directory, 'input.sdp');
     fs.writeFileSync(this._sdpPath, sdpData);
@@ -176,7 +193,7 @@ class Recorder extends EventEmitter {
         probe.bind(port, '127.0.0.1', () => probe.close(() => resolve(false)));
       });
     for (let attempt = 0; attempt < 120 && !this.destroyed; attempt++) {
-      const ports = await Promise.all([bound(this.portUdpH264), bound(this.portUdpOpus)]);
+      const ports = await Promise.all([bound(this.portUdpVideo), bound(this.portUdpOpus)]);
       if (ports.every(Boolean)) {
         this.ready = true;
         this.emit('ready', this);
@@ -206,15 +223,28 @@ class Recorder extends EventEmitter {
     const message = payload.serialize();
     // Get port from payloadType
     let port;
+    let kind;
     if (payload.header.payloadType === Util.getPayloadType('opus')) {
+      kind = 'audio';
       port = this.portUdpOpus;
       this._lastAudioHeader = payload.header;
-    } else if (payload.header.payloadType === Util.getPayloadType('H264')) {
-      port = this.portUdpH264;
+    } else if (payload.header.payloadType === Util.getPayloadType(this.codec)) {
+      kind = 'video';
+      port = this.portUdpVideo;
       this._lastVideoHeader = payload.header;
     } else {
       return;
     }
+    // FFmpeg's RTP probation starts at sequence zero. Normalize each new local
+    // source to one so the first keyframe's leading fragment is not discarded.
+    // Keep subsequent gaps and wrap intact, and never mutate the caller's packet.
+    const sourceKey = `_${kind}SequenceSource`;
+    const offsetKey = `_${kind}SequenceOffset`;
+    if (this[sourceKey] !== payload.header.ssrc) {
+      this[sourceKey] = payload.header.ssrc;
+      this[offsetKey] = 1 - payload.header.sequenceNumber;
+    }
+    message.writeUInt16BE((payload.header.sequenceNumber + this[offsetKey]) & 65535, 2);
     this.socket.send(message, 0, message.length, port, '127.0.0.1', callback);
   }
 
@@ -227,7 +257,7 @@ class Recorder extends EventEmitter {
       // RTCP BYE ends both local RTP inputs. Unlike an immediate quit, EOF lets
       // FFmpeg drain its parser and muxer, preserving the final buffered frame.
       for (const [port, ssrc] of [
-        [this.portUdpH264, this._lastVideoHeader?.ssrc ?? 1],
+        [this.portUdpVideo, this._lastVideoHeader?.ssrc ?? 1],
         [this.portUdpOpus, this._lastAudioHeader?.ssrc ?? 2],
       ]) {
         // Include an empty, padded reason: FFmpeg's RTP demuxer requires at

package/src/client/voice/util/PlayInterface.js

@@ -91,6 +91,8 @@ class PlayInterface {
    * Ex: ['-config1', 'value1', '-config2', 'value2']
    * @property {number|'auto'} [bitrate=2000] The bitrate (quality) of the video in kbps.
    * If set to 'auto', ffmpeg will automatically select
+   * @property {boolean|Object} [congestionControl=true] Enable loss-based AIMD video pacing.
+   * An object can set bitrate and minBitrate in kbps. Audio playback is unaffected.
    */
 
   /**

package/src/client/voice/util/Secretbox.js

@@ -56,7 +56,7 @@ async function importModule(name, usingImport = false) {
   for (const libName of Object.keys(libs)) {
     try {
       const lib = await importModule(libName);
-      if (libName === 'libsodium-wrappers' && lib.ready) await lib.ready; // eslint-disable-line no-await-in-loop
+      if (libName === 'libsodium-wrappers' && lib.ready) await lib.ready;
       exports.methods = libs[libName](lib);
       break;
     } catch {} // eslint-disable-line no-empty

package/src/client/websocket/WebSocketShard.js

@@ -605,7 +605,6 @@ class WebSocketShard extends EventEmitter {
       }
 
       this.debug(
-        // eslint-disable-next-line max-len
         `[WebSocket] Close Emitted: ${this.closeEmitted} | did not close properly, assuming a zombie connection.\nEmitting close and reconnecting again.`,
       );
 

package/src/managers/ApplicationCommandManager.js

@@ -55,12 +55,10 @@ class ApplicationCommandManager extends CachedManager {
    * @typedef {ApplicationCommand|Snowflake} ApplicationCommandResolvable
    */
 
-  /* eslint-disable max-len */
   /**
    * Data that resolves to the data of an ApplicationCommand
    * @typedef {ApplicationCommandData|APIApplicationCommand|SlashCommandBuilder|ContextMenuCommandBuilder} ApplicationCommandDataResolvable
    */
-  /* eslint-enable max-len */
 
   /**
    * Options used to fetch data from Discord

package/src/managers/ApplicationCommandPermissionsManager.js

@@ -410,7 +410,6 @@ class ApplicationCommandPermissionsManager extends BaseManager {
 
 module.exports = ApplicationCommandPermissionsManager;
 
-/* eslint-disable max-len */
 /**
  * @external APIApplicationCommandPermissions
  * @see {@link https://discord.com/developers/docs/interactions/application-commands#application-command-permissions-object-application-command-permissions-structure}

package/src/managers/GuildChannelManager.js

@@ -58,7 +58,7 @@ class GuildChannelManager extends CachedManager {
   get channelCountWithoutThreads() {
     return this.cache.reduce((acc, channel) => {
       if (ThreadChannelTypes.includes(channel.type)) return acc;
-      return ++acc;
+      return acc + 1;
     }, 0);
   }
 
@@ -155,7 +155,7 @@ class GuildChannelManager extends CachedManager {
   ) {
     parent &&= this.client.channels.resolveId(parent);
     permissionOverwrites &&= permissionOverwrites.map(o => PermissionOverwrites.resolve(o, this.guild));
-    const intType = typeof type === 'number' ? type : ChannelTypes[type] ?? ChannelTypes.GUILD_TEXT;
+    const intType = typeof type === 'number' ? type : (ChannelTypes[type] ?? ChannelTypes.GUILD_TEXT);
 
     const videoMode = typeof videoQualityMode === 'number' ? videoQualityMode : VideoQualityModes[videoQualityMode];
 
@@ -167,7 +167,6 @@ class GuildChannelManager extends CachedManager {
     if (intType === ChannelTypes.GUILD_STORE && !storeChannelDeprecationEmitted) {
       storeChannelDeprecationEmitted = true;
       process.emitWarning(
-        // eslint-disable-next-line max-len
         'Creating store channels is deprecated by Discord and will stop working in March 2022. Check the docs for more info.',
         'DeprecationWarning',
       );

package/src/managers/GuildMemberManager.js

@@ -1,4 +1,3 @@
-/* eslint-disable newline-per-chained-call */
 'use strict';
 
 const { Buffer } = require('node:buffer');

package/src/managers/GuildTextThreadManager.js

@@ -75,7 +75,7 @@ class GuildTextThreadManager extends ThreadManager {
       if (!startMessageId) throw new TypeError('INVALID_TYPE', 'startMessage', 'MessageResolvable');
       path = path.messages(startMessageId);
     } else if (this.channel.type !== 'GUILD_NEWS') {
-      resolvedType = typeof type === 'string' ? ChannelTypes[type] : type ?? resolvedType;
+      resolvedType = typeof type === 'string' ? ChannelTypes[type] : (type ?? resolvedType);
     }
 
     if (autoArchiveDuration === 'MAX') autoArchiveDuration = resolveAutoArchiveMaxLimit(this.channel.guild);

package/src/managers/MessageManager.js

@@ -139,16 +139,17 @@ class MessageManager extends CachedManager {
 
     const preserveAttachments =
       (options instanceof MessagePayload ? options.options : options)?.attachments === undefined;
-    const { data, files } = await (options instanceof MessagePayload
-      ? options
-      : MessagePayload.create(message instanceof Message ? message : this, options)
+    const { data, files } = await (
+      options instanceof MessagePayload
+        ? options
+        : MessagePayload.create(message instanceof Message ? message : this, options)
     )
       .resolveData()
       .resolveFiles();
 
     if (files.length && preserveAttachments) {
       const original =
-        message instanceof Message ? message : this.cache.get(messageId) ?? (await this.fetch(messageId));
+        message instanceof Message ? message : (this.cache.get(messageId) ?? (await this.fetch(messageId)));
       data.attachments = [...original.attachments.values()].map(attachment => ({ id: attachment.id }));
     }
     data.attachments = await Util.resolveUploadedAttachments(this.client, this.channel.id, files, data.attachments);
@@ -221,7 +222,6 @@ class MessageManager extends CachedManager {
       ? `${emoji.animated ? 'a:' : ''}${emoji.name}:${emoji.id}`
       : encodeURIComponent(emoji.name);
 
-    // eslint-disable-next-line newline-per-chained-call
     await this.client.api
       .channels(this.channel.id)
       .messages(message)

package/src/managers/RoleManager.js

@@ -72,7 +72,7 @@ class RoleManager extends CachedManager {
     const data = await this.client.api.guilds(this.guild.id).roles.get();
     const roles = new Collection();
     for (const role of data) roles.set(role.id, this._add(role, cache));
-    return id ? roles.get(id) ?? null : roles;
+    return id ? (roles.get(id) ?? null) : roles;
   }
 
   /**

package/src/rest/APIRequest.js

@@ -106,7 +106,6 @@ class APIRequest {
           body.append('payload_json', JSON.stringify(this.options.data));
         }
       }
-      // eslint-disable-next-line eqeqeq
     } else if (this.options.data != null) {
       if (this.options.usePayloadJSON) {
         body = new FormData();

package/src/rest/APIRouter.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const noop = () => {}; // eslint-disable-line no-empty-function
+const noop = () => {};
 const methods = ['get', 'post', 'delete', 'patch', 'put'];
 const reflectors = [
   'toString',
@@ -43,7 +43,7 @@ function buildRoute(manager) {
       return new Proxy(noop, handler);
     },
     apply(target, _, args) {
-      route.push(...args.filter(x => x != null)); // eslint-disable-line eqeqeq
+      route.push(...args.filter(x => x != null));
       return new Proxy(noop, handler);
     },
   };

package/src/rest/DiscordAPIError.js

@@ -11,7 +11,7 @@ class DiscordAPIError extends Error {
     super();
     const flattened = this.constructor.flattenErrors(error.errors ?? error).join('\n');
     this.name = 'DiscordAPIError';
-    this.message = error.message && flattened ? `${error.message}\n${flattened}` : error.message ?? flattened;
+    this.message = error.message && flattened ? `${error.message}\n${flattened}` : (error.message ?? flattened);
 
     /**
      * The HTTP method used for the request

package/src/rest/RequestHandler.js

@@ -154,7 +154,7 @@ class RequestHandler {
       }
 
       // Decide before allocating a delay: a rejected limit must not leave an unused promise/timer.
-      await this.onRateLimit(request, limit, timeout, isGlobal); // eslint-disable-line no-await-in-loop
+      await this.onRateLimit(request, limit, timeout, isGlobal);
 
       if (isGlobal) {
         // If this is the first task to reach the global timeout, set the global delay
@@ -168,7 +168,7 @@ class RequestHandler {
       }
 
       // Wait for the timeout to expire in order to avoid an actual 429
-      await delayPromise; // eslint-disable-line no-await-in-loop
+      await delayPromise;
     }
 
     // As the request goes out, update the global usage information
@@ -378,7 +378,7 @@ class RequestHandler {
     rqToken : [REDACTED]`,
           );
           const solved = await this.manager.client.options.captchaSolver(data, request.fullUserAgent);
-          const captcha = typeof solved === 'string' ? solved : solved?.token ?? solved?.data;
+          const captcha = typeof solved === 'string' ? solved : (solved?.token ?? solved?.data);
           if (typeof captcha !== 'string' || !captcha) throw new Error('Captcha solver must return a non-empty token');
           this.manager.client.emit(
             DEBUG,

package/src/sharding/ShardingManager.js

@@ -218,7 +218,7 @@ class ShardingManager extends EventEmitter {
       const shard = this.createShard(shardId);
       promises.push(shard.spawn(timeout));
       if (delay > 0 && this.shards.size !== this.shardList.length) promises.push(sleep(delay));
-      await Promise.all(promises); // eslint-disable-line no-await-in-loop
+      await Promise.all(promises);
     }
 
     return this.shards;
@@ -310,7 +310,7 @@ class ShardingManager extends EventEmitter {
     for (const shard of this.shards.values()) {
       const promises = [shard.respawn({ delay: respawnDelay, timeout })];
       if (++s < this.shards.size && shardDelay > 0) promises.push(sleep(shardDelay));
-      await Promise.all(promises); // eslint-disable-line no-await-in-loop
+      await Promise.all(promises);
     }
     return this.shards;
   }

package/src/structures/ApplicationCommand.js

@@ -121,7 +121,6 @@ class ApplicationCommand extends Base {
       this.options ??= [];
     }
 
-    /* eslint-disable max-len */
     if ('default_permission' in data) {
       /**
        * Whether the command is enabled by default when the app is added to a guild
@@ -130,7 +129,6 @@ class ApplicationCommand extends Base {
        */
       this.defaultPermission = data.default_permission;
     }
-    /* eslint-disable max-len */
 
     if ('default_member_permissions' in data) {
       /**
@@ -307,7 +305,6 @@ class ApplicationCommand extends Base {
     return this.edit({ descriptionLocalizations });
   }
 
-  /* eslint-disable max-len */
   /**
    * Edits the default permission of this ApplicationCommand
    * @param {boolean} [defaultPermission=true] The default permission for this command
@@ -317,7 +314,6 @@ class ApplicationCommand extends Base {
   setDefaultPermission(defaultPermission = true) {
     return this.edit({ defaultPermission });
   }
-  /* eslint-enable max-len */
 
   /**
    * Edits the default member permissions of this ApplicationCommand
@@ -568,9 +564,9 @@ class ApplicationCommand extends Base {
       options: option.options?.map(o => this.transformOption(o, received)),
       [channelTypesKey]: received
         ? option.channel_types?.map(type => ChannelTypes[type])
-        : option.channelTypes?.map(type => (typeof type === 'string' ? ChannelTypes[type] : type)) ??
+        : (option.channelTypes?.map(type => (typeof type === 'string' ? ChannelTypes[type] : type)) ??
           // When transforming to API data, accept API data
-          option.channel_types,
+          option.channel_types),
       [minValueKey]: option.minValue ?? option.min_value,
       [maxValueKey]: option.maxValue ?? option.max_value,
       [minLengthKey]: option.minLength ?? option.min_length,
@@ -581,7 +577,6 @@ class ApplicationCommand extends Base {
 
 module.exports = ApplicationCommand;
 
-/* eslint-disable max-len */
 /**
  * @external APIApplicationCommand
  * @see {@link https://discord.com/developers/docs/interactions/application-commands#application-command-object-application-command-structure}

package/src/structures/BaseCommandInteraction.js

@@ -189,7 +189,7 @@ class BaseCommandInteraction extends Interaction {
   }
 
   // These are here only for documentation purposes - they are implemented by InteractionResponses
-  /* eslint-disable no-empty-function */
+
   deferReply() {}
   reply() {}
   fetchReply() {}
@@ -204,7 +204,6 @@ InteractionResponses.applyToClass(BaseCommandInteraction, ['deferUpdate', 'updat
 
 module.exports = BaseCommandInteraction;
 
-/* eslint-disable max-len */
 /**
  * @external APIInteractionDataResolved
  * @see {@link https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-object-resolved-data-structure}

package/src/structures/BaseGuildTextChannel.js

@@ -173,7 +173,7 @@ class BaseGuildTextChannel extends GuildChannel {
   }
 
   // These are here only for documentation purposes - they are implemented by TextBasedChannel
-  /* eslint-disable no-empty-function */
+
   get lastMessage() {}
   get lastPinAt() {}
   send() {}

package/src/structures/BaseGuildVoiceChannel.js

@@ -224,7 +224,7 @@ class BaseGuildVoiceChannel extends GuildChannel {
   }
 
   // These are here only for documentation purposes - they are implemented by TextBasedChannel
-  /* eslint-disable no-empty-function */
+
   get lastMessage() {}
   send() {}
   sendTyping() {}

package/src/structures/ClientPresence.js

@@ -70,7 +70,6 @@ class ClientPresence extends Presence {
 
 module.exports = ClientPresence;
 
-/* eslint-disable max-len */
 /**
  * @external APIPresence
  * @see {@link https://discord.com/developers/docs/rich-presence/how-to#updating-presence-update-presence-payload-fields}

package/src/structures/ClientUser.js

@@ -15,11 +15,19 @@ const Util = require('../util/Util');
  */
 class ClientUser extends User {
   #packageName = null;
-  #intervalSamsungPresence = setInterval(() => {
-    this.client.emit('debug', `[UPDATE] Samsung Presence: ${this.#packageName}`);
-    if (!this.#packageName) return;
-    this.setSamsungActivity(this.#packageName, 'UPDATE');
-  }, 1000 * 60 * 10).unref();
+  #intervalSamsungPresence = setInterval(
+    () => {
+      this.client.emit('debug', `[UPDATE] Samsung Presence: ${this.#packageName}`);
+      if (!this.#packageName) return;
+      this.setSamsungActivity(this.#packageName, 'UPDATE').catch(error => this.client.emit('debug', error));
+    },
+    1000 * 60 * 10,
+  ).unref();
+
+  _stopSamsungPresence() {
+    clearInterval(this.#intervalSamsungPresence);
+    this.#packageName = null;
+  }
 
   _patch(data) {
     super._patch(data);

package/src/structures/ContainerComponent.js

@@ -49,7 +49,7 @@ class ContainerComponent extends BaseMessageComponent {
   get hexAccentColor() {
     return typeof this.accentColor === 'number'
       ? `#${this.accentColor.toString(16).padStart(6, '0')}`
-      : this.accentColor ?? null;
+      : (this.accentColor ?? null);
   }
 
   /**