oceanic.js 0.0.7 → 0.0.11-dev.40bf3a4
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/.github/workflows/build.yml +12 -0
- package/.github/workflows/dev-publish.yml +32 -0
- package/.github/workflows/lint.yml +13 -0
- package/.npm-deprecaterc.json +9 -0
- package/README.md +1 -1
- package/build.js +6 -0
- package/dist/lib/Client.d.ts +7 -4
- package/dist/lib/Client.js +45 -25
- package/dist/lib/Constants.d.ts +5 -2
- package/dist/lib/Constants.js +4 -1
- package/dist/lib/gateway/Shard.d.ts +4 -10
- package/dist/lib/gateway/Shard.js +402 -332
- package/dist/lib/gateway/ShardManager.d.ts +1 -4
- package/dist/lib/gateway/ShardManager.js +41 -38
- package/dist/lib/index.d.ts +1 -0
- package/dist/lib/index.js +5 -3
- package/dist/lib/rest/Bucket.d.ts +1 -1
- package/dist/lib/rest/Bucket.js +9 -8
- package/dist/lib/rest/DiscordHTTPError.d.ts +1 -1
- package/dist/lib/rest/DiscordHTTPError.js +4 -6
- package/dist/lib/rest/DiscordRESTError.d.ts +1 -1
- package/dist/lib/rest/DiscordRESTError.js +8 -10
- package/dist/lib/rest/RESTManager.d.ts +1 -2
- package/dist/lib/rest/RESTManager.js +16 -18
- package/dist/lib/rest/RequestHandler.d.ts +1 -1
- package/dist/lib/rest/RequestHandler.js +18 -20
- package/dist/lib/rest/SequentialBucket.d.ts +1 -1
- package/dist/lib/rest/SequentialBucket.js +9 -8
- package/dist/lib/routes/ApplicationCommands.d.ts +4 -2
- package/dist/lib/routes/ApplicationCommands.js +37 -34
- package/dist/lib/routes/Channels.d.ts +7 -4
- package/dist/lib/routes/Channels.js +83 -77
- package/dist/lib/routes/Guilds.d.ts +4 -2
- package/dist/lib/routes/Guilds.js +137 -134
- package/dist/lib/routes/Interactions.d.ts +4 -2
- package/dist/lib/routes/Interactions.js +19 -18
- package/dist/lib/routes/OAuth.d.ts +4 -2
- package/dist/lib/routes/OAuth.js +24 -21
- package/dist/lib/routes/Users.d.ts +4 -2
- package/dist/lib/routes/Users.js +14 -11
- package/dist/lib/routes/Webhooks.d.ts +4 -2
- package/dist/lib/routes/Webhooks.js +38 -35
- package/dist/lib/structures/AnnouncementChannel.d.ts +6 -2
- package/dist/lib/structures/AnnouncementChannel.js +9 -3
- package/dist/lib/structures/AnnouncementThreadChannel.js +2 -2
- package/dist/lib/structures/Application.js +15 -5
- package/dist/lib/structures/ApplicationCommand.js +8 -8
- package/dist/lib/structures/AutoModerationRule.d.ts +4 -3
- package/dist/lib/structures/AutoModerationRule.js +29 -11
- package/dist/lib/structures/AutocompleteInteraction.d.ts +0 -5
- package/dist/lib/structures/AutocompleteInteraction.js +6 -16
- package/dist/lib/structures/Base.d.ts +1 -1
- package/dist/lib/structures/Base.js +3 -3
- package/dist/lib/structures/CategoryChannel.d.ts +7 -0
- package/dist/lib/structures/CategoryChannel.js +44 -6
- package/dist/lib/structures/Channel.js +4 -2
- package/dist/lib/structures/ClientApplication.js +18 -17
- package/dist/lib/structures/CommandInteraction.js +25 -25
- package/dist/lib/structures/ComponentInteraction.js +18 -18
- package/dist/lib/structures/ExtendedUser.js +4 -2
- package/dist/lib/structures/ForumChannel.d.ts +86 -0
- package/dist/lib/structures/ForumChannel.js +194 -0
- package/dist/lib/structures/GroupChannel.d.ts +1 -1
- package/dist/lib/structures/GroupChannel.js +29 -23
- package/dist/lib/structures/Guild.d.ts +3 -2
- package/dist/lib/structures/Guild.js +131 -82
- package/dist/lib/structures/GuildChannel.d.ts +3 -2
- package/dist/lib/structures/GuildChannel.js +9 -5
- package/dist/lib/structures/GuildPreview.js +12 -2
- package/dist/lib/structures/GuildScheduledEvent.d.ts +2 -2
- package/dist/lib/structures/GuildScheduledEvent.js +18 -8
- package/dist/lib/structures/GuildTemplate.d.ts +4 -3
- package/dist/lib/structures/GuildTemplate.js +22 -10
- package/dist/lib/structures/Integration.d.ts +5 -5
- package/dist/lib/structures/Integration.js +12 -3
- package/dist/lib/structures/Interaction.d.ts +2 -1
- package/dist/lib/structures/Interaction.js +4 -4
- package/dist/lib/structures/Invite.d.ts +1 -1
- package/dist/lib/structures/Invite.js +11 -11
- package/dist/lib/structures/Member.d.ts +1 -1
- package/dist/lib/structures/Member.js +28 -16
- package/dist/lib/structures/Message.d.ts +6 -6
- package/dist/lib/structures/Message.js +43 -29
- package/dist/lib/structures/ModalSubmitInteraction.js +17 -17
- package/dist/lib/structures/PartialApplication.js +5 -2
- package/dist/lib/structures/PingInteraction.js +2 -2
- package/dist/lib/structures/PrivateChannel.js +15 -15
- package/dist/lib/structures/PrivateThreadChannel.js +2 -2
- package/dist/lib/structures/PublicThreadChannel.js +2 -2
- package/dist/lib/structures/Role.js +13 -4
- package/dist/lib/structures/StageChannel.js +11 -7
- package/dist/lib/structures/StageInstance.js +6 -3
- package/dist/lib/structures/Team.js +6 -3
- package/dist/lib/structures/TextChannel.d.ts +6 -1
- package/dist/lib/structures/TextChannel.js +9 -3
- package/dist/lib/structures/TextableChannel.d.ts +1 -3
- package/dist/lib/structures/TextableChannel.js +33 -32
- package/dist/lib/structures/ThreadChannel.d.ts +6 -0
- package/dist/lib/structures/ThreadChannel.js +49 -26
- package/dist/lib/structures/User.js +8 -4
- package/dist/lib/structures/VoiceChannel.js +32 -24
- package/dist/lib/structures/VoiceState.d.ts +7 -3
- package/dist/lib/structures/VoiceState.js +24 -11
- package/dist/lib/structures/Webhook.js +17 -18
- package/dist/lib/types/channels.d.ts +151 -53
- package/dist/lib/types/client.d.ts +25 -3
- package/dist/lib/types/guilds.d.ts +15 -5
- package/dist/lib/types/interactions.d.ts +27 -3
- package/dist/lib/types/json.d.ts +26 -9
- package/dist/lib/util/Collection.d.ts +3 -3
- package/dist/lib/util/Collection.js +18 -10
- package/dist/lib/util/InteractionOptionsWrapper.d.ts +2 -1
- package/dist/lib/util/InteractionOptionsWrapper.js +15 -9
- package/dist/lib/util/Properties.d.ts +1 -1
- package/dist/lib/util/Properties.js +5 -5
- package/dist/lib/util/Routes.d.ts +1 -1
- package/dist/lib/util/Util.d.ts +5 -2
- package/dist/lib/util/Util.js +126 -8
- package/dist/lib/voice/VoiceConnectionManager.d.ts +1 -1
- package/dist/lib/voice/VoiceConnectionManager.js +3 -7
- package/dist/package.json +15 -15
- package/esm.mjs +5 -3
- package/package.json +15 -15
- package/dist/lib/routes/BaseRoute.d.ts +0 -6
- package/dist/lib/routes/BaseRoute.js +0 -16
- package/dist/lib/util/Debug.d.ts +0 -1
- package/dist/lib/util/Debug.js +0 -13
- package/favicon.ico +0 -0
- package/typedoc.json +0 -26
|
@@ -33,9 +33,15 @@ class VoiceChannel extends GuildChannel_1.default {
|
|
|
33
33
|
voiceMembers;
|
|
34
34
|
constructor(data, client) {
|
|
35
35
|
super(data, client);
|
|
36
|
-
this.
|
|
37
|
-
this.
|
|
36
|
+
this.bitrate = data.bitrate;
|
|
37
|
+
this.lastMessage = data.last_message_id === null ? null : { id: data.last_message_id };
|
|
38
|
+
this.messages = new Collection_1.default(Message_1.default, client, client.options.collectionLimits.messages);
|
|
39
|
+
this.nsfw = false;
|
|
38
40
|
this.permissionOverwrites = new Collection_1.default(PermissionOverwrite_1.default, client);
|
|
41
|
+
this.position = data.position;
|
|
42
|
+
this.rtcRegion = data.rtc_region;
|
|
43
|
+
this.topic = data.topic;
|
|
44
|
+
this.videoQualityMode = data.video_quality_mode;
|
|
39
45
|
this.voiceMembers = new Collection_1.default(Member_1.default, client);
|
|
40
46
|
this.update(data);
|
|
41
47
|
}
|
|
@@ -43,6 +49,8 @@ class VoiceChannel extends GuildChannel_1.default {
|
|
|
43
49
|
super.update(data);
|
|
44
50
|
if (data.bitrate !== undefined)
|
|
45
51
|
this.bitrate = data.bitrate;
|
|
52
|
+
if (data.last_message_id !== undefined)
|
|
53
|
+
this.lastMessage = data.last_message_id === null ? null : this.messages.get(data.last_message_id) || { id: data.last_message_id };
|
|
46
54
|
if (data.nsfw !== undefined)
|
|
47
55
|
this.nsfw = data.nsfw;
|
|
48
56
|
if (data.position !== undefined)
|
|
@@ -61,14 +69,14 @@ class VoiceChannel extends GuildChannel_1.default {
|
|
|
61
69
|
* @param options The options for creating the invite.
|
|
62
70
|
*/
|
|
63
71
|
async createInvite(options) {
|
|
64
|
-
return this.
|
|
72
|
+
return this.client.rest.channels.createInvite(this.id, options);
|
|
65
73
|
}
|
|
66
74
|
/**
|
|
67
75
|
* Create a message in this channel.
|
|
68
76
|
* @param options The options for creating the message.
|
|
69
77
|
*/
|
|
70
78
|
async createMessage(options) {
|
|
71
|
-
return this.
|
|
79
|
+
return this.client.rest.channels.createMessage(this.id, options);
|
|
72
80
|
}
|
|
73
81
|
/**
|
|
74
82
|
* Add a reaction to a message in this channel.
|
|
@@ -76,7 +84,7 @@ class VoiceChannel extends GuildChannel_1.default {
|
|
|
76
84
|
* @param emoji The reaction to add to the message. `name:id` for custom emojis, and the unicode codepoint for default emojis.
|
|
77
85
|
*/
|
|
78
86
|
async createReaction(messageID, emoji) {
|
|
79
|
-
return this.
|
|
87
|
+
return this.client.rest.channels.createReaction(this.id, messageID, emoji);
|
|
80
88
|
}
|
|
81
89
|
/**
|
|
82
90
|
* Delete a message in this channel.
|
|
@@ -84,7 +92,7 @@ class VoiceChannel extends GuildChannel_1.default {
|
|
|
84
92
|
* @param reason The reason for deleting the message.
|
|
85
93
|
*/
|
|
86
94
|
async deleteMessage(messageID, reason) {
|
|
87
|
-
return this.
|
|
95
|
+
return this.client.rest.channels.deleteMessage(this.id, messageID, reason);
|
|
88
96
|
}
|
|
89
97
|
/**
|
|
90
98
|
* Bulk delete messages in this channel.
|
|
@@ -92,7 +100,7 @@ class VoiceChannel extends GuildChannel_1.default {
|
|
|
92
100
|
* @param reason The reason for deleting the messages.
|
|
93
101
|
*/
|
|
94
102
|
async deleteMessages(messageIDs, reason) {
|
|
95
|
-
return this.
|
|
103
|
+
return this.client.rest.channels.deleteMessages(this.id, messageIDs, reason);
|
|
96
104
|
}
|
|
97
105
|
/**
|
|
98
106
|
* Delete a permission overwrite on this channel.
|
|
@@ -100,7 +108,7 @@ class VoiceChannel extends GuildChannel_1.default {
|
|
|
100
108
|
* @param reason The reason for deleting the permission overwrite.
|
|
101
109
|
*/
|
|
102
110
|
async deletePermission(overwriteID, reason) {
|
|
103
|
-
return this.
|
|
111
|
+
return this.client.rest.channels.deletePermission(this.id, overwriteID, reason);
|
|
104
112
|
}
|
|
105
113
|
/**
|
|
106
114
|
* Remove a reaction from a message in this channel.
|
|
@@ -109,7 +117,7 @@ class VoiceChannel extends GuildChannel_1.default {
|
|
|
109
117
|
* @param user The user to remove the reaction from, `@me` for the current user (default).
|
|
110
118
|
*/
|
|
111
119
|
async deleteReaction(messageID, emoji, user = "@me") {
|
|
112
|
-
return this.
|
|
120
|
+
return this.client.rest.channels.deleteReaction(this.id, messageID, emoji, user);
|
|
113
121
|
}
|
|
114
122
|
/**
|
|
115
123
|
* Remove all, or a specific emoji's reactions from a message in this channel.
|
|
@@ -117,14 +125,14 @@ class VoiceChannel extends GuildChannel_1.default {
|
|
|
117
125
|
* @param emoji The reaction to remove from the message. `name:id` for custom emojis, and the unicode codepoint for default emojis. Omit to remove all reactions.
|
|
118
126
|
*/
|
|
119
127
|
async deleteReactions(messageID, emoji) {
|
|
120
|
-
return this.
|
|
128
|
+
return this.client.rest.channels.deleteReactions(this.id, messageID, emoji);
|
|
121
129
|
}
|
|
122
130
|
/**
|
|
123
131
|
* Edit this channel.
|
|
124
132
|
* @param options The options for editing the channel.
|
|
125
133
|
*/
|
|
126
134
|
async edit(options) {
|
|
127
|
-
return this.
|
|
135
|
+
return this.client.rest.channels.edit(this.id, options);
|
|
128
136
|
}
|
|
129
137
|
/**
|
|
130
138
|
* Edit a message in this channel.
|
|
@@ -132,7 +140,7 @@ class VoiceChannel extends GuildChannel_1.default {
|
|
|
132
140
|
* @param options The options for editing the message.
|
|
133
141
|
*/
|
|
134
142
|
async editMessage(messageID, options) {
|
|
135
|
-
return this.
|
|
143
|
+
return this.client.rest.channels.editMessage(this.id, messageID, options);
|
|
136
144
|
}
|
|
137
145
|
/**
|
|
138
146
|
* Edit a permission overwrite on this channel.
|
|
@@ -140,33 +148,33 @@ class VoiceChannel extends GuildChannel_1.default {
|
|
|
140
148
|
* @param options The options for editing the permission overwrite.
|
|
141
149
|
*/
|
|
142
150
|
async editPermission(overwriteID, options) {
|
|
143
|
-
return this.
|
|
151
|
+
return this.client.rest.channels.editPermission(this.id, overwriteID, options);
|
|
144
152
|
}
|
|
145
153
|
/**
|
|
146
154
|
* Get the invites of this channel.
|
|
147
155
|
*/
|
|
148
156
|
async getInvites() {
|
|
149
|
-
return this.
|
|
157
|
+
return this.client.rest.channels.getInvites(this.id);
|
|
150
158
|
}
|
|
151
159
|
/**
|
|
152
160
|
* Get a message in this channel.
|
|
153
161
|
* @param messageID The ID of the message to get.
|
|
154
162
|
*/
|
|
155
163
|
async getMessage(messageID) {
|
|
156
|
-
return this.
|
|
164
|
+
return this.client.rest.channels.getMessage(this.id, messageID);
|
|
157
165
|
}
|
|
158
166
|
/**
|
|
159
167
|
* Get messages in this channel.
|
|
160
168
|
* @param options The options for getting the messages. All options are mutually exclusive.
|
|
161
169
|
*/
|
|
162
170
|
async getMessages(options) {
|
|
163
|
-
return this.
|
|
171
|
+
return this.client.rest.channels.getMessages(this.id, options);
|
|
164
172
|
}
|
|
165
173
|
/**
|
|
166
174
|
* Get the pinned messages in this channel.
|
|
167
175
|
*/
|
|
168
176
|
async getPinnedMessages() {
|
|
169
|
-
return this.
|
|
177
|
+
return this.client.rest.channels.getPinnedMessages(this.id);
|
|
170
178
|
}
|
|
171
179
|
/**
|
|
172
180
|
* Get the users who reacted with a specific emoji on a message in this channel.
|
|
@@ -175,14 +183,14 @@ class VoiceChannel extends GuildChannel_1.default {
|
|
|
175
183
|
* @param options The options for getting the reactions.
|
|
176
184
|
*/
|
|
177
185
|
async getReactions(messageID, emoji, options) {
|
|
178
|
-
return this.
|
|
186
|
+
return this.client.rest.channels.getReactions(this.id, messageID, emoji, options);
|
|
179
187
|
}
|
|
180
188
|
/**
|
|
181
189
|
* Join this voice channel.
|
|
182
190
|
* @param options The options for joining the voice channel.
|
|
183
191
|
*/
|
|
184
192
|
async join(options) {
|
|
185
|
-
return this.
|
|
193
|
+
return this.client.joinVoiceChannel(this.id, options);
|
|
186
194
|
}
|
|
187
195
|
/**
|
|
188
196
|
* Get the permissions of a member.
|
|
@@ -196,7 +204,7 @@ class VoiceChannel extends GuildChannel_1.default {
|
|
|
196
204
|
let permission = this.guild.permissionsOf(member).allow;
|
|
197
205
|
if (permission & Constants_1.Permissions.ADMINISTRATOR)
|
|
198
206
|
return new Permission_1.default(Constants_1.AllPermissions);
|
|
199
|
-
let overwrite = this.permissionOverwrites.get(this.
|
|
207
|
+
let overwrite = this.permissionOverwrites.get(this.guildID);
|
|
200
208
|
if (overwrite)
|
|
201
209
|
permission = (permission & ~overwrite.deny) | overwrite.allow;
|
|
202
210
|
let deny = 0n;
|
|
@@ -219,13 +227,13 @@ class VoiceChannel extends GuildChannel_1.default {
|
|
|
219
227
|
* @param reason The reason for pinning the message.
|
|
220
228
|
*/
|
|
221
229
|
async pinMessage(messageID, reason) {
|
|
222
|
-
return this.
|
|
230
|
+
return this.client.rest.channels.pinMessage(this.id, messageID, reason);
|
|
223
231
|
}
|
|
224
232
|
/**
|
|
225
233
|
* Show a typing indicator in this channel. How long users see this varies from client to client.
|
|
226
234
|
*/
|
|
227
235
|
async sendTyping() {
|
|
228
|
-
return this.
|
|
236
|
+
return this.client.rest.channels.sendTyping(this.id);
|
|
229
237
|
}
|
|
230
238
|
toJSON() {
|
|
231
239
|
return {
|
|
@@ -248,8 +256,8 @@ class VoiceChannel extends GuildChannel_1.default {
|
|
|
248
256
|
* @param reason The reason for unpinning the message.
|
|
249
257
|
*/
|
|
250
258
|
async unpinMessage(messageID, reason) {
|
|
251
|
-
return this.
|
|
259
|
+
return this.client.rest.channels.unpinMessage(this.id, messageID, reason);
|
|
252
260
|
}
|
|
253
261
|
}
|
|
254
262
|
exports.default = VoiceChannel;
|
|
255
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
263
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"VoiceChannel.js","sourceRoot":"","sources":["../../../lib/structures/VoiceChannel.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import Base from "./Base";
|
|
2
2
|
import type VoiceChannel from "./VoiceChannel";
|
|
3
3
|
import type StageChannel from "./StageChannel";
|
|
4
|
-
import
|
|
4
|
+
import Member from "./Member";
|
|
5
5
|
import type Guild from "./Guild";
|
|
6
6
|
import type User from "./User";
|
|
7
7
|
import type Client from "../Client";
|
|
@@ -11,12 +11,16 @@ import type { JSONVoiceState } from "../types/json";
|
|
|
11
11
|
export default class VoiceState extends Base {
|
|
12
12
|
/** The channel the user is connected to. */
|
|
13
13
|
channel: VoiceChannel | StageChannel | null;
|
|
14
|
+
/** The ID of the channel the user is connected to. */
|
|
15
|
+
channelID: string | null;
|
|
14
16
|
/** If the associated member is deafened. */
|
|
15
17
|
deaf: boolean;
|
|
16
18
|
/** The guild this voice state is a part of. */
|
|
17
|
-
guild
|
|
19
|
+
guild?: Guild;
|
|
20
|
+
/** The ID of the guild this voice state is a part of. */
|
|
21
|
+
guildID?: string;
|
|
18
22
|
/** The member associated with this voice state. */
|
|
19
|
-
member
|
|
23
|
+
member?: Member;
|
|
20
24
|
/** If the associated member is muted. */
|
|
21
25
|
mute: boolean;
|
|
22
26
|
/** The time at which the associated member requested to speak. */
|
|
@@ -4,14 +4,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const Base_1 = __importDefault(require("./Base"));
|
|
7
|
+
const Member_1 = __importDefault(require("./Member"));
|
|
7
8
|
/** Represents a guild member's voice state. */
|
|
8
9
|
class VoiceState extends Base_1.default {
|
|
9
10
|
/** The channel the user is connected to. */
|
|
10
11
|
channel;
|
|
12
|
+
/** The ID of the channel the user is connected to. */
|
|
13
|
+
channelID;
|
|
11
14
|
/** If the associated member is deafened. */
|
|
12
15
|
deaf;
|
|
13
16
|
/** The guild this voice state is a part of. */
|
|
14
17
|
guild;
|
|
18
|
+
/** The ID of the guild this voice state is a part of. */
|
|
19
|
+
guildID;
|
|
15
20
|
/** The member associated with this voice state. */
|
|
16
21
|
member;
|
|
17
22
|
/** If the associated member is muted. */
|
|
@@ -35,22 +40,29 @@ class VoiceState extends Base_1.default {
|
|
|
35
40
|
constructor(data, client) {
|
|
36
41
|
super(data.user_id, client);
|
|
37
42
|
this.channel = null;
|
|
43
|
+
this.channelID = data.channel_id;
|
|
38
44
|
this.deaf = false;
|
|
39
45
|
this.mute = false;
|
|
46
|
+
this.requestToSpeakTimestamp = null;
|
|
40
47
|
this.selfDeaf = false;
|
|
41
48
|
this.selfMute = false;
|
|
42
49
|
this.selfStream = false;
|
|
43
50
|
this.selfVideo = false;
|
|
44
51
|
this.suppress = false;
|
|
52
|
+
this.user = client.users.get(this.id);
|
|
53
|
+
this.update(data);
|
|
45
54
|
}
|
|
46
55
|
update(data) {
|
|
47
56
|
if (data.channel_id !== undefined) {
|
|
57
|
+
this.channelID = data.channel_id;
|
|
48
58
|
if (data.channel_id === null)
|
|
49
59
|
this.channel = null;
|
|
50
60
|
else {
|
|
51
|
-
const ch = this.
|
|
52
|
-
if (!ch)
|
|
53
|
-
this.
|
|
61
|
+
const ch = this.client.getChannel(data.channel_id);
|
|
62
|
+
if (!ch) {
|
|
63
|
+
if (!this.channel || this.channel.id !== data.channel_id)
|
|
64
|
+
this.client.emit("warn", `Missing channel for VoiceState ${this.id}`);
|
|
65
|
+
}
|
|
54
66
|
else
|
|
55
67
|
this.channel = ch;
|
|
56
68
|
}
|
|
@@ -58,14 +70,15 @@ class VoiceState extends Base_1.default {
|
|
|
58
70
|
if (data.deaf !== undefined)
|
|
59
71
|
this.deaf = data.deaf;
|
|
60
72
|
if (data.guild_id !== undefined) {
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
73
|
+
this.guildID = data.guild_id;
|
|
74
|
+
const guild = this.client.guilds.get(data.guild_id);
|
|
75
|
+
if (!guild && !this.guild)
|
|
76
|
+
this.client.emit("warn", `Missing guild for VoiceState ${this.id}`);
|
|
64
77
|
else
|
|
65
78
|
this.guild = guild;
|
|
66
79
|
}
|
|
67
80
|
if (data.member !== undefined)
|
|
68
|
-
this.member = this.guild.members.update({ ...data.member, id: this.id }, this.
|
|
81
|
+
this.member = this.guild ? this.guild.members.update({ ...data.member, id: this.id }, this.guildID) : new Member_1.default(data.member, this.client, this.guildID);
|
|
69
82
|
if (data.mute !== undefined)
|
|
70
83
|
this.mute = data.mute;
|
|
71
84
|
if (data.request_to_speak_timestamp !== undefined)
|
|
@@ -81,15 +94,15 @@ class VoiceState extends Base_1.default {
|
|
|
81
94
|
if (data.suppress !== undefined)
|
|
82
95
|
this.suppress = data.suppress;
|
|
83
96
|
if (data.user_id !== undefined)
|
|
84
|
-
this.user = this.
|
|
97
|
+
this.user = this.client.users.get(data.user_id);
|
|
85
98
|
}
|
|
86
99
|
toJSON() {
|
|
87
100
|
return {
|
|
88
101
|
...super.toJSON(),
|
|
89
102
|
channel: this.channel?.id || null,
|
|
90
103
|
deaf: this.deaf,
|
|
91
|
-
guild: this.
|
|
92
|
-
member: this.member
|
|
104
|
+
guild: this.guildID,
|
|
105
|
+
member: this.member?.toJSON(),
|
|
93
106
|
mute: this.mute,
|
|
94
107
|
requestToSpeakTimestamp: this.requestToSpeakTimestamp ? this.requestToSpeakTimestamp.getTime() : null,
|
|
95
108
|
selfDeaf: this.selfDeaf,
|
|
@@ -103,4 +116,4 @@ class VoiceState extends Base_1.default {
|
|
|
103
116
|
}
|
|
104
117
|
}
|
|
105
118
|
exports.default = VoiceState;
|
|
106
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
119
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVm9pY2VTdGF0ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2xpYi9zdHJ1Y3R1cmVzL1ZvaWNlU3RhdGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxrREFBMEI7QUFHMUIsc0RBQThCO0FBTzlCLCtDQUErQztBQUMvQyxNQUFxQixVQUFXLFNBQVEsY0FBSTtJQUN4Qyw0Q0FBNEM7SUFDNUMsT0FBTyxDQUFxQztJQUM1QyxzREFBc0Q7SUFDdEQsU0FBUyxDQUFnQjtJQUN6Qiw0Q0FBNEM7SUFDNUMsSUFBSSxDQUFVO0lBQ2QsK0NBQStDO0lBQy9DLEtBQUssQ0FBUztJQUNkLHlEQUF5RDtJQUN6RCxPQUFPLENBQVU7SUFDakIsbURBQW1EO0lBQ25ELE1BQU0sQ0FBVTtJQUNoQix5Q0FBeUM7SUFDekMsSUFBSSxDQUFVO0lBQ2Qsa0VBQWtFO0lBQ2xFLHVCQUF1QixDQUFjO0lBQ3JDLGlEQUFpRDtJQUNqRCxRQUFRLENBQVU7SUFDbEIsOENBQThDO0lBQzlDLFFBQVEsQ0FBVTtJQUNsQiw2Q0FBNkM7SUFDN0MsVUFBVSxDQUFVO0lBQ3BCLHVEQUF1RDtJQUN2RCxTQUFTLENBQVU7SUFDbkIsdURBQXVEO0lBQ3ZELFNBQVMsQ0FBVTtJQUNuQiw4Q0FBOEM7SUFDOUMsUUFBUSxDQUFVO0lBQ2xCLGlEQUFpRDtJQUNqRCxJQUFJLENBQU87SUFDWCxZQUFZLElBQW1CLEVBQUUsTUFBYztRQUMzQyxLQUFLLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUMsQ0FBQztRQUM1QixJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQztRQUNwQixJQUFJLENBQUMsU0FBUyxHQUFHLElBQUksQ0FBQyxVQUFVLENBQUM7UUFDakMsSUFBSSxDQUFDLElBQUksR0FBRyxLQUFLLENBQUM7UUFDbEIsSUFBSSxDQUFDLElBQUksR0FBRyxLQUFLLENBQUM7UUFDbEIsSUFBSSxDQUFDLHVCQUF1QixHQUFHLElBQUksQ0FB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
|
|
@@ -54,18 +54,17 @@ class Webhook extends Base_1.default {
|
|
|
54
54
|
user;
|
|
55
55
|
constructor(data, client) {
|
|
56
56
|
super(data.id, client);
|
|
57
|
-
|
|
58
|
-
this.application = data.application_id === null ? null : this._client.application?.id === data.application_id ? this._client.application : { id: data.application_id };
|
|
57
|
+
this.application = data.application_id === null ? null : client.application?.id === data.application_id ? client.application : { id: data.application_id };
|
|
59
58
|
this.avatar = data.avatar ?? null;
|
|
60
|
-
this.channel = data.channel_id === null ? null :
|
|
61
|
-
this.guild = !data.guild_id ? null :
|
|
59
|
+
this.channel = data.channel_id === null ? null : client.getChannel(data.channel_id) || { id: data.channel_id };
|
|
60
|
+
this.guild = !data.guild_id ? null : client.guilds.get(data.guild_id);
|
|
62
61
|
this.guildID = data.guild_id ?? null;
|
|
63
62
|
this.name = data.name;
|
|
64
63
|
this.sourceChannel = data.source_channel;
|
|
65
64
|
this.sourceGuild = data.source_guild;
|
|
66
65
|
this.token = data.token;
|
|
67
66
|
this.type = data.type;
|
|
68
|
-
this.user = !data.user ? null :
|
|
67
|
+
this.user = !data.user ? null : client.users.update(data.user);
|
|
69
68
|
}
|
|
70
69
|
get url() { return `${Constants_1.BASE_URL}${Routes.WEBHOOK(this.id, this.token)}`; }
|
|
71
70
|
/**
|
|
@@ -74,14 +73,14 @@ class Webhook extends Base_1.default {
|
|
|
74
73
|
* @param size The dimensions of the image.
|
|
75
74
|
*/
|
|
76
75
|
avatarURL(format, size) {
|
|
77
|
-
return this.avatar === null ? null : this.
|
|
76
|
+
return this.avatar === null ? null : this.client.util.formatImage(Routes.USER_AVATAR(this.id, this.avatar), format, size);
|
|
78
77
|
}
|
|
79
78
|
/**
|
|
80
79
|
* Delete this webhook (requires a bot user, see `deleteToken`).
|
|
81
80
|
* @param reason The reason for deleting this webhook.
|
|
82
81
|
*/
|
|
83
82
|
async delete(reason) {
|
|
84
|
-
return this.
|
|
83
|
+
return this.client.rest.webhooks.delete(this.id, reason);
|
|
85
84
|
}
|
|
86
85
|
/**
|
|
87
86
|
* Delete a message from this webhook.
|
|
@@ -93,7 +92,7 @@ class Webhook extends Base_1.default {
|
|
|
93
92
|
const t = this.token || token;
|
|
94
93
|
if (!t)
|
|
95
94
|
throw new Error("Token is not present on webhook, and was not provided in options.");
|
|
96
|
-
return this.
|
|
95
|
+
return this.client.rest.webhooks.deleteMessage(this.id, t, messageID, options);
|
|
97
96
|
}
|
|
98
97
|
/**
|
|
99
98
|
* Delete this webhook via its token.
|
|
@@ -103,14 +102,14 @@ class Webhook extends Base_1.default {
|
|
|
103
102
|
const t = this.token || token;
|
|
104
103
|
if (!t)
|
|
105
104
|
throw new Error("Token is not present on webhook, and was not provided in options.");
|
|
106
|
-
return this.
|
|
105
|
+
return this.client.rest.webhooks.deleteToken(this.id, t);
|
|
107
106
|
}
|
|
108
107
|
/**
|
|
109
108
|
* Edit this webhook (requires a bot user, see `editToken`).
|
|
110
109
|
* @param options The options for editing the webhook.
|
|
111
110
|
*/
|
|
112
111
|
async edit(options) {
|
|
113
|
-
return this.
|
|
112
|
+
return this.client.rest.webhooks.edit(this.id, options);
|
|
114
113
|
}
|
|
115
114
|
/**
|
|
116
115
|
* Edit a webhook message.
|
|
@@ -123,7 +122,7 @@ class Webhook extends Base_1.default {
|
|
|
123
122
|
const t = this.token || token;
|
|
124
123
|
if (!t)
|
|
125
124
|
throw new Error("Token is not present on webhook, and was not provided in options.");
|
|
126
|
-
return this.
|
|
125
|
+
return this.client.rest.webhooks.editMessage(this.id, t, messageID, options);
|
|
127
126
|
}
|
|
128
127
|
/**
|
|
129
128
|
* Edit a webhook via its token.
|
|
@@ -134,25 +133,25 @@ class Webhook extends Base_1.default {
|
|
|
134
133
|
const t = this.token || token;
|
|
135
134
|
if (!t)
|
|
136
135
|
throw new Error("Token is not present on webhook, and was not provided in options.");
|
|
137
|
-
return this.
|
|
136
|
+
return this.client.rest.webhooks.editToken(this.id, t, options);
|
|
138
137
|
}
|
|
139
138
|
async execute(options, token) {
|
|
140
139
|
const t = this.token || token;
|
|
141
140
|
if (!t)
|
|
142
141
|
throw new Error("Token is not present on webhook, and was not provided in options.");
|
|
143
|
-
return this.
|
|
142
|
+
return this.client.rest.webhooks.execute(this.id, t, options);
|
|
144
143
|
}
|
|
145
144
|
async executeGithub(options, token) {
|
|
146
145
|
const t = this.token || token;
|
|
147
146
|
if (!t)
|
|
148
147
|
throw new Error("Token is not present on webhook, and was not provided in options.");
|
|
149
|
-
return this.
|
|
148
|
+
return this.client.rest.webhooks.executeGithub(this.id, t, options);
|
|
150
149
|
}
|
|
151
150
|
async executeSlack(options, token) {
|
|
152
151
|
const t = this.token || token;
|
|
153
152
|
if (!t)
|
|
154
153
|
throw new Error("Token is not present on webhook, and was not provided in options.");
|
|
155
|
-
return this.
|
|
154
|
+
return this.client.rest.webhooks.executeSlack(this.id, t, options);
|
|
156
155
|
}
|
|
157
156
|
/**
|
|
158
157
|
* Get a webhook message.
|
|
@@ -164,7 +163,7 @@ class Webhook extends Base_1.default {
|
|
|
164
163
|
const t = this.token || token;
|
|
165
164
|
if (!t)
|
|
166
165
|
throw new Error("Token is not present on webhook, and was not provided in options.");
|
|
167
|
-
return this.
|
|
166
|
+
return this.client.rest.webhooks.getMessage(this.id, t, messageID, threadID);
|
|
168
167
|
}
|
|
169
168
|
/**
|
|
170
169
|
* The url of this webhook's `sourceGuild` icon (only present on channel follower webhooks).
|
|
@@ -172,7 +171,7 @@ class Webhook extends Base_1.default {
|
|
|
172
171
|
* @param size The dimensions of the image.
|
|
173
172
|
*/
|
|
174
173
|
sourceGuildIconURL(format, size) {
|
|
175
|
-
return !this.sourceGuild?.icon ? null : this.
|
|
174
|
+
return !this.sourceGuild?.icon ? null : this.client.util.formatImage(Routes.GUILD_ICON(this.id, this.sourceGuild?.icon), format, size);
|
|
176
175
|
}
|
|
177
176
|
toJSON() {
|
|
178
177
|
return {
|
|
@@ -191,4 +190,4 @@ class Webhook extends Base_1.default {
|
|
|
191
190
|
}
|
|
192
191
|
}
|
|
193
192
|
exports.default = Webhook;
|
|
194
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
193
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiV2ViaG9vay5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2xpYi9zdHJ1Y3R1cmVzL1dlYmhvb2sudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLGtEQUEwQjtBQU8xQiw0Q0FBd0M7QUFDeEMsdURBQXlDO0FBY3pDLE1BQXFCLE9BQVEsU0FBUSxjQUFJO0lBQ3JDLG1EQUFtRDtJQUNuRCxXQUFXLENBQXNDO0lBQ2pELHlDQUF5QztJQUN6QyxNQUFNLENBQWdCO0lBQ3RCLHNEQUFzRDtJQUN0RCxPQUFPLENBQXdDO0lBQy9DLG9EQUFvRDtJQUNwRCxLQUFLLENBQWU7SUFDcEIsNkRBQTZEO0lBQzdELE9BQU8sQ0FBZ0I7SUFDdkIsNENBQTRDO0lBQzVDLElBQUksQ0FBZ0I7SUFDcEIsbUVBQW1FO0lBQ25FLGFBQWEsQ0FBbUM7SUFDaEQsaUVBQWlFO0lBQ2pFLFdBQVcsQ0FBMEM7SUFDckQsMEZBQTBGO0lBQzFGLEtBQUssQ0FBVTtJQUNmLHNIQUFzSDtJQUN0SCxJQUFJLENBQWU7SUFDbkIsMENBQTBDO0lBQzFDLElBQUksQ0FBYztJQUNsQixZQUFZLElBQWdCLEVBQUUsTUFBYztRQUN4QyxLQUFLLENBQUMsSUFBSSxDQUFDLEVBQUUsRUFBRSxNQUFNLENBQUMsQ0FBQztRQUN2QixJQUFJLENBQUMsV0FBVyxHQUFHLElBQUksQ0FBQyxjQUFjLEtBQUssSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxXQUFXLEVBQUUsRUFBRSxLQUFLLElBQUksQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLElBQUksQ0FBQyxjQUFjLEVBQUUsQ0FBQztRQUMzSixJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksQ0FBQyxNQUFNLElBQUksSUFBSSxDQUFDO1FBQ2xDLElBQUks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
|