seyfert 2.1.1-dev-12485652015.0 → 2.1.1-dev-12489494190.0

package/lib/cache/index.d.ts

@@ -97,20 +97,24 @@ export declare class Cache {
         bans: import("..").GuildBan[];
     }>>;
     bulkPatch(keys: (readonly [
+        CacheFrom,
         NonGuildBased,
         any,
         string
     ] | readonly [
+        CacheFrom,
         GuildBased | GuildRelated,
         any,
         string,
         string
     ])[]): Promise<void>;
     bulkSet(keys: (readonly [
+        CacheFrom,
         NonGuildBased,
         any,
         string
     ] | readonly [
+        CacheFrom,
         GuildBased | GuildRelated,
         any,
         string,
@@ -122,3 +126,8 @@ export declare class Cache {
     private testUsersAndMembers;
     private testChannelsAndOverwrites;
 }
+export declare enum CacheFrom {
+    Gateway = 1,
+    Rest = 2,
+    Test = 3
+}

package/lib/cache/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Cache = exports.GuildRelatedResource = exports.GuildBasedResource = exports.BaseResource = void 0;
+exports.CacheFrom = exports.Cache = exports.GuildRelatedResource = exports.GuildBasedResource = exports.BaseResource = void 0;
 const common_1 = require("../common");
 const guilds_1 = require("./resources/guilds");
 const users_1 = require("./resources/users");
@@ -172,7 +172,7 @@ class Cache {
     async bulkPatch(keys) {
         const allData = [];
         const relationshipsData = {};
-        for (const [type, data, id, guildId] of keys) {
+        for (const [from, type, data, id, guildId] of keys) {
             switch (type) {
                 case 'roles':
                 case 'stickers':
@@ -184,7 +184,7 @@ class Cache {
                 case 'bans':
                 case 'messages':
                     {
-                        if (!this[type]?.filter(data, id, guildId))
+                        if (!this[type]?.filter(data, id, guildId, from))
                             continue;
                         const hashId = this[type]?.hashId(guildId);
                         if (!hashId) {
@@ -203,7 +203,7 @@ class Cache {
                 case 'voiceStates':
                 case 'members':
                     {
-                        if (!this[type]?.filter(data, id, guildId))
+                        if (!this[type]?.filter(data, id, guildId, from))
                             continue;
                         const hashId = this[type]?.hashId(guildId);
                         if (!hashId) {
@@ -220,7 +220,7 @@ class Cache {
                 case 'users':
                 case 'guilds':
                     {
-                        if (!this[type]?.filter(data, id))
+                        if (!this[type]?.filter(data, id, from))
                             continue;
                         const hashId = this[type]?.namespace;
                         if (!hashId) {
@@ -243,7 +243,7 @@ class Cache {
     async bulkSet(keys) {
         const allData = [];
         const relationshipsData = {};
-        for (const [type, data, id, guildId] of keys) {
+        for (const [from, type, data, id, guildId] of keys) {
             switch (type) {
                 case 'roles':
                 case 'stickers':
@@ -254,7 +254,7 @@ class Cache {
                 case 'overwrites':
                 case 'messages':
                     {
-                        if (!this[type]?.filter(data, id, guildId))
+                        if (!this[type]?.filter(data, id, guildId, from))
                             continue;
                         const hashId = this[type]?.hashId(guildId);
                         if (!hashId) {
@@ -274,7 +274,7 @@ class Cache {
                 case 'voiceStates':
                 case 'members':
                     {
-                        if (!this[type]?.filter(data, id, guildId))
+                        if (!this[type]?.filter(data, id, guildId, from))
                             continue;
                         const hashId = this[type]?.hashId(guildId);
                         if (!hashId) {
@@ -291,7 +291,7 @@ class Cache {
                 case 'users':
                 case 'guilds':
                     {
-                        if (!this[type]?.filter(data, id))
+                        if (!this[type]?.filter(data, id, from))
                             continue;
                         const hashId = this[type]?.namespace;
                         if (!hashId) {
@@ -317,17 +317,17 @@ class Cache {
     async onPacketDefault(event) {
         switch (event.t) {
             case 'READY':
-                await this.users?.set(event.d.user.id, event.d.user);
+                await this.users?.set(CacheFrom.Gateway, event.d.user.id, event.d.user);
                 break;
             case 'GUILD_CREATE':
             case 'GUILD_UPDATE':
             case 'RAW_GUILD_CREATE':
-                await this.guilds?.patch(event.d.id, { unavailable: false, ...event.d });
+                await this.guilds?.patch(CacheFrom.Gateway, event.d.id, { unavailable: false, ...event.d });
                 break;
             case 'GUILD_DELETE':
             case 'RAW_GUILD_DELETE':
                 if (event.d.unavailable) {
-                    await this.guilds?.patch(event.d.id, event.d);
+                    await this.guilds?.patch(CacheFrom.Gateway, event.d.id, event.d);
                 }
                 else {
                     await this.guilds?.remove(event.d.id);
@@ -337,13 +337,13 @@ class Cache {
             case 'CHANNEL_UPDATE':
                 {
                     if ('guild_id' in event.d) {
-                        await this.channels?.set(event.d.id, event.d.guild_id, event.d);
+                        await this.channels?.set(CacheFrom.Gateway, event.d.id, event.d.guild_id, event.d);
                         if (event.d.permission_overwrites?.length)
-                            await this.overwrites?.set(event.d.id, event.d.guild_id, event.d.permission_overwrites);
+                            await this.overwrites?.set(CacheFrom.Gateway, event.d.id, event.d.guild_id, event.d.permission_overwrites);
                         break;
                     }
                     if (event.d.type === types_1.ChannelType.DM) {
-                        await this.channels?.set(event.d.recipients[0]?.id, '@me', event.d);
+                        await this.channels?.set(CacheFrom.Gateway, event.d.recipients[0]?.id, '@me', event.d);
                         break;
                     }
                 }
@@ -353,13 +353,13 @@ class Cache {
                 break;
             case 'GUILD_ROLE_CREATE':
             case 'GUILD_ROLE_UPDATE':
-                await this.roles?.set(event.d.role.id, event.d.guild_id, event.d.role);
+                await this.roles?.set(CacheFrom.Gateway, event.d.role.id, event.d.guild_id, event.d.role);
                 break;
             case 'GUILD_ROLE_DELETE':
                 await this.roles?.remove(event.d.role_id, event.d.guild_id);
                 break;
             case 'GUILD_BAN_ADD':
-                await this.bans?.set(event.d.user.id, event.d.guild_id, event.d);
+                await this.bans?.set(CacheFrom.Gateway, event.d.user.id, event.d.guild_id, event.d);
                 break;
             case 'GUILD_BAN_REMOVE':
                 await this.bans?.remove(event.d.user.id, event.d.guild_id);
@@ -367,37 +367,37 @@ class Cache {
             case 'GUILD_EMOJIS_UPDATE':
                 {
                     await this.emojis?.remove(await this.emojis?.keys(event.d.guild_id), event.d.guild_id);
-                    await this.emojis?.set(event.d.emojis.map(x => [x.id, x]), event.d.guild_id);
+                    await this.emojis?.set(CacheFrom.Gateway, event.d.emojis.map(x => [x.id, x]), event.d.guild_id);
                 }
                 break;
             case 'GUILD_STICKERS_UPDATE':
                 {
                     await this.stickers?.remove(await this.stickers?.keys(event.d.guild_id), event.d.guild_id);
-                    await this.stickers?.set(event.d.stickers.map(x => [x.id, x]), event.d.guild_id);
+                    await this.stickers?.set(CacheFrom.Gateway, event.d.stickers.map(x => [x.id, x]), event.d.guild_id);
                 }
                 break;
             case 'GUILD_MEMBER_ADD':
             case 'GUILD_MEMBER_UPDATE':
                 if (event.d.user)
-                    await this.members?.set(event.d.user.id, event.d.guild_id, event.d);
+                    await this.members?.set(CacheFrom.Gateway, event.d.user.id, event.d.guild_id, event.d);
                 break;
             case 'GUILD_MEMBER_REMOVE':
                 await this.members?.remove(event.d.user.id, event.d.guild_id);
                 break;
             case 'PRESENCE_UPDATE':
                 // Should update member data?
-                await this.presences?.set(event.d.user.id, event.d.guild_id, event.d);
+                await this.presences?.set(CacheFrom.Gateway, event.d.user.id, event.d.guild_id, event.d);
                 break;
             case 'THREAD_CREATE':
             case 'THREAD_UPDATE':
                 if (event.d.guild_id)
-                    await this.channels?.set(event.d.id, event.d.guild_id, event.d);
+                    await this.channels?.set(CacheFrom.Gateway, event.d.id, event.d.guild_id, event.d);
                 break;
             case 'THREAD_DELETE':
                 await this.channels?.remove(event.d.id, event.d.guild_id);
                 break;
             case 'USER_UPDATE':
-                await this.users?.set(event.d.id, event.d);
+                await this.users?.set(CacheFrom.Gateway, event.d.id, event.d);
                 break;
             case 'VOICE_STATE_UPDATE':
                 {
@@ -405,7 +405,7 @@ class Cache {
                         return;
                     }
                     if (event.d.channel_id != null) {
-                        await this.voiceStates?.set(event.d.user_id, event.d.guild_id, event.d);
+                        await this.voiceStates?.set(CacheFrom.Gateway, event.d.user_id, event.d.guild_id, event.d);
                     }
                     else {
                         await this.voiceStates?.remove(event.d.user_id, event.d.guild_id);
@@ -414,7 +414,7 @@ class Cache {
                 break;
             case 'STAGE_INSTANCE_CREATE':
             case 'STAGE_INSTANCE_UPDATE':
-                await this.stageInstances?.set(event.d.id, event.d.guild_id, event.d);
+                await this.stageInstances?.set(CacheFrom.Gateway, event.d.id, event.d.guild_id, event.d);
                 break;
             case 'STAGE_INSTANCE_DELETE':
                 await this.stageInstances?.remove(event.d.id, event.d.guild_id);
@@ -423,12 +423,12 @@ class Cache {
                 {
                     if (this.messages !== undefined) {
                         const data = [
-                            ['messages', event.d, event.d.id, event.d.channel_id],
-                            ['users', event.d.author, event.d.author.id],
+                            [CacheFrom.Gateway, 'messages', event.d, event.d.id, event.d.channel_id],
+                            [CacheFrom.Gateway, 'users', event.d.author, event.d.author.id],
                         ];
                         if (event.d.guild_id) {
                             if (event.d.member)
-                                data.push(['members', event.d.member, event.d.author.id, event.d.guild_id]);
+                                data.push([CacheFrom.Gateway, 'members', event.d.member, event.d.author.id, event.d.guild_id]);
                         }
                         await this.bulkPatch(data);
                     }
@@ -438,12 +438,12 @@ class Cache {
                 {
                     if (this.messages !== undefined) {
                         const data = [
-                            ['messages', event.d, event.d.id, event.d.channel_id],
-                            ['users', event.d.author, event.d.author.id],
+                            [CacheFrom.Gateway, 'messages', event.d, event.d.id, event.d.channel_id],
+                            [CacheFrom.Gateway, 'users', event.d.author, event.d.author.id],
                         ];
                         if (event.d.guild_id) {
                             if (event.d.member)
-                                data.push(['members', event.d.member, event.d.author.id, event.d.guild_id]);
+                                data.push([CacheFrom.Gateway, 'members', event.d.member, event.d.author.id, event.d.guild_id]);
                         }
                         await this.bulkPatch(data);
                     }
@@ -512,7 +512,7 @@ class Cache {
             createUser('marcrock'),
         ];
         for (const user of users) {
-            await this.users.set(user.id, user);
+            await this.users.set(CacheFrom.Test, user.id, user);
         }
         let count = 0;
         if ((await this.users.values()).length !== users.length)
@@ -559,7 +559,7 @@ class Cache {
         for (const guildId in guildMembers) {
             const members = guildMembers[guildId];
             for (const member of members) {
-                await this.members.set(member.user.id, guildId, member);
+                await this.members.set(CacheFrom.Test, member.user.id, guildId, member);
             }
             if ((await this.members.values(guildId)).length !== members.length)
                 throw new Error('members.values(guildId) is not of the expected size.');
@@ -654,7 +654,7 @@ class Cache {
         for (const guildId in guildChannels) {
             const channels = guildChannels[guildId];
             for (const channel of channels) {
-                await this.channels.set(channel.id, guildId, channel);
+                await this.channels.set(CacheFrom.Test, channel.id, guildId, channel);
             }
             if ((await this.channels.values(guildId)).length !== channels.length)
                 throw new Error('channels.values(guildId) is not of the expected size');
@@ -712,7 +712,7 @@ class Cache {
         for (const guildId in guildOverwrites) {
             const bulkOverwrites = guildOverwrites[guildId];
             for (const overwrites of bulkOverwrites) {
-                await this.overwrites.set(overwrites[0].channel_id, guildId, overwrites);
+                await this.overwrites.set(CacheFrom.Test, overwrites[0].channel_id, guildId, overwrites);
             }
             if ((await this.overwrites.values(guildId)).length !== bulkOverwrites.length)
                 throw new Error('overwrites.values(channelId) is not of the expected size');
@@ -753,3 +753,9 @@ class Cache {
     }
 }
 exports.Cache = Cache;
+var CacheFrom;
+(function (CacheFrom) {
+    CacheFrom[CacheFrom["Gateway"] = 1] = "Gateway";
+    CacheFrom[CacheFrom["Rest"] = 2] = "Rest";
+    CacheFrom[CacheFrom["Test"] = 3] = "Test";
+})(CacheFrom || (exports.CacheFrom = CacheFrom = {}));

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

@@ -1,10 +1,10 @@
-import type { ReturnCache } from '../..';
+import type { CacheFrom, ReturnCache } from '../..';
 import { type GuildBanStructure } from '../../client/transformers';
 import type { APIBan, GatewayGuildBanModifyDispatchData } from '../../types';
 import { GuildBasedResource } from './default/guild-based';
 export declare class Bans extends GuildBasedResource<any, GatewayGuildBanModifyDispatchData | APIBan> {
     namespace: string;
-    filter(data: APIBan, id: string, guild_id: string): boolean;
+    filter(data: APIBan, id: string, guild_id: string, from: CacheFrom): boolean;
     parse(data: any, key: string, guild_id: string): any;
     get(id: string, guild: string): ReturnCache<GuildBanStructure | undefined>;
     raw(id: string, guild: string): ReturnCache<Omit<GatewayGuildBanModifyDispatchData | APIBan, 'user'> | undefined>;

package/lib/cache/resources/bans.js

@@ -7,7 +7,7 @@ const guild_based_1 = require("./default/guild-based");
 class Bans extends guild_based_1.GuildBasedResource {
     namespace = 'ban';
     //@ts-expect-error
-    filter(data, id, guild_id) {
+    filter(data, id, guild_id, from) {
         return true;
     }
     parse(data, key, guild_id) {

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

@@ -1,10 +1,10 @@
 import { type AllChannels, channelFrom } from '../../structures';
 import type { APIChannel } from '../../types';
-import type { ReturnCache } from '../index';
+import type { CacheFrom, ReturnCache } from '../index';
 import { GuildRelatedResource } from './default/guild-related';
 export declare class Channels extends GuildRelatedResource<any, APIChannel> {
     namespace: string;
-    filter(data: APIChannel, id: string, guild_id: string): boolean;
+    filter(data: APIChannel, id: string, guild_id: string, from: CacheFrom): boolean;
     parse(data: APIChannel, id: string, guild_id: string): any;
     get(id: string): ReturnCache<AllChannels | undefined>;
     raw(id: string): ReturnCache<Omit<APIChannel, 'permission_overwrites'> | undefined>;

package/lib/cache/resources/channels.js

@@ -7,7 +7,7 @@ const guild_related_1 = require("./default/guild-related");
 class Channels extends guild_related_1.GuildRelatedResource {
     namespace = 'channel';
     //@ts-expect-error
-    filter(data, id, guild_id) {
+    filter(data, id, guild_id, from) {
         return true;
     }
     parse(data, id, guild_id) {

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

@@ -1,19 +1,19 @@
 import type { UsingClient } from '../../../commands';
 import type { GatewayIntentBits } from '../../../types';
-import type { Cache, ReturnCache } from '../../index';
+import type { Cache, CacheFrom, ReturnCache } from '../../index';
 export declare class BaseResource<T = any, S = any> {
     protected cache: Cache;
     readonly client: UsingClient;
     namespace: string;
     constructor(cache: Cache, client: UsingClient);
-    filter(data: any, id: string): boolean;
+    filter(data: any, id: string, from: CacheFrom): 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: S): import("../../../common").Awaitable<void>;
+    setIfNI(from: CacheFrom, intent: keyof typeof GatewayIntentBits, id: string, data: S): import("../../../common").Awaitable<void>;
     get(id: string): ReturnCache<T | undefined>;
     bulk(ids: string[]): ReturnCache<T[]>;
-    set(id: string, data: S): import("../../../common").Awaitable<void>;
-    patch(id: string, data: S): import("../../../common").Awaitable<void>;
+    set(from: CacheFrom, id: string, data: S): import("../../../common").Awaitable<void>;
+    patch(from: CacheFrom, id: string, data: S): import("../../../common").Awaitable<void>;
     remove(id: string): import("../../../common").Awaitable<void>;
     keys(): ReturnCache<string[]>;
     values(): ReturnCache<T[]>;

package/lib/cache/resources/default/base.js

@@ -11,7 +11,7 @@ class BaseResource {
         this.client = client;
     }
     //@ts-expect-error
-    filter(data, id) {
+    filter(data, id, from) {
         return true;
     }
     get adapter() {
@@ -23,9 +23,9 @@ class BaseResource {
         }
         return;
     }
-    setIfNI(intent, id, data) {
+    setIfNI(from, intent, id, data) {
         if (!this.cache.hasIntent(intent)) {
-            return this.set(id, data);
+            return this.set(from, id, data);
         }
     }
     get(id) {
@@ -34,13 +34,13 @@ class BaseResource {
     bulk(ids) {
         return (0, common_1.fakePromise)(this.adapter.bulkGet(ids.map(id => this.hashId(id)))).then(x => x.filter(y => y));
     }
-    set(id, data) {
-        if (!this.filter(data, id))
+    set(from, id, data) {
+        if (!this.filter(data, id, from))
             return;
         return (0, common_1.fakePromise)(this.addToRelationship(id)).then(() => this.adapter.set(this.hashId(id), data));
     }
-    patch(id, data) {
-        if (!this.filter(data, id))
+    patch(from, id, data) {
+        if (!this.filter(data, id, from))
             return;
         return (0, common_1.fakePromise)(this.addToRelationship(id)).then(() => this.adapter.patch(this.hashId(id), data));
     }

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

@@ -1,26 +1,26 @@
 import type { UsingClient } from '../../../commands';
 import type { GatewayIntentBits } from '../../../types';
-import type { Cache, ReturnCache } from '../../index';
+import type { Cache, CacheFrom, ReturnCache } from '../../index';
 export declare class GuildBasedResource<T = any, S = any> {
     protected cache: Cache;
     readonly client: UsingClient;
     namespace: string;
     constructor(cache: Cache, client: UsingClient);
-    filter(data: any, id: string, guild_id: string): boolean;
+    filter(data: any, id: string, guild_id: string, from: CacheFrom): boolean;
     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: S): void;
+    setIfNI(from: CacheFrom, intent: keyof typeof GatewayIntentBits, id: string, guildId: string, data: S): void;
     get(id: string, guild: string): ReturnCache<(T & {
         guild_id: string;
     }) | undefined>;
     bulk(ids: string[], guild: string): ReturnCache<(T & {
         guild_id: string;
     })[]>;
-    set(__keys: string, guild: string, data: S): ReturnCache<void>;
-    set(__keys: [string, S][], guild: string): ReturnCache<void>;
-    patch(__keys: string, guild: string, data: S): ReturnCache<void>;
-    patch(__keys: [string, any][], guild: string): ReturnCache<void>;
+    set(from: CacheFrom, __keys: string, guild: string, data: S): ReturnCache<void>;
+    set(from: CacheFrom, __keys: [string, S][], guild: string): ReturnCache<void>;
+    patch(from: CacheFrom, __keys: string, guild: string, data: S): ReturnCache<void>;
+    patch(from: CacheFrom, __keys: [string, any][], guild: string): ReturnCache<void>;
     remove(id: string | string[], guild: string): import("../../../common").Awaitable<void>;
     keys(guild: string): ReturnCache<string[]>;
     values(guild: string): ReturnCache<(T & {

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

@@ -11,7 +11,7 @@ class GuildBasedResource {
         this.client = client;
     }
     //@ts-expect-error
-    filter(data, id, guild_id) {
+    filter(data, id, guild_id, from) {
         return true;
     }
     parse(data, id, guild_id) {
@@ -29,9 +29,9 @@ class GuildBasedResource {
         }
         return;
     }
-    setIfNI(intent, id, guildId, data) {
+    setIfNI(from, intent, id, guildId, data) {
         if (!this.cache.hasIntent(intent)) {
-            return this.set(id, guildId, data);
+            return this.set(from, id, guildId, data);
         }
     }
     get(id, guild) {
@@ -40,14 +40,14 @@ class GuildBasedResource {
     bulk(ids, guild) {
         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));
+    set(from, __keys, guild, data) {
+        const keys = (Array.isArray(__keys) ? __keys : [[__keys, data]]).filter(x => this.filter(x[1], x[0], guild, from));
         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));
+    patch(from, __keys, guild, data) {
+        const keys = (Array.isArray(__keys) ? __keys : [[__keys, data]]).filter(x => this.filter(x[1], x[0], guild, from));
         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)];

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

@@ -1,26 +1,26 @@
 import type { UsingClient } from '../../../commands';
 import type { GatewayIntentBits } from '../../../types';
-import type { Cache, ReturnCache } from '../../index';
+import type { Cache, CacheFrom, ReturnCache } from '../../index';
 export declare class GuildRelatedResource<T = any, S = any> {
     protected cache: Cache;
     readonly client: UsingClient;
     namespace: string;
     constructor(cache: Cache, client: UsingClient);
-    filter(data: any, id: string, guild_id?: string): boolean;
+    filter(data: any, id: string, guild_id: string, from: CacheFrom): boolean;
     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: S): void;
+    setIfNI(from: CacheFrom, 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: 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>;
+    set(from: CacheFrom, __keys: string, guild: string, data: S): ReturnCache<void>;
+    set(from: CacheFrom, __keys: [string, S][], guild: string): ReturnCache<void>;
+    patch(from: CacheFrom, __keys: string, guild: string, data?: any): ReturnCache<void>;
+    patch(from: CacheFrom, __keys: [string, any][], guild: string): ReturnCache<void>;
     remove(id: string | string[], guild: string): import("../../../common").Awaitable<void>;
     keys(guild: string): ReturnCache<string[]>;
     values(guild: string): ReturnCache<(T & {

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

@@ -11,7 +11,7 @@ class GuildRelatedResource {
         this.client = client;
     }
     //@ts-expect-error
-    filter(data, id, guild_id) {
+    filter(data, id, guild_id, from) {
         return true;
     }
     parse(data, id, guild_id) {
@@ -28,9 +28,9 @@ class GuildRelatedResource {
             return this.remove(id, guildId);
         }
     }
-    setIfNI(intent, id, guildId, data) {
+    setIfNI(from, intent, id, guildId, data) {
         if (!this.cache.hasIntent(intent)) {
-            return this.set(id, guildId, data);
+            return this.set(from, id, guildId, data);
         }
     }
     get(id) {
@@ -39,14 +39,14 @@ class GuildRelatedResource {
     bulk(ids) {
         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));
+    set(from, __keys, guild, data) {
+        const keys = (Array.isArray(__keys) ? __keys : [[__keys, data]]).filter(x => this.filter(x[1], x[0], guild, from));
         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));
+    patch(from, __keys, guild, data) {
+        const keys = (Array.isArray(__keys) ? __keys : [[__keys, data]]).filter(x => this.filter(x[1], x[0], guild, from));
         return (0, common_1.fakePromise)(this.addToRelationship(keys.map(x => x[0]), guild)).then(() => this.adapter.bulkPatch(keys.map(([key, value]) => {
             return [this.hashId(key), this.parse(value, key, guild)];
         })));

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

@@ -1,10 +1,10 @@
-import type { ReturnCache } from '../..';
+import type { CacheFrom, ReturnCache } from '../..';
 import { type GuildEmojiStructure } from '../../client/transformers';
 import type { APIEmoji } from '../../types';
 import { GuildRelatedResource } from './default/guild-related';
 export declare class Emojis extends GuildRelatedResource<any, APIEmoji> {
     namespace: string;
-    filter(data: APIEmoji, id: string, guild_id?: string): boolean;
+    filter(data: APIEmoji, id: string, guild_id: string, from: CacheFrom): boolean;
     get(id: string): ReturnCache<GuildEmojiStructure | undefined>;
     raw(id: string): ReturnCache<APIEmoji | undefined>;
     bulk(ids: string[]): ReturnCache<GuildEmojiStructure[]>;

package/lib/cache/resources/emojis.js

@@ -7,7 +7,7 @@ const guild_related_1 = require("./default/guild-related");
 class Emojis extends guild_related_1.GuildRelatedResource {
     namespace = 'emoji';
     //@ts-expect-error
-    filter(data, id, guild_id) {
+    filter(data, id, guild_id, from) {
         return true;
     }
     get(id) {

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

@@ -1,10 +1,10 @@
-import type { ReturnCache } from '..';
+import type { CacheFrom, ReturnCache } from '..';
 import { type GuildStructure } from '../../client/transformers';
 import type { APIGuild, GatewayGuildCreateDispatchData } from '../../types';
 import { BaseResource } from './default/base';
 export declare class Guilds extends BaseResource<any, APIGuild | GatewayGuildCreateDispatchData> {
     namespace: string;
-    filter(data: APIGuild, id: string): boolean;
+    filter(data: APIGuild, id: string, from: CacheFrom): boolean;
     get(id: string): ReturnCache<GuildStructure<'cached'> | undefined>;
     raw(id: string): ReturnCache<APIGuild | undefined>;
     bulk(ids: string[]): ReturnCache<GuildStructure<'cached'>[]>;
@@ -12,6 +12,6 @@ export declare class Guilds extends BaseResource<any, APIGuild | GatewayGuildCre
     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>;
+    set(from: CacheFrom, id: string, data: any): Promise<void>;
+    patch(from: CacheFrom, id: string, data: any): Promise<void>;
 }