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

package/lib/common/shorters/guilds.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GuildShorter = void 0;
 const builders_1 = require("../../builders");
+const cache_1 = require("../../cache");
 const transformers_1 = require("../../client/transformers");
 const structures_1 = require("../../structures");
 const base_1 = require("./base");
@@ -13,7 +14,7 @@ class GuildShorter extends base_1.BaseShorter {
      */
     async create(body) {
         const guild = await this.client.proxy.guilds.post({ body });
-        await this.client.cache.guilds?.setIfNI('Guilds', guild.id, guild);
+        await this.client.cache.guilds?.setIfNI(cache_1.CacheFrom.Rest, 'Guilds', guild.id, guild);
         return transformers_1.Transformers.Guild(this.client, guild);
     }
     /**
@@ -32,7 +33,7 @@ class GuildShorter extends base_1.BaseShorter {
                 return guild;
         }
         const data = await this.client.proxy.guilds(id).get();
-        await this.client.cache.guilds?.patch(id, data);
+        await this.client.cache.guilds?.patch(cache_1.CacheFrom.Rest, id, data);
         return (await this.client.cache.guilds?.raw(id)) ?? data;
     }
     /**
@@ -47,7 +48,7 @@ class GuildShorter extends base_1.BaseShorter {
     async edit(guildId, body, reason) {
         const guild = await this.client.proxy.guilds(guildId).patch({ body, reason });
         if (!this.client.cache.hasGuildsIntent)
-            await this.client.cache.guilds?.patch(guildId, guild);
+            await this.client.cache.guilds?.patch(cache_1.CacheFrom.Rest, guildId, guild);
         return new structures_1.Guild(this.client, guild);
     }
     list(query) {
@@ -63,7 +64,7 @@ class GuildShorter extends base_1.BaseShorter {
                 return transformers_1.Transformers.GuildMember(this.client, self, self.user, id);
         }
         const self = await this.client.proxy.guilds(id).members(this.client.botId).get();
-        await this.client.cache.members?.patch(self.user.id, id, self);
+        await this.client.cache.members?.patch(cache_1.CacheFrom.Rest, self.user.id, id, self);
         return transformers_1.Transformers.GuildMember(this.client, self, self.user, id);
     }
     leave(id) {
@@ -93,7 +94,7 @@ class GuildShorter extends base_1.BaseShorter {
                     }
                 }
                 channels = await this.client.proxy.guilds(guildId).channels.get();
-                await this.client.cache.channels?.set(channels.map(x => [x.id, x]), guildId);
+                await this.client.cache.channels?.set(cache_1.CacheFrom.Rest, channels.map(x => [x.id, x]), guildId);
                 return channels.map(m => (0, structures_1.channelFrom)(m, this.client));
             },
             /**
@@ -111,7 +112,7 @@ class GuildShorter extends base_1.BaseShorter {
                         return channel;
                 }
                 channel = await this.client.proxy.channels(channelId).get();
-                await this.client.cache.channels?.patch(channelId, guildId, channel);
+                await this.client.cache.channels?.patch(cache_1.CacheFrom.Rest, channelId, guildId, channel);
                 return (0, structures_1.channelFrom)(channel, this.client);
             },
             /**
@@ -122,7 +123,7 @@ class GuildShorter extends base_1.BaseShorter {
              */
             create: async (guildId, body) => {
                 const res = await this.client.proxy.guilds(guildId).channels.post({ body });
-                await this.client.cache.channels?.setIfNI(structures_1.BaseChannel.__intent__(guildId), res.id, guildId, res);
+                await this.client.cache.channels?.setIfNI(cache_1.CacheFrom.Rest, structures_1.BaseChannel.__intent__(guildId), res.id, guildId, res);
                 return (0, structures_1.channelFrom)(res, this.client);
             },
             /**
@@ -147,7 +148,7 @@ class GuildShorter extends base_1.BaseShorter {
              */
             edit: async (guildchannelId, channelId, body, reason) => {
                 const res = await this.client.proxy.channels(channelId).patch({ body, reason });
-                await this.client.cache.channels?.setIfNI(structures_1.BaseChannel.__intent__(guildchannelId), res.id, guildchannelId, res);
+                await this.client.cache.channels?.setIfNI(cache_1.CacheFrom.Rest, structures_1.BaseChannel.__intent__(guildchannelId), res.id, guildchannelId, res);
                 return (0, structures_1.channelFrom)(res, this.client);
             },
             /**
@@ -238,7 +239,7 @@ class GuildShorter extends base_1.BaseShorter {
              */
             list: async (guildId) => {
                 const stickers = await this.client.proxy.guilds(guildId).stickers.get();
-                await this.client.cache.stickers?.set(stickers.map(st => [st.id, st]), guildId);
+                await this.client.cache.stickers?.set(cache_1.CacheFrom.Rest, stickers.map(st => [st.id, st]), guildId);
                 return stickers.map(st => transformers_1.Transformers.Sticker(this.client, st));
             },
             /**
@@ -253,7 +254,7 @@ class GuildShorter extends base_1.BaseShorter {
                 const sticker = await this.client.proxy
                     .guilds(guildId)
                     .stickers.post({ reason, body: json, files: [{ ...fileResolve[0], key: 'file' }], appendToFormData: true });
-                await this.client.cache.stickers?.setIfNI('GuildExpressions', sticker.id, guildId, sticker);
+                await this.client.cache.stickers?.setIfNI(cache_1.CacheFrom.Rest, 'GuildExpressions', sticker.id, guildId, sticker);
                 return transformers_1.Transformers.Sticker(this.client, sticker);
             },
             /**
@@ -266,7 +267,7 @@ class GuildShorter extends base_1.BaseShorter {
              */
             edit: async (guildId, stickerId, body, reason) => {
                 const sticker = await this.client.proxy.guilds(guildId).stickers(stickerId).patch({ body, reason });
-                await this.client.cache.stickers?.setIfNI('GuildExpressions', stickerId, guildId, sticker);
+                await this.client.cache.stickers?.setIfNI(cache_1.CacheFrom.Rest, 'GuildExpressions', stickerId, guildId, sticker);
                 return transformers_1.Transformers.Sticker(this.client, sticker);
             },
             /**
@@ -284,7 +285,7 @@ class GuildShorter extends base_1.BaseShorter {
                         return sticker;
                 }
                 sticker = await this.client.proxy.guilds(guildId).stickers(stickerId).get();
-                await this.client.cache.stickers?.patch(stickerId, guildId, sticker);
+                await this.client.cache.stickers?.patch(cache_1.CacheFrom.Rest, stickerId, guildId, sticker);
                 return transformers_1.Transformers.Sticker(this.client, sticker);
             },
             /**

package/lib/common/shorters/members.d.ts

@@ -91,7 +91,7 @@ export declare class MemberShorter extends BaseShorter {
     listRoles(guildId: string, memberId: string, force?: boolean): Promise<GuildRoleStructure[]>;
     sortRoles(guildId: string, memberId: string, force?: boolean): Promise<GuildRoleStructure[]>;
     permissions(guildId: string, memberId: string, force?: boolean): Promise<PermissionsBitField>;
-    presence(memberId: string): import("../..").ReturnCache<(Omit<import("../../types").GatewayPresenceUpdate, "user"> & {
+    presence(memberId: string): import("../../cache").ReturnCache<(Omit<import("../../types").GatewayPresenceUpdate, "user"> & {
         id: string;
         user_id: string;
     } & {

package/lib/common/shorters/members.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MemberShorter = void 0;
+const cache_1 = require("../../cache");
 const transformers_1 = require("../../client/transformers");
 const Permissions_1 = require("../../structures/extra/Permissions");
 const types_1 = require("../../types");
@@ -40,7 +41,7 @@ class MemberShorter extends base_1.BaseShorter {
         const members = await this.client.proxy.guilds(guildId).members.search.get({
             query,
         });
-        await this.client.cache.members?.set(members.map(x => [x.user.id, x]), guildId);
+        await this.client.cache.members?.set(cache_1.CacheFrom.Rest, members.map(x => [x.user.id, x]), guildId);
         return members.map(m => transformers_1.Transformers.GuildMember(this.client, m, m.user, guildId));
     }
     /**
@@ -83,7 +84,7 @@ class MemberShorter extends base_1.BaseShorter {
      */
     async edit(guildId, memberId, body, reason) {
         const member = await this.client.proxy.guilds(guildId).members(memberId).patch({ body, reason });
-        await this.client.cache.members?.setIfNI('GuildMembers', memberId, guildId, member);
+        await this.client.cache.members?.setIfNI(cache_1.CacheFrom.Rest, 'GuildMembers', memberId, guildId, member);
         return transformers_1.Transformers.GuildMember(this.client, member, member.user, guildId);
     }
     /**
@@ -101,7 +102,7 @@ class MemberShorter extends base_1.BaseShorter {
         if (!member) {
             return;
         }
-        await this.client.cache.members?.setIfNI('GuildMembers', member.user.id, guildId, member);
+        await this.client.cache.members?.setIfNI(cache_1.CacheFrom.Rest, 'GuildMembers', member.user.id, guildId, member);
         return transformers_1.Transformers.GuildMember(this.client, member, member.user, guildId);
     }
     /**
@@ -123,7 +124,7 @@ class MemberShorter extends base_1.BaseShorter {
                 return member;
         }
         member = await this.client.proxy.guilds(guildId).members(memberId).get();
-        await this.client.cache.members?.set(member.user.id, guildId, member);
+        await this.client.cache.members?.set(cache_1.CacheFrom.Rest, member.user.id, guildId, member);
         return member;
     }
     /**
@@ -143,7 +144,7 @@ class MemberShorter extends base_1.BaseShorter {
         members = await this.client.proxy.guilds(guildId).members.get({
             query,
         });
-        await this.client.cache.members?.set(members.map(x => [x.user.id, x]), guildId);
+        await this.client.cache.members?.set(cache_1.CacheFrom.Rest, members.map(x => [x.user.id, x]), guildId);
         return members.map(m => transformers_1.Transformers.GuildMember(this.client, m, m.user, guildId));
     }
     /**
@@ -196,7 +197,7 @@ class MemberShorter extends base_1.BaseShorter {
                 return state;
         }
         const state = await this.client.proxy.guilds(guildId)['voice-states'](memberId).get();
-        await this.client.cache.voiceStates?.set(memberId, guildId, state);
+        await this.client.cache.voiceStates?.set(cache_1.CacheFrom.Rest, memberId, guildId, state);
         return transformers_1.Transformers.VoiceState(this.client, state);
     }
     /**

package/lib/common/shorters/messages.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MessageShorter = void 0;
 const builders_1 = require("../../builders");
 const structures_1 = require("../../structures");
+const cache_1 = require("../../cache");
 const client_1 = require("../../client");
 const base_1 = require("./base");
 class MessageShorter extends base_1.BaseShorter {
@@ -16,7 +17,7 @@ class MessageShorter extends base_1.BaseShorter {
             files: parsedFiles,
         })
             .then(async (message) => {
-            await this.client.cache.messages?.setIfNI('GuildMessages', message.id, message.channel_id, message);
+            await this.client.cache.messages?.setIfNI(cache_1.CacheFrom.Rest, 'GuildMessages', message.id, message.channel_id, message);
             return client_1.Transformers.Message(this.client, message);
         });
     }
@@ -30,7 +31,7 @@ class MessageShorter extends base_1.BaseShorter {
             files: parsedFiles,
         })
             .then(async (message) => {
-            await this.client.cache.messages?.setIfNI('GuildMessages', message.id, message.channel_id, message);
+            await this.client.cache.messages?.setIfNI(cache_1.CacheFrom.Rest, 'GuildMessages', message.id, message.channel_id, message);
             return client_1.Transformers.Message(this.client, message);
         });
     }
@@ -40,7 +41,7 @@ class MessageShorter extends base_1.BaseShorter {
             .messages(messageId)
             .crosspost.post({ reason })
             .then(async (m) => {
-            await this.client.cache.messages?.setIfNI('GuildMessages', m.id, m.channel_id, m);
+            await this.client.cache.messages?.setIfNI(cache_1.CacheFrom.Rest, 'GuildMessages', m.id, m.channel_id, m);
             return client_1.Transformers.Message(this.client, m);
         });
     }
@@ -65,7 +66,7 @@ class MessageShorter extends base_1.BaseShorter {
             .messages(messageId)
             .get()
             .then(async (x) => {
-            await this.client.cache.messages?.set(x.id, x.channel_id, x);
+            await this.client.cache.messages?.set(cache_1.CacheFrom.Rest, x.id, x.channel_id, x);
             return client_1.Transformers.Message(this.client, x);
         });
     }

package/lib/common/shorters/roles.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoleShorter = void 0;
+const cache_1 = require("../../cache");
 const transformers_1 = require("../../client/transformers");
 const base_1 = require("./base");
 class RoleShorter extends base_1.BaseShorter {
@@ -13,7 +14,7 @@ class RoleShorter extends base_1.BaseShorter {
      */
     async create(guildId, body, reason) {
         const res = await this.client.proxy.guilds(guildId).roles.post({ body, reason });
-        await this.client.cache.roles?.setIfNI('Guilds', res.id, guildId, res);
+        await this.client.cache.roles?.setIfNI(cache_1.CacheFrom.Rest, 'Guilds', res.id, guildId, res);
         return transformers_1.Transformers.GuildRole(this.client, res, guildId);
     }
     async fetch(guildId, roleId, force = false) {
@@ -28,7 +29,7 @@ class RoleShorter extends base_1.BaseShorter {
                 return role;
         }
         role = await this.client.proxy.guilds(guildId).roles(roleId).get();
-        await this.client.cache.roles?.set(roleId, guildId, role);
+        await this.client.cache.roles?.set(cache_1.CacheFrom.Rest, roleId, guildId, role);
         return role;
     }
     /**
@@ -50,7 +51,7 @@ class RoleShorter extends base_1.BaseShorter {
             }
         }
         roles = await this.client.proxy.guilds(guildId).roles.get();
-        await this.client.cache.roles?.set(roles.map(r => [r.id, r]), guildId);
+        await this.client.cache.roles?.set(cache_1.CacheFrom.Rest, roles.map(r => [r.id, r]), guildId);
         return roles;
     }
     /**
@@ -63,7 +64,7 @@ class RoleShorter extends base_1.BaseShorter {
      */
     async edit(guildId, roleId, body, reason) {
         const res = await this.client.proxy.guilds(guildId).roles(roleId).patch({ body, reason });
-        await this.client.cache.roles?.setIfNI('Guilds', roleId, guildId, res);
+        await this.client.cache.roles?.setIfNI(cache_1.CacheFrom.Rest, 'Guilds', roleId, guildId, res);
         return transformers_1.Transformers.GuildRole(this.client, res, guildId);
     }
     /**
@@ -89,7 +90,7 @@ class RoleShorter extends base_1.BaseShorter {
             body,
         });
         if (!this.client.cache.hasRolesIntent) {
-            await this.client.cache.roles?.set(roles.map(x => [x.id, x]), guildId);
+            await this.client.cache.roles?.set(cache_1.CacheFrom.Rest, roles.map(x => [x.id, x]), guildId);
         }
         return roles.map(x => transformers_1.Transformers.GuildRole(this.client, x, guildId));
     }

package/lib/common/shorters/threads.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ThreadShorter = void 0;
+const __1 = require("../..");
 const structures_1 = require("../../structures");
 const base_1 = require("./base");
 class ThreadShorter extends base_1.BaseShorter {
@@ -16,7 +17,7 @@ class ThreadShorter extends base_1.BaseShorter {
             .threads.post({ body, reason })
             // When testing this, discord returns the thread object, but in discord api types it does not.
             .then(async (thread) => {
-            await this.client.cache.channels?.setIfNI('Guilds', thread.id, thread.guild_id, thread);
+            await this.client.cache.channels?.setIfNI(__1.CacheFrom.Rest, 'Guilds', thread.id, thread.guild_id, thread);
             return (0, structures_1.channelFrom)(thread, this.client);
         }));
     }
@@ -27,7 +28,7 @@ class ThreadShorter extends base_1.BaseShorter {
             .messages(messageId)
             .threads.post({ body, reason })
             .then(async (thread) => {
-            await this.client.cache.channels?.setIfNI('Guilds', thread.id, thread.guild_id, thread);
+            await this.client.cache.channels?.setIfNI(__1.CacheFrom.Rest, 'Guilds', thread.id, thread.guild_id, thread);
             return (0, structures_1.channelFrom)(thread, this.client);
         });
     }

package/lib/common/shorters/users.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UsersShorter = void 0;
+const __1 = require("../..");
 const transformers_1 = require("../../client/transformers");
 const structures_1 = require("../../structures");
 const base_1 = require("./base");
@@ -14,7 +15,7 @@ class UsersShorter extends base_1.BaseShorter {
         const data = await this.client.proxy.users('@me').channels.post({
             body: { recipient_id: userId },
         });
-        await this.client.cache.channels?.set(userId, '@me', data);
+        await this.client.cache.channels?.set(__1.CacheFrom.Rest, userId, '@me', data);
         return transformers_1.Transformers.DMChannel(this.client, data);
     }
     async deleteDM(userId, reason) {
@@ -32,7 +33,7 @@ class UsersShorter extends base_1.BaseShorter {
                 return user;
         }
         const data = await this.client.proxy.users(userId).get();
-        await this.client.cache.users?.patch(userId, data);
+        await this.client.cache.users?.patch(__1.CacheFrom.Rest, userId, data);
         return data;
     }
     async write(userId, body) {

package/lib/structures/ClientUser.d.ts

@@ -1,4 +1,4 @@
-import type { ClientUserStructure } from '../client';
+import { type ClientUserStructure } from '../client';
 import type { UsingClient } from '../commands';
 import type { GatewayReadyDispatchData, RESTPatchAPICurrentUserJSONBody } from '../types';
 import { User } from './User';

package/lib/structures/ClientUser.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClientUser = void 0;
+const client_1 = require("../client");
 const User_1 = require("./User");
 class ClientUser extends User_1.User {
     application;
@@ -11,11 +12,11 @@ class ClientUser extends User_1.User {
     }
     async fetch() {
         const data = await this.api.users('@me').get();
-        return new ClientUser(this.client, data, this.application);
+        return client_1.Transformers.ClientUser(this.client, data, this.application);
     }
     async edit(body) {
         const data = await this.api.users('@me').patch({ body });
-        return new ClientUser(this.client, data, this.application);
+        return client_1.Transformers.ClientUser(this.client, data, this.application);
     }
 }
 exports.ClientUser = ClientUser;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "seyfert",
-	"version": "2.1.1-dev-12471001861.0",
+	"version": "2.1.1-dev-12488366079.0",
 	"description": "The most advanced framework for discord bots",
 	"main": "./lib/index.js",
 	"module": "./lib/index.js",