oceanic.js 1.10.1-dev.97cef9c → 1.10.1-dev.9b37972

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oceanic.js",
-    "version": "1.10.1-dev.97cef9c",
+    "version": "1.10.1-dev.9b37972",
     "description": "A NodeJS library for interfacing with Discord.",
     "main": "./dist/lib/index.js",
     "types": "./dist/lib/index.d.ts",
@@ -44,14 +44,14 @@
     "devDependencies": {
         "@favware/npm-deprecate": "^1.0.7",
         "@mxssfd/typedoc-theme": "^1.1.3",
-        "@types/node": "^20.11.16",
+        "@types/node": "^20.12.2",
         "@types/pako": "^2.0.3",
         "@types/ws": "^8.5.10",
-        "@typescript-eslint/eslint-plugin": "^6.20.0",
+        "@typescript-eslint/eslint-plugin": "^7.0.0",
         "@typescript-eslint/parser": "^6.21.0",
         "eslint": "^8.57.0",
         "eslint-plugin-import": "^2.29.1",
-        "eslint-plugin-import-newlines": "^1.3.4",
+        "eslint-plugin-import-newlines": "^1.4.0",
         "eslint-plugin-jsdoc": "^48.0.4",
         "eslint-plugin-json": "^3.1.0",
         "eslint-plugin-prefer-arrow": "^1.2.3",
@@ -63,7 +63,7 @@
         "typedoc-plugin-mdn-links": "^3.1.19",
         "typedoc-plugin-merge-modules": "^5.1.0",
         "typescript": "^5.3.3",
-        "undici-types": "^6.9.0"
+        "undici-types": "~6.9.0"
     },
     "dependencies": {
         "tslib": "^2.6.2",

package/esm.mjs

@@ -49,6 +49,7 @@ const PartialApplication = (await import("./dist/lib/structures/PartialApplicati
 const Permission = (await import("./dist/lib/structures/Permission.js")).default.default;
 const PermissionOverwrite = (await import("./dist/lib/structures/PermissionOverwrite.js")).default.default;
 const PingInteraction = (await import("./dist/lib/structures/PingInteraction.js")).default.default;
+const Poll = (await import("./dist/lib/structures/Poll.js")).default.default;
 const PrivateChannel = (await import("./dist/lib/structures/PrivateChannel.js")).default.default;
 const PrivateThreadChannel = (await import("./dist/lib/structures/PrivateThreadChannel.js")).default.default;
 const PublicThreadChannel = (await import("./dist/lib/structures/PublicThreadChannel.js")).default.default;
@@ -134,6 +135,7 @@ export {
     Permission,
     PermissionOverwrite,
     PingInteraction,
+    Poll,
     PrivateChannel,
     PrivateThreadChannel,
     PublicThreadChannel,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oceanic.js",
-  "version": "1.10.1-dev.97cef9c",
+  "version": "1.10.1-dev.9b37972",
   "description": "A NodeJS library for interfacing with Discord.",
   "main": "./dist/lib/index.js",
   "types": "./dist/lib/index.d.ts",
@@ -44,14 +44,14 @@
   "devDependencies": {
     "@favware/npm-deprecate": "^1.0.7",
     "@mxssfd/typedoc-theme": "^1.1.3",
-    "@types/node": "^20.11.16",
+    "@types/node": "^20.12.2",
     "@types/pako": "^2.0.3",
     "@types/ws": "^8.5.10",
-    "@typescript-eslint/eslint-plugin": "^6.20.0",
+    "@typescript-eslint/eslint-plugin": "^7.0.0",
     "@typescript-eslint/parser": "^6.21.0",
     "eslint": "^8.57.0",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-import-newlines": "^1.3.4",
+    "eslint-plugin-import-newlines": "^1.4.0",
     "eslint-plugin-jsdoc": "^48.0.4",
     "eslint-plugin-json": "^3.1.0",
     "eslint-plugin-prefer-arrow": "^1.2.3",
@@ -63,7 +63,7 @@
     "typedoc-plugin-mdn-links": "^3.1.19",
     "typedoc-plugin-merge-modules": "^5.1.0",
     "typescript": "^5.3.3",
-    "undici-types": "^6.9.0"
+    "undici-types": "~6.9.0"
   },
   "dependencies": {
     "tslib": "^2.6.2",

package/dist/lib/Client.d.ts

@@ -1,91 +0,0 @@
-/** @module Client */
-import RESTManager from "./rest/RESTManager";
-import TypedCollection from "./util/TypedCollection";
-import PrivateChannel from "./structures/PrivateChannel";
-import GroupChannel from "./structures/GroupChannel";
-import User from "./structures/User";
-import Guild from "./structures/Guild";
-import type { AnyChannel, RawGroupChannel, RawPrivateChannel } from "./types/channels";
-import type { RawGuild, RawUnavailableGuild } from "./types/guilds";
-import type { RawUser } from "./types/users";
-import type { ClientInstanceOptions, ClientOptions } from "./types/client";
-import TypedEmitter from "./util/TypedEmitter";
-import type ClientApplication from "./structures/ClientApplication";
-import ShardManager from "./gateway/ShardManager";
-import type { BotActivity, SendStatuses } from "./types/gateway";
-import UnavailableGuild from "./structures/UnavailableGuild";
-import type ExtendedUser from "./structures/ExtendedUser";
-import Util from "./util/Util";
-import type { ClientEvents } from "./types/events";
-import type { JoinVoiceChannelOptions } from "./types/voice";
-import type { DiscordGatewayAdapterLibraryMethods, VoiceConnection } from "@discordjs/voice";
-/** The primary class for interfacing with Discord. See {@link ClientEvents | Client Events} for a list of events. */
-export default class Client<E extends ClientEvents = ClientEvents> extends TypedEmitter<E> {
-    private _application?;
-    private _user?;
-    channelGuildMap: Record<string, string>;
-    groupChannels: TypedCollection<RawGroupChannel, GroupChannel>;
-    guildShardMap: Record<string, number>;
-    guilds: TypedCollection<RawGuild, Guild, [rest?: boolean]>;
-    options: ClientInstanceOptions;
-    privateChannels: TypedCollection<RawPrivateChannel, PrivateChannel>;
-    ready: boolean;
-    rest: RESTManager;
-    shards: ShardManager;
-    startTime: number;
-    threadGuildMap: Record<string, string>;
-    unavailableGuilds: TypedCollection<RawUnavailableGuild, UnavailableGuild>;
-    users: TypedCollection<RawUser, User>;
-    util: Util;
-    voiceAdapters: Map<string, DiscordGatewayAdapterLibraryMethods>;
-    /**
-     * @constructor
-     * @param options The options to create the client with.
-     */
-    constructor(options?: ClientOptions);
-    /** The client's partial application. This will throw an error if not using a gateway connection or no shard is READY. If using a client for rest only, consider enabling rest mode. */
-    get application(): ClientApplication;
-    get uptime(): number;
-    /** The client's user. This will throw an error if not using a gateway connection or no shard is READY. If using a client for rest only, consider enabling rest mode. */
-    get user(): ExtendedUser;
-    /** The active voice connections of this client. */
-    get voiceConnections(): Map<string, VoiceConnection>;
-    /** Connect the client to Discord. */
-    connect(): Promise<void>;
-    /**
-     * Disconnect all shards.
-     * @param reconnect If shards should be reconnected. Defaults to {@link Types/Gateway~GatewayOptions#autoReconnect | GatewayOptions#autoReconnect}
-     */
-    disconnect(reconnect?: boolean): void;
-    /**
-     * Edit the client's status across all shards.
-     * @param status The status.
-     * @param activities An array of activities.
-     */
-    editStatus(status: SendStatuses, activities?: Array<BotActivity>): Promise<void>;
-    /**
-     * Get a channel from an ID. This will return undefined if the channel is not cached.
-     * @param channelID The id of the channel.
-     */
-    getChannel<T extends AnyChannel = AnyChannel>(channelID: string): T | undefined;
-    /**
-     * Get a voice connection.
-     * @param guildID The ID of the guild the voice channel belongs to.
-     */
-    getVoiceConnection(guildID: string): VoiceConnection | undefined;
-    /**
-     * Join a voice channel.
-     * @param options The options to join the channel with.
-     * */
-    joinVoiceChannel(options: JoinVoiceChannelOptions): VoiceConnection;
-    /**
-     * Leave a voice channel.
-     * @param guildID The ID of the guild the voice channel belongs to.
-     */
-    leaveVoiceChannel(guildID: string): void;
-    /**
-     * Initialize this client for rest only use. Currently, this sets both the `application` and `user` properties (if not already present), as would happen with a gateway connection.
-     * @param fakeReady If the client should emit a ready event. Defaults to true.
-     */
-    restMode(fakeReady?: boolean): Promise<this>;
-}

package/dist/lib/Client.js

@@ -1,254 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-/** @module Client */
-const RESTManager_1 = tslib_1.__importDefault(require("./rest/RESTManager"));
-const TypedCollection_1 = tslib_1.__importDefault(require("./util/TypedCollection"));
-const PrivateChannel_1 = tslib_1.__importDefault(require("./structures/PrivateChannel"));
-const GroupChannel_1 = tslib_1.__importDefault(require("./structures/GroupChannel"));
-const User_1 = tslib_1.__importDefault(require("./structures/User"));
-const Guild_1 = tslib_1.__importDefault(require("./structures/Guild"));
-const TypedEmitter_1 = tslib_1.__importDefault(require("./util/TypedEmitter"));
-const ShardManager_1 = tslib_1.__importDefault(require("./gateway/ShardManager"));
-const UnavailableGuild_1 = tslib_1.__importDefault(require("./structures/UnavailableGuild"));
-const Util_1 = tslib_1.__importDefault(require("./util/Util"));
-const Errors_1 = require("./util/Errors");
-// @ts-ignore
-let DiscordJSVoice;
-try {
-    DiscordJSVoice = require("@discordjs/voice");
-}
-catch { }
-/* eslint-enable @typescript-eslint/ban-ts-comment, @typescript-eslint/no-redundant-type-constituents, @typescript-eslint/no-var-requires, @typescript-eslint/no-unsafe-assignment, unicorn/prefer-module */
-/** The primary class for interfacing with Discord. See {@link ClientEvents | Client Events} for a list of events. */
-class Client extends TypedEmitter_1.default {
-    _application;
-    _user;
-    channelGuildMap;
-    groupChannels;
-    guildShardMap;
-    guilds;
-    options;
-    privateChannels;
-    ready;
-    rest;
-    shards;
-    startTime = 0;
-    threadGuildMap;
-    unavailableGuilds;
-    users;
-    util;
-    voiceAdapters;
-    /**
-     * @constructor
-     * @param options The options to create the client with.
-     */
-    constructor(options) {
-        super();
-        this.util = new Util_1.default(this);
-        const disableCache = options?.disableCache === true || options?.disableCache === "no-warning";
-        const colZero = {
-            auditLogEntries: 0,
-            autoModerationRules: 0,
-            channels: 0,
-            emojis: 0,
-            groupChannels: 0,
-            guilds: 0,
-            guildThreads: 0,
-            integrations: 0,
-            invites: 0,
-            members: 0,
-            messages: 0,
-            privateChannels: 0,
-            roles: 0,
-            scheduledEvents: 0,
-            stageInstances: 0,
-            stickers: 0,
-            unavailableGuilds: 0,
-            users: 0,
-            voiceMembers: 0,
-            voiceStates: 0
-        };
-        this.options = {
-            allowedMentions: options?.allowedMentions ?? {
-                everyone: false,
-                repliedUser: false,
-                users: true,
-                roles: true
-            },
-            auth: options?.auth ?? null,
-            collectionLimits: disableCache ? colZero : {
-                auditLogEntries: this.util._setLimit(options?.collectionLimits?.auditLogEntries, 50),
-                autoModerationRules: this.util._setLimit(options?.collectionLimits?.autoModerationRules, Infinity),
-                channels: this.util._setLimit(options?.collectionLimits?.channels, Infinity),
-                emojis: this.util._setLimit(options?.collectionLimits?.emojis, Infinity),
-                groupChannels: options?.collectionLimits?.groupChannels ?? 10,
-                guilds: options?.collectionLimits?.guilds ?? Infinity,
-                guildThreads: this.util._setLimit(options?.collectionLimits?.guildThreads, Infinity),
-                integrations: this.util._setLimit(options?.collectionLimits?.integrations, Infinity),
-                invites: this.util._setLimit(options?.collectionLimits?.invites, Infinity),
-                members: this.util._setLimit(options?.collectionLimits?.members, Infinity),
-                messages: this.util._setLimit(options?.collectionLimits?.messages, 100),
-                privateChannels: options?.collectionLimits?.privateChannels ?? 25,
-                roles: this.util._setLimit(options?.collectionLimits?.roles, Infinity),
-                scheduledEvents: this.util._setLimit(options?.collectionLimits?.scheduledEvents, Infinity),
-                stageInstances: this.util._setLimit(options?.collectionLimits?.stageInstances, Infinity),
-                stickers: this.util._setLimit(options?.collectionLimits?.stickers, Infinity),
-                unavailableGuilds: options?.collectionLimits?.unavailableGuilds ?? Infinity,
-                users: options?.collectionLimits?.users ?? Infinity,
-                voiceMembers: this.util._setLimit(options?.collectionLimits?.voiceMembers, Infinity),
-                voiceStates: this.util._setLimit(options?.collectionLimits?.voiceStates, Infinity)
-            },
-            defaultImageFormat: options?.defaultImageFormat ?? "png",
-            defaultImageSize: options?.defaultImageSize ?? 4096,
-            disableMemberLimitScaling: options?.disableMemberLimitScaling ?? false,
-            restMode: false,
-            disableCache
-        };
-        if (options?.disableCache === true) {
-            process.emitWarning("Enabling the disableCache option is not recommended. This will break many aspects of the library, as it is not designed to function without cache.", {
-                code: "OCEANIC_CACHE_DISABLED",
-                detail: "Set the disableCache option to the literal string \"no-warning\" to disable this warning."
-            });
-        }
-        if (disableCache && options?.collectionLimits !== undefined && JSON.stringify(options.collectionLimits) !== JSON.stringify(colZero)) {
-            process.emitWarning("Providing the collectionsLimit option when the disableCache option has been enabled is redundant. Any provided values will be ignored.", {
-                code: "OCEANIC_COLLECTIONS_LIMIT_WITH_CACHE_DISABLED",
-                detail: "Remove the collectionsLimit option, or zero out all of the possible options to disable this warning."
-            });
-        }
-        this.voiceAdapters = new Map();
-        this.channelGuildMap = {};
-        this.groupChannels = new TypedCollection_1.default(GroupChannel_1.default, this, this.options.collectionLimits.groupChannels);
-        this.guilds = new TypedCollection_1.default(Guild_1.default, this, this.options.collectionLimits.guilds);
-        this.privateChannels = new TypedCollection_1.default(PrivateChannel_1.default, this, this.options.collectionLimits.privateChannels);
-        this.ready = false;
-        this.guildShardMap = {};
-        this.rest = new RESTManager_1.default(this, options?.rest);
-        this.shards = new ShardManager_1.default(this, options?.gateway);
-        this.threadGuildMap = {};
-        this.unavailableGuilds = new TypedCollection_1.default(UnavailableGuild_1.default, this, this.options.collectionLimits.unavailableGuilds);
-        this.users = new TypedCollection_1.default(User_1.default, this, this.options.collectionLimits.users);
-    }
-    /** The client's partial application. This will throw an error if not using a gateway connection or no shard is READY. If using a client for rest only, consider enabling rest mode. */
-    get application() {
-        if (this._application) {
-            return this._application;
-        }
-        else {
-            throw new Errors_1.UncachedError(`${this.constructor.name}#application is not present if not using a gateway connection or no shard is READY. Consider making sure you have connected your client, or enable rest mode.`);
-        }
-    }
-    get uptime() {
-        return this.startTime ? Date.now() - this.startTime : 0;
-    }
-    /** The client's user. This will throw an error if not using a gateway connection or no shard is READY. If using a client for rest only, consider enabling rest mode. */
-    get user() {
-        if (this._user) {
-            return this._user;
-        }
-        else {
-            throw new Errors_1.UncachedError(`${this.constructor.name}#user is not present if not using a gateway connection or no shard is READY. Consider making sure you have connected your client, or enable rest mode.`);
-        }
-    }
-    /** The active voice connections of this client. */
-    get voiceConnections() {
-        if (!DiscordJSVoice) {
-            throw new Errors_1.DependencyError("Voice is only supported with @discordjs/voice installed.");
-        }
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access
-        return DiscordJSVoice.getVoiceConnections();
-    }
-    /** Connect the client to Discord. */
-    async connect() {
-        if (this.options.restMode) {
-            throw new TypeError("Rest mode has been enabled on this client. You cannot connect to the gateway.");
-        }
-        if (!this.options.auth || !this.options.auth.startsWith("Bot ")) {
-            throw new TypeError("You must provide a bot token to connect. Make sure it has been prefixed with `Bot `.");
-        }
-        await this.shards.connect();
-    }
-    /**
-     * Disconnect all shards.
-     * @param reconnect If shards should be reconnected. Defaults to {@link Types/Gateway~GatewayOptions#autoReconnect | GatewayOptions#autoReconnect}
-     */
-    disconnect(reconnect = this.shards.options.autoReconnect) {
-        return this.shards.disconnect(reconnect);
-    }
-    /**
-     * Edit the client's status across all shards.
-     * @param status The status.
-     * @param activities An array of activities.
-     */
-    async editStatus(status, activities = []) {
-        for (const [, shard] of this.shards)
-            await shard.editStatus(status, activities);
-    }
-    /**
-     * Get a channel from an ID. This will return undefined if the channel is not cached.
-     * @param channelID The id of the channel.
-     */
-    getChannel(channelID) {
-        if (this.channelGuildMap[channelID]) {
-            return this.guilds.get(this.channelGuildMap[channelID])?.channels.get(channelID);
-        }
-        else if (this.threadGuildMap[channelID]) {
-            return this.guilds.get(this.threadGuildMap[channelID])?.threads.get(channelID);
-        }
-        return (this.privateChannels.get(channelID) ?? this.groupChannels.get(channelID));
-    }
-    /**
-     * Get a voice connection.
-     * @param guildID The ID of the guild the voice channel belongs to.
-     */
-    getVoiceConnection(guildID) {
-        if (!DiscordJSVoice) {
-            throw new Errors_1.DependencyError("Voice is only supported with @discordjs/voice installed.");
-        }
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
-        return DiscordJSVoice.getVoiceConnection(guildID);
-    }
-    /**
-     * Join a voice channel.
-     * @param options The options to join the channel with.
-     * */
-    joinVoiceChannel(options) {
-        if (!DiscordJSVoice) {
-            throw new Errors_1.DependencyError("Voice is only supported with @discordjs/voice installed.");
-        }
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access
-        return DiscordJSVoice.joinVoiceChannel({
-            channelId: options.channelID,
-            guildId: options.guildID,
-            debug: options.debug,
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-            adapterCreator: options.voiceAdapterCreator,
-            selfDeaf: options.selfDeaf,
-            selfMute: options.selfMute
-        });
-    }
-    /**
-     * Leave a voice channel.
-     * @param guildID The ID of the guild the voice channel belongs to.
-     */
-    leaveVoiceChannel(guildID) {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access
-        return this.getVoiceConnection(guildID)?.destroy();
-    }
-    /**
-     * Initialize this client for rest only use. Currently, this sets both the `application` and `user` properties (if not already present), as would happen with a gateway connection.
-     * @param fakeReady If the client should emit a ready event. Defaults to true.
-     */
-    async restMode(fakeReady = true) {
-        this._application ??= await this.rest.applications.getCurrent();
-        this._user ??= await this.rest.oauth.getCurrentUser();
-        this.options.restMode = true;
-        if (fakeReady) {
-            this.emit("ready");
-        }
-        return this;
-    }
-}
-exports.default = Client;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Client.js","sourceRoot":"","sources":["../../lib/Client.ts"],"names":[],"mappings":"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"}