snowtransfer 0.4.3 → 0.5.2

package/README.md

@@ -6,12 +6,13 @@
 Part of the WeatherStack
 
 SnowTransfer is a small library specially made to **only** cover the REST/HTTP area of the discord api.
-It makes no assumptions about the rest of your stack, therefore you can use it anywhere as long as you use node 8 or higher.
+It makes no assumptions about the rest of your stack, therefore you can use it anywhere as long as you use node 12 or higher.
 
 ### Some of the things that make SnowTransfer awesome:
 - No requirement for other components
 - Full coverage of the discord rest api
 - Well documented
+- Supports both Bot and Bearer tokens (Bearer tokens will have much more limited access than Bot tokens)
 
 ### General Usecase:
 SnowTransfer is not your everyday library,

package/dist/Constants.d.ts

@@ -1,7 +1,11 @@
 declare const _default: {
     REST_API_VERSION: 10;
+    GET_CHANNEL_MESSAGES_MIN_RESULTS: 1;
     GET_CHANNEL_MESSAGES_MAX_RESULTS: 100;
+    GET_GUILD_SCHEDULED_EVENT_USERS_MIN_RESULTS: 1;
     GET_GUILD_SCHEDULED_EVENT_USERS_MAX_RESULTS: 100;
+    SEARCH_MEMBERS_MIN_RESULTS: 1;
+    SEARCH_MEMBERS_MAX_RESULTS: 1000;
     BULK_DELETE_MESSAGES_MIN: 2;
     BULK_DELETE_MESSAGES_MAX: 100;
     OK_STATUS_CODES: number[];

package/dist/Constants.js

@@ -1,8 +1,12 @@
 "use strict";
 module.exports = {
     REST_API_VERSION: 10,
+    GET_CHANNEL_MESSAGES_MIN_RESULTS: 1,
     GET_CHANNEL_MESSAGES_MAX_RESULTS: 100,
+    GET_GUILD_SCHEDULED_EVENT_USERS_MIN_RESULTS: 1,
     GET_GUILD_SCHEDULED_EVENT_USERS_MAX_RESULTS: 100,
+    SEARCH_MEMBERS_MIN_RESULTS: 1,
+    SEARCH_MEMBERS_MAX_RESULTS: 1000,
     BULK_DELETE_MESSAGES_MIN: 2,
     BULK_DELETE_MESSAGES_MAX: 100,
     OK_STATUS_CODES: [200, 201, 204, 304]

package/dist/Endpoints.d.ts

@@ -7,89 +7,90 @@ declare const Endpoints: {
     BASE_URL: "/api/v10";
     BASE_HOST: "https://discord.com";
     CDN_URL: "https://cdn.discordapp.com";
-    APPLICATION_COMMAND: (appID: string, cmdID: string) => "/applications/:app_id/commands/:cmd_id";
-    APPLICATION_COMMANDS: (appID: string) => "/applications/:app_id/commands";
-    APPLICATION_GUILD_COMMANDS_PERMISSIONS: (appID: string, guildID: string) => "/applications/:app_id/guilds/:guild_id/commands/permissions";
-    APPLICATION_GUILD_COMMAND_PERMISSIONS: (appID: string, guildID: string, cmdID: string) => "/applications/:app_id/guilds/:guild_id/commands/permissions";
-    APPLICATION_GUILD_COMMAND: (appID: string, guildID: string, cmdID: string) => "/applications/:app_id/guilds/:guild_id/commands/:cmd_id";
-    APPLICATION_GUILD_COMMANDS: (appID: string, guildID: string) => "/applications/:app_id/guilds/:guild_id/commands";
-    CHANNEL: (chanID: string) => "/channels/:channel_id";
-    CHANNEL_BULK_DELETE: (chanID: string) => "/channels/:channel_id/messages/bulk-delete";
-    CHANNEL_INVITES: (chanID: string) => "/channels/:channel_id/invites";
-    CHANNEL_MESSAGE: (chanID: string, msgID: string) => "/channels/:channel_id/messages/:message_id";
-    CHANNEL_MESSAGE_CROSSPOST: (chanID: string, msgID: string) => "/channels/:channel_id/messages/:message_id/crosspost";
-    CHANNEL_MESSAGE_REACTION: (chanID: string, msgID: string, reaction: string) => "/channels/:channel_id/messages/:message_id/reactions/:reaction";
-    CHANNEL_MESSAGE_REACTION_USER: (chanID: string, msgID: string, reaction: string, userID: string) => "/channels/:channel_id/messages/:message_id/reactions/:reaction/:user_id";
-    CHANNEL_MESSAGE_REACTIONS: (chanID: string, msgID: string) => "/channels/:channel_id/messages/:message_id/reactions";
-    CHANNEL_MESSAGE_THREADS: (chanID: string, msgID: string) => "/channels/:channel_id/messages/:message_id/threads";
-    CHANNEL_MESSAGES: (chanID: string) => "/channels/:channel_id/messages";
-    CHANNEL_PERMISSION: (chanID: string, permID: string) => "/channels/:channel_id/permissions/:perm_id";
-    CHANNEL_PERMISSIONS: (chanID: string) => "/channels/:channel_id/permissions";
-    CHANNEL_PIN: (chanID: string, msgID: string) => "/channels/:channel_id/pins/:message_id";
-    CHANNEL_PINS: (chanID: string) => "/channels/:channel_id/pins";
-    CHANNEL_RECIPIENT: (chanID: string, userID: string) => "/channels/:channel_id/recipients/:user_id";
-    CHANNEL_THREADS: (chanID: string) => "/channels/:channel_id/threads";
-    CHANNEL_THREAD_MEMBER: (chanID: string, memberID: string) => "/channels/:channel_id/thread-members/:member_id";
-    CHANNEL_THREAD_MEMBERS: (chanID: string) => "/channels/:channel_id/thread-members";
-    CHANNEL_THREADS_ARCHIVED_PRIVATE: (chanID: string) => "/channels/:channel_id/threads/archived/private";
-    CHANNEL_THREADS_ARCHIVED_PRIVATE_USER: (chanID: string) => "/channels/:channel_id/users/@me/threads/archived/private";
-    CHANNEL_THREADS_ARCHIVED_PUBLIC: (chanID: string) => "/channels/:channel_id/threads/archived/public";
-    CHANNEL_TYPING: (chanID: string) => "/channels/:channel_id/typing";
-    CHANNEL_WEBHOOKS: (chanID: string) => "/channels/:channel_id/webhooks";
+    APPLICATION_COMMAND: (appID: string, cmdID: string) => "/applications/{app_id}/commands/{cmd_id}";
+    APPLICATION_COMMANDS: (appID: string) => "/applications/{app_id}/commands";
+    APPLICATION_GUILD_COMMANDS_PERMISSIONS: (appID: string, guildID: string) => "/applications/{app_id}/guilds/{guild_id}/commands/permissions";
+    APPLICATION_GUILD_COMMAND_PERMISSIONS: (appID: string, guildID: string, cmdID: string) => "/applications/{app_id}/guilds/{guild_id}/commands/{cmd_id}/permissions";
+    APPLICATION_GUILD_COMMAND: (appID: string, guildID: string, cmdID: string) => "/applications/{app_id}/guilds/{guild_id}/commands/{cmd_id}";
+    APPLICATION_GUILD_COMMANDS: (appID: string, guildID: string) => "/applications/{app_id}/guilds/{guild_id}/commands";
+    CHANNEL: (chanID: string) => "/channels/{channel_id}";
+    CHANNEL_BULK_DELETE: (chanID: string) => "/channels/{channel_id}/messages/bulk-delete";
+    CHANNEL_FOLLOWERS: (chanID: string) => "/channels/{channel_id}/followers";
+    CHANNEL_INVITES: (chanID: string) => "/channels/{channel_id}/invites";
+    CHANNEL_MESSAGE: (chanID: string, msgID: string) => "/channels/{channel_id}/messages/{message_id}";
+    CHANNEL_MESSAGE_CROSSPOST: (chanID: string, msgID: string) => "/channels/{channel_id}/messages/{message_id}/crosspost";
+    CHANNEL_MESSAGE_REACTION: (chanID: string, msgID: string, reaction: string) => "/channels/{channel_id}/messages/{message_id}/reactions/{reaction}";
+    CHANNEL_MESSAGE_REACTION_USER: (chanID: string, msgID: string, reaction: string, userID: string) => "/channels/{channel_id}/messages/{message_id}/reactions/{reaction}/{user_id}";
+    CHANNEL_MESSAGE_REACTIONS: (chanID: string, msgID: string) => "/channels/{channel_id}/messages/{message_id}/reactions";
+    CHANNEL_MESSAGE_THREADS: (chanID: string, msgID: string) => "/channels/{channel_id}/messages/{message_id}/threads";
+    CHANNEL_MESSAGES: (chanID: string) => "/channels/{channel_id}/messages";
+    CHANNEL_PERMISSION: (chanID: string, permID: string) => "/channels/{channel_id}/permissions/{perm_id}";
+    CHANNEL_PERMISSIONS: (chanID: string) => "/channels/{channel_id}/permissions";
+    CHANNEL_PIN: (chanID: string, msgID: string) => "/channels/{channel_id}/pins/{message_id}";
+    CHANNEL_PINS: (chanID: string) => "/channels/{channel_id}/pins";
+    CHANNEL_RECIPIENT: (chanID: string, userID: string) => "/channels/{channel_id}/recipients/{user_id}";
+    CHANNEL_THREADS: (chanID: string) => "/channels/{channel_id}/threads";
+    CHANNEL_THREAD_MEMBER: (chanID: string, memberID: string) => "/channels/{channel_id}/thread-members/{member_id}";
+    CHANNEL_THREAD_MEMBERS: (chanID: string) => "/channels/{channel_id}/thread-members";
+    CHANNEL_THREADS_ARCHIVED_PRIVATE: (chanID: string) => "/channels/{channel_id}/threads/archived/private";
+    CHANNEL_THREADS_ARCHIVED_PRIVATE_USER: (chanID: string) => "/channels/{channel_id}/users/@me/threads/archived/private";
+    CHANNEL_THREADS_ARCHIVED_PUBLIC: (chanID: string) => "/channels/{channel_id}/threads/archived/public";
+    CHANNEL_TYPING: (chanID: string) => "/channels/{channel_id}/typing";
+    CHANNEL_WEBHOOKS: (chanID: string) => "/channels/{channel_id}/webhooks";
     CHANNELS: "/channels";
     GATEWAY: "/gateway";
     GATEWAY_BOT: "/gateway/bot";
-    GUILD: (guildID: string) => "/guilds/:guild_id";
-    GUILD_AUDIT_LOGS: (guildID: string) => "/guilds/:guild_id/audit-logs";
-    GUILD_BAN: (guildID: string, memberID: string) => "/guilds/:guild_id/bans/:member_id";
-    GUILD_BANS: (guildID: string) => "/guilds/:guild_id/bans";
-    GUILD_CHANNELS: (guildID: string) => "/guilds/:guild_id/channels";
-    GUILD_EMOJI: (guildID: string, emojiID: string) => "/guilds/:guild_id/emojis/:emoji_id";
-    GUILD_EMOJIS: (guildID: string) => "/guilds/:guild_id/emojis";
-    GUILD_INVITES: (guildID: string) => "/guilds/:guild_id/invites";
-    GUILD_INTEGRATION: (guildID: string, integrationID: string) => "/guilds/:guild_id/integrations/:integration_id";
-    GUILD_INTEGRATIONS: (guildID: string) => "/guilds/:guild_id/integrations";
-    GUILD_MEMBER: (guildID: string, memberID: string) => "/guilds/:guild_id/members/:member_id";
-    GUILD_MEMBER_ROLE: (guildID: string, memberID: string, roleID: string) => "/guilds/:guild_id/members/:member_id/roles/:role_id";
-    GUILD_MEMBERS: (guildID: string) => "/guilds/:guild_id/members";
-    GUILD_MEMBERS_SEARCH: (guildID: string) => "/guilds/:guild_id/members/search";
-    GUILD_PREVIEW: (guildID: string) => "/guilds/:guild_id/preview";
-    GUILD_PRUNE: (guildID: string) => "/guilds/:guild_id/prune";
-    GUILD_ROLE: (guildID: string, roleID: string) => "/guilds/:guild_id/roles/:role_id";
-    GUILD_ROLES: (guildID: string) => "/guilds/:guild_id/roles";
-    GUILD_SCHEDULED_EVENTS: (guildID: string) => "/guilds/:guild_id/scheduled-events";
-    GUILD_SCHEDULED_EVENT: (guildID: string, eventId: string) => "/guilds/:guild_id/scheduled-events/:event_id";
-    GUILD_SCHEDULED_EVENT_USERS: (guildID: string, eventId: string) => "/guilds/:guild_id/scheduled-events/:event_id/users";
-    GUILD_STICKER: (guildID: string, stickerID: string) => "/guilds/:guild_id/stickers/:sticker_id";
-    GUILD_STICKERS: (guildID: string) => "/guilds/:guild_id/stickers";
-    GUILD_TEMPLATE: (guildID: string, code: string) => "/guilds/:guild_id/templates/:code";
-    GUILD_THREADS_ACTIVE: (guildID: string) => "/guilds/:guild_id/threads/active";
-    GUILD_TEMPLATES: (guildID: string) => "/guilds/:guild_id/templates";
-    GUILD_VANITY: (guildID: string) => "/guilds/:guild_id/vanity-url";
-    GUILD_VOICE_REGIONS: (guildID: string) => "/guilds/:guild_id/regions";
-    GUILD_VOICE_STATE_USER: (guildID: string, memberID: string) => "/guilds/:guild_id/voice-states/:member-id";
-    GUILD_WEBHOOKS: (guildID: string) => "/guilds/:guild_id/webhooks";
-    GUILD_WELCOME_SCREEN: (guildID: string) => "/guilds/:guild_id/welcome-screen";
-    GUILD_WIDGET: (guildID: string) => "/guilds/:guild_id/widget.json";
-    GUILD_WIDGET_SETTINGS: (guildID: string) => "/guilds/:guild_id/widget";
+    GUILD: (guildID: string) => "/guilds/{guild_id}";
+    GUILD_AUDIT_LOGS: (guildID: string) => "/guilds/{guild_id}/audit-logs";
+    GUILD_BAN: (guildID: string, memberID: string) => "/guilds/{guild_id}/bans/{member_id}";
+    GUILD_BANS: (guildID: string) => "/guilds/{guild_id}/bans";
+    GUILD_CHANNELS: (guildID: string) => "/guilds/{guild_id}/channels";
+    GUILD_EMOJI: (guildID: string, emojiID: string) => "/guilds/{guild_id}/emojis/{emoji_id}";
+    GUILD_EMOJIS: (guildID: string) => "/guilds/{guild_id}/emojis";
+    GUILD_INVITES: (guildID: string) => "/guilds/{guild_id}/invites";
+    GUILD_INTEGRATION: (guildID: string, integrationID: string) => "/guilds/{guild_id}/integrations/{integration_id}";
+    GUILD_INTEGRATIONS: (guildID: string) => "/guilds/{guild_id}/integrations";
+    GUILD_MEMBER: (guildID: string, memberID: string) => "/guilds/{guild_id}/members/{member_id}";
+    GUILD_MEMBER_ROLE: (guildID: string, memberID: string, roleID: string) => "/guilds/{guild_id}/members/{member_id}/roles/{role_id}";
+    GUILD_MEMBERS: (guildID: string) => "/guilds/{guild_id}/members";
+    GUILD_MEMBERS_SEARCH: (guildID: string) => "/guilds/{guild_id}/members/search";
+    GUILD_PREVIEW: (guildID: string) => "/guilds/{guild_id}/preview";
+    GUILD_PRUNE: (guildID: string) => "/guilds/{guild_id}/prune";
+    GUILD_ROLE: (guildID: string, roleID: string) => "/guilds/{guild_id}/roles/{role_id}";
+    GUILD_ROLES: (guildID: string) => "/guilds/{guild_id}/roles";
+    GUILD_SCHEDULED_EVENTS: (guildID: string) => "/guilds/{guild_id}/scheduled-events";
+    GUILD_SCHEDULED_EVENT: (guildID: string, eventId: string) => "/guilds/{guild_id}/scheduled-events/{event_id}";
+    GUILD_SCHEDULED_EVENT_USERS: (guildID: string, eventId: string) => "/guilds/{guild_id}/scheduled-events/{event_id}/users";
+    GUILD_STICKER: (guildID: string, stickerID: string) => "/guilds/{guild_id}/stickers/{sticker_id}";
+    GUILD_STICKERS: (guildID: string) => "/guilds/{guild_id}/stickers";
+    GUILD_TEMPLATE: (guildID: string, code: string) => "/guilds/{guild_id}/templates/{code}";
+    GUILD_THREADS_ACTIVE: (guildID: string) => "/guilds/{guild_id}/threads/active";
+    GUILD_TEMPLATES: (guildID: string) => "/guilds/{guild_id}/templates";
+    GUILD_VANITY: (guildID: string) => "/guilds/{guild_id}/vanity-url";
+    GUILD_VOICE_REGIONS: (guildID: string) => "/guilds/{guild_id}/regions";
+    GUILD_VOICE_STATE_USER: (guildID: string, memberID: string) => "/guilds/{guild_id}/voice-states/{member-id}";
+    GUILD_WEBHOOKS: (guildID: string) => "/guilds/{guild_id}/webhooks";
+    GUILD_WELCOME_SCREEN: (guildID: string) => "/guilds/{guild_id}/welcome-screen";
+    GUILD_WIDGET: (guildID: string) => "/guilds/{guild_id}/widget.json";
+    GUILD_WIDGET_SETTINGS: (guildID: string) => "/guilds/{guild_id}/widget";
     GUILDS: "/guilds";
-    INTERACTION_CALLBACK: (interactionID: string, token: string) => "/interactions/:interaction_id/:token/callback";
-    INVITE: (inviteID: string) => "/invites/:invite_id";
-    OAUTH2_APPLICATION: (appID: string) => "/oauth2/applications/:app_id";
-    STAGE_INSTANCE_CHANNEL: (chanID: string) => "/stage-instances/:channel_id";
+    INTERACTION_CALLBACK: (interactionID: string, token: string) => "/interactions/{interaction_id}/{token}/callback";
+    INVITES: (inviteID: string) => "/invites/{invite_id}";
+    OAUTH2_APPLICATION: (appID: string) => "/oauth2/applications/{app_id}";
+    STAGE_INSTANCE_CHANNEL: (chanID: string) => "/stage-instances/{channel_id}";
     STAGE_INSTANCES: "/stage-instances";
-    STICKER: (stickerID: string) => "/stickers/:sticker_id";
-    TEMPLATE: (code: string) => "/guilds/templates/:code";
-    USER: (userID: string) => "/users/:user_id";
-    USER_CHANNELS: (userID: string) => "/users/:user_id/channels";
-    USER_GUILD: (userID: string, guildID: string) => any;
-    USER_GUILDS: (userID: string) => "/users/:user_id/guilds";
+    STICKER: (stickerID: string) => "/stickers/{sticker_id}";
+    TEMPLATE: (code: string) => "/guilds/templates/{code}";
+    USER: (userID: string) => "/users/{user_id}";
+    USER_CHANNELS: (userID: string) => "/users/{user_id}/channels";
+    USER_GUILD: (userID: string, guildID: string) => "/users/{user_id}/guilds/{guild_id}";
+    USER_GUILDS: (userID: string) => "/users/{user_id}/guilds";
     USERS: "/users";
     VOICE_REGIONS: "/voice/regions";
-    WEBHOOK: (hookID: string) => "/webhooks/:hook_id";
-    WEBHOOK_TOKEN: (hookID: string, token: string) => "/webhooks/:hook_id/:token";
-    WEBHOOK_TOKEN_GITHUB: (hookID: string, token: string) => "/webhooks/:hook_id/:token/github";
-    WEBHOOK_TOKEN_MESSAGE: (hookID: string, token: string, msgID: string) => string;
-    WEBHOOK_TOKEN_SLACK: (hookID: string, token: string) => "/webhooks/:hook_id/:token/slack";
+    WEBHOOK: (hookID: string) => "/webhooks/{hook_id}";
+    WEBHOOK_TOKEN: (hookID: string, token: string) => "/webhooks/{hook_id}/{token}";
+    WEBHOOK_TOKEN_GITHUB: (hookID: string, token: string) => "/webhooks/{hook_id}/{token}/github";
+    WEBHOOK_TOKEN_MESSAGE: (hookID: string, token: string, msgID: string) => "/webhooks/{hook_id}/{token}/messages/{message_id}";
+    WEBHOOK_TOKEN_SLACK: (hookID: string, token: string) => "/webhooks/{hook_id}/{token}/slack";
 };
 export = Endpoints;

package/dist/Endpoints.js

@@ -20,6 +20,7 @@ const Endpoints = {
     APPLICATION_GUILD_COMMANDS: (appID, guildID) => `/applications/${appID}/guilds/${guildID}/commands`,
     CHANNEL: (chanID) => `${Endpoints.CHANNELS}/${chanID}`,
     CHANNEL_BULK_DELETE: (chanID) => `${Endpoints.CHANNEL_MESSAGES(chanID)}/bulk-delete`,
+    CHANNEL_FOLLOWERS: (chanID) => `${Endpoints.CHANNEL(chanID)}/followers`,
     CHANNEL_INVITES: (chanID) => `${Endpoints.CHANNEL(chanID)}/invites`,
     CHANNEL_MESSAGE: (chanID, msgID) => `${Endpoints.CHANNEL_MESSAGES(chanID)}/${msgID}`,
     CHANNEL_MESSAGE_CROSSPOST: (chanID, msgID) => `${Endpoints.CHANNEL_MESSAGE(chanID, msgID)}/crosspost`,
@@ -79,7 +80,7 @@ const Endpoints = {
     GUILD_WIDGET_SETTINGS: (guildID) => `${Endpoints.GUILD(guildID)}/widget`,
     GUILDS: "/guilds",
     INTERACTION_CALLBACK: (interactionID, token) => `/interactions/${interactionID}/${token}/callback`,
-    INVITE: (inviteID) => `/invites/${inviteID}`,
+    INVITES: (inviteID) => `/invites/${inviteID}`,
     OAUTH2_APPLICATION: (appID) => `/oauth2/applications/${appID}`,
     STAGE_INSTANCE_CHANNEL: (chanID) => `${Endpoints.STAGE_INSTANCES}/${chanID}`,
     STAGE_INSTANCES: "/stage-instances",

package/dist/{ratelimitBuckets/LocalBucket.d.ts → LocalBucket.d.ts}

@@ -1,5 +1,7 @@
+/// <reference types="node" />
 /**
  * Bucket used for saving ratelimits
+ * @protected
  */
 declare class LocalBucket {
     /**
@@ -16,32 +18,36 @@ declare class LocalBucket {
     /**
      * Remaining amount of executions during the current timeframe
      */
-    protected _remaining: number;
+    remaining: number;
     /**
      * Timeframe in milliseconds until the ratelimit resets
      */
     reset: number;
     /**
-     * The Date time in which the bucket will reset
+     * Timeout that calls the reset function once the timeframe passed
      */
-    resetAt: number | null;
+    resetTimeout: NodeJS.Timeout | null;
     /**
      * ratelimiter used for ratelimiting requests
      */
-    ratelimiter: import("../Ratelimiter");
+    ratelimiter: import("./Ratelimiter");
+    /**
+     * Key used internally to routify requests
+     */
+    routeKey: string;
+    static readonly default: typeof LocalBucket;
     /**
      * Create a new bucket
      * @param ratelimiter ratelimiter used for ratelimiting requests
+     * @param routeKey Key used internally to routify requests. Assigned by ratelimiter
      */
-    constructor(ratelimiter: import("../Ratelimiter"));
-    get remaining(): number;
-    set remaining(value: number);
+    constructor(ratelimiter: import("./Ratelimiter"), routeKey: string);
     /**
      * Queue a function to be executed
      * @param fn function to be executed
      * @returns Result of the function if any
      */
-    queue(fn: (bucket: LocalBucket) => any | Promise<any>): Promise<any>;
+    queue<T>(fn: (bucket: LocalBucket) => T): Promise<T>;
     /**
      * Check if there are any functions in the queue that haven't been executed yet
      */
@@ -49,7 +55,7 @@ declare class LocalBucket {
     /**
      * Reset the remaining tokens to the base limit
      */
-    resetRemaining(): void;
+    private resetRemaining;
     /**
      * Clear the current queue of events to be sent
      */

package/dist/LocalBucket.js

@@ -0,0 +1,88 @@
+"use strict";
+/**
+ * Bucket used for saving ratelimits
+ * @protected
+ */
+class LocalBucket {
+    /**
+     * Create a new bucket
+     * @param ratelimiter ratelimiter used for ratelimiting requests
+     * @param routeKey Key used internally to routify requests. Assigned by ratelimiter
+     */
+    constructor(ratelimiter, routeKey) {
+        /**
+         * array of functions waiting to be executed
+         */
+        this.fnQueue = [];
+        /**
+         * Number of functions that may be executed during the timeframe set in limitReset
+         */
+        this.limit = 5;
+        /**
+         * Remaining amount of executions during the current timeframe
+         */
+        this.remaining = 1;
+        /**
+         * Timeframe in milliseconds until the ratelimit resets
+         */
+        this.reset = 5000;
+        /**
+         * Timeout that calls the reset function once the timeframe passed
+         */
+        this.resetTimeout = null;
+        this.ratelimiter = ratelimiter;
+        this.routeKey = routeKey;
+    }
+    /**
+     * Queue a function to be executed
+     * @param fn function to be executed
+     * @returns Result of the function if any
+     */
+    queue(fn) {
+        return new Promise(res => {
+            const wrapFn = () => {
+                this.remaining--;
+                if (!this.resetTimeout)
+                    this.resetTimeout = setTimeout(() => this.resetRemaining(), this.reset);
+                if (this.remaining !== 0)
+                    this.checkQueue();
+                return res(fn(this));
+            };
+            this.fnQueue.push({ fn, callback: wrapFn });
+            this.checkQueue();
+        });
+    }
+    /**
+     * Check if there are any functions in the queue that haven't been executed yet
+     */
+    checkQueue() {
+        if (this.ratelimiter.global)
+            return;
+        if (this.fnQueue.length && this.remaining !== 0) {
+            const queuedFunc = this.fnQueue.splice(0, 1)[0];
+            queuedFunc.callback();
+        }
+    }
+    /**
+     * Reset the remaining tokens to the base limit
+     */
+    resetRemaining() {
+        this.remaining = this.limit;
+        if (this.resetTimeout) {
+            clearTimeout(this.resetTimeout);
+            this.resetTimeout = null;
+        }
+        if (this.fnQueue.length)
+            this.checkQueue();
+        else
+            delete this.ratelimiter.buckets[this.routeKey];
+    }
+    /**
+     * Clear the current queue of events to be sent
+     */
+    dropQueue() {
+        this.fnQueue.length = 0;
+    }
+}
+LocalBucket.default = LocalBucket;
+module.exports = LocalBucket;

package/dist/Ratelimiter.d.ts

@@ -1,25 +1,37 @@
 /// <reference types="node" />
-import LocalBucket from "./ratelimitBuckets/LocalBucket";
+import LocalBucket from "./LocalBucket";
 /**
  * Ratelimiter used for handling the ratelimits imposed by the rest api
  * @protected
  */
 declare class Ratelimiter {
+    /**
+     * An object of Buckets that store rate limit info
+     */
     buckets: {
         [routeKey: string]: LocalBucket;
     };
-    global: boolean;
-    globalResetAt: number;
     /**
-     * This is an interval to constantly check Buckets which should be reset or unreferenced from the RateLimiter to be swept by the garbage collector.
-     * This 1 timeout is more performant as compared to potentially many more ticking timers to reset individual bucket remaining values.
-     *
-     * YOU SHOULD NEVER OVERRIDE THIS UNLESS YOU KNOW WHAT YOU'RE DOING. REQUESTS MAY POSSIBLY NEVER EXECUTE WITHOUT THIS AND/OR MEMORY MAY SLOWLY CLIMB OVER TIME.
+     * If you're being globally rate limited
+     */
+    private _global;
+    /**
+     * Timeframe in milliseconds until when the global rate limit resets
+     */
+    globalReset: number;
+    /**
+     * Timeout that resets the global ratelimit once the timeframe has passed
+     */
+    globalResetTimeout: NodeJS.Timeout | null;
+    static default: typeof Ratelimiter;
+    /**
+     * If you're being globally rate limited
+     */
+    get global(): boolean;
+    /**
+     * If you're being globally rate limited
      */
-    protected _timeout: NodeJS.Timeout;
-    protected _timeoutFN: () => void;
-    protected _timeoutDuration: number;
-    constructor();
+    set global(value: boolean);
     /**
      * Returns a key for saving ratelimits for routes
      * (Taken from https://github.com/abalabahaha/eris/blob/master/lib/rest/RequestHandler.js) -> I luv u abal <3
@@ -34,6 +46,6 @@ declare class Ratelimiter {
      * @param url Endpoint of the request
      * @param method Http method used by the request
      */
-    queue(fn: (bucket: import("./ratelimitBuckets/LocalBucket")) => any, url: string, method: string): void;
+    queue(fn: (bucket: import("./LocalBucket")) => any, url: string, method: string): void;
 }
 export = Ratelimiter;

package/dist/Ratelimiter.js

@@ -2,37 +2,53 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-const LocalBucket_1 = __importDefault(require("./ratelimitBuckets/LocalBucket"));
+const LocalBucket_1 = __importDefault(require("./LocalBucket"));
 /**
  * Ratelimiter used for handling the ratelimits imposed by the rest api
  * @protected
  */
 class Ratelimiter {
     constructor() {
+        /**
+         * An object of Buckets that store rate limit info
+         */
         this.buckets = {};
-        this.global = false;
-        this.globalResetAt = 0;
-        // eslint-disable-next-line @typescript-eslint/no-this-alias
-        const limiter = this;
-        this._timeoutFN = function () {
-            for (const routeKey of Object.keys(limiter.buckets)) {
-                const bkt = limiter.buckets[routeKey];
-                if (bkt.resetAt && bkt.resetAt < Date.now()) {
-                    if (bkt.fnQueue.length)
-                        bkt.resetRemaining();
-                    else
-                        delete limiter.buckets[routeKey];
-                }
-                else if (!bkt.resetAt && limiter.global && limiter.globalResetAt < Date.now()) {
-                    if (bkt.fnQueue.length)
-                        bkt.checkQueue();
-                    else
-                        delete limiter.buckets[routeKey];
+        /**
+         * If you're being globally rate limited
+         */
+        this._global = false;
+        /**
+         * Timeframe in milliseconds until when the global rate limit resets
+         */
+        this.globalReset = 0;
+        /**
+         * Timeout that resets the global ratelimit once the timeframe has passed
+         */
+        this.globalResetTimeout = null;
+    }
+    /**
+     * If you're being globally rate limited
+     */
+    get global() {
+        return this._global;
+    }
+    /**
+     * If you're being globally rate limited
+     */
+    set global(value) {
+        if (value && this.globalReset) {
+            if (this.globalResetTimeout)
+                clearTimeout(this.globalResetTimeout);
+            this.globalResetTimeout = setTimeout(() => {
+                this.globalResetTimeout = null;
+                this.globalReset = 0;
+                this.global = false;
+                for (const bkt of Object.values(this.buckets)) {
+                    bkt.checkQueue();
                 }
-            }
-        };
-        this._timeoutDuration = 1000;
-        this._timeout = setInterval(() => { limiter._timeoutFN(); }, limiter._timeoutDuration);
+            }, this.globalReset);
+        }
+        this._global = value;
     }
     /**
      * Returns a key for saving ratelimits for routes
@@ -58,8 +74,9 @@ class Ratelimiter {
     queue(fn, url, method) {
         const routeKey = this.routify(url, method);
         if (!this.buckets[routeKey])
-            this.buckets[routeKey] = new LocalBucket_1.default(this);
+            this.buckets[routeKey] = new LocalBucket_1.default(this, routeKey);
         this.buckets[routeKey].queue(fn);
     }
 }
+Ratelimiter.default = Ratelimiter;
 module.exports = Ratelimiter;

package/dist/RequestHandler.d.ts

@@ -73,10 +73,9 @@ declare class RequestHandler extends EventEmitter {
      * @param method http method to use
      * @param dataType type of the data being sent
      * @param data data to send, if any
-     * @param amount amount of requests previously executed
      * @returns Result of the request
      */
-    request(endpoint: string, method: HTTPMethod, dataType?: "json" | "multipart", data?: any | undefined, amount?: number): Promise<any>;
+    request(endpoint: string, method: HTTPMethod, dataType?: "json" | "multipart", data?: any | undefined): Promise<any>;
     /**
      * Apply the received ratelimit headers to the ratelimit bucket
      * @param bkt Ratelimit bucket to apply the headers to
@@ -88,7 +87,6 @@ declare class RequestHandler extends EventEmitter {
      * @param endpoint Endpoint to use
      * @param data Data to send
      * @param useParams Whether to send the data in the body or use query params
-     * @param amount amount of requests previously executed
      * @returns Result of the request
      */
     private _request;