fix: return cache types

src/commands/applications/chatcontext.ts

@@ -1,4 +1,4 @@
-import type { ReturnCache } from '../..';
+import type { ReturnCache } from '../../cache';
 import type { Client, WorkerClient } from '../../client';
 import type {
 	GuildMemberStructure,

src/commands/applications/entrycontext.ts

@@ -1,4 +1,4 @@
-import type { ReturnCache } from '../..';
+import type { ReturnCache } from '../../cache';
 import type {
 	GuildMemberStructure,
 	GuildStructure,

src/structures/AutoModerationRule.ts

@@ -1,4 +1,4 @@
-import type { ReturnCache } from '../../src';
+import type { ReturnCache } from '../cache';
 import type { AutoModerationRuleStructure, GuildMemberStructure, GuildStructure } from '../client';
 import type { UsingClient } from '../commands';
 import type { MethodContext, ObjectToLower } from '../common';

src/structures/Guild.ts

@@ -1,4 +1,4 @@
-import type { GuildMemberStructure } from '../client';
+import type { GuildMemberStructure, GuildStructure } from '../client';
 import type { UsingClient } from '../commands';
 import type { ObjectToLower, StructPropState, StructStates, ToClass } from '../common/types/util';
 import type { APIGuild, APIPartialGuild, GatewayGuildCreateDispatchData, RESTPatchAPIGuildJSONBody } from '../types';
@@ -79,7 +79,7 @@ export class Guild<State extends StructStates = 'api'> extends (BaseGuild as unk
 	emojis = GuildEmoji.methods({ client: this.client, guildId: this.id });
 	bans = GuildBan.methods({ client: this.client, guildId: this.id });
 
-	edit(body: RESTPatchAPIGuildJSONBody, reason?: string) {
+	edit(body: RESTPatchAPIGuildJSONBody, reason?: string): Promise<GuildStructure<'api'>> {
 		return this.client.guilds.edit(this.id, body, reason);
 	}
 }

src/structures/GuildBan.ts

@@ -1,4 +1,4 @@
-import type { ReturnCache } from '../../src';
+import type { ReturnCache } from '../cache';
 import type { GuildBanStructure, GuildStructure } from '../client';
 import type { UsingClient } from '../commands';
 import { Formatter, type MethodContext, type ObjectToLower } from '../common';

src/structures/GuildEmoji.ts

@@ -1,5 +1,5 @@
-import type { ReturnCache } from '../../src';
 import type { BaseCDNUrlOptions } from '../api';
+import type { ReturnCache } from '../cache';
 import type { GuildEmojiStructure, GuildStructure } from '../client';
 import type { UsingClient } from '../commands';
 import { type EmojiShorter, Formatter, type MethodContext, type ObjectToLower } from '../common';

src/structures/GuildMember.ts

@@ -7,7 +7,7 @@ export type GuildMemberData =
 	| GatewayGuildMemberAddDispatchData
 	| APIInteractionDataResolvedGuildMember;
 
-import type { ReturnCache } from '../';
+import type { GuildRoleStructure, ReturnCache } from '../';
 import {
 	type DMChannelStructure,
 	type GuildMemberStructure,
@@ -38,7 +38,6 @@ import type {
 	RESTPutAPIGuildBanJSONBody,
 	RESTPutAPIGuildMemberJSONBody,
 } from '../types';
-import type { GuildRole } from './GuildRole';
 import { PermissionsBitField } from './extra/Permissions';
 
 export interface BaseGuildMember extends DiscordBase, ObjectToLower<Omit<APIGuildMember, 'user' | 'roles'>> {}
@@ -133,7 +132,7 @@ export class BaseGuildMember extends DiscordBase {
 	get roles() {
 		return {
 			keys: Object.freeze(this._roles.concat(this.guildId)) as string[],
-			list: (force = false): Promise<GuildRole[]> =>
+			list: (force = false): Promise<GuildRoleStructure[]> =>
 				this.client.roles
 					.list(this.guildId, force)
 					.then(roles => roles.filter(role => this.roles.keys.includes(role.id))),
@@ -141,9 +140,9 @@ export class BaseGuildMember extends DiscordBase {
 			remove: (id: string) => this.client.members.removeRole(this.guildId, this.id, id),
 			permissions: (force = false) =>
 				this.roles.list(force).then(roles => new PermissionsBitField(roles.map(x => BigInt(x.permissions.bits)))),
-			sorted: (force = false): Promise<GuildRole[]> =>
+			sorted: (force = false): Promise<GuildRoleStructure[]> =>
 				this.roles.list(force).then(roles => roles.sort((a, b) => b.position - a.position)),
-			highest: (force = false): Promise<GuildRole> => this.roles.sorted(force).then(roles => roles[0]),
+			highest: (force = false): Promise<GuildRoleStructure> => this.roles.sorted(force).then(roles => roles[0]),
 		};
 	}
 

src/structures/GuildRole.ts

@@ -1,4 +1,4 @@
-import type { ReturnCache } from '../../src';
+import type { ReturnCache } from '../cache';
 import type { GuildRoleStructure, GuildStructure } from '../client';
 import type { UsingClient } from '../commands';
 import { Formatter, type MethodContext, type ObjectToLower } from '../common';

src/structures/GuildTemplate.ts

@@ -1,4 +1,4 @@
-import type { ReturnCache } from '../../src';
+import type { ReturnCache } from '../cache';
 import type { GuildStructure, GuildTemplateStructure } from '../client';
 import type { UsingClient } from '../commands';
 import type { MethodContext, ObjectToLower } from '../common';

src/structures/Interaction.ts

@@ -42,9 +42,9 @@ import {
 	type RESTPostAPIInteractionCallbackResult,
 } from '../types';
 
-import type { ReturnCache } from '../../src';
 import type { RawFile } from '../api';
 import { ActionRow, Embed, Modal, PollBuilder, resolveAttachment, resolveFiles } from '../builders';
+import type { ReturnCache } from '../cache';
 import {
 	type EntitlementStructure,
 	type GuildRoleStructure,

src/structures/Poll.ts

@@ -30,8 +30,16 @@ export class Poll extends Base {
 		return this.client.messages.endPoll(this.channelId, this.messageId);
 	}
 
-	getAnswerVoters(id: ValidAnswerId): Promise<UserStructure[]> {
+	/**
-		if (!this.answers.find(x => x.answerId === id)) throw new Error('Invalid answer id');
+	 * @param id - The ID of the answer whose voters need to be fetched.
+	 * @param checkAnswer - A flag that determines if the answer ID should be validated before fetching voters.
+	 *                        Default is `false`. If `true`, the method checks if the answer ID exists in the list
+	 *                        of answers and throws an error if not.
+	 */
+	async getAnswerVoters(id: ValidAnswerId, checkAnswer = false): Promise<UserStructure[]> {
+		if (checkAnswer && !this.answers.find(answer => answer.answerId === id)) {
+			throw new Error('Invalid answer id');
+		}
 		return this.client.messages.getAnswerVoters(this.channelId, this.messageId, id);
 	}
 }

src/structures/Sticker.ts

@@ -1,6 +1,6 @@
 import type { GuildStructure, RawFile, StickerStructure, UsingClient } from '..';
-import type { ReturnCache } from '../../src';
 import type { Attachment, AttachmentBuilder } from '../builders';
+import type { ReturnCache } from '../cache';
 import { Transformers, type UserStructure } from '../client/transformers';
 import type { MethodContext, ObjectToLower } from '../common';
 import type { APISticker, RESTPatchAPIGuildStickerJSONBody, RESTPostAPIGuildStickerFormDataBody } from '../types';

src/structures/VoiceState.ts

@@ -1,5 +1,11 @@
-import type { AllGuildVoiceChannels, UserStructure, UsingClient, VoiceStateStructure } from '../';
+import type {
-import type { GuildStructure, ReturnCache } from '../../src';
+	AllGuildVoiceChannels,
+	GuildStructure,
+	ReturnCache,
+	UserStructure,
+	UsingClient,
+	VoiceStateStructure,
+} from '../';
 import type { VoiceStateResource } from '../cache/resources/voice-states';
 import { type GuildMemberStructure, Transformers } from '../client/transformers';
 import type { ObjectToLower } from '../common';

src/structures/Webhook.ts

@@ -1,4 +1,4 @@
-import type { ReturnCache } from '../../src';
+import type { ReturnCache } from '../cache';
 import {
 	type AnonymousGuildStructure,
 	type GuildStructure,

src/structures/extra/BaseGuild.ts

@@ -1,5 +1,4 @@
-import type { WorkerClient } from '../..';
+import type { ReturnCache, WorkerClient } from '../..';
-import type { ReturnCache } from '../../../src';
 import type { GuildStructure } from '../../client';
 import { type ObjectToLower, calculateShardId } from '../../common';
 import type { ImageOptions } from '../../common/types/options';