oceanic.js 1.0.0-dev.eee4ff9 → 1.0.0-dev.fd2598d
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib/Client.d.ts +16 -9
- package/dist/lib/Client.js +43 -23
- package/dist/lib/gateway/Shard.js +51 -56
- package/dist/lib/routes/Channels.d.ts +7 -6
- package/dist/lib/routes/Channels.js +8 -8
- package/dist/lib/routes/Guilds.js +17 -19
- package/dist/lib/routes/Interactions.d.ts +7 -6
- package/dist/lib/routes/Interactions.js +1 -1
- package/dist/lib/routes/Webhooks.d.ts +7 -6
- package/dist/lib/routes/Webhooks.js +1 -1
- package/dist/lib/structures/AnnouncementChannel.d.ts +1 -1
- package/dist/lib/structures/AnnouncementChannel.js +1 -1
- package/dist/lib/structures/AutocompleteInteraction.d.ts +15 -13
- package/dist/lib/structures/AutocompleteInteraction.js +19 -11
- package/dist/lib/structures/CommandInteraction.d.ts +19 -17
- package/dist/lib/structures/CommandInteraction.js +23 -15
- package/dist/lib/structures/ComponentInteraction.d.ts +20 -18
- package/dist/lib/structures/ComponentInteraction.js +20 -12
- package/dist/lib/structures/Guild.d.ts +11 -0
- package/dist/lib/structures/Guild.js +48 -6
- package/dist/lib/structures/Member.js +3 -2
- package/dist/lib/structures/Message.d.ts +3 -3
- package/dist/lib/structures/Message.js +6 -22
- package/dist/lib/structures/ModalSubmitInteraction.d.ts +19 -17
- package/dist/lib/structures/ModalSubmitInteraction.js +19 -11
- package/dist/lib/structures/StageChannel.d.ts +5 -2
- package/dist/lib/structures/StageChannel.js +17 -3
- package/dist/lib/structures/TextChannel.js +2 -3
- package/dist/lib/structures/VoiceChannel.d.ts +6 -3
- package/dist/lib/structures/VoiceChannel.js +18 -4
- package/dist/lib/types/channels.d.ts +1 -0
- package/dist/lib/types/discordjs-voice.d.ts +12 -0
- package/dist/lib/types/interactions.d.ts +11 -11
- package/dist/lib/util/Util.d.ts +4 -2
- package/dist/lib/util/Util.js +27 -2
- package/dist/package.json +1 -1
- package/package.json +1 -1
- package/dist/lib/voice/VoiceConnection.d.ts +0 -7
- package/dist/lib/voice/VoiceConnection.js +0 -16
- package/dist/lib/voice/VoiceConnectionManager.d.ts +0 -7
- package/dist/lib/voice/VoiceConnectionManager.js +0 -15
package/dist/lib/Client.d.ts
CHANGED
|
@@ -11,16 +11,18 @@ import type { ClientInstanceOptions, ClientOptions } from "./types/client";
|
|
|
11
11
|
import TypedEmitter from "./util/TypedEmitter";
|
|
12
12
|
import type ClientApplication from "./structures/ClientApplication";
|
|
13
13
|
import ShardManager from "./gateway/ShardManager";
|
|
14
|
-
import type { BotActivity, SendStatuses
|
|
14
|
+
import type { BotActivity, SendStatuses } from "./types/gateway";
|
|
15
15
|
import UnavailableGuild from "./structures/UnavailableGuild";
|
|
16
|
-
import VoiceConnectionManager from "./voice/VoiceConnectionManager";
|
|
17
16
|
import type ExtendedUser from "./structures/ExtendedUser";
|
|
18
17
|
import Util from "./util/Util";
|
|
19
18
|
import { ClientEvents } from "./types/events";
|
|
19
|
+
import type { JoinVoiceChannelOptions } from "./types/discordjs-voice";
|
|
20
|
+
import { type VoiceConnection } from "@discordjs/voice";
|
|
20
21
|
/** The primary class for interfacing with Discord. See {@link types/events~ClientEvents | Client Events} for a list of events. */
|
|
21
22
|
export default class Client extends TypedEmitter<ClientEvents> {
|
|
22
23
|
private _application?;
|
|
23
24
|
private _user?;
|
|
25
|
+
private voiceAdapters;
|
|
24
26
|
channelGuildMap: Record<string, string>;
|
|
25
27
|
gatewayURL: string;
|
|
26
28
|
groupChannels: TypedCollection<string, RawGroupChannel, GroupChannel>;
|
|
@@ -36,7 +38,6 @@ export default class Client extends TypedEmitter<ClientEvents> {
|
|
|
36
38
|
unavailableGuilds: TypedCollection<string, RawUnavailableGuild, UnavailableGuild>;
|
|
37
39
|
users: TypedCollection<string, RawUser, User>;
|
|
38
40
|
util: Util;
|
|
39
|
-
voiceConnections: VoiceConnectionManager;
|
|
40
41
|
/**
|
|
41
42
|
* @constructor
|
|
42
43
|
* @param options The options to create the client with.
|
|
@@ -44,6 +45,8 @@ export default class Client extends TypedEmitter<ClientEvents> {
|
|
|
44
45
|
constructor(options?: ClientOptions);
|
|
45
46
|
/** The client's partial application. This will throw an error if not using a gateway connection or no shard is READY. */
|
|
46
47
|
get application(): ClientApplication;
|
|
48
|
+
/** All the active voice connections of this client. */
|
|
49
|
+
get getVoiceConnections(): Map<string, VoiceConnection>;
|
|
47
50
|
get uptime(): number;
|
|
48
51
|
/** The client's user application. This will throw an error if not using a gateway connection or no shard is READY. */
|
|
49
52
|
get user(): ExtendedUser;
|
|
@@ -57,14 +60,18 @@ export default class Client extends TypedEmitter<ClientEvents> {
|
|
|
57
60
|
editStatus(status: SendStatuses, activities?: Array<BotActivity>): Promise<void>;
|
|
58
61
|
getChannel<T extends AnyChannel = AnyChannel>(id: string): T | undefined;
|
|
59
62
|
/**
|
|
60
|
-
*
|
|
61
|
-
* @param
|
|
62
|
-
* @param options The options for joining the voice channel.
|
|
63
|
+
* Get a voice connection.
|
|
64
|
+
* @param guildID The ID of the guild the voice channel belongs to.
|
|
63
65
|
*/
|
|
64
|
-
|
|
66
|
+
getVoiceConnection(guildID: string): VoiceConnection | undefined;
|
|
67
|
+
/**
|
|
68
|
+
* Join a voice channel.
|
|
69
|
+
* @param options The options to join the channel with.
|
|
70
|
+
* */
|
|
71
|
+
joinVoiceChannel(options: JoinVoiceChannelOptions): VoiceConnection;
|
|
65
72
|
/**
|
|
66
73
|
* Leave a voice channel.
|
|
67
|
-
* @param
|
|
74
|
+
* @param guildID The ID of the guild the voice channel belongs to.
|
|
68
75
|
*/
|
|
69
|
-
leaveVoiceChannel(
|
|
76
|
+
leaveVoiceChannel(guildID: string): void;
|
|
70
77
|
}
|
package/dist/lib/Client.js
CHANGED
|
@@ -13,8 +13,9 @@ const Guild_1 = __importDefault(require("./structures/Guild"));
|
|
|
13
13
|
const TypedEmitter_1 = __importDefault(require("./util/TypedEmitter"));
|
|
14
14
|
const ShardManager_1 = __importDefault(require("./gateway/ShardManager"));
|
|
15
15
|
const UnavailableGuild_1 = __importDefault(require("./structures/UnavailableGuild"));
|
|
16
|
-
const VoiceConnectionManager_1 = __importDefault(require("./voice/VoiceConnectionManager"));
|
|
17
16
|
const Util_1 = __importDefault(require("./util/Util"));
|
|
17
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment, import-newlines/enforce
|
|
18
|
+
const voice_1 = require("@discordjs/voice");
|
|
18
19
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
19
20
|
// @ts-ignore
|
|
20
21
|
let Erlpack;
|
|
@@ -27,6 +28,7 @@ catch { }
|
|
|
27
28
|
class Client extends TypedEmitter_1.default {
|
|
28
29
|
_application;
|
|
29
30
|
_user;
|
|
31
|
+
voiceAdapters;
|
|
30
32
|
channelGuildMap;
|
|
31
33
|
gatewayURL;
|
|
32
34
|
groupChannels;
|
|
@@ -42,7 +44,6 @@ class Client extends TypedEmitter_1.default {
|
|
|
42
44
|
unavailableGuilds;
|
|
43
45
|
users;
|
|
44
46
|
util;
|
|
45
|
-
voiceConnections;
|
|
46
47
|
/**
|
|
47
48
|
* @constructor
|
|
48
49
|
* @param options The options to create the client with.
|
|
@@ -68,6 +69,7 @@ class Client extends TypedEmitter_1.default {
|
|
|
68
69
|
defaultImageFormat: options?.defaultImageFormat ?? "png",
|
|
69
70
|
defaultImageSize: options?.defaultImageSize ?? 4096
|
|
70
71
|
};
|
|
72
|
+
this.voiceAdapters = new Map();
|
|
71
73
|
this.channelGuildMap = {};
|
|
72
74
|
this.groupChannels = new TypedCollection_1.default(GroupChannel_1.default, this, 10);
|
|
73
75
|
this.guilds = new TypedCollection_1.default(Guild_1.default, this);
|
|
@@ -80,7 +82,6 @@ class Client extends TypedEmitter_1.default {
|
|
|
80
82
|
this.unavailableGuilds = new TypedCollection_1.default(UnavailableGuild_1.default, this);
|
|
81
83
|
this.users = new TypedCollection_1.default(User_1.default, this, this.options.collectionLimits.users);
|
|
82
84
|
this.util = new Util_1.default(this);
|
|
83
|
-
this.voiceConnections = new VoiceConnectionManager_1.default(this);
|
|
84
85
|
}
|
|
85
86
|
/** The client's partial application. This will throw an error if not using a gateway connection or no shard is READY. */
|
|
86
87
|
get application() {
|
|
@@ -91,6 +92,14 @@ class Client extends TypedEmitter_1.default {
|
|
|
91
92
|
return this._application;
|
|
92
93
|
}
|
|
93
94
|
}
|
|
95
|
+
/** All the active voice connections of this client. */
|
|
96
|
+
get getVoiceConnections() {
|
|
97
|
+
if (!voice_1.getVoiceConnections) {
|
|
98
|
+
throw new Error("Voice is only supported with @discordjs/voice installed.");
|
|
99
|
+
}
|
|
100
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-return
|
|
101
|
+
return (0, voice_1.getVoiceConnections)();
|
|
102
|
+
}
|
|
94
103
|
get uptime() {
|
|
95
104
|
return this.startTime ? Date.now() - this.startTime : 0;
|
|
96
105
|
}
|
|
@@ -175,32 +184,43 @@ class Client extends TypedEmitter_1.default {
|
|
|
175
184
|
return (this.privateChannels.get(id) ?? this.groupChannels.get(id));
|
|
176
185
|
}
|
|
177
186
|
/**
|
|
178
|
-
*
|
|
179
|
-
* @param
|
|
180
|
-
* @param options The options for joining the voice channel.
|
|
187
|
+
* Get a voice connection.
|
|
188
|
+
* @param guildID The ID of the guild the voice channel belongs to.
|
|
181
189
|
*/
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
throw new Error("Invalid channel. Make sure the id is correct, and the channel is cached.");
|
|
186
|
-
}
|
|
187
|
-
if (channel.type !== Constants_1.ChannelTypes.GUILD_VOICE && channel.type !== Constants_1.ChannelTypes.GUILD_STAGE_VOICE) {
|
|
188
|
-
throw new Error("Only voice & stage channels can be joined.");
|
|
190
|
+
getVoiceConnection(guildID) {
|
|
191
|
+
if (!voice_1.getVoiceConnection) {
|
|
192
|
+
throw new Error("Voice is only supported with @discordjs/voice installed.");
|
|
189
193
|
}
|
|
190
|
-
|
|
191
|
-
|
|
194
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
|
|
195
|
+
return (0, voice_1.getVoiceConnection)(guildID);
|
|
196
|
+
}
|
|
197
|
+
/**
|
|
198
|
+
* Join a voice channel.
|
|
199
|
+
* @param options The options to join the channel with.
|
|
200
|
+
* */
|
|
201
|
+
joinVoiceChannel(options) {
|
|
202
|
+
if (!voice_1.joinVoiceChannel) {
|
|
203
|
+
throw new Error("Voice is only supported with @discordjs/voice installed.");
|
|
204
|
+
}
|
|
205
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-return
|
|
206
|
+
return (0, voice_1.joinVoiceChannel)({
|
|
207
|
+
channelId: options.channelID,
|
|
208
|
+
guildId: options.guildID,
|
|
209
|
+
debug: options.debug,
|
|
210
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
|
|
211
|
+
adapterCreator: options.voiceAdapterCreator,
|
|
212
|
+
selfDeaf: options.selfDeaf,
|
|
213
|
+
selfMute: options.selfMute
|
|
214
|
+
});
|
|
192
215
|
}
|
|
193
216
|
/**
|
|
194
217
|
* Leave a voice channel.
|
|
195
|
-
* @param
|
|
218
|
+
* @param guildID The ID of the guild the voice channel belongs to.
|
|
196
219
|
*/
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
return;
|
|
201
|
-
}
|
|
202
|
-
this.shards.get(this.guildShardMap[channel.guildID] ?? 0).updateVoiceState(channel.guildID, null, { selfDeaf: false, selfMute: false });
|
|
220
|
+
leaveVoiceChannel(guildID) {
|
|
221
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access
|
|
222
|
+
return this.getVoiceConnection(guildID)?.destroy();
|
|
203
223
|
}
|
|
204
224
|
}
|
|
205
225
|
exports.default = Client;
|
|
206
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
226
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Client.js","sourceRoot":"","sources":["../../lib/Client.ts"],"names":[],"mappings":"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"}
|