Merge branch 'next' of https://github.com/discordeno/discordeno into getters

src/api/handlers/channel.ts

@@ -1,6 +1,4 @@
-import { cacheHandlers } from "../controllers/cache.ts";
 import { RequestManager } from "../../rest/mod.ts";
-import { structures } from "../structures/structures.ts";
 import {
   ChannelEditOptions,
   ChannelTypes,
@@ -23,6 +21,8 @@ import {
   botHasChannelPermissions,
   calculateBits,
 } from "../../util/permissions.ts";
+import { cacheHandlers } from "../controllers/cache.ts";
+import { structures } from "../structures/structures.ts";
 
 /** Checks if a channel overwrite for a user id or a role id has permission in this channel */
 export function channelOverwriteHasPermission(

src/api/handlers/guild.ts

@@ -1,13 +1,5 @@
-import { cacheHandlers } from "../controllers/cache.ts";
 import { identifyPayload } from "../../bot.ts";
 import { RequestManager } from "../../rest/mod.ts";
-import { requestAllMembers } from "../../ws/shard_manager.ts";
-import {
-  Guild,
-  Member,
-  structures,
-  Template,
-} from "../structures/structures.ts";
 import {
   AuditLogs,
   BannedUser,
@@ -40,11 +32,18 @@ import {
   UpdateGuildPayload,
   UserPayload,
 } from "../../types/types.ts";
-import { formatImageURL } from "../../util/cdn.ts";
 import { Collection } from "../../util/collection.ts";
 import { endpoints } from "../../util/constants.ts";
 import { botHasPermission, calculateBits } from "../../util/permissions.ts";
-import { urlToBase64 } from "../../util/utils.ts";
+import { formatImageURL, urlToBase64 } from "../../util/utils.ts";
+import { requestAllMembers } from "../../ws/shard_manager.ts";
+import { cacheHandlers } from "../controllers/cache.ts";
+import {
+  Guild,
+  Member,
+  structures,
+  Template,
+} from "../structures/structures.ts";
 
 /** Create a new guild. Returns a guild object on success. Fires a Guild Create Gateway event. This endpoint can be used only by bots in less than 10 guilds. */
 export async function createServer(options: CreateServerOptions) {

src/api/handlers/member.ts

@@ -1,7 +1,5 @@
-import { cacheHandlers } from "../controllers/cache.ts";
 import { botID } from "../../bot.ts";
 import { RequestManager } from "../../rest/mod.ts";
-import { Member, structures } from "../structures/structures.ts";
 import {
   DMChannelCreatePayload,
   EditMemberOptions,
@@ -10,14 +8,15 @@ import {
   ImageSize,
   MessageContent,
 } from "../../types/types.ts";
-import { formatImageURL } from "../../util/cdn.ts";
 import { endpoints } from "../../util/constants.ts";
 import {
   botHasPermission,
   higherRolePosition,
   highestRole,
 } from "../../util/permissions.ts";
-import { urlToBase64 } from "../../util/utils.ts";
+import { formatImageURL, urlToBase64 } from "../../util/utils.ts";
+import { cacheHandlers } from "../controllers/cache.ts";
+import { Member, structures } from "../structures/structures.ts";
 import { sendMessage } from "./channel.ts";
 
 /** The users custom avatar or the default avatar if you don't have a member object. */

src/api/handlers/message.ts

@@ -1,7 +1,5 @@
-import { cacheHandlers } from "../controllers/cache.ts";
 import { botID } from "../../bot.ts";
 import { RequestManager } from "../../rest/mod.ts";
-import { Message, structures } from "../structures/structures.ts";
 import {
   Errors,
   MessageContent,
@@ -11,6 +9,8 @@ import {
 import { endpoints } from "../../util/constants.ts";
 import { botHasChannelPermissions } from "../../util/permissions.ts";
 import { delay } from "../../util/utils.ts";
+import { cacheHandlers } from "../controllers/cache.ts";
+import { Message, structures } from "../structures/structures.ts";
 
 /** Delete a message with the channel id and message id only. */
 export async function deleteMessageByID(

src/api/handlers/webhook.ts

@@ -1,5 +1,5 @@
+import { botID } from "../../bot.ts";
 import { RequestManager } from "../../rest/mod.ts";
-import { structures } from "../structures/structures.ts";
 import {
   CreateSlashCommandOptions,
   EditSlashCommandOptions,
@@ -13,11 +13,11 @@ import {
   WebhookCreateOptions,
   WebhookPayload,
 } from "../../types/types.ts";
+import { cache } from "../../util/cache.ts";
 import { endpoints } from "../../util/constants.ts";
 import { botHasChannelPermissions } from "../../util/permissions.ts";
 import { urlToBase64 } from "../../util/utils.ts";
-import { botID } from "../../bot.ts";
-import { cache } from "../../util/cache.ts";
+import { structures } from "../structures/structures.ts";
 
 /** Create a new webhook. Requires the MANAGE_WEBHOOKS permission. Returns a webhook object on success. Webhook names follow our naming restrictions that can be found in our Usernames and Nicknames documentation, with the following additional stipulations:
 *