seyfert 4.4.1 → 5.0.0

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GuildRelatedResource = void 0;
-const common_1 = require("../../../common");
+const fake_promise_1 = require("../../../common/it/fake-promise");
 class GuildRelatedResource {
     cache;
     client;
@@ -38,41 +38,41 @@ class GuildRelatedResource {
         return this.adapter.get(this.hashId(id));
     }
     bulk(ids) {
-        return (0, common_1.fakePromise)(this.adapter.bulkGet(ids.map(x => this.hashId(x)))).then(x => x.filter(y => y));
+        return (0, fake_promise_1.fakePromise)(this.adapter.bulkGet(ids.map(x => this.hashId(x)))).then(x => x.filter(y => y));
     }
     set(from, __keys, guild, data) {
         const keys = (Array.isArray(__keys) ? __keys : [[__keys, data]]).filter(x => this.filter(x[1], x[0], guild, from));
         if (!keys.length)
-            return (0, common_1.fakePromise)(undefined).then(() => { });
-        return (0, common_1.fakePromise)(this.addToRelationship(keys.map(x => x[0]), guild)).then(() => this.adapter.bulkSet(keys.map(([key, value]) => {
+            return (0, fake_promise_1.fakePromise)(undefined).then(() => { });
+        return (0, fake_promise_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(from, __keys, guild, data) {
         const keys = (Array.isArray(__keys) ? __keys : [[__keys, data]]).filter(x => this.filter(x[1], x[0], guild, from));
         if (!keys.length)
-            return (0, common_1.fakePromise)(undefined).then(() => { });
-        return (0, common_1.fakePromise)(this.addToRelationship(keys.map(x => x[0]), guild)).then(() => this.adapter.bulkPatch(keys.map(([key, value]) => {
+            return (0, fake_promise_1.fakePromise)(undefined).then(() => { });
+        return (0, fake_promise_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];
-        return (0, common_1.fakePromise)(this.removeToRelationship(ids, guild)).then(() => this.adapter.bulkRemove(ids.map(x => this.hashId(x))));
+        return (0, fake_promise_1.fakePromise)(this.removeToRelationship(ids, guild)).then(() => this.adapter.bulkRemove(ids.map(x => this.hashId(x))));
     }
     keys(guild) {
         return guild === '*'
             ? this.adapter.scan(this.hashId(guild), true)
-            : (0, common_1.fakePromise)(this.adapter.getToRelationship(this.hashId(guild))).then(keys => keys.map(x => `${this.namespace}.${x}`));
+            : (0, fake_promise_1.fakePromise)(this.adapter.getToRelationship(this.hashId(guild))).then(keys => keys.map(x => `${this.namespace}.${x}`));
     }
     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.bulkGet(keys.map(x => `${this.namespace}.${x}`)));
+            ? (0, fake_promise_1.fakePromise)(this.adapter.scan(this.hashId(guild))).then(x => x)
+            : (0, fake_promise_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)
+            ? (0, fake_promise_1.fakePromise)(this.keys(to)).then(x => x.length)
             : this.adapter.count(this.hashId(to));
     }
     contains(id, guild) {
@@ -93,9 +93,9 @@ class GuildRelatedResource {
     hashId(id) {
         return id.startsWith(this.namespace) ? id : `${this.namespace}.${id}`;
     }
-    flush(guild) {
-        return (0, common_1.fakePromise)(this.keys(guild)).then(keys => {
-            return (0, common_1.fakePromise)(this.adapter.bulkRemove(keys)).then(() => {
+    flush(guild = '*') {
+        return (0, fake_promise_1.fakePromise)(this.keys(guild)).then(keys => {
+            return (0, fake_promise_1.fakePromise)(this.adapter.bulkRemove(keys)).then(() => {
                 return this.removeRelationship(guild);
             });
         });

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

@@ -12,7 +12,7 @@ export declare class Emojis extends GuildRelatedResource<any, APIEmoji | APIAppl
         id: string;
         guild_id: string;
     })[]>;
-    values(guild: string): ReturnCache<(GuildEmojiStructure | ApplicationEmojiStructure)[]>;
+    values(guild: '*' | (string & {})): ReturnCache<(GuildEmojiStructure | ApplicationEmojiStructure)[]>;
     valuesRaw(guild: string): ReturnCache<(((APIEmoji & {
         id: string;
     }) | APIApplicationEmoji) & {

package/lib/cache/resources/emojis.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Emojis = void 0;
 const transformers_1 = require("../../client/transformers");
-const common_1 = require("../../common");
+const fake_promise_1 = require("../../common/it/fake-promise");
 const guild_related_1 = require("./default/guild-related");
 class Emojis extends guild_related_1.GuildRelatedResource {
     namespace = 'emoji';
@@ -11,7 +11,7 @@ class Emojis extends guild_related_1.GuildRelatedResource {
         return true;
     }
     get(id) {
-        return (0, common_1.fakePromise)(super.get(id)).then(rawEmoji => {
+        return (0, fake_promise_1.fakePromise)(super.get(id)).then(rawEmoji => {
             if (!rawEmoji)
                 return undefined;
             if (rawEmoji.guild_id === this.client.applicationId)
@@ -23,7 +23,7 @@ class Emojis extends guild_related_1.GuildRelatedResource {
         return super.get(id);
     }
     bulk(ids) {
-        return (0, common_1.fakePromise)(super.bulk(ids)).then(emojis => emojis.map(rawEmoji => {
+        return (0, fake_promise_1.fakePromise)(super.bulk(ids)).then(emojis => emojis.map(rawEmoji => {
             if (rawEmoji.guild_id === this.client.applicationId)
                 return transformers_1.Transformers.ApplicationEmoji(this.client, rawEmoji);
             return transformers_1.Transformers.GuildEmoji(this.client, rawEmoji, rawEmoji.guild_id);
@@ -33,7 +33,7 @@ class Emojis extends guild_related_1.GuildRelatedResource {
         return super.bulk(ids);
     }
     values(guild) {
-        return (0, common_1.fakePromise)(super.values(guild)).then(emojis => emojis.map(rawEmoji => {
+        return (0, fake_promise_1.fakePromise)(super.values(guild)).then(emojis => emojis.map(rawEmoji => {
             if (rawEmoji.guild_id === this.client.applicationId)
                 return transformers_1.Transformers.ApplicationEmoji(this.client, rawEmoji);
             return transformers_1.Transformers.GuildEmoji(this.client, rawEmoji, rawEmoji.guild_id);

package/lib/cache/resources/guilds.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Guilds = void 0;
 const transformers_1 = require("../../client/transformers");
-const common_1 = require("../../common");
+const fake_promise_1 = require("../../common/it/fake-promise");
 const base_1 = require("./default/base");
 class Guilds extends base_1.BaseResource {
     namespace = 'guild';
@@ -11,25 +11,43 @@ class Guilds extends base_1.BaseResource {
         return true;
     }
     get(id) {
-        return (0, common_1.fakePromise)(super.get(id)).then(guild => guild ? transformers_1.Transformers.Guild(this.client, guild) : undefined);
+        return (0, fake_promise_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 => transformers_1.Transformers.Guild(this.client, x)));
+        return (0, fake_promise_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 => transformers_1.Transformers.Guild(this.client, x)));
+        return (0, fake_promise_1.fakePromise)(super.values()).then(guilds => guilds.map(x => transformers_1.Transformers.Guild(this.client, x)));
     }
     valuesRaw() {
         return super.values();
     }
     async remove(id) {
         const keysChannels = (await this.cache.channels?.keys(id)) ?? [];
+        const channelIds = this.cache.channels
+            ? keysChannels.map(i => i.slice(this.cache.channels.namespace.length + 1))
+            : [];
+        const overwriteKeys = this.cache.overwrites ? ((await this.cache.overwrites.keys(id)) ?? []) : [];
+        const messageKeys = [];
+        const messageRelationships = [];
+        const overwriteRelationships = this.cache.overwrites ? [this.cache.overwrites.hashId(id)] : [];
+        if (this.cache.messages) {
+            const messageEntries = await Promise.allSettled(channelIds.map(async (channelId) => ({
+                keys: await this.cache.messages.keys(channelId),
+                relationship: this.cache.messages.hashId(channelId),
+            })));
+            for (const { value } of messageEntries.filter(result => result.status === 'fulfilled')) {
+                const { keys, relationship } = value;
+                messageKeys.push(...keys);
+                messageRelationships.push(relationship);
+            }
+        }
         await this.cache.adapter.bulkRemove((await Promise.all([
             this.cache.members?.keys(id) ?? [],
             this.cache.roles?.keys(id) ?? [],
@@ -40,17 +58,9 @@ class Guilds extends base_1.BaseResource {
             this.cache.presences?.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);
-        }
+        ]))
+            .flat()
+            .concat(overwriteKeys, messageKeys));
         await this.cache.adapter.removeRelationship([
             this.cache.members?.hashId(id),
             this.cache.roles?.hashId(id),
@@ -60,6 +70,9 @@ class Guilds extends base_1.BaseResource {
             this.cache.voiceStates?.hashId(id),
             this.cache.presences?.hashId(id),
             this.cache.stageInstances?.hashId(id),
+            this.cache.bans?.hashId(id),
+            ...overwriteRelationships,
+            ...messageRelationships,
         ].filter(x => x !== undefined));
         await super.remove(id);
     }

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

@@ -10,7 +10,7 @@ export declare class Members extends GuildBasedResource<any, APIGuildMember> {
     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[]>;
+    values(guild: '*' | (string & {})): ReturnCache<GuildMemberStructure[]>;
     valuesRaw(guild: string): ReturnCache<Omit<APIGuildMember, 'user'>[]>;
     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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Members = void 0;
 const transformers_1 = require("../../client/transformers");
-const common_1 = require("../../common");
+const fake_promise_1 = require("../../common/it/fake-promise");
 const guild_based_1 = require("./default/guild-based");
 class Members extends guild_based_1.GuildBasedResource {
     namespace = 'member';
@@ -15,11 +15,11 @@ 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?.raw(id)).then(user => rawMember && user ? transformers_1.Transformers.GuildMember(this.client, rawMember, user, guild) : undefined));
+        return (0, fake_promise_1.fakePromise)(super.get(id, guild)).then(rawMember => (0, fake_promise_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
+        return (0, fake_promise_1.fakePromise)(super.get(id, guild)).then(rawMember => {
+            return (0, fake_promise_1.fakePromise)(this.client.cache.users?.raw(id)).then(user => rawMember && user
                 ? {
                     ...rawMember,
                     user,
@@ -28,7 +28,7 @@ class Members extends guild_based_1.GuildBasedResource {
         });
     }
     bulk(ids, guild) {
-        return (0, common_1.fakePromise)(super.bulk(ids, guild)).then(members => (0, common_1.fakePromise)(this.client.cache.users?.bulkRaw(ids)).then(users => {
+        return (0, fake_promise_1.fakePromise)(super.bulk(ids, guild)).then(members => (0, fake_promise_1.fakePromise)(this.client.cache.users?.bulkRaw(ids)).then(users => {
             if (!users)
                 return [];
             let usersRecord = {};
@@ -49,7 +49,7 @@ class Members extends guild_based_1.GuildBasedResource {
         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?.bulkRaw(members.map(member => member.id))).then(users => {
+        return (0, fake_promise_1.fakePromise)(super.values(guild)).then(members => (0, fake_promise_1.fakePromise)(this.client.cache.users?.bulkRaw(members.map(member => member.id))).then(users => {
             if (!users)
                 return [];
             let usersRecord = {};

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

@@ -10,9 +10,14 @@ export declare class Messages extends GuildRelatedResource<any, APIMessage> {
     raw(id: string): ReturnCache<APIMessageResource | undefined>;
     bulk(ids: string[]): ReturnCache<MessageStructure[]>;
     bulkRaw(ids: string[]): ReturnCache<APIMessageResource[]>;
-    values(channel: string): ReturnCache<MessageStructure[]>;
+    values(channel: '*' | (string & {})): ReturnCache<MessageStructure[]>;
     valuesRaw(channel: string): ReturnCache<APIMessageResource[]>;
-    keys(channel: string): string[];
+    keys(channel: '*' | (string & {})): string[];
+    private _buildCacheEntries;
+    set(from: CacheFrom, messageId: string, channelId: string, data: any): Promise<void>;
+    set(from: CacheFrom, messageDataArray: [string, any][], channelId: string): Promise<void>;
+    patch(from: CacheFrom, messageId: string, channelId: string, data: any): Promise<void>;
+    patch(from: CacheFrom, messageDataArray: [string, any][], channelId: string): Promise<void>;
 }
 export type APIMessageResource = Omit<APIMessage, 'author' | 'member'> & {
     user_id?: string;

package/lib/cache/resources/messages.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Messages = void 0;
 const transformers_1 = require("../../client/transformers");
-const common_1 = require("../../common");
+const fake_promise_1 = require("../../common/it/fake-promise");
 const guild_related_1 = require("./default/guild-related");
 class Messages extends guild_related_1.GuildRelatedResource {
     namespace = 'message';
@@ -17,9 +17,9 @@ class Messages extends guild_related_1.GuildRelatedResource {
         return rest;
     }
     get(id) {
-        return (0, common_1.fakePromise)(super.get(id)).then(rawMessage => {
+        return (0, fake_promise_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 => {
+                ? (0, fake_promise_1.fakePromise)(this.cache.adapter.get(this.cache.users.hashId(rawMessage.user_id))).then(user => {
                     return user ? transformers_1.Transformers.Message(this.client, { ...rawMessage, author: user }) : undefined;
                 })
                 : undefined;
@@ -29,31 +29,43 @@ class Messages extends guild_related_1.GuildRelatedResource {
         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 ? transformers_1.Transformers.Message(this.client, { ...rawMessage, author: user }) : undefined;
-                })
-                : undefined;
-        })
-            .filter(x => x !== undefined));
+        return (0, fake_promise_1.fakePromise)(super.bulk(ids)).then(messages => {
+            const hashes = this.cache.users
+                ? messages.map(x => (x.user_id ? this.cache.users?.hashId(x.user_id) : undefined))
+                : [];
+            return (0, fake_promise_1.fakePromise)(this.cache.adapter.bulkGet(hashes.filter(x => x !== undefined))).then(users => {
+                const userMap = new Map();
+                for (const user of users)
+                    userMap.set(user.id, user);
+                const result = [];
+                for (const message of messages) {
+                    const user = message.user_id ? userMap.get(message.user_id) : undefined;
+                    if (user)
+                        result.push(transformers_1.Transformers.Message(this.client, { ...message, author: user }));
+                }
+                return result;
+            });
+        });
     }
     bulkRaw(ids) {
         return super.bulk(ids);
     }
     values(channel) {
-        return (0, common_1.fakePromise)(super.values(channel)).then(messages => {
+        return (0, fake_promise_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.bulkGet(hashes.filter(x => x !== undefined))).then(users => {
-                return messages
-                    .map(message => {
-                    const user = users.find(user => user.id === message.user_id);
-                    return user ? transformers_1.Transformers.Message(this.client, { ...message, author: user }) : undefined;
-                })
-                    .filter(x => x !== undefined);
+            return (0, fake_promise_1.fakePromise)(this.cache.adapter.bulkGet(hashes.filter(x => x !== undefined))).then(users => {
+                const userMap = new Map();
+                for (const user of users)
+                    userMap.set(user.id, user);
+                const result = [];
+                for (const message of messages) {
+                    const user = message.user_id ? userMap.get(message.user_id) : undefined;
+                    if (user)
+                        result.push(transformers_1.Transformers.Message(this.client, { ...message, author: user }));
+                }
+                return result;
             });
         });
     }
@@ -63,5 +75,16 @@ class Messages extends guild_related_1.GuildRelatedResource {
     keys(channel) {
         return super.keys(channel);
     }
+    _buildCacheEntries(from, keys, channelId) {
+        return keys.map(([id, value]) => [from, 'messages', value, id, channelId]);
+    }
+    async set(from, __keys, channelId, data) {
+        const keys = Array.isArray(__keys) ? __keys : [[__keys, data]];
+        await this.cache.bulkSet(this._buildCacheEntries(from, keys, channelId));
+    }
+    async patch(from, __keys, channelId, data) {
+        const keys = Array.isArray(__keys) ? __keys : [[__keys, data]];
+        await this.cache.bulkPatch(this._buildCacheEntries(from, keys, channelId));
+    }
 }
 exports.Messages = Messages;

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

@@ -16,7 +16,7 @@ export declare class Overwrites extends GuildRelatedResource<any, APIOverwrite[]
         allow: PermissionsBitField;
         guildId: string;
     }[] | undefined>;
-    values(guild: string): ReturnCache<{
+    values(guild: '*' | (string & {})): ReturnCache<{
         type: OverwriteType;
         id: string;
         deny: PermissionsBitField;

package/lib/cache/resources/overwrites.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Overwrites = void 0;
-const utils_1 = require("../../common/it/utils");
+const fake_promise_1 = require("../../common/it/fake-promise");
 const Permissions_1 = require("../../structures/extra/Permissions");
 const guild_related_1 = require("./default/guild-related");
 class Overwrites extends guild_related_1.GuildRelatedResource {
@@ -11,16 +11,13 @@ class Overwrites extends guild_related_1.GuildRelatedResource {
         return true;
     }
     parse(data, _id, guild_id) {
-        data.forEach(x => {
-            x.guild_id = guild_id;
-        });
-        return data;
+        return data.map(x => ({ ...x, guild_id }));
     }
     raw(id) {
         return super.get(id);
     }
     get(id) {
-        return (0, utils_1.fakePromise)(super.get(id)).then(rawOverwrites => rawOverwrites
+        return (0, fake_promise_1.fakePromise)(super.get(id)).then(rawOverwrites => rawOverwrites
             ? rawOverwrites.map(rawOverwrite => ({
                 allow: new Permissions_1.PermissionsBitField(BigInt(rawOverwrite.allow)),
                 deny: new Permissions_1.PermissionsBitField(BigInt(rawOverwrite.deny)),
@@ -31,7 +28,7 @@ class Overwrites extends guild_related_1.GuildRelatedResource {
             : undefined);
     }
     values(guild) {
-        return (0, utils_1.fakePromise)(super.values(guild)).then(values => values.map(rawOverwrites => rawOverwrites.map(rawOverwrite => ({
+        return (0, fake_promise_1.fakePromise)(super.values(guild)).then(values => values.map(rawOverwrites => rawOverwrites.map(rawOverwrite => ({
             allow: new Permissions_1.PermissionsBitField(BigInt(rawOverwrite.allow)),
             deny: new Permissions_1.PermissionsBitField(BigInt(rawOverwrite.deny)),
             id: rawOverwrite.id,
@@ -43,7 +40,7 @@ class Overwrites extends guild_related_1.GuildRelatedResource {
         return super.values(guild);
     }
     bulk(ids) {
-        return (0, utils_1.fakePromise)(super.bulk(ids)).then(values => values.map(rawOverwrites => rawOverwrites.map(rawOverwrite => ({
+        return (0, fake_promise_1.fakePromise)(super.bulk(ids)).then(values => values.map(rawOverwrites => rawOverwrites.map(rawOverwrite => ({
             allow: new Permissions_1.PermissionsBitField(BigInt(rawOverwrite.allow)),
             deny: new Permissions_1.PermissionsBitField(BigInt(rawOverwrite.deny)),
             id: rawOverwrite.id,

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

@@ -9,6 +9,6 @@ export declare class Roles extends GuildRelatedResource<any, APIRole> {
     raw(id: string): ReturnCache<APIRole | undefined>;
     bulk(ids: string[]): ReturnCache<GuildRoleStructure[]>;
     bulkRaw(ids: string[]): ReturnCache<APIRole[]>;
-    values(guild: string): ReturnCache<GuildRoleStructure[]>;
+    values(guild: '*' | (string & {})): ReturnCache<GuildRoleStructure[]>;
     valuesRaw(guild: string): ReturnCache<APIRole[]>;
 }

package/lib/cache/resources/roles.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Roles = void 0;
 const transformers_1 = require("../../client/transformers");
-const common_1 = require("../../common");
+const fake_promise_1 = require("../../common/it/fake-promise");
 const guild_related_1 = require("./default/guild-related");
 class Roles extends guild_related_1.GuildRelatedResource {
     namespace = 'role';
@@ -11,19 +11,19 @@ class Roles extends guild_related_1.GuildRelatedResource {
         return true;
     }
     get(id) {
-        return (0, common_1.fakePromise)(super.get(id)).then(rawRole => rawRole ? transformers_1.Transformers.GuildRole(this.client, rawRole, rawRole.guild_id) : undefined);
+        return (0, fake_promise_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 => transformers_1.Transformers.GuildRole(this.client, rawRole, rawRole.guild_id)));
+        return (0, fake_promise_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 => transformers_1.Transformers.GuildRole(this.client, rawRole, rawRole.guild_id)));
+        return (0, fake_promise_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);

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

@@ -9,6 +9,6 @@ export declare class Stickers extends GuildRelatedResource<any, APISticker> {
     raw(id: string): ReturnCache<APISticker | undefined>;
     bulk(ids: string[]): ReturnCache<StickerStructure[]>;
     bulkRaw(ids: string[]): ReturnCache<APISticker[]>;
-    values(guild: string): ReturnCache<StickerStructure[]>;
+    values(guild: '*' | (string & {})): ReturnCache<StickerStructure[]>;
     valuesRaw(guild: string): ReturnCache<APISticker[]>;
 }

package/lib/cache/resources/stickers.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Stickers = void 0;
 const transformers_1 = require("../../client/transformers");
-const common_1 = require("../../common");
+const fake_promise_1 = require("../../common/it/fake-promise");
 const guild_related_1 = require("./default/guild-related");
 class Stickers extends guild_related_1.GuildRelatedResource {
     namespace = 'sticker';
@@ -11,19 +11,19 @@ class Stickers extends guild_related_1.GuildRelatedResource {
         return true;
     }
     get(id) {
-        return (0, common_1.fakePromise)(super.get(id)).then(rawSticker => rawSticker ? transformers_1.Transformers.Sticker(this.client, rawSticker) : undefined);
+        return (0, fake_promise_1.fakePromise)(super.get(id)).then(rawSticker => rawSticker ? transformers_1.Transformers.Sticker(this.client, rawSticker) : undefined);
     }
     raw(id) {
         return super.get(id);
     }
     bulk(ids) {
-        return (0, common_1.fakePromise)(super.bulk(ids)).then(emojis => emojis.map(rawSticker => transformers_1.Transformers.Sticker(this.client, rawSticker)));
+        return (0, fake_promise_1.fakePromise)(super.bulk(ids)).then(emojis => emojis.map(rawSticker => transformers_1.Transformers.Sticker(this.client, rawSticker)));
     }
     bulkRaw(ids) {
         return super.bulk(ids);
     }
     values(guild) {
-        return (0, common_1.fakePromise)(super.values(guild)).then(emojis => emojis.map(rawSticker => transformers_1.Transformers.Sticker(this.client, rawSticker)));
+        return (0, fake_promise_1.fakePromise)(super.values(guild)).then(emojis => emojis.map(rawSticker => transformers_1.Transformers.Sticker(this.client, rawSticker)));
     }
     valuesRaw(guild) {
         return super.values(guild);

package/lib/cache/resources/users.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Users = void 0;
 const transformers_1 = require("../../client/transformers");
-const common_1 = require("../../common");
+const fake_promise_1 = require("../../common/it/fake-promise");
 const base_1 = require("./default/base");
 class Users extends base_1.BaseResource {
     namespace = 'user';
@@ -11,19 +11,19 @@ class Users extends base_1.BaseResource {
         return true;
     }
     get(id) {
-        return (0, common_1.fakePromise)(super.get(id)).then(rawUser => (rawUser ? transformers_1.Transformers.User(this.client, rawUser) : undefined));
+        return (0, fake_promise_1.fakePromise)(super.get(id)).then(rawUser => (rawUser ? transformers_1.Transformers.User(this.client, rawUser) : undefined));
     }
     raw(id) {
         return super.get(id);
     }
     bulk(ids) {
-        return (0, common_1.fakePromise)(super.bulk(ids)).then(users => users.map(rawUser => transformers_1.Transformers.User(this.client, rawUser)));
+        return (0, fake_promise_1.fakePromise)(super.bulk(ids)).then(users => users.map(rawUser => transformers_1.Transformers.User(this.client, rawUser)));
     }
     bulkRaw(ids) {
         return super.bulk(ids);
     }
     values() {
-        return (0, common_1.fakePromise)(super.values()).then(users => users.map(rawUser => transformers_1.Transformers.User(this.client, rawUser)));
+        return (0, fake_promise_1.fakePromise)(super.values()).then(users => users.map(rawUser => transformers_1.Transformers.User(this.client, rawUser)));
     }
     valuesRaw() {
         return super.values();

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

@@ -10,7 +10,7 @@ export declare class VoiceStates extends GuildBasedResource<any, APIVoiceState>
     raw(memberId: string, guildId: string): ReturnCache<APIVoiceState | undefined>;
     bulk(ids: string[], guild: string): ReturnCache<VoiceStateStructure[]>;
     bulkRaw(ids: string[], guild: string): ReturnCache<APIVoiceState[]>;
-    values(guildId: string): ReturnCache<VoiceStateStructure[]>;
+    values(guildId: '*' | (string & {})): ReturnCache<VoiceStateStructure[]>;
     valuesRaw(guildId: string): ReturnCache<APIVoiceState[]>;
 }
 export type VoiceStateResource = Omit<APIVoiceState, 'member'> & {

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VoiceStates = void 0;
 const transformers_1 = require("../../client/transformers");
-const common_1 = require("../../common");
+const fake_promise_1 = require("../../common/it/fake-promise");
 const guild_based_1 = require("./default/guild-based");
 class VoiceStates extends guild_based_1.GuildBasedResource {
     namespace = 'voice_state';
@@ -15,13 +15,13 @@ class VoiceStates extends guild_based_1.GuildBasedResource {
         return rest;
     }
     get(memberId, guildId) {
-        return (0, common_1.fakePromise)(super.get(memberId, guildId)).then(state => state ? transformers_1.Transformers.VoiceState(this.client, state) : undefined);
+        return (0, fake_promise_1.fakePromise)(super.get(memberId, guildId)).then(state => state ? transformers_1.Transformers.VoiceState(this.client, state) : undefined);
     }
     raw(memberId, guildId) {
         return super.get(memberId, guildId);
     }
     bulk(ids, guild) {
-        return (0, common_1.fakePromise)(super.bulk(ids, guild)).then(states => states
+        return (0, fake_promise_1.fakePromise)(super.bulk(ids, guild)).then(states => states
             .map(state => (state ? transformers_1.Transformers.VoiceState(this.client, state) : undefined))
             .filter(x => x !== undefined));
     }
@@ -29,7 +29,7 @@ class VoiceStates extends guild_based_1.GuildBasedResource {
         return super.bulk(ids, guild);
     }
     values(guildId) {
-        return (0, common_1.fakePromise)(super.values(guildId)).then(states => states.map(state => transformers_1.Transformers.VoiceState(this.client, state)));
+        return (0, fake_promise_1.fakePromise)(super.values(guildId)).then(states => states.map(state => transformers_1.Transformers.VoiceState(this.client, state)));
     }
     valuesRaw(guildId) {
         return super.values(guildId);