seyfert 2.1.1-dev-12471001861.0 → 2.1.1-dev-12488366079.0

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,22 +39,17 @@ 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));
-        if (guild) {
-            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.bulkPatch(true, keys.map(([key, value]) => {
-            return [this.hashId(key), value];
-        }))).then(x => x);
+    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)];
+        })));
     }
     remove(id, guild) {
         const ids = Array.isArray(id) ? id : [id];

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>;
 }

package/lib/cache/resources/guilds.js

@@ -7,7 +7,7 @@ const base_1 = require("./default/base");
 class Guilds extends base_1.BaseResource {
     namespace = 'guild';
     //@ts-expect-error
-    filter(data, id) {
+    filter(data, id, from) {
         return true;
     }
     get(id) {
@@ -63,83 +63,83 @@ class Guilds extends base_1.BaseResource {
         ].filter(x => x !== undefined));
         await super.remove(id);
     }
-    async set(id, data) {
+    async set(from, id, data) {
         const bulkData = [];
         for (const member of data.members ?? []) {
             if (!member.user?.id) {
                 continue;
             }
-            bulkData.push(['members', member, member.user.id, id]);
-            bulkData.push(['users', member.user, member.user.id]);
+            bulkData.push([from, 'members', member, member.user.id, id]);
+            bulkData.push([from, 'users', member.user, member.user.id]);
         }
         for (const role of data.roles ?? []) {
-            bulkData.push(['roles', role, role.id, id]);
+            bulkData.push([from, 'roles', role, role.id, id]);
         }
         for (const channel of data.channels ?? []) {
-            bulkData.push(['channels', channel, channel.id, id]);
+            bulkData.push([from, 'channels', channel, channel.id, id]);
             if (channel.permission_overwrites?.length)
-                bulkData.push(['overwrites', channel.permission_overwrites, channel.id, id]);
+                bulkData.push([from, 'overwrites', channel.permission_overwrites, channel.id, id]);
         }
         for (const thread of data.threads ?? []) {
-            bulkData.push(['channels', thread, thread.id, id]);
+            bulkData.push([from, 'channels', thread, thread.id, id]);
         }
         for (const emoji of data.emojis ?? []) {
-            bulkData.push(['emojis', emoji, emoji.id, id]);
+            bulkData.push([from, 'emojis', emoji, emoji.id, id]);
         }
         for (const sticker of data.stickers ?? []) {
-            bulkData.push(['stickers', sticker, sticker.id, id]);
+            bulkData.push([from, 'stickers', sticker, sticker.id, id]);
         }
         for (const voiceState of data.voice_states ?? []) {
-            bulkData.push(['voiceStates', voiceState, voiceState.user_id, id]);
+            bulkData.push([from, 'voiceStates', voiceState, voiceState.user_id, id]);
         }
         for (const presence of data.presences ?? []) {
-            bulkData.push(['presences', presence, presence.user.id, id]);
+            bulkData.push([from, 'presences', presence, presence.user.id, id]);
         }
         for (const instance of data.stage_instances ?? []) {
-            bulkData.push(['stageInstances', instance, instance.id, id]);
+            bulkData.push([from, 'stageInstances', instance, instance.id, id]);
         }
         const { voice_states, members, channels, threads, presences, stage_instances, guild_scheduled_events, roles, emojis, stickers, guild_hashes, ...guild } = data;
-        bulkData.push(['guilds', guild, id]);
+        bulkData.push([from, 'guilds', guild, id]);
         await this.cache.bulkSet(bulkData);
     }
-    async patch(id, data) {
+    async patch(from, id, data) {
         const bulkData = [];
         for (const member of data.members ?? []) {
             if (!member.user?.id) {
                 continue;
             }
-            bulkData.push(['members', member, member.user.id, id]);
-            bulkData.push(['users', member.user, member.user.id]);
+            bulkData.push([from, 'members', member, member.user.id, id]);
+            bulkData.push([from, 'users', member.user, member.user.id]);
         }
         for (const role of data.roles ?? []) {
-            bulkData.push(['roles', role, role.id, id]);
+            bulkData.push([from, 'roles', role, role.id, id]);
         }
         for (const channel of data.channels ?? []) {
-            bulkData.push(['channels', channel, channel.id, id]);
+            bulkData.push([from, 'channels', channel, channel.id, id]);
             if (channel.permission_overwrites?.length) {
-                bulkData.push(['overwrites', channel.permission_overwrites, channel.id, id]);
+                bulkData.push([from, 'overwrites', channel.permission_overwrites, channel.id, id]);
             }
         }
         for (const thread of data.threads ?? []) {
-            bulkData.push(['channels', thread, thread.id, id]);
+            bulkData.push([from, 'channels', thread, thread.id, id]);
         }
         for (const emoji of data.emojis ?? []) {
-            bulkData.push(['emojis', emoji, emoji.id, id]);
+            bulkData.push([from, 'emojis', emoji, emoji.id, id]);
         }
         for (const sticker of data.stickers ?? []) {
-            bulkData.push(['stickers', sticker, sticker.id, id]);
+            bulkData.push([from, 'stickers', sticker, sticker.id, id]);
         }
         for (const voiceState of data.voice_states ?? []) {
-            bulkData.push(['voiceStates', voiceState, voiceState.user_id, id]);
+            bulkData.push([from, 'voiceStates', voiceState, voiceState.user_id, id]);
         }
         for (const presence of data.presences ?? []) {
-            bulkData.push(['presences', presence, presence.user.id, id]);
+            bulkData.push([from, 'presences', presence, presence.user.id, id]);
         }
         for (const instance of data.stage_instances ?? []) {
-            bulkData.push(['stageInstances', instance, instance.id, id]);
+            bulkData.push([from, 'stageInstances', instance, instance.id, id]);
         }
         const { voice_states, members, channels, threads, presences, stage_instances, guild_scheduled_events, roles, emojis, stickers, guild_hashes, ...guild } = data;
-        bulkData.push(['guilds', guild, id]);
+        bulkData.push([from, 'guilds', guild, id]);
         await this.cache.bulkPatch(bulkData);
     }
 }

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

@@ -1,10 +1,10 @@
-import type { ReturnCache } from '../..';
+import type { CacheFrom, ReturnCache } from '../..';
 import { type GuildMemberStructure } from '../../client/transformers';
 import type { APIGuildMember } from '../../types';
 import { GuildBasedResource } from './default/guild-based';
 export declare class Members extends GuildBasedResource<any, APIGuildMember> {
     namespace: string;
-    filter(data: APIGuildMember, id: string, guild_id: string): boolean;
+    filter(data: APIGuildMember, id: string, guild_id: string, from: CacheFrom): boolean;
     parse(data: any, key: string, guild_id: string): any;
     get(id: string, guild: string): ReturnCache<GuildMemberStructure | undefined>;
     raw(id: string, guild: string): ReturnCache<APIGuildMember | undefined>;
@@ -12,6 +12,6 @@ export declare class Members extends GuildBasedResource<any, APIGuildMember> {
     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>;
+    set(from: CacheFrom, memberId: string, guildId: string, data: any): Promise<void>;
+    set(from: CacheFrom, memberId_dataArray: [string, any][], guildId: string): Promise<void>;
 }

package/lib/cache/resources/members.js

@@ -7,7 +7,7 @@ const guild_based_1 = require("./default/guild-based");
 class Members extends guild_based_1.GuildBasedResource {
     namespace = 'member';
     //@ts-expect-error
-    filter(data, id, guild_id) {
+    filter(data, id, guild_id, from) {
         return true;
     }
     parse(data, key, guild_id) {
@@ -49,13 +49,13 @@ class Members extends guild_based_1.GuildBasedResource {
     valuesRaw(guild) {
         return super.values(guild);
     }
-    async set(__keys, guild, data) {
+    async set(from, __keys, guild, data) {
         const keys = Array.isArray(__keys) ? __keys : [[__keys, data]];
         const bulkData = [];
         for (const [id, value] of keys) {
             if (value.user) {
-                bulkData.push(['members', value, id, guild]);
-                bulkData.push(['users', value.user, id]);
+                bulkData.push([from, 'members', value, id, guild]);
+                bulkData.push([from, 'users', value.user, id]);
             }
         }
         await this.cache.bulkSet(bulkData);

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

@@ -1,10 +1,10 @@
-import type { MessageData, ReturnCache } from '../..';
+import type { CacheFrom, MessageData, ReturnCache } from '../..';
 import { type MessageStructure } from '../../client/transformers';
 import type { APIMessage } from '../../types';
 import { GuildRelatedResource } from './default/guild-related';
 export declare class Messages extends GuildRelatedResource<any, APIMessage> {
     namespace: string;
-    filter(data: MessageData, id: string, channel_id?: string): boolean;
+    filter(data: MessageData, id: string, channel_id: string, from: CacheFrom): boolean;
     parse(data: any, _key: string, _channel_id: string): any;
     get(id: string): ReturnCache<MessageStructure | undefined>;
     raw(id: string): ReturnCache<APIMessageResource | undefined>;

package/lib/cache/resources/messages.js

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

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

@@ -1,10 +1,10 @@
-import type { ReturnCache } from '../..';
+import type { CacheFrom, ReturnCache } from '../..';
 import { PermissionsBitField } from '../../structures/extra/Permissions';
 import type { APIOverwrite } from '../../types';
 import { GuildRelatedResource } from './default/guild-related';
 export declare class Overwrites extends GuildRelatedResource<any, APIOverwrite[]> {
     namespace: string;
-    filter(data: APIOverwrite[], id: string, guild_id?: string): boolean;
+    filter(data: APIOverwrite[], id: string, guild_id: string, from: CacheFrom): boolean;
     parse(data: any[], _id: string, guild_id: string): any[];
     raw(id: string): ReturnCache<(APIOverwrite & {
         guild_id: string;

package/lib/cache/resources/overwrites.js

@@ -7,7 +7,7 @@ const guild_related_1 = require("./default/guild-related");
 class Overwrites extends guild_related_1.GuildRelatedResource {
     namespace = 'overwrite';
     //@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/presence.d.ts

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

package/lib/cache/resources/presence.js

@@ -5,7 +5,7 @@ const guild_related_1 = require("./default/guild-related");
 class Presences extends guild_related_1.GuildRelatedResource {
     namespace = 'presence';
     //@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/roles.d.ts

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

package/lib/cache/resources/roles.js

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

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

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

package/lib/cache/resources/stage-instances.js

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

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

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

package/lib/cache/resources/stickers.js

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

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

@@ -1,10 +1,10 @@
-import type { ReturnCache } from '../..';
+import type { CacheFrom, ReturnCache } from '../..';
 import { type UserStructure } from '../../client/transformers';
 import type { APIUser } from '../../types';
 import { BaseResource } from './default/base';
 export declare class Users extends BaseResource<any, APIUser> {
     namespace: string;
-    filter(data: APIUser, id: string): boolean;
+    filter(data: APIUser, id: string, from: CacheFrom): boolean;
     get(id: string): ReturnCache<UserStructure | undefined>;
     raw(id: string): ReturnCache<APIUser | undefined>;
     bulk(ids: string[]): ReturnCache<UserStructure[]>;

package/lib/cache/resources/users.js

@@ -7,7 +7,7 @@ const base_1 = require("./default/base");
 class Users extends base_1.BaseResource {
     namespace = 'user';
     //@ts-expect-error
-    filter(data, id) {
+    filter(data, id, from) {
         return true;
     }
     get(id) {

package/lib/cache/resources/voice-states.d.ts

@@ -1,10 +1,10 @@
-import type { ReturnCache } from '../..';
+import type { CacheFrom, ReturnCache } from '../..';
 import { type VoiceStateStructure } from '../../client/transformers';
 import type { APIVoiceState } from '../../types';
 import { GuildBasedResource } from './default/guild-based';
 export declare class VoiceStates extends GuildBasedResource<any, APIVoiceState> {
     namespace: string;
-    filter(data: APIVoiceState, id: string, guild_id: string): boolean;
+    filter(data: APIVoiceState, id: string, guild_id: string, from: CacheFrom): boolean;
     parse(data: any, id: string, guild_id: string): any;
     get(memberId: string, guildId: string): ReturnCache<VoiceStateStructure | undefined>;
     raw(memberId: string, guildId: string): ReturnCache<APIVoiceState | undefined>;

package/lib/cache/resources/voice-states.js

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

package/lib/common/shorters/bans.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BanShorter = void 0;
+const cache_1 = require("../../cache");
 const transformers_1 = require("../../client/transformers");
 const base_1 = require("./base");
 class BanShorter extends base_1.BaseShorter {
@@ -51,7 +52,7 @@ class BanShorter extends base_1.BaseShorter {
                 return ban;
         }
         ban = await this.client.proxy.guilds(guildId).bans(userId).get();
-        await this.client.cache.members?.set(ban.user.id, guildId, ban);
+        await this.client.cache.members?.set(cache_1.CacheFrom.Rest, ban.user.id, guildId, ban);
         return transformers_1.Transformers.GuildBan(this.client, ban, guildId);
     }
     /**
@@ -71,7 +72,7 @@ class BanShorter extends base_1.BaseShorter {
         bans = await this.client.proxy.guilds(guildId).bans.get({
             query,
         });
-        await this.client.cache.bans?.set(bans.map(x => [x.user.id, x]), guildId);
+        await this.client.cache.bans?.set(cache_1.CacheFrom.Rest, bans.map(x => [x.user.id, x]), guildId);
         return bans.map(m => transformers_1.Transformers.GuildBan(this.client, m, guildId));
     }
 }

package/lib/common/shorters/channels.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChannelShorter = void 0;
+const cache_1 = require("../../cache");
 const transformers_1 = require("../../client/transformers");
 const structures_1 = require("../../structures");
 const Permissions_1 = require("../../structures/extra/Permissions");
@@ -29,7 +30,7 @@ class ChannelShorter extends base_1.BaseShorter {
             }
         }
         channel = await this.client.proxy.channels(id).get();
-        await this.client.cache.channels?.patch(id, undefined, channel);
+        await this.client.cache.channels?.patch(cache_1.CacheFrom.Rest, id, 'guild_id' in channel && channel.guild_id ? channel.guild_id : '@me', channel);
         return channel;
     }
     /**
@@ -54,9 +55,9 @@ class ChannelShorter extends base_1.BaseShorter {
     async edit(id, body, optional = { guildId: '@me' }) {
         const options = (0, utils_1.MergeOptions)({ guildId: '@me' }, optional);
         const res = await this.client.proxy.channels(id).patch({ body, reason: options.reason });
-        await this.client.cache.channels?.setIfNI(structures_1.BaseChannel.__intent__(options.guildId), res.id, options.guildId, res);
+        await this.client.cache.channels?.setIfNI(cache_1.CacheFrom.Rest, structures_1.BaseChannel.__intent__(options.guildId), res.id, options.guildId, res);
         if (body.permission_overwrites && 'permission_overwrites' in res && res.permission_overwrites)
-            await this.client.cache.overwrites?.setIfNI(structures_1.BaseChannel.__intent__(options.guildId), res.id, options.guildId, res.permission_overwrites);
+            await this.client.cache.overwrites?.setIfNI(cache_1.CacheFrom.Rest, structures_1.BaseChannel.__intent__(options.guildId), res.id, options.guildId, res.permission_overwrites);
         return (0, structures_1.channelFrom)(res, this.client);
     }
     /**
@@ -69,7 +70,7 @@ class ChannelShorter extends base_1.BaseShorter {
     }
     async pins(channelId) {
         const messages = await this.client.proxy.channels(channelId).pins.get();
-        await this.client.cache.messages?.patch(messages.map(x => {
+        await this.client.cache.messages?.patch(cache_1.CacheFrom.Rest, messages.map(x => {
             return [x.id, x];
         }), channelId);
         return messages.map(message => transformers_1.Transformers.Message(this.client, message));
@@ -158,7 +159,7 @@ class ChannelShorter extends base_1.BaseShorter {
         const result = await this.client.proxy.channels(channelId).messages.get({
             query,
         });
-        await this.client.cache.messages?.patch(result.map(x => {
+        await this.client.cache.messages?.patch(cache_1.CacheFrom.Rest, result.map(x => {
             return [x.id, x];
         }), channelId);
         return result.map(message => transformers_1.Transformers.Message(this.client, message));

package/lib/common/shorters/emojis.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EmojiShorter = void 0;
 const builders_1 = require("../../builders");
+const cache_1 = require("../../cache");
 const transformers_1 = require("../../client/transformers");
 const base_1 = require("./base");
 class EmojiShorter extends base_1.BaseShorter {
@@ -20,7 +21,7 @@ class EmojiShorter extends base_1.BaseShorter {
             }
         }
         emojis = await this.client.proxy.guilds(guildId).emojis.get();
-        await this.client.cache.emojis?.set(emojis.map(x => [x.id, x]), guildId);
+        await this.client.cache.emojis?.set(cache_1.CacheFrom.Rest, emojis.map(x => [x.id, x]), guildId);
         return emojis.map(m => transformers_1.Transformers.GuildEmoji(this.client, m, guildId));
     }
     /**
@@ -34,7 +35,7 @@ class EmojiShorter extends base_1.BaseShorter {
         const emoji = await this.client.proxy.guilds(guildId).emojis.post({
             body: bodyResolved,
         });
-        await this.client.cache.emojis?.setIfNI('GuildExpressions', emoji.id, guildId, emoji);
+        await this.client.cache.emojis?.setIfNI(cache_1.CacheFrom.Rest, 'GuildExpressions', emoji.id, guildId, emoji);
         return transformers_1.Transformers.GuildEmoji(this.client, emoji, guildId);
     }
     /**
@@ -74,7 +75,7 @@ class EmojiShorter extends base_1.BaseShorter {
      */
     async edit(guildId, emojiId, body, reason) {
         const emoji = await this.client.proxy.guilds(guildId).emojis(emojiId).patch({ body, reason });
-        await this.client.cache.emojis?.setIfNI('GuildExpressions', emoji.id, guildId, emoji);
+        await this.client.cache.emojis?.setIfNI(cache_1.CacheFrom.Rest, 'GuildExpressions', emoji.id, guildId, emoji);
         return transformers_1.Transformers.GuildEmoji(this.client, emoji, guildId);
     }
 }