oceanic.js 1.0.0-dev.5de1d4e → 1.0.0-dev.5f062dd
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/README.md +4 -2
- package/dist/lib/Client.d.ts +16 -9
- package/dist/lib/Client.js +49 -23
- package/dist/lib/gateway/Shard.js +37 -47
- package/dist/lib/routes/Channels.js +8 -8
- package/dist/lib/routes/Guilds.js +17 -19
- package/dist/lib/structures/AutoModerationRule.js +2 -2
- package/dist/lib/structures/AutocompleteInteraction.js +2 -2
- package/dist/lib/structures/CommandInteraction.js +2 -2
- package/dist/lib/structures/ComponentInteraction.js +2 -2
- package/dist/lib/structures/Guild.d.ts +11 -0
- package/dist/lib/structures/Guild.js +46 -6
- package/dist/lib/structures/GuildChannel.js +2 -2
- package/dist/lib/structures/GuildScheduledEvent.js +2 -2
- package/dist/lib/structures/Member.d.ts +1 -1
- package/dist/lib/structures/Member.js +5 -4
- package/dist/lib/structures/Message.js +3 -7
- package/dist/lib/structures/ModalSubmitInteraction.js +2 -2
- package/dist/lib/structures/Role.js +2 -2
- package/dist/lib/structures/StageChannel.d.ts +5 -2
- package/dist/lib/structures/StageChannel.js +17 -3
- package/dist/lib/structures/StageInstance.js +2 -2
- 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/util/Util.d.ts +4 -2
- package/dist/lib/util/Util.js +27 -2
- package/dist/package.json +4 -1
- package/package.json +4 -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/README.md
CHANGED
|
@@ -9,10 +9,12 @@ NodeJS **16.16.0** or higher is required.
|
|
|
9
9
|
**See [Development Builds](#development-builds) if you wish to install in-dev versions.**
|
|
10
10
|
|
|
11
11
|
```sh
|
|
12
|
-
npm i oceanic.js
|
|
12
|
+
npm i oceanic.js --no-optional
|
|
13
13
|
```
|
|
14
14
|
|
|
15
|
-
|
|
15
|
+
If you need voice support, remove `--no-optional`. Voice support is currently provided by [@discordjs/voice](https://discord.js.org/#/docs/voice/main/general/welcome).
|
|
16
|
+
|
|
17
|
+
See the [examples](https://github.com/OceanicJS/Oceanic/tree/dev/examples) folder on GitHub for some examples, and visit [this site](https://oceanic.owo-whats-this.dev) for documentation.
|
|
16
18
|
|
|
17
19
|
### Development Builds
|
|
18
20
|
```sh
|
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.
|
|
@@ -47,6 +48,8 @@ export default class Client extends TypedEmitter<ClientEvents> {
|
|
|
47
48
|
get uptime(): number;
|
|
48
49
|
/** The client's user application. This will throw an error if not using a gateway connection or no shard is READY. */
|
|
49
50
|
get user(): ExtendedUser;
|
|
51
|
+
/** The active voice connections of this client. */
|
|
52
|
+
get voiceConnections(): Map<string, VoiceConnection>;
|
|
50
53
|
/** Connect the client to Discord. */
|
|
51
54
|
connect(): Promise<void>;
|
|
52
55
|
/**
|
|
@@ -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,10 +13,17 @@ 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"));
|
|
18
17
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
19
18
|
// @ts-ignore
|
|
19
|
+
let DiscordJSVoice;
|
|
20
|
+
try {
|
|
21
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
|
|
22
|
+
DiscordJSVoice = require("@discordjs/voice");
|
|
23
|
+
}
|
|
24
|
+
catch { }
|
|
25
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
26
|
+
// @ts-ignore
|
|
20
27
|
let Erlpack;
|
|
21
28
|
try {
|
|
22
29
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
|
|
@@ -27,6 +34,7 @@ catch { }
|
|
|
27
34
|
class Client extends TypedEmitter_1.default {
|
|
28
35
|
_application;
|
|
29
36
|
_user;
|
|
37
|
+
voiceAdapters;
|
|
30
38
|
channelGuildMap;
|
|
31
39
|
gatewayURL;
|
|
32
40
|
groupChannels;
|
|
@@ -42,7 +50,6 @@ class Client extends TypedEmitter_1.default {
|
|
|
42
50
|
unavailableGuilds;
|
|
43
51
|
users;
|
|
44
52
|
util;
|
|
45
|
-
voiceConnections;
|
|
46
53
|
/**
|
|
47
54
|
* @constructor
|
|
48
55
|
* @param options The options to create the client with.
|
|
@@ -68,6 +75,7 @@ class Client extends TypedEmitter_1.default {
|
|
|
68
75
|
defaultImageFormat: options?.defaultImageFormat ?? "png",
|
|
69
76
|
defaultImageSize: options?.defaultImageSize ?? 4096
|
|
70
77
|
};
|
|
78
|
+
this.voiceAdapters = new Map();
|
|
71
79
|
this.channelGuildMap = {};
|
|
72
80
|
this.groupChannels = new TypedCollection_1.default(GroupChannel_1.default, this, 10);
|
|
73
81
|
this.guilds = new TypedCollection_1.default(Guild_1.default, this);
|
|
@@ -80,7 +88,6 @@ class Client extends TypedEmitter_1.default {
|
|
|
80
88
|
this.unavailableGuilds = new TypedCollection_1.default(UnavailableGuild_1.default, this);
|
|
81
89
|
this.users = new TypedCollection_1.default(User_1.default, this, this.options.collectionLimits.users);
|
|
82
90
|
this.util = new Util_1.default(this);
|
|
83
|
-
this.voiceConnections = new VoiceConnectionManager_1.default(this);
|
|
84
91
|
}
|
|
85
92
|
/** The client's partial application. This will throw an error if not using a gateway connection or no shard is READY. */
|
|
86
93
|
get application() {
|
|
@@ -103,6 +110,14 @@ class Client extends TypedEmitter_1.default {
|
|
|
103
110
|
return this._user;
|
|
104
111
|
}
|
|
105
112
|
}
|
|
113
|
+
/** The active voice connections of this client. */
|
|
114
|
+
get voiceConnections() {
|
|
115
|
+
if (!DiscordJSVoice) {
|
|
116
|
+
throw new Error("Voice is only supported with @discordjs/voice installed.");
|
|
117
|
+
}
|
|
118
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access
|
|
119
|
+
return DiscordJSVoice.getVoiceConnections();
|
|
120
|
+
}
|
|
106
121
|
/** Connect the client to Discord. */
|
|
107
122
|
async connect() {
|
|
108
123
|
if (!this.options.auth || !this.options.auth.startsWith("Bot ")) {
|
|
@@ -175,32 +190,43 @@ class Client extends TypedEmitter_1.default {
|
|
|
175
190
|
return (this.privateChannels.get(id) ?? this.groupChannels.get(id));
|
|
176
191
|
}
|
|
177
192
|
/**
|
|
178
|
-
*
|
|
179
|
-
* @param
|
|
180
|
-
* @param options The options for joining the voice channel.
|
|
193
|
+
* Get a voice connection.
|
|
194
|
+
* @param guildID The ID of the guild the voice channel belongs to.
|
|
181
195
|
*/
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
throw new Error("Invalid channel. Make sure the id is correct, and the channel is cached.");
|
|
196
|
+
getVoiceConnection(guildID) {
|
|
197
|
+
if (!DiscordJSVoice) {
|
|
198
|
+
throw new Error("Voice is only supported with @discordjs/voice installed.");
|
|
186
199
|
}
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
200
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
|
|
201
|
+
return DiscordJSVoice.getVoiceConnection(guildID);
|
|
202
|
+
}
|
|
203
|
+
/**
|
|
204
|
+
* Join a voice channel.
|
|
205
|
+
* @param options The options to join the channel with.
|
|
206
|
+
* */
|
|
207
|
+
joinVoiceChannel(options) {
|
|
208
|
+
if (!DiscordJSVoice) {
|
|
209
|
+
throw new Error("Voice is only supported with @discordjs/voice installed.");
|
|
210
|
+
}
|
|
211
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access
|
|
212
|
+
return DiscordJSVoice.joinVoiceChannel({
|
|
213
|
+
channelId: options.channelID,
|
|
214
|
+
guildId: options.guildID,
|
|
215
|
+
debug: options.debug,
|
|
216
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
|
|
217
|
+
adapterCreator: options.voiceAdapterCreator,
|
|
218
|
+
selfDeaf: options.selfDeaf,
|
|
219
|
+
selfMute: options.selfMute
|
|
220
|
+
});
|
|
192
221
|
}
|
|
193
222
|
/**
|
|
194
223
|
* Leave a voice channel.
|
|
195
|
-
* @param
|
|
224
|
+
* @param guildID The ID of the guild the voice channel belongs to.
|
|
196
225
|
*/
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
return;
|
|
201
|
-
}
|
|
202
|
-
this.shards.get(this.guildShardMap[channel.guildID] ?? 0).updateVoiceState(channel.guildID, null, { selfDeaf: false, selfMute: false });
|
|
226
|
+
leaveVoiceChannel(guildID) {
|
|
227
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access
|
|
228
|
+
return this.getVoiceConnection(guildID)?.destroy();
|
|
203
229
|
}
|
|
204
230
|
}
|
|
205
231
|
exports.default = Client;
|
|
206
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
232
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Client.js","sourceRoot":"","sources":["../../lib/Client.ts"],"names":[],"mappings":"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"}
|