seyfert 1.5.0 → 2.1.0

package/lib/cache/resources/default/guild-based.js

@@ -44,24 +44,24 @@ class GuildBasedResource {
         return this.adapter.get(this.hashGuildId(guild, id));
     }
     bulk(ids, guild) {
-        return (0, common_1.fakePromise)(this.adapter.get(ids.map(id => this.hashGuildId(guild, id)))).then(x => x.filter(y => y));
+        return (0, common_1.fakePromise)(this.adapter.bulkGet(ids.map(id => this.hashGuildId(guild, id)))).then(x => x.filter(y => y));
     }
     set(__keys, guild, data) {
         const keys = (Array.isArray(__keys) ? __keys : [[__keys, data]]).filter(x => this.filter(x[1], x[0], guild));
-        return (0, common_1.fakePromise)(this.addToRelationship(keys.map(x => x[0]), guild)).then(() => this.adapter.set(keys.map(([key, value]) => {
+        return (0, common_1.fakePromise)(this.addToRelationship(keys.map(x => x[0]), guild)).then(() => this.adapter.bulkSet(keys.map(([key, value]) => {
             return [this.hashGuildId(guild, key), this.parse(value, key, guild)];
         })));
     }
     patch(__keys, guild, data) {
         const keys = (Array.isArray(__keys) ? __keys : [[__keys, data]]).filter(x => this.filter(x[1], x[0], guild));
-        return (0, common_1.fakePromise)(this.adapter.get(keys.map(([key]) => this.hashGuildId(guild, key)))).then(oldDatas => (0, common_1.fakePromise)(this.addToRelationship(keys.map(x => x[0]), guild)).then(() => this.adapter.set(keys.map(([key, value]) => {
+        return (0, common_1.fakePromise)(this.adapter.bulkGet(keys.map(([key]) => this.hashGuildId(guild, key)))).then(oldDatas => (0, common_1.fakePromise)(this.addToRelationship(keys.map(x => x[0]), guild)).then(() => this.adapter.bulkSet(keys.map(([key, value]) => {
             const oldData = oldDatas.find(x => x.id === key) ?? {};
             return [this.hashGuildId(guild, key), this.parse({ ...oldData, ...value }, key, guild)];
         }))));
     }
     remove(id, guild) {
         const ids = Array.isArray(id) ? id : [id];
-        return (0, common_1.fakePromise)(this.removeToRelationship(ids, guild)).then(() => this.adapter.remove(ids.map(x => this.hashGuildId(guild, x))));
+        return (0, common_1.fakePromise)(this.removeToRelationship(ids, guild)).then(() => this.adapter.bulkRemove(ids.map(x => this.hashGuildId(guild, x))));
     }
     keys(guild) {
         return this.adapter.scan(this.hashGuildId(guild, '*'), true);
@@ -88,10 +88,10 @@ class GuildBasedResource {
         return this.adapter.removeRelationship((Array.isArray(id) ? id : [id]).map(x => this.hashId(x)));
     }
     hashId(id) {
-        return `${this.namespace}.${id}`;
+        return id.startsWith(this.namespace) ? id : `${this.namespace}.${id}`;
     }
     hashGuildId(guild, id) {
-        return `${this.namespace}.${guild}.${id}`;
+        return id.startsWith(this.namespace) ? id : `${this.namespace}.${guild}.${id}`;
     }
 }
 exports.GuildBasedResource = GuildBasedResource;

package/lib/cache/resources/default/guild-related.d.ts

@@ -1,8 +1,8 @@
-import type { GatewayIntentBits } from 'discord-api-types/v10';
 import type { BaseClient } from '../../../client/base';
 import type { UsingClient } from '../../../commands';
+import type { GatewayIntentBits } from '../../../types';
 import type { Cache, ReturnCache } from '../../index';
-export declare class GuildRelatedResource<T = any> {
+export declare class GuildRelatedResource<T = any, S = any> {
     protected cache: Cache;
     client: BaseClient;
     namespace: string;
@@ -11,15 +11,15 @@ export declare class GuildRelatedResource<T = any> {
     parse(data: any, id: string, guild_id: string): any;
     get adapter(): import("../../index").Adapter;
     removeIfNI(intent: keyof typeof GatewayIntentBits, id: string | string[], guildId: string): import("../../../common").Awaitable<void>;
-    setIfNI(intent: keyof typeof GatewayIntentBits, id: string, guildId: string, data: any): void;
+    setIfNI(intent: keyof typeof GatewayIntentBits, id: string, guildId: string, data: S): void;
     get(id: string): ReturnCache<(T & {
         guild_id: string;
     }) | undefined>;
     bulk(ids: string[]): ReturnCache<(T & {
         guild_id: string;
     })[]>;
-    set(__keys: string, guild: string, data: any): ReturnCache<void>;
-    set(__keys: [string, any][], guild: string): ReturnCache<void>;
+    set(__keys: string, guild: string, data: S): ReturnCache<void>;
+    set(__keys: [string, S][], guild: string): ReturnCache<void>;
     patch(__keys: string, guild?: string, data?: any): ReturnCache<void>;
     patch(__keys: [string, any][], guild?: string): ReturnCache<void>;
     remove(id: string | string[], guild: string): import("../../../common").Awaitable<void>;
@@ -27,8 +27,8 @@ export declare class GuildRelatedResource<T = any> {
     values(guild: string): ReturnCache<(T & {
         guild_id: string;
     })[]>;
-    count(to: string): import("../../../common").Awaitable<number>;
-    contains(id: string, guild: string): import("../../../common").Awaitable<boolean>;
+    count(to: string): ReturnCache<number>;
+    contains(id: string, guild: string): ReturnCache<boolean>;
     getToRelationship(guild: string): import("../../../common").Awaitable<string[]>;
     addToRelationship(id: string | string[], guild: string): import("../../../common").Awaitable<void>;
     removeToRelationship(id: string | string[], guild: string): import("../../../common").Awaitable<void>;

package/lib/cache/resources/default/guild-related.js

@@ -43,28 +43,28 @@ class GuildRelatedResource {
         return this.adapter.get(this.hashId(id));
     }
     bulk(ids) {
-        return (0, common_1.fakePromise)(this.adapter.get(ids.map(x => this.hashId(x)))).then(x => x.filter(y => y));
+        return (0, common_1.fakePromise)(this.adapter.bulkGet(ids.map(x => this.hashId(x)))).then(x => x.filter(y => y));
     }
     set(__keys, guild, data) {
         const keys = (Array.isArray(__keys) ? __keys : [[__keys, data]]).filter(x => this.filter(x[1], x[0], guild));
-        return (0, common_1.fakePromise)(this.addToRelationship(keys.map(x => x[0]), guild)).then(() => this.adapter.set(keys.map(([key, value]) => {
+        return (0, common_1.fakePromise)(this.addToRelationship(keys.map(x => x[0]), guild)).then(() => this.adapter.bulkSet(keys.map(([key, value]) => {
             return [this.hashId(key), this.parse(value, key, guild)];
         })));
     }
     patch(__keys, guild, data) {
         const keys = (Array.isArray(__keys) ? __keys : [[__keys, data]]).filter(x => this.filter(x[1], x[0], guild));
         if (guild) {
-            return (0, common_1.fakePromise)(this.addToRelationship(keys.map(x => x[0]), guild)).then(() => this.adapter.patch(false, keys.map(([key, value]) => {
+            return (0, common_1.fakePromise)(this.addToRelationship(keys.map(x => x[0]), guild)).then(() => this.adapter.bulkPatch(false, keys.map(([key, value]) => {
                 return [this.hashId(key), this.parse(value, key, guild)];
             })));
         }
-        return (0, common_1.fakePromise)(this.adapter.patch(true, keys.map(([key, value]) => {
+        return (0, common_1.fakePromise)(this.adapter.bulkPatch(true, keys.map(([key, value]) => {
             return [this.hashId(key), value];
         }))).then(x => x);
     }
     remove(id, guild) {
         const ids = Array.isArray(id) ? id : [id];
-        return (0, common_1.fakePromise)(this.removeToRelationship(ids, guild)).then(() => this.adapter.remove(ids.map(x => this.hashId(x))));
+        return (0, common_1.fakePromise)(this.removeToRelationship(ids, guild)).then(() => this.adapter.bulkRemove(ids.map(x => this.hashId(x))));
     }
     keys(guild) {
         return guild === '*'
@@ -74,10 +74,12 @@ class GuildRelatedResource {
     values(guild) {
         return guild === '*'
             ? (0, common_1.fakePromise)(this.adapter.scan(this.hashId(guild))).then(x => x)
-            : (0, common_1.fakePromise)(this.adapter.getToRelationship(this.hashId(guild))).then(keys => this.adapter.get(keys.map(x => `${this.namespace}.${x}`)));
+            : (0, common_1.fakePromise)(this.adapter.getToRelationship(this.hashId(guild))).then(keys => this.adapter.bulkGet(keys.map(x => `${this.namespace}.${x}`)));
     }
     count(to) {
-        return to === '*' ? (0, common_1.fakePromise)(this.keys(to)).then(x => x.length) : this.adapter.count(this.hashId(to));
+        return to === '*'
+            ? (0, common_1.fakePromise)(this.keys(to)).then(x => x.length)
+            : this.adapter.count(this.hashId(to));
     }
     contains(id, guild) {
         return this.adapter.contains(this.hashId(guild), id);
@@ -95,7 +97,7 @@ class GuildRelatedResource {
         return this.adapter.removeRelationship((Array.isArray(id) ? id : [id]).map(x => this.hashId(x)));
     }
     hashId(id) {
-        return `${this.namespace}.${id}`;
+        return id.startsWith(this.namespace) ? id : `${this.namespace}.${id}`;
     }
 }
 exports.GuildRelatedResource = GuildRelatedResource;

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

@@ -1,11 +1,20 @@
-import type { APIEmoji } from 'discord-api-types/v10';
+import type { APIEmoji } from '../../types';
 import type { ReturnCache } from '../..';
-import { GuildEmoji } from '../../structures';
 import { GuildRelatedResource } from './default/guild-related';
-export declare class Emojis extends GuildRelatedResource {
+import { type GuildEmojiStructure } from '../../client/transformers';
+export declare class Emojis extends GuildRelatedResource<any, APIEmoji> {
     namespace: string;
     filter(data: APIEmoji, id: string, guild_id?: string): boolean;
-    get(id: string): ReturnCache<GuildEmoji | undefined>;
-    bulk(ids: string[]): ReturnCache<GuildEmoji[]>;
-    values(guild: string): ReturnCache<GuildEmoji[]>;
+    get(id: string): ReturnCache<GuildEmojiStructure | undefined>;
+    raw(id: string): ReturnCache<APIEmoji | undefined>;
+    bulk(ids: string[]): ReturnCache<GuildEmojiStructure[]>;
+    bulkRaw(ids: string[]): ReturnCache<(APIEmoji & {
+        id: string;
+        guild_id: string;
+    })[]>;
+    values(guild: string): ReturnCache<GuildEmojiStructure[]>;
+    valuesRaw(guild: string): ReturnCache<(APIEmoji & {
+        id: string;
+        guild_id: string;
+    })[]>;
 }

package/lib/cache/resources/emojis.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Emojis = void 0;
 const common_1 = require("../../common");
-const structures_1 = require("../../structures");
 const guild_related_1 = require("./default/guild-related");
+const transformers_1 = require("../../client/transformers");
 class Emojis extends guild_related_1.GuildRelatedResource {
     namespace = 'emoji';
     //@ts-expect-error
@@ -11,13 +11,22 @@ class Emojis extends guild_related_1.GuildRelatedResource {
         return true;
     }
     get(id) {
-        return (0, common_1.fakePromise)(super.get(id)).then(rawEmoji => rawEmoji ? new structures_1.GuildEmoji(this.client, rawEmoji, rawEmoji.guild_id) : undefined);
+        return (0, common_1.fakePromise)(super.get(id)).then(rawEmoji => rawEmoji ? transformers_1.Transformers.GuildEmoji(this.client, rawEmoji, rawEmoji.guild_id) : undefined);
+    }
+    raw(id) {
+        return super.get(id);
     }
     bulk(ids) {
-        return (0, common_1.fakePromise)(super.bulk(ids)).then(emojis => emojis.map(rawEmoji => new structures_1.GuildEmoji(this.client, rawEmoji, rawEmoji.guild_id)));
+        return (0, common_1.fakePromise)(super.bulk(ids)).then(emojis => emojis.map(rawEmoji => transformers_1.Transformers.GuildEmoji(this.client, rawEmoji, rawEmoji.guild_id)));
+    }
+    bulkRaw(ids) {
+        return super.bulk(ids);
     }
     values(guild) {
-        return (0, common_1.fakePromise)(super.values(guild)).then(emojis => emojis.map(rawEmoji => new structures_1.GuildEmoji(this.client, rawEmoji, rawEmoji.guild_id)));
+        return (0, common_1.fakePromise)(super.values(guild)).then(emojis => emojis.map(rawEmoji => transformers_1.Transformers.GuildEmoji(this.client, rawEmoji, rawEmoji.guild_id)));
+    }
+    valuesRaw(guild) {
+        return super.values(guild);
     }
 }
 exports.Emojis = Emojis;

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

@@ -1,13 +1,16 @@
-import type { APIGuild } from 'discord-api-types/v10';
+import type { APIGuild, GatewayGuildCreateDispatchData } from '../../types';
 import type { ReturnCache } from '..';
-import { Guild } from '../../structures';
 import { BaseResource } from './default/base';
-export declare class Guilds extends BaseResource {
+import { type GuildStructure } from '../../client/transformers';
+export declare class Guilds extends BaseResource<any, APIGuild | GatewayGuildCreateDispatchData> {
     namespace: string;
     filter(data: APIGuild, id: string): boolean;
-    get(id: string): ReturnCache<Guild<'cached'> | undefined>;
-    bulk(ids: string[]): ReturnCache<Guild<'cached'>[]>;
-    values(): ReturnCache<Guild<'cached'>[]>;
+    get(id: string): ReturnCache<GuildStructure<'cached'> | undefined>;
+    raw(id: string): ReturnCache<APIGuild | undefined>;
+    bulk(ids: string[]): ReturnCache<GuildStructure<'cached'>[]>;
+    bulkRaw(ids: string[]): ReturnCache<APIGuild[]>;
+    values(): ReturnCache<GuildStructure<'cached'>[]>;
+    valuesRaw(): ReturnCache<APIGuild[]>;
     remove(id: string): Promise<void>;
     set(id: string, data: any): Promise<void>;
     patch(id: string, data: any): Promise<void>;

package/lib/cache/resources/guilds.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Guilds = void 0;
 const common_1 = require("../../common");
-const structures_1 = require("../../structures");
 const base_1 = require("./default/base");
+const transformers_1 = require("../../client/transformers");
 class Guilds extends base_1.BaseResource {
     namespace = 'guild';
     //@ts-expect-error
@@ -11,26 +11,47 @@ class Guilds extends base_1.BaseResource {
         return true;
     }
     get(id) {
-        return (0, common_1.fakePromise)(super.get(id)).then(guild => (guild ? new structures_1.Guild(this.client, guild) : undefined));
+        return (0, common_1.fakePromise)(super.get(id)).then(guild => guild ? transformers_1.Transformers.Guild(this.client, guild) : undefined);
+    }
+    raw(id) {
+        return super.get(id);
     }
     bulk(ids) {
-        return (0, common_1.fakePromise)(super.bulk(ids)).then(guilds => guilds.map(x => new structures_1.Guild(this.client, x)));
+        return (0, common_1.fakePromise)(super.bulk(ids)).then(guilds => guilds.map(x => transformers_1.Transformers.Guild(this.client, x)));
+    }
+    bulkRaw(ids) {
+        return super.bulk(ids);
     }
     values() {
-        return (0, common_1.fakePromise)(super.values()).then(guilds => guilds.map(x => new structures_1.Guild(this.client, x)));
+        return (0, common_1.fakePromise)(super.values()).then(guilds => guilds.map(x => transformers_1.Transformers.Guild(this.client, x)));
+    }
+    valuesRaw() {
+        return super.values();
     }
     async remove(id) {
-        await this.cache.adapter.remove((await Promise.all([
+        const keysChannels = this.cache.channels?.keys(id) ?? [];
+        await this.cache.adapter.bulkRemove((await Promise.all([
             this.cache.members?.keys(id) ?? [],
             this.cache.roles?.keys(id) ?? [],
-            this.cache.channels?.keys(id) ?? [],
+            keysChannels,
             this.cache.emojis?.keys(id) ?? [],
             this.cache.stickers?.keys(id) ?? [],
             this.cache.voiceStates?.keys(id) ?? [],
             this.cache.presences?.keys(id) ?? [],
             this.cache.threads?.keys(id) ?? [],
             this.cache.stageInstances?.keys(id) ?? [],
+            this.cache.bans?.keys(id) ?? [],
         ])).flat());
+        if (this.cache.messages && this.cache.channels) {
+            const keysMessages = [];
+            for (const i of keysChannels) {
+                const channelId = i.slice(this.cache.channels.namespace.length + 1);
+                const messages = await this.cache.messages.keys(channelId);
+                keysMessages.push(...messages);
+            }
+            if (keysMessages.length)
+                await this.cache.adapter.bulkRemove(keysMessages);
+        }
         await this.cache.adapter.removeRelationship([
             this.cache.members?.hashId(id),
             this.cache.roles?.hashId(id),

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

@@ -1,14 +1,17 @@
-import type { APIGuildMember } from 'discord-api-types/v10';
+import type { APIGuildMember } from '../../types';
 import type { ReturnCache } from '../..';
-import { GuildMember } from '../../structures';
 import { GuildBasedResource } from './default/guild-based';
-export declare class Members extends GuildBasedResource {
+import { type GuildMemberStructure } from '../../client/transformers';
+export declare class Members extends GuildBasedResource<any, APIGuildMember> {
     namespace: string;
     filter(data: APIGuildMember, id: string, guild_id: string): boolean;
     parse(data: any, key: string, guild_id: string): any;
-    get(id: string, guild: string): ReturnCache<GuildMember | undefined>;
-    bulk(ids: string[], guild: string): ReturnCache<GuildMember[]>;
-    values(guild: string): ReturnCache<GuildMember[]>;
+    get(id: string, guild: string): ReturnCache<GuildMemberStructure | undefined>;
+    raw(id: string, guild: string): ReturnCache<APIGuildMember | undefined>;
+    bulk(ids: string[], guild: string): ReturnCache<GuildMemberStructure[]>;
+    bulkRaw(ids: string[], guild: string): ReturnCache<Omit<APIGuildMember, 'user'>[]>;
+    values(guild: string): ReturnCache<GuildMemberStructure[]>;
+    valuesRaw(guild: string): ReturnCache<Omit<APIGuildMember, 'user'>[]>;
     set(memberId: string, guildId: string, data: any): Promise<void>;
     set(memberId_dataArray: [string, any][], guildId: string): Promise<void>;
 }

package/lib/cache/resources/members.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Members = void 0;
 const common_1 = require("../../common");
-const structures_1 = require("../../structures");
 const guild_based_1 = require("./default/guild-based");
+const transformers_1 = require("../../client/transformers");
 class Members extends guild_based_1.GuildBasedResource {
     namespace = 'member';
     //@ts-expect-error
@@ -15,24 +15,40 @@ class Members extends guild_based_1.GuildBasedResource {
         return rest;
     }
     get(id, guild) {
-        return (0, common_1.fakePromise)(super.get(id, guild)).then(rawMember => (0, common_1.fakePromise)(this.client.cache.users?.get(id)).then(user => rawMember && user ? new structures_1.GuildMember(this.client, rawMember, user, guild) : undefined));
+        return (0, common_1.fakePromise)(super.get(id, guild)).then(rawMember => (0, common_1.fakePromise)(this.client.cache.users?.raw(id)).then(user => rawMember && user ? transformers_1.Transformers.GuildMember(this.client, rawMember, user, guild) : undefined));
+    }
+    raw(id, guild) {
+        return (0, common_1.fakePromise)(super.get(id, guild)).then(rawMember => {
+            return (0, common_1.fakePromise)(this.client.cache.users?.raw(id)).then(user => rawMember && user
+                ? {
+                    ...rawMember,
+                    user,
+                }
+                : undefined);
+        });
     }
     bulk(ids, guild) {
-        return (0, common_1.fakePromise)(super.bulk(ids, guild)).then(members => (0, common_1.fakePromise)(this.client.cache.users?.bulk(ids)).then(users => members
+        return (0, common_1.fakePromise)(super.bulk(ids, guild)).then(members => (0, common_1.fakePromise)(this.client.cache.users?.bulkRaw(ids)).then(users => members
             .map(rawMember => {
             const user = users?.find(x => x.id === rawMember.id);
-            return user ? new structures_1.GuildMember(this.client, rawMember, user, guild) : undefined;
+            return user ? transformers_1.Transformers.GuildMember(this.client, rawMember, user, guild) : undefined;
         })
             .filter(Boolean)));
     }
+    bulkRaw(ids, guild) {
+        return super.bulk(ids, guild);
+    }
     values(guild) {
-        return (0, common_1.fakePromise)(super.values(guild)).then(members => (0, common_1.fakePromise)(this.client.cache.users?.values()).then(users => members
+        return (0, common_1.fakePromise)(super.values(guild)).then(members => (0, common_1.fakePromise)(this.client.cache.users?.valuesRaw()).then(users => members
             .map(rawMember => {
             const user = users?.find(x => x.id === rawMember.id);
-            return user ? new structures_1.GuildMember(this.client, rawMember, user, rawMember.guild_id) : undefined;
+            return user ? transformers_1.Transformers.GuildMember(this.client, rawMember, user, rawMember.guild_id) : undefined;
         })
             .filter(Boolean)));
     }
+    valuesRaw(guild) {
+        return super.values(guild);
+    }
     async set(__keys, guild, data) {
         const keys = Array.isArray(__keys) ? __keys : [[__keys, data]];
         const bulkData = [];

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

@@ -1,15 +1,19 @@
-import type { APIMessage } from 'discord-api-types/v10';
+import type { APIMessage } from '../../types';
 import { GuildRelatedResource } from './default/guild-related';
 import type { MessageData, ReturnCache } from '../..';
-import { Message } from '../../structures';
-export declare class Messages extends GuildRelatedResource {
+import { type MessageStructure } from '../../client/transformers';
+export declare class Messages extends GuildRelatedResource<any, APIMessage> {
     namespace: string;
     filter(data: MessageData, id: string, channel_id?: string): boolean;
     parse(data: any, _key: string, _channel_id: string): any;
-    get(id: string): ReturnCache<Message | undefined>;
-    bulk(ids: string[]): ReturnCache<Message[]>;
-    values(guild: string): ReturnCache<Message[]>;
+    get(id: string): ReturnCache<MessageStructure | undefined>;
+    raw(id: string): ReturnCache<APIMessageResource | undefined>;
+    bulk(ids: string[]): ReturnCache<MessageStructure[]>;
+    bulkRaw(ids: string[]): ReturnCache<APIMessageResource[]>;
+    values(channel: string): ReturnCache<MessageStructure[]>;
+    valuesRaw(channel: string): ReturnCache<APIMessageResource[]>;
+    keys(channel: string): string[];
 }
-export type APIMessageResource = Omit<APIMessage, 'author'> & {
+export type APIMessageResource = Omit<APIMessage, 'author' | 'member'> & {
     user_id?: string;
 };

package/lib/cache/resources/messages.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Messages = void 0;
 const guild_related_1 = require("./default/guild-related");
 const common_1 = require("../../common");
-const structures_1 = require("../../structures");
+const transformers_1 = require("../../client/transformers");
 class Messages extends guild_related_1.GuildRelatedResource {
     namespace = 'message';
     //@ts-expect-error
@@ -20,36 +20,48 @@ class Messages extends guild_related_1.GuildRelatedResource {
         return (0, common_1.fakePromise)(super.get(id)).then(rawMessage => {
             return this.cache.users && rawMessage?.user_id
                 ? (0, common_1.fakePromise)(this.cache.adapter.get(this.cache.users.hashId(rawMessage.user_id))).then(user => {
-                    return user ? new structures_1.Message(this.client, { ...rawMessage, author: user }) : undefined;
+                    return user ? transformers_1.Transformers.Message(this.client, { ...rawMessage, author: user }) : undefined;
                 })
                 : undefined;
         });
     }
+    raw(id) {
+        return super.get(id);
+    }
     bulk(ids) {
         return (0, common_1.fakePromise)(super.bulk(ids)).then(messages => messages
             .map(rawMessage => {
             return this.cache.users && rawMessage?.user_id
                 ? (0, common_1.fakePromise)(this.cache.adapter.get(this.cache.users.hashId(rawMessage.user_id))).then(user => {
-                    return user ? new structures_1.Message(this.client, { ...rawMessage, author: user }) : undefined;
+                    return user ? transformers_1.Transformers.Message(this.client, { ...rawMessage, author: user }) : undefined;
                 })
                 : undefined;
         })
             .filter(Boolean));
     }
-    values(guild) {
-        return (0, common_1.fakePromise)(super.values(guild)).then(messages => {
+    bulkRaw(ids) {
+        return super.bulk(ids);
+    }
+    values(channel) {
+        return (0, common_1.fakePromise)(super.values(channel)).then(messages => {
             const hashes = this.cache.users
                 ? messages.map(x => (x.user_id ? this.cache.users.hashId(x.user_id) : undefined))
                 : [];
-            return (0, common_1.fakePromise)(this.cache.adapter.get(hashes.filter(Boolean))).then(users => {
+            return (0, common_1.fakePromise)(this.cache.adapter.bulkGet(hashes.filter(Boolean))).then(users => {
                 return messages
                     .map(message => {
                     const user = users.find(user => user.id === message.user_id);
-                    return user ? new structures_1.Message(this.client, { ...message, author: user }) : undefined;
+                    return user ? transformers_1.Transformers.Message(this.client, { ...message, author: user }) : undefined;
                 })
                     .filter(Boolean);
             });
         });
     }
+    valuesRaw(channel) {
+        return super.values(channel);
+    }
+    keys(channel) {
+        return super.keys(channel);
+    }
 }
 exports.Messages = Messages;

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

@@ -1,11 +1,14 @@
-import type { APIOverwrite } from 'discord-api-types/v10';
+import type { APIOverwrite } from '../../types';
 import type { ReturnCache } from '../..';
 import { PermissionsBitField } from '../../structures/extra/Permissions';
 import { GuildRelatedResource } from './default/guild-related';
-export declare class Overwrites extends GuildRelatedResource {
+export declare class Overwrites extends GuildRelatedResource<any, APIOverwrite[]> {
     namespace: string;
     filter(data: APIOverwrite[], id: string, guild_id?: string): boolean;
     parse(data: any[], _id: string, guild_id: string): any[];
+    raw(id: string): ReturnCache<(APIOverwrite & {
+        guild_id: string;
+    })[] | undefined>;
     get(id: string): ReturnCache<{
         type: number;
         id: string;
@@ -20,10 +23,16 @@ export declare class Overwrites extends GuildRelatedResource {
         allow: PermissionsBitField;
         guildId: string;
     }[][]>;
+    valuesRaw(guild: string): ReturnCache<(APIOverwrite & {
+        guild_id: string;
+    })[][]>;
     bulk(ids: string[]): ReturnCache<{
         type: number;
         id: string;
         deny: PermissionsBitField;
         allow: PermissionsBitField;
     }[][]>;
+    bulkRaw(ids: string[]): ReturnCache<(APIOverwrite & {
+        guild_id: string;
+    })[][]>;
 }

package/lib/cache/resources/overwrites.js

@@ -16,6 +16,9 @@ class Overwrites extends guild_related_1.GuildRelatedResource {
         });
         return data;
     }
+    raw(id) {
+        return super.get(id);
+    }
     get(id) {
         return (0, utils_1.fakePromise)(super.get(id)).then(rawOverwrites => rawOverwrites
             ? rawOverwrites.map(rawOverwrite => ({
@@ -36,6 +39,9 @@ class Overwrites extends guild_related_1.GuildRelatedResource {
             guildId: rawOverwrite.guild_id,
         }))));
     }
+    valuesRaw(guild) {
+        return super.values(guild);
+    }
     bulk(ids) {
         return (0, utils_1.fakePromise)(super.bulk(ids)).then(values => values.map(rawOverwrites => rawOverwrites.map(rawOverwrite => ({
             allow: new Permissions_1.PermissionsBitField(BigInt(rawOverwrite.allow)),
@@ -45,5 +51,8 @@ class Overwrites extends guild_related_1.GuildRelatedResource {
             guildId: rawOverwrite.guild_id,
         }))));
     }
+    bulkRaw(ids) {
+        return super.bulk(ids);
+    }
 }
 exports.Overwrites = Overwrites;

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

@@ -1,10 +1,11 @@
-import type { GatewayPresenceUpdate } from 'discord-api-types/v10';
+import type { GatewayPresenceUpdate } from '../../types';
 import { GuildRelatedResource } from './default/guild-related';
-export declare class Presences extends GuildRelatedResource<PresenceResource> {
+export declare class Presences extends GuildRelatedResource<PresenceResource, GatewayPresenceUpdate> {
     namespace: string;
     filter(data: GatewayPresenceUpdate, id: string, guild_id?: string): boolean;
     parse(data: any, key: string, guild_id: string): PresenceResource;
 }
 export type PresenceResource = Omit<GatewayPresenceUpdate, 'user'> & {
     id: string;
+    user_id: string;
 };

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

@@ -1,11 +1,14 @@
-import type { APIRole } from 'discord-api-types/v10';
+import type { APIRole } from '../../types';
 import type { ReturnCache } from '../..';
-import { GuildRole } from '../../structures';
 import { GuildRelatedResource } from './default/guild-related';
-export declare class Roles extends GuildRelatedResource {
+import { type GuildRoleStructure } from '../../client/transformers';
+export declare class Roles extends GuildRelatedResource<any, APIRole> {
     namespace: string;
     filter(data: APIRole, id: string, guild_id?: string): boolean;
-    get(id: string): ReturnCache<GuildRole | undefined>;
-    bulk(ids: string[]): ReturnCache<GuildRole[]>;
-    values(guild: string): ReturnCache<GuildRole[]>;
+    get(id: string): ReturnCache<GuildRoleStructure | undefined>;
+    raw(id: string): ReturnCache<APIRole | undefined>;
+    bulk(ids: string[]): ReturnCache<GuildRoleStructure[]>;
+    bulkRaw(ids: string[]): ReturnCache<APIRole[]>;
+    values(guild: string): ReturnCache<GuildRoleStructure[]>;
+    valuesRaw(guild: string): ReturnCache<APIRole[]>;
 }

package/lib/cache/resources/roles.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Roles = void 0;
 const common_1 = require("../../common");
-const structures_1 = require("../../structures");
 const guild_related_1 = require("./default/guild-related");
+const transformers_1 = require("../../client/transformers");
 class Roles extends guild_related_1.GuildRelatedResource {
     namespace = 'role';
     //@ts-expect-error
@@ -11,13 +11,22 @@ class Roles extends guild_related_1.GuildRelatedResource {
         return true;
     }
     get(id) {
-        return (0, common_1.fakePromise)(super.get(id)).then(rawRole => rawRole ? new structures_1.GuildRole(this.client, rawRole, rawRole.guild_id) : undefined);
+        return (0, common_1.fakePromise)(super.get(id)).then(rawRole => rawRole ? transformers_1.Transformers.GuildRole(this.client, rawRole, rawRole.guild_id) : undefined);
+    }
+    raw(id) {
+        return super.get(id);
     }
     bulk(ids) {
-        return (0, common_1.fakePromise)(super.bulk(ids)).then(roles => roles.map(rawRole => new structures_1.GuildRole(this.client, rawRole, rawRole.guild_id)));
+        return (0, common_1.fakePromise)(super.bulk(ids)).then(roles => roles.map(rawRole => transformers_1.Transformers.GuildRole(this.client, rawRole, rawRole.guild_id)));
+    }
+    bulkRaw(ids) {
+        return super.bulk(ids);
     }
     values(guild) {
-        return (0, common_1.fakePromise)(super.values(guild)).then(roles => roles.map(rawRole => new structures_1.GuildRole(this.client, rawRole, rawRole.guild_id)));
+        return (0, common_1.fakePromise)(super.values(guild)).then(roles => roles.map(rawRole => transformers_1.Transformers.GuildRole(this.client, rawRole, rawRole.guild_id)));
+    }
+    valuesRaw(guild) {
+        return super.values(guild);
     }
 }
 exports.Roles = Roles;

package/lib/cache/resources/stage-instances.d.ts

@@ -1,6 +1,6 @@
-import type { APIStageInstance } from 'discord-api-types/v10';
+import type { APIStageInstance } from '../../types';
 import { GuildRelatedResource } from './default/guild-related';
-export declare class StageInstances extends GuildRelatedResource<APIStageInstance> {
+export declare class StageInstances extends GuildRelatedResource<APIStageInstance, APIStageInstance> {
     namespace: string;
     filter(data: APIStageInstance, id: string, guild_id?: string): boolean;
 }

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

@@ -1,11 +1,14 @@
-import type { APISticker } from 'discord-api-types/v10';
+import type { APISticker } from '../../types';
 import type { ReturnCache } from '../..';
-import { Sticker } from '../../structures';
 import { GuildRelatedResource } from './default/guild-related';
-export declare class Stickers extends GuildRelatedResource {
+import { type StickerStructure } from '../../client/transformers';
+export declare class Stickers extends GuildRelatedResource<any, APISticker> {
     namespace: string;
     filter(data: APISticker, id: string, guild_id?: string): boolean;
-    get(id: string): ReturnCache<Sticker | undefined>;
-    bulk(ids: string[]): ReturnCache<Sticker[]>;
-    values(guild: string): ReturnCache<Sticker[]>;
+    get(id: string): ReturnCache<StickerStructure | undefined>;
+    raw(id: string): ReturnCache<APISticker | undefined>;
+    bulk(ids: string[]): ReturnCache<StickerStructure[]>;
+    bulkRaw(ids: string[]): ReturnCache<APISticker[]>;
+    values(guild: string): ReturnCache<StickerStructure[]>;
+    valuesRaw(guild: string): ReturnCache<APISticker[]>;
 }