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

.eslintrc.yml

@@ -4,12 +4,26 @@ env:
   node: true
 plugins:
   - "sort-class-members"
+  - "jsdoc"
 extends: "eslint:recommended"
 globals:
   BigInt: true
   window: true
 parserOptions:
   ecmaVersion: 2020
+settings:
+  jsdoc:
+    preferredTypes:
+      boolean: 'Boolean'
+      number: 'Number'
+      bigint: 'BigInt'
+      string: 'String'
+      object: 'Object'
+    tagNamePreference:
+      param: 'arg'
+      argument: 'arg'
+      property: 'prop'
+      augments: 'extends'
 rules:
   array-bracket-spacing:
     - 2
@@ -88,3 +102,9 @@ rules:
         custom-inspect-method:
         - name: "[util.inspect.custom]"
           type: method
+  jsdoc/check-types:
+    - 2
+  jsdoc/check-tag-names:
+    - 2
+  jsdoc/check-alignment:
+    - 2

esm.mjs

@@ -6,6 +6,7 @@ export default function(token, options) {
 
 export const {
   Attachment,
+  ApplicationCommand,
   AutocompleteInteraction,
   Base,
   Bucket,
@@ -27,11 +28,13 @@ export const {
   GuildChannel,
   GuildIntegration,
   GuildPreview,
+  GuildScheduledEvent,
   GuildTemplate,
   Interaction,
   Invite,
   Member,
   Message,
+  ModalSubmitInteraction,
   NewsChannel,
   NewsThreadChannel,
   Permission,
@@ -48,7 +51,6 @@ export const {
   SharedStream,
   StageChannel,
   StageInstance,
-  StoreChannel,
   TextChannel,
   TextVoiceChannel,
   ThreadChannel,

index.js

@@ -7,18 +7,19 @@ function Eris(token, options) {
 }
 
 Eris.Attachment = require("./lib/structures/Attachment");
+Eris.ApplicationCommand = require("./lib/structures/ApplicationCommand");
 Eris.AutocompleteInteraction = require("./lib/structures/AutocompleteInteraction");
 Eris.Base = require("./lib/structures/Base");
 Eris.Bucket = require("./lib/util/Bucket");
 Eris.Call = require("./lib/structures/Call");
 Eris.CategoryChannel = require("./lib/structures/CategoryChannel");
 Eris.Channel = require("./lib/structures/Channel");
-Eris.CommandInteraction = require("./lib/structures/CommandInteraction");
-Eris.ComponentInteraction = require("./lib/structures/ComponentInteraction");
 Eris.Client = Client;
 Eris.Collection = require("./lib/util/Collection");
 Eris.Command = require("./lib/command/Command");
 Eris.CommandClient = require("./lib/command/CommandClient");
+Eris.CommandInteraction = require("./lib/structures/CommandInteraction");
+Eris.ComponentInteraction = require("./lib/structures/ComponentInteraction");
 Eris.Constants = require("./lib/Constants");
 Eris.DiscordHTTPError = require("./lib/errors/DiscordHTTPError");
 Eris.DiscordRESTError = require("./lib/errors/DiscordRESTError");
@@ -28,11 +29,13 @@ Eris.Guild = require("./lib/structures/Guild");
 Eris.GuildChannel = require("./lib/structures/GuildChannel");
 Eris.GuildIntegration = require("./lib/structures/GuildIntegration");
 Eris.GuildPreview = require("./lib/structures/GuildPreview");
+Eris.GuildScheduledEvent = require("./lib/structures/GuildScheduledEvent");
 Eris.GuildTemplate = require("./lib/structures/GuildTemplate");
 Eris.Interaction = require("./lib/structures/Interaction");
 Eris.Invite = require("./lib/structures/Invite");
 Eris.Member = require("./lib/structures/Member");
 Eris.Message = require("./lib/structures/Message");
+Eris.ModalSubmitInteraction = require("./lib/structures/ModalSubmitInteraction.js");
 Eris.NewsChannel = require("./lib/structures/NewsChannel");
 Eris.NewsThreadChannel = require("./lib/structures/NewsThreadChannel");
 Eris.Permission = require("./lib/structures/Permission");
@@ -49,7 +52,6 @@ Eris.Shard = require("./lib/gateway/Shard");
 Eris.SharedStream = require("./lib/voice/SharedStream");
 Eris.StageChannel = require("./lib/structures/StageChannel");
 Eris.StageInstance = require("./lib/structures/StageInstance");
-Eris.StoreChannel = require("./lib/structures/StoreChannel");
 Eris.TextChannel = require("./lib/structures/TextChannel");
 Eris.TextVoiceChannel = require("./lib/structures/TextVoiceChannel");
 Eris.ThreadChannel = require("./lib/structures/ThreadChannel");