seyfert 1.2.3 → 1.3.1

package/lib/api/Routes/channels.d.ts

@@ -1,4 +1,4 @@
-import type { RESTDeleteAPIChannelAllMessageReactionsResult, RESTDeleteAPIChannelMessageReactionResult, RESTDeleteAPIChannelMessageResult, RESTDeleteAPIChannelPermissionResult, RESTDeleteAPIChannelPinResult, RESTDeleteAPIChannelRecipientResult, RESTDeleteAPIChannelResult, RESTDeleteAPIChannelThreadMembersResult, RESTGetAPIChannelInvitesResult, RESTGetAPIChannelMessageReactionUsersQuery, RESTGetAPIChannelMessageReactionUsersResult, RESTGetAPIChannelMessageResult, RESTGetAPIChannelMessagesQuery, RESTGetAPIChannelMessagesResult, RESTGetAPIChannelPinsResult, RESTGetAPIChannelResult, RESTGetAPIChannelThreadMemberQuery, RESTGetAPIChannelThreadMemberResult, RESTGetAPIChannelThreadMembersQuery, RESTGetAPIChannelThreadMembersResult, RESTGetAPIChannelThreadsArchivedPrivateResult, RESTGetAPIChannelThreadsArchivedPublicResult, RESTGetAPIChannelThreadsArchivedQuery, RESTGetAPIChannelUsersThreadsArchivedResult, RESTGetAPIGuildWebhooksResult, RESTPatchAPIChannelJSONBody, RESTPatchAPIChannelMessageJSONBody, RESTPatchAPIChannelMessageResult, RESTPatchAPIChannelResult, RESTPostAPIChannelFollowersJSONBody, RESTPostAPIChannelFollowersResult, RESTPostAPIChannelInviteJSONBody, RESTPostAPIChannelInviteResult, RESTPostAPIChannelMessageCrosspostResult, RESTPostAPIChannelMessageJSONBody, RESTPostAPIChannelMessageResult, RESTPostAPIChannelMessagesBulkDeleteJSONBody, RESTPostAPIChannelMessagesBulkDeleteResult, RESTPostAPIChannelMessagesThreadsJSONBody, RESTPostAPIChannelMessagesThreadsResult, RESTPostAPIChannelThreadsJSONBody, RESTPostAPIChannelThreadsResult, RESTPostAPIChannelTypingResult, RESTPostAPIChannelWebhookJSONBody, RESTPostAPIChannelWebhookResult, RESTPostAPIGuildForumThreadsJSONBody, RESTPutAPIChannelMessageReactionResult, RESTPutAPIChannelPermissionJSONBody, RESTPutAPIChannelPermissionResult, RESTPutAPIChannelPinResult, RESTPutAPIChannelRecipientJSONBody, RESTPutAPIChannelRecipientResult, RESTPutAPIChannelThreadMembersResult } from 'discord-api-types/v10';
+import type { RESTDeleteAPIChannelAllMessageReactionsResult, RESTDeleteAPIChannelMessageReactionResult, RESTDeleteAPIChannelMessageResult, RESTDeleteAPIChannelPermissionResult, RESTDeleteAPIChannelPinResult, RESTDeleteAPIChannelRecipientResult, RESTDeleteAPIChannelResult, RESTDeleteAPIChannelThreadMembersResult, RESTGetAPIChannelInvitesResult, RESTGetAPIChannelMessageReactionUsersQuery, RESTGetAPIChannelMessageReactionUsersResult, RESTGetAPIChannelMessageResult, RESTGetAPIChannelMessagesQuery, RESTGetAPIChannelMessagesResult, RESTGetAPIChannelPinsResult, RESTGetAPIChannelResult, RESTGetAPIChannelThreadMemberQuery, RESTGetAPIChannelThreadMemberResult, RESTGetAPIChannelThreadMembersQuery, RESTGetAPIChannelThreadMembersResult, RESTGetAPIChannelThreadsArchivedPrivateResult, RESTGetAPIChannelThreadsArchivedPublicResult, RESTGetAPIChannelThreadsArchivedQuery, RESTGetAPIChannelUsersThreadsArchivedResult, RESTGetAPIGuildWebhooksResult, RESTGetAPIPollAnswerVotersQuery, RESTGetAPIPollAnswerVotersResult, RESTPatchAPIChannelJSONBody, RESTPatchAPIChannelMessageJSONBody, RESTPatchAPIChannelMessageResult, RESTPatchAPIChannelResult, RESTPostAPIChannelFollowersJSONBody, RESTPostAPIChannelFollowersResult, RESTPostAPIChannelInviteJSONBody, RESTPostAPIChannelInviteResult, RESTPostAPIChannelMessageCrosspostResult, RESTPostAPIChannelMessageJSONBody, RESTPostAPIChannelMessageResult, RESTPostAPIChannelMessagesBulkDeleteJSONBody, RESTPostAPIChannelMessagesBulkDeleteResult, RESTPostAPIChannelMessagesThreadsJSONBody, RESTPostAPIChannelMessagesThreadsResult, RESTPostAPIChannelThreadsJSONBody, RESTPostAPIChannelThreadsResult, RESTPostAPIChannelTypingResult, RESTPostAPIChannelWebhookJSONBody, RESTPostAPIChannelWebhookResult, RESTPostAPIGuildForumThreadsJSONBody, RESTPostAPIPollExpireResult, RESTPutAPIChannelMessageReactionResult, RESTPutAPIChannelPermissionJSONBody, RESTPutAPIChannelPermissionResult, RESTPutAPIChannelPinResult, RESTPutAPIChannelRecipientJSONBody, RESTPutAPIChannelRecipientResult, RESTPutAPIChannelThreadMembersResult } from 'discord-api-types/v10';
 import type { ProxyRequestMethod } from '../Router';
 import type { RestArguments } from '../api';
 export interface ChannelRoutes {
@@ -99,5 +99,19 @@ export interface ChannelRoutes {
             get(args?: RestArguments<ProxyRequestMethod.Get>): Promise<RESTGetAPIGuildWebhooksResult>;
             post(args: RestArguments<ProxyRequestMethod.Post, RESTPostAPIChannelWebhookJSONBody>): Promise<RESTPostAPIChannelWebhookResult>;
         };
+        'voice-status': {
+            put(args: RestArguments<ProxyRequestMethod.Put, {
+                status: string | null;
+            }>): Promise<never>;
+        };
+        polls(messageId: string): {
+            answers(id: ValidAnswerId): {
+                get(args?: RestArguments<ProxyRequestMethod.Get, never, RESTGetAPIPollAnswerVotersQuery>): Promise<RESTGetAPIPollAnswerVotersResult>;
+            };
+            expire: {
+                post(args?: RestArguments<ProxyRequestMethod.Post>): Promise<RESTPostAPIPollExpireResult>;
+            };
+        };
     };
 }
+export type ValidAnswerId = 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10;

package/lib/api/api.js

@@ -23,6 +23,7 @@ class ApiHandler {
         this.options = {
             baseUrl: 'api/v10',
             domain: 'https://discord.com',
+            type: 'Bot',
             ...options,
             userAgent: shared_1.DefaultUserAgent,
         };
@@ -270,7 +271,7 @@ class ApiHandler {
         let finalUrl = options.url;
         let data;
         if (options.request.auth) {
-            options.headers.Authorization = `Bot ${this.options.token}`;
+            options.headers.Authorization = `${this.options.type} ${options.request.token || this.options.token}`;
         }
         if (options.request.query) {
             finalUrl += `?${new URLSearchParams(options.request.query)}`;
@@ -318,6 +319,9 @@ class ApiHandler {
         return { data, finalUrl };
     }
     routefy(url, method) {
+        if (url.startsWith('/interactions/') && url.endsWith('/callback')) {
+            return '/interactions/:id/:token/callback';
+        }
         let route = url
             .replace(/\/([a-z-]+)\/(?:[0-9]{17,19})/g, (match, p) => p === 'channels' || p === 'guilds' || p === 'webhooks' ? match : `/${p}/:id`)
             .replace(/\/reactions\/[^/]+/g, '/reactions/:id')

package/lib/api/shared.d.ts

@@ -12,8 +12,9 @@ export interface ApiHandlerOptions {
     agent?: string;
     smartBucket?: boolean;
     workerProxy?: boolean;
+    type?: 'Bearer' | 'Bot';
 }
-export interface ApiHandlerInternalOptions extends MakeRequired<ApiHandlerOptions, 'baseUrl' | 'domain'> {
+export interface ApiHandlerInternalOptions extends MakeRequired<ApiHandlerOptions, 'baseUrl' | 'domain' | 'type'> {
     userAgent: string;
 }
 export interface RawFile {
@@ -31,5 +32,6 @@ export interface ApiRequestOptions {
     route?: `/${string}`;
     unshift?: boolean;
     appendToFormData?: boolean;
+    token?: string;
 }
 export type HttpMethods = 'GET' | 'DELETE' | 'PUT' | 'POST' | 'PATCH';

package/lib/api/utils/utils.d.ts

@@ -5,7 +5,7 @@ import type { Snowflake } from 'discord-api-types/v10';
  *
  * @param userId - The user id to calculate the default avatar index for
  */
-export declare function calculateUserDefaultAvatarIndex(userId: Snowflake): number;
+export declare function calculateUserDefaultAvatarIndex(userId: Snowflake, discriminator: string): number;
 /**
  * Verifies that a value is a buffer-like object.
  *

package/lib/api/utils/utils.js

@@ -6,8 +6,8 @@ exports.isBufferLike = exports.calculateUserDefaultAvatarIndex = void 0;
  *
  * @param userId - The user id to calculate the default avatar index for
  */
-function calculateUserDefaultAvatarIndex(userId) {
-    return Number(BigInt(userId) >> 22n) % 6;
+function calculateUserDefaultAvatarIndex(userId, discriminator) {
+    return discriminator === '0' ? Number(BigInt(userId) >> 22n) % 6 : Number.parseInt(discriminator) % 5;
 }
 exports.calculateUserDefaultAvatarIndex = calculateUserDefaultAvatarIndex;
 /**

package/lib/builders/Poll.d.ts

@@ -0,0 +1,16 @@
+import { type APIPollMedia, type RESTAPIPollCreate } from 'discord-api-types/v10';
+import type { DeepPartial, EmojiResolvable, RestOrArray } from '../common';
+export declare class PollBuilder {
+    data: DeepPartial<RESTAPIPollCreate>;
+    constructor(data?: DeepPartial<RESTAPIPollCreate>);
+    addAnswers(...answers: RestOrArray<PollMedia>): this;
+    setAnswers(...answers: RestOrArray<PollMedia>): this;
+    setQuestion(data: PollMedia): this;
+    setDuration(hours: number): this;
+    allowMultiselect(value?: boolean): this;
+    toJSON(): RESTAPIPollCreate;
+    private resolvedPollMedia;
+}
+export type PollMedia = Omit<APIPollMedia, 'emoji'> & {
+    emoji?: EmojiResolvable;
+};

package/lib/builders/Poll.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PollBuilder = void 0;
+const v10_1 = require("discord-api-types/v10");
+const __1 = require("..");
+const functions_1 = require("../structures/extra/functions");
+class PollBuilder {
+    data;
+    constructor(data = {}) {
+        this.data = data;
+        this.data.layout_type = v10_1.PollLayoutType.Default;
+    }
+    addAnswers(...answers) {
+        this.data.answers = (this.data.answers ?? []).concat(answers.flat().map(x => ({ poll_media: this.resolvedPollMedia(x) })));
+        return this;
+    }
+    setAnswers(...answers) {
+        this.data.answers = answers.flat().map(x => ({ poll_media: this.resolvedPollMedia(x) }));
+        return this;
+    }
+    setQuestion(data) {
+        this.data.question ??= {};
+        const { emoji, text } = this.resolvedPollMedia(data);
+        this.data.question.text = text;
+        this.data.question.emoji = emoji;
+        return this;
+    }
+    setDuration(hours) {
+        this.data.duration = hours;
+        return this;
+    }
+    allowMultiselect(value = true) {
+        this.data.allow_multiselect = value;
+        return this;
+    }
+    toJSON() {
+        return { ...this.data };
+    }
+    resolvedPollMedia(data) {
+        if (!data.emoji)
+            return { text: data.text };
+        const resolve = (0, functions_1.resolvePartialEmoji)(data.emoji);
+        if (!resolve)
+            return (0, __1.throwError)('Invalid Emoji');
+        return { text: data.text, emoji: resolve };
+    }
+}
+exports.PollBuilder = PollBuilder;

package/lib/builders/index.d.ts

@@ -8,5 +8,6 @@ export * from './Button';
 export * from './Embed';
 export * from './Modal';
 export * from './SelectMenu';
+export * from './Poll';
 export * from './types';
 export declare function fromComponent(data: BuilderComponents | APIActionRowComponentTypes | APIActionRowComponent<APIActionRowComponentTypes> | ActionRow<BuilderComponents>): BuilderComponents | ActionRow<BuilderComponents>;

package/lib/builders/index.js

@@ -27,6 +27,7 @@ __exportStar(require("./Button"), exports);
 __exportStar(require("./Embed"), exports);
 __exportStar(require("./Modal"), exports);
 __exportStar(require("./SelectMenu"), exports);
+__exportStar(require("./Poll"), exports);
 __exportStar(require("./types"), exports);
 function fromComponent(data) {
     if ('toJSON' in data) {

package/lib/cache/adapters/index.d.ts

@@ -1,4 +1,5 @@
 export * from './default';
+export * from './limited';
 export * from './redis';
 export * from './types';
 export * from './workeradapter';

package/lib/cache/adapters/index.js

@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./default"), exports);
+__exportStar(require("./limited"), exports);
 __exportStar(require("./redis"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./workeradapter"), exports);

package/lib/cache/adapters/limited.d.ts

@@ -0,0 +1,50 @@
+import { LimitedCollection } from '../..';
+import { type MakeRequired } from '../../common';
+import type { Adapter } from './types';
+export interface ResourceLimitedMemoryAdapter {
+    expire?: number;
+    limit?: number;
+}
+export interface LimitedMemoryAdapterOptions {
+    default?: ResourceLimitedMemoryAdapter;
+    guild?: ResourceLimitedMemoryAdapter;
+    user?: ResourceLimitedMemoryAdapter;
+    member?: ResourceLimitedMemoryAdapter;
+    voice_state?: ResourceLimitedMemoryAdapter;
+    channel?: ResourceLimitedMemoryAdapter;
+    emoji?: ResourceLimitedMemoryAdapter;
+    overwrite?: ResourceLimitedMemoryAdapter;
+    presence?: ResourceLimitedMemoryAdapter;
+    role?: ResourceLimitedMemoryAdapter;
+    stage_instance?: ResourceLimitedMemoryAdapter;
+    sticker?: ResourceLimitedMemoryAdapter;
+    thread?: ResourceLimitedMemoryAdapter;
+}
+export declare class LimitedMemoryAdapter implements Adapter {
+    isAsync: boolean;
+    readonly storage: Map<string, LimitedCollection<string, string>>;
+    readonly relationships: Map<string, Map<string, string[]>>;
+    options: MakeRequired<LimitedMemoryAdapterOptions, 'default'>;
+    constructor(options: LimitedMemoryAdapterOptions);
+    scan(query: string, keys?: false): any[];
+    scan(query: string, keys: true): string[];
+    get(keys: string): any;
+    get(keys: string[]): any[];
+    private __set;
+    set(keys: string, data: any): void;
+    set(keys: [string, any][]): void;
+    patch(updateOnly: boolean, keys: string, data: any): void;
+    patch(updateOnly: boolean, keys: [string, any][]): void;
+    values(to: string): any[];
+    keys(to: string): string[];
+    count(to: string): number;
+    remove(keys: string): void;
+    remove(keys: string[]): void;
+    flush(): void;
+    contains(to: string, keys: string): boolean;
+    getToRelationship(to: string): string[];
+    bulkAddToRelationShip(data: Record<string, string[]>): void;
+    addToRelationship(to: string, keys: string | string[]): void;
+    removeToRelationship(to: string, keys: string | string[]): void;
+    removeRelationship(to: string | string[]): void;
+}

package/lib/cache/adapters/limited.js

@@ -0,0 +1,188 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LimitedMemoryAdapter = void 0;
+const __1 = require("../..");
+const common_1 = require("../../common");
+class LimitedMemoryAdapter {
+    isAsync = false;
+    storage = new Map();
+    relationships = new Map();
+    options;
+    constructor(options) {
+        this.options = (0, common_1.MergeOptions)({
+            default: {
+                expire: undefined,
+                limit: Number.POSITIVE_INFINITY,
+            },
+        }, options);
+    }
+    scan(query, keys = false) {
+        const values = [];
+        const sq = query.split('.');
+        for (const iterator of [...this.storage.values()].flatMap(x => x.entries()))
+            for (const [key, value] of iterator) {
+                if (key.split('.').every((value, i) => (sq[i] === '*' ? !!value : sq[i] === value))) {
+                    values.push(keys ? key : JSON.parse(value.value));
+                }
+            }
+        return values;
+    }
+    get(keys) {
+        if (!Array.isArray(keys)) {
+            const data = [...this.storage.values()].find(x => x.has(keys))?.get(keys);
+            return data ? JSON.parse(data) : null;
+        }
+        const iterator = [...this.storage.values()];
+        return keys
+            .map(key => {
+            const data = iterator.find(x => x.has(key))?.get(key);
+            return data ? JSON.parse(data) : null;
+        })
+            .filter(x => x);
+    }
+    __set(key, data) {
+        const __guildId = Array.isArray(data) ? data[0].guild_id : data.guild_id;
+        const namespace = `${key.split('.')[0]}${__guildId ? `.${__guildId}` : ''}`;
+        const self = this;
+        if (!this.storage.has(namespace)) {
+            this.storage.set(namespace, new __1.LimitedCollection({
+                expire: this.options[key.split('.')[0]]?.expire ?? this.options.default.expire,
+                limit: this.options[key.split('.')[0]]?.limit ?? this.options.default.limit,
+                resetOnDemand: true,
+                onDelete(k) {
+                    const relationshipNamespace = key.split('.')[0];
+                    const relation = self.relationships.get(relationshipNamespace);
+                    if (relation) {
+                        switch (relationshipNamespace) {
+                            case 'guild':
+                            case 'user':
+                                self.removeToRelationship(namespace, k.split('.')[1]);
+                                break;
+                            case 'member':
+                            case 'voice_state':
+                                {
+                                    const split = k.split('.');
+                                    self.removeToRelationship(`${namespace}.${split[1]}`, split[2]);
+                                }
+                                break;
+                            case 'channel':
+                            case 'emoji':
+                            case 'presence':
+                            case 'role':
+                            case 'stage_instance':
+                            case 'sticker':
+                            case 'thread':
+                            case 'overwrite':
+                            case 'message':
+                                self.removeToRelationship(namespace, k.split('.')[1]);
+                                break;
+                        }
+                    }
+                },
+            }));
+        }
+        this.storage.get(namespace).set(key, JSON.stringify(data));
+    }
+    set(keys, data) {
+        if (Array.isArray(keys)) {
+            for (const [key, value] of keys) {
+                this.__set(key, value);
+            }
+        }
+        else {
+            this.__set(keys, data);
+        }
+    }
+    patch(updateOnly, keys, data) {
+        if (Array.isArray(keys)) {
+            for (const [key, value] of keys) {
+                const oldData = this.get(key);
+                if (updateOnly && !oldData) {
+                    continue;
+                }
+                this.__set(key, Array.isArray(value) ? value : { ...(oldData ?? {}), ...value });
+            }
+        }
+        else {
+            const oldData = this.get(keys);
+            if (updateOnly && !oldData) {
+                return;
+            }
+            this.__set(keys, Array.isArray(data) ? data : { ...(oldData ?? {}), ...data });
+        }
+    }
+    values(to) {
+        const array = [];
+        const data = this.keys(to);
+        for (const key of data) {
+            const content = this.get(key);
+            if (content) {
+                array.push(content);
+            }
+        }
+        return array;
+    }
+    keys(to) {
+        return this.getToRelationship(to).map(id => `${to}.${id}`);
+    }
+    count(to) {
+        return this.getToRelationship(to).length;
+    }
+    remove(keys) {
+        for (const i of Array.isArray(keys) ? keys : [keys]) {
+            this.storage.get(i.split('.')[0])?.delete(i);
+        }
+    }
+    flush() {
+        this.storage.clear();
+        this.relationships.clear();
+    }
+    contains(to, keys) {
+        return this.getToRelationship(to).includes(keys);
+    }
+    getToRelationship(to) {
+        const key = to.split('.')[0];
+        if (!this.relationships.has(key))
+            this.relationships.set(key, new Map());
+        const relation = this.relationships.get(key);
+        const subrelationKey = to.split('.')[1] ?? '*';
+        if (!relation.has(subrelationKey)) {
+            relation.set(subrelationKey, []);
+        }
+        return relation.get(subrelationKey);
+    }
+    bulkAddToRelationShip(data) {
+        for (const i in data) {
+            this.addToRelationship(i, data[i]);
+        }
+    }
+    addToRelationship(to, keys) {
+        const key = to.split('.')[0];
+        if (!this.relationships.has(key)) {
+            this.relationships.set(key, new Map());
+        }
+        const data = this.getToRelationship(to);
+        for (const key of Array.isArray(keys) ? keys : [keys]) {
+            if (!data.includes(key)) {
+                data.push(key);
+            }
+        }
+    }
+    removeToRelationship(to, keys) {
+        const data = this.getToRelationship(to);
+        if (data) {
+            for (const key of Array.isArray(keys) ? keys : [keys]) {
+                const idx = data.indexOf(key);
+                if (idx !== -1) {
+                    data.splice(idx, 1);
+                }
+            }
+        }
+    }
+    removeRelationship(to) {
+        for (const i of Array.isArray(to) ? to : [to]) {
+            this.relationships.delete(i);
+        }
+    }
+}
+exports.LimitedMemoryAdapter = LimitedMemoryAdapter;

package/lib/cache/index.d.ts

@@ -14,12 +14,13 @@ import { VoiceStates } from './resources/voice-states';
 import { GatewayIntentBits, type GatewayDispatchPayload } from 'discord-api-types/v10';
 import type { InternalOptions, UsingClient } from '../commands';
 import { Overwrites } from './resources/overwrites';
+import { Messages } from './resources/messages';
 export type InferAsyncCache = InternalOptions extends {
     asyncCache: infer P;
 } ? P : false;
 export type ReturnCache<T> = If<InferAsyncCache, Promise<T>, T>;
 export type GuildBased = 'members' | 'voiceStates';
-export type GuildRelated = 'emojis' | 'roles' | 'threads' | 'channels' | 'stickers' | 'presences' | 'stageInstances' | 'overwrites';
+export type GuildRelated = 'emojis' | 'roles' | 'threads' | 'channels' | 'stickers' | 'presences' | 'stageInstances' | 'overwrites' | 'messages';
 export type NonGuildBased = 'users' | 'guilds';
 export * from './adapters/index';
 export type CachedEvents = 'READY' | 'GUILD_CREATE' | 'GUILD_UPDATE' | 'GUILD_DELETE' | 'CHANNEL_CREATE' | 'CHANNEL_UPDATE' | 'CHANNEL_DELETE' | 'GUILD_ROLE_CREATE' | 'GUILD_ROLE_UPDATE' | 'GUILD_ROLE_DELETE' | 'GUILD_EMOJIS_UPDATE' | 'GUILD_STICKERS_UPDATE' | 'GUILD_MEMBER_ADD' | 'GUILD_MEMBER_UPDATE' | 'GUILD_MEMBER_REMOVE' | 'MESSAGE_CREATE' | 'PRESENCE_UPDATE' | 'THREAD_DELETE' | 'THREAD_CREATE' | 'THREAD_UPDATE' | 'USER_UPDATE' | 'VOICE_STATE_UPDATE' | 'STAGE_INSTANCE_CREATE' | 'STAGE_INSTANCE_UPDATE' | 'STAGE_INSTANCE_DELETE';
@@ -39,6 +40,7 @@ export declare class Cache {
     stickers?: Stickers;
     presences?: Presences;
     stageInstances?: StageInstances;
+    messages?: Messages;
     constructor(intents: number, adapter: Adapter, disabledCache?: (NonGuildBased | GuildBased | GuildRelated)[], client?: UsingClient);
     flush(): ReturnCache<void>;
     hasIntent(intent: keyof typeof GatewayIntentBits): boolean;
@@ -65,12 +67,13 @@ export declare class Cache {
         channels: NonNullable<ReturnCache<import("..").AllChannels | undefined>>[];
         members: import("..").GuildMember[];
         users: import("..").User[];
-        threads: import("..").ThreadChannel[];
+        messages: import("..").Message[];
         presences: (Omit<import("discord-api-types/v10").GatewayPresenceUpdate, "user"> & {
             id: string;
         } & {
             guild_id: string;
         })[];
+        threads: import("..").ThreadChannel[];
         voiceStates: import("..").VoiceState[];
         stageInstances: (import("discord-api-types/v10").APIStageInstance & {
             guild_id: string;

package/lib/cache/index.js

@@ -28,6 +28,7 @@ const threads_1 = require("./resources/threads");
 const voice_states_1 = require("./resources/voice-states");
 const v10_1 = require("discord-api-types/v10");
 const overwrites_1 = require("./resources/overwrites");
+const messages_1 = require("./resources/messages");
 __exportStar(require("./adapters/index"), exports);
 class Cache {
     intents;
@@ -48,6 +49,7 @@ class Cache {
     stickers;
     presences;
     stageInstances;
+    messages;
     constructor(intents, adapter, disabledCache = [], client) {
         this.intents = intents;
         this.adapter = adapter;
@@ -91,6 +93,9 @@ class Cache {
         if (!this.disabledCache.includes('stageInstances')) {
             this.stageInstances = new stage_instances_1.StageInstances(this, client);
         }
+        if (!this.disabledCache.includes('messages')) {
+            this.messages = new messages_1.Messages(this, client);
+        }
     }
     /** @internal */
     __setClient(client) {
@@ -106,6 +111,7 @@ class Cache {
         this.presences?.__setClient(client);
         this.threads?.__setClient(client);
         this.stageInstances?.__setClient(client);
+        this.messages?.__setClient(client);
     }
     flush() {
         return this.adapter.flush();
@@ -161,6 +167,7 @@ class Cache {
                 case 'users':
                 case 'guilds':
                 case 'overwrites':
+                case 'messages':
                     {
                         if (!allData[type]) {
                             allData[type] = [];
@@ -200,7 +207,10 @@ class Cache {
                 case 'stageInstances':
                 case 'emojis':
                 case 'overwrites':
+                case 'messages':
                     {
+                        if (!this[type]?.filter(data, id, guildId))
+                            continue;
                         const hashId = this[type]?.hashId(guildId);
                         if (!hashId) {
                             continue;
@@ -218,6 +228,8 @@ class Cache {
                 case 'voiceStates':
                 case 'members':
                     {
+                        if (!this[type]?.filter(data, id, guildId))
+                            continue;
                         const hashId = this[type]?.hashId(guildId);
                         if (!hashId) {
                             continue;
@@ -233,6 +245,8 @@ class Cache {
                 case 'users':
                 case 'guilds':
                     {
+                        if (!this[type]?.filter(data, id))
+                            continue;
                         const hashId = this[type]?.namespace;
                         if (!hashId) {
                             continue;
@@ -248,8 +262,8 @@ class Cache {
                     throw new Error(`Invalid type ${type}`);
             }
         }
-        await this.adapter.patch(false, allData);
         await this.adapter.bulkAddToRelationShip(relationshipsData);
+        await this.adapter.patch(false, allData);
     }
     async bulkSet(keys) {
         const allData = [];
@@ -264,7 +278,10 @@ class Cache {
                 case 'stageInstances':
                 case 'emojis':
                 case 'overwrites':
+                case 'messages':
                     {
+                        if (!this[type]?.filter(data, id, guildId))
+                            continue;
                         const hashId = this[type]?.hashId(guildId);
                         if (!hashId) {
                             continue;
@@ -282,6 +299,8 @@ class Cache {
                 case 'voiceStates':
                 case 'members':
                     {
+                        if (!this[type]?.filter(data, id, guildId))
+                            continue;
                         const hashId = this[type]?.hashId(guildId);
                         if (!hashId) {
                             continue;
@@ -297,6 +316,8 @@ class Cache {
                 case 'users':
                 case 'guilds':
                     {
+                        if (!this[type]?.filter(data, id))
+                            continue;
                         const hashId = this[type]?.namespace;
                         if (!hashId) {
                             continue;
@@ -312,16 +333,13 @@ class Cache {
                     throw new Error(`Invalid type ${type}`);
             }
         }
-        await this.adapter.set(allData);
         await this.adapter.bulkAddToRelationShip(relationshipsData);
+        await this.adapter.set(allData);
     }
     async onPacket(event) {
         switch (event.t) {
             case 'READY':
-                {
-                    const data = event.d;
-                    await this.users?.set(data.user.id, data.user);
-                }
+                await this.users?.set(event.d.user.id, event.d.user);
                 break;
             case 'GUILD_CREATE':
             case 'GUILD_UPDATE':
@@ -380,7 +398,8 @@ class Cache {
                 break;
             case 'THREAD_CREATE':
             case 'THREAD_UPDATE':
-                await this.threads?.set(event.d.id, event.d.guild_id, event.d);
+                if (event.d.guild_id)
+                    await this.threads?.set(event.d.id, event.d.guild_id, event.d);
                 break;
             case 'THREAD_DELETE':
                 await this.threads?.remove(event.d.id, event.d.guild_id);
@@ -406,6 +425,18 @@ class Cache {
             case 'STAGE_INSTANCE_DELETE':
                 await this.stageInstances?.remove(event.d.id, event.d.guild_id);
                 break;
+            case 'MESSAGE_CREATE':
+                await this.messages?.set(event.d.id, event.d.channel_id, event.d);
+                break;
+            case 'MESSAGE_UPDATE':
+                await this.messages?.patch(event.d.id, event.d.channel_id, event.d);
+                break;
+            case 'MESSAGE_DELETE':
+                await this.messages?.remove(event.d.id, event.d.channel_id);
+                break;
+            case 'MESSAGE_DELETE_BULK':
+                await this.messages?.remove(event.d.ids, event.d.channel_id);
+                break;
         }
     }
 }

package/lib/cache/resources/channels.d.ts

@@ -1,10 +1,11 @@
+import type { APIChannel } from 'discord-api-types/v10';
 import type { AllChannels } from '../../structures';
 import channelFrom from '../../structures/channels';
 import type { ReturnCache } from '../index';
 import { GuildRelatedResource } from './default/guild-related';
 export declare class Channels extends GuildRelatedResource {
     namespace: string;
-    parse(data: any, id: string, guild_id: string): any;
+    parse(data: APIChannel, id: string, guild_id: string): any;
     get(id: string): ReturnCache<AllChannels | undefined>;
     bulk(ids: string[]): ReturnCache<ReturnType<typeof channelFrom>[]>;
     values(guild: string): ReturnCache<ReturnType<typeof channelFrom>[]>;

package/lib/cache/resources/default/base.d.ts

@@ -7,14 +7,14 @@ export declare class BaseResource<T = any> {
     client: BaseClient;
     namespace: string;
     constructor(cache: Cache, client?: UsingClient);
-    get rest(): import("../../..").ApiHandler;
+    filter(data: any, id: string): boolean;
     get adapter(): import("../../index").Adapter;
     removeIfNI(intent: keyof typeof GatewayIntentBits, id: string): import("../../../common").Awaitable<void>;
-    setIfNI(intent: keyof typeof GatewayIntentBits, id: string, data: any): any;
+    setIfNI(intent: keyof typeof GatewayIntentBits, id: string, data: any): import("../../../common").Awaitable<void>;
     get(id: string): ReturnCache<T | undefined>;
     bulk(ids: string[]): ReturnCache<T[]>;
     set(id: string, data: any): import("../../../common").Awaitable<void>;
-    patch<T extends Record<any, any> = Record<any, any>>(id: string, data: T): import("../../../common").Awaitable<void>;
+    patch(id: string, data: any): import("../../../common").Awaitable<void>;
     remove(id: string): import("../../../common").Awaitable<void>;
     keys(): ReturnCache<string[]>;
     values(): ReturnCache<T[]>;