Skip to content

Commit b951a15

Browse files
author
Alex
committed
Merge remote-tracking branch 'origin/dev' into attachments-type
# Conflicts: # esm.mjs # index.d.ts # index.js # lib/structures/AutocompleteInteraction.js # lib/structures/CommandInteraction.js # lib/structures/ComponentInteraction.js
2 parents b8d8d1b + dcfee4c commit b951a15

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+8058
-5811
lines changed

.eslintrc.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,26 @@ env:
44
node: true
55
plugins:
66
- "sort-class-members"
7+
- "jsdoc"
78
extends: "eslint:recommended"
89
globals:
910
BigInt: true
1011
window: true
1112
parserOptions:
1213
ecmaVersion: 2020
14+
settings:
15+
jsdoc:
16+
preferredTypes:
17+
boolean: 'Boolean'
18+
number: 'Number'
19+
bigint: 'BigInt'
20+
string: 'String'
21+
object: 'Object'
22+
tagNamePreference:
23+
param: 'arg'
24+
argument: 'arg'
25+
property: 'prop'
26+
augments: 'extends'
1327
rules:
1428
array-bracket-spacing:
1529
- 2
@@ -88,3 +102,9 @@ rules:
88102
custom-inspect-method:
89103
- name: "[util.inspect.custom]"
90104
type: method
105+
jsdoc/check-types:
106+
- 2
107+
jsdoc/check-tag-names:
108+
- 2
109+
jsdoc/check-alignment:
110+
- 2

esm.mjs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ export default function(token, options) {
66

77
export const {
88
Attachment,
9+
ApplicationCommand,
910
AutocompleteInteraction,
1011
Base,
1112
Bucket,
@@ -27,11 +28,13 @@ export const {
2728
GuildChannel,
2829
GuildIntegration,
2930
GuildPreview,
31+
GuildScheduledEvent,
3032
GuildTemplate,
3133
Interaction,
3234
Invite,
3335
Member,
3436
Message,
37+
ModalSubmitInteraction,
3538
NewsChannel,
3639
NewsThreadChannel,
3740
Permission,
@@ -48,7 +51,6 @@ export const {
4851
SharedStream,
4952
StageChannel,
5053
StageInstance,
51-
StoreChannel,
5254
TextChannel,
5355
TextVoiceChannel,
5456
ThreadChannel,

index.d.ts

Lines changed: 856 additions & 506 deletions
Large diffs are not rendered by default.

index.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,19 @@ function Eris(token, options) {
77
}
88

99
Eris.Attachment = require("./lib/structures/Attachment");
10+
Eris.ApplicationCommand = require("./lib/structures/ApplicationCommand");
1011
Eris.AutocompleteInteraction = require("./lib/structures/AutocompleteInteraction");
1112
Eris.Base = require("./lib/structures/Base");
1213
Eris.Bucket = require("./lib/util/Bucket");
1314
Eris.Call = require("./lib/structures/Call");
1415
Eris.CategoryChannel = require("./lib/structures/CategoryChannel");
1516
Eris.Channel = require("./lib/structures/Channel");
16-
Eris.CommandInteraction = require("./lib/structures/CommandInteraction");
17-
Eris.ComponentInteraction = require("./lib/structures/ComponentInteraction");
1817
Eris.Client = Client;
1918
Eris.Collection = require("./lib/util/Collection");
2019
Eris.Command = require("./lib/command/Command");
2120
Eris.CommandClient = require("./lib/command/CommandClient");
21+
Eris.CommandInteraction = require("./lib/structures/CommandInteraction");
22+
Eris.ComponentInteraction = require("./lib/structures/ComponentInteraction");
2223
Eris.Constants = require("./lib/Constants");
2324
Eris.DiscordHTTPError = require("./lib/errors/DiscordHTTPError");
2425
Eris.DiscordRESTError = require("./lib/errors/DiscordRESTError");
@@ -28,11 +29,13 @@ Eris.Guild = require("./lib/structures/Guild");
2829
Eris.GuildChannel = require("./lib/structures/GuildChannel");
2930
Eris.GuildIntegration = require("./lib/structures/GuildIntegration");
3031
Eris.GuildPreview = require("./lib/structures/GuildPreview");
32+
Eris.GuildScheduledEvent = require("./lib/structures/GuildScheduledEvent");
3133
Eris.GuildTemplate = require("./lib/structures/GuildTemplate");
3234
Eris.Interaction = require("./lib/structures/Interaction");
3335
Eris.Invite = require("./lib/structures/Invite");
3436
Eris.Member = require("./lib/structures/Member");
3537
Eris.Message = require("./lib/structures/Message");
38+
Eris.ModalSubmitInteraction = require("./lib/structures/ModalSubmitInteraction.js");
3639
Eris.NewsChannel = require("./lib/structures/NewsChannel");
3740
Eris.NewsThreadChannel = require("./lib/structures/NewsThreadChannel");
3841
Eris.Permission = require("./lib/structures/Permission");
@@ -49,7 +52,6 @@ Eris.Shard = require("./lib/gateway/Shard");
4952
Eris.SharedStream = require("./lib/voice/SharedStream");
5053
Eris.StageChannel = require("./lib/structures/StageChannel");
5154
Eris.StageInstance = require("./lib/structures/StageInstance");
52-
Eris.StoreChannel = require("./lib/structures/StoreChannel");
5355
Eris.TextChannel = require("./lib/structures/TextChannel");
5456
Eris.TextVoiceChannel = require("./lib/structures/TextVoiceChannel");
5557
Eris.ThreadChannel = require("./lib/structures/ThreadChannel");

lib/Client.js

Lines changed: 1806 additions & 1463 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)