@ovencord/builders 1.12.8 → 1.13.0

package/src/interactions/modals/Modal.ts

@@ -110,14 +110,10 @@ export class ModalBuilder implements JSONEncodable<APIModalInteractionResponseCa
 	 * @param components - The action rows to add
 	 */
 	public addActionRowComponents(
-		...components: RestOrArray<
-			ActionRowBuilder | APIActionRowComponent<APIComponentInActionRow>
-		>
+		...components: RestOrArray<ActionRowBuilder | APIActionRowComponent<APIComponentInActionRow>>
 	) {
 		const normalized = normalizeArray(components);
-		const resolved = normalized.map((row) =>
-			row instanceof ActionRowBuilder ? row : new ActionRowBuilder(row),
-		);
+		const resolved = normalized.map((row) => (row instanceof ActionRowBuilder ? row : new ActionRowBuilder(row)));
 
 		this.data.components.push(...resolved);
 
@@ -130,9 +126,7 @@ export class ModalBuilder implements JSONEncodable<APIModalInteractionResponseCa
 	 *
 	 * @param components - The components to add
 	 */
-	public addComponents(
-		...components: RestOrArray<ActionRowBuilder | AnyModalComponentBuilder>
-	) {
+	public addComponents(...components: RestOrArray<ActionRowBuilder | AnyModalComponentBuilder>) {
 		const normalized = normalizeArray(components);
 		this.data.components.push(...normalized);
 

package/src/messages/Assertions.ts

@@ -126,9 +126,12 @@ const allTopLevelComponentsPredicate = z
 
 const messageComponentsV2Predicate = baseMessagePredicate.extend({
 	components: allTopLevelComponentsPredicate,
-	flags: z.number().int().refine((flags) => (flags & MessageFlags.IsComponentsV2) === MessageFlags.IsComponentsV2, {
-		message: 'Must set IsComponentsV2 flag to use Components V2',
-	}),
+	flags: z
+		.number()
+		.int()
+		.refine((flags) => (flags & MessageFlags.IsComponentsV2) === MessageFlags.IsComponentsV2, {
+			message: 'Must set IsComponentsV2 flag to use Components V2',
+		}),
 	// These fields cannot be set
 	content: z.string().length(0).nullish(),
 	embeds: z.array(z.never()).nullish(),

package/src/messages/Attachment.ts

@@ -109,7 +109,7 @@ export class AttachmentBuilder implements JSONEncodable<RESTAPIAttachment> {
 	 * @remarks Note that this data is NOT included in the {@link toJSON} output. To retrieve it, use {@link getRawFile}.
 	 */
 	public setFileData(data: Uint8Array | string): this {
-		this.fileData.data = data as any;
+		this.fileData.data = data as unknown as RawFile['data'];
 		return this;
 	}
 

package/src/messages/Message.ts

@@ -3,21 +3,21 @@ import type {
 	APIActionRowComponent,
 	APIAllowedMentions,
 	APIAttachment,
-	APIEmbed,
+	APIComponentInActionRow,
 	APIComponentInMessageActionRow,
-	APIMessageReference,
-	APIPoll,
-	RESTPostAPIChannelMessageJSONBody,
-	Snowflake,
-	MessageFlags,
 	APIContainerComponent,
+	APIEmbed,
 	APIFileComponent,
 	APIMediaGalleryComponent,
+	APIMessageReference,
+	APIMessageTopLevelComponent,
+	APIPoll,
 	APISectionComponent,
 	APISeparatorComponent,
 	APITextDisplayComponent,
-	APIMessageTopLevelComponent,
-	APIComponentInActionRow,
+	MessageFlags,
+	RESTPostAPIChannelMessageJSONBody,
+	Snowflake,
 } from 'discord-api-types/v10';
 import { ActionRowBuilder } from '../components/ActionRow.js';
 import { ComponentBuilder } from '../components/Component.js';
@@ -35,16 +35,17 @@ import { validate } from '../util/validation.js';
 import { AllowedMentionsBuilder } from './AllowedMentions.js';
 import { fileBodyMessagePredicate, messagePredicate } from './Assertions.js';
 import { AttachmentBuilder } from './Attachment.js';
-import { MessageReferenceBuilder } from './MessageReference.js';
 import { EmbedBuilder } from './embed/Embed.js';
+import { MessageReferenceBuilder } from './MessageReference.js';
 import { PollBuilder } from './poll/Poll.js';
 
-export interface MessageBuilderData extends Partial<
-	Omit<
-		RESTPostAPIChannelMessageJSONBody,
-		'allowed_mentions' | 'attachments' | 'components' | 'embeds' | 'message_reference' | 'poll'
-	>
-> {
+export interface MessageBuilderData
+	extends Partial<
+		Omit<
+			RESTPostAPIChannelMessageJSONBody,
+			'allowed_mentions' | 'attachments' | 'components' | 'embeds' | 'message_reference' | 'poll'
+		>
+	> {
 	allowed_mentions?: AllowedMentionsBuilder;
 	attachments: AttachmentBuilder[];
 	components: MessageTopLevelComponentBuilder[];
@@ -252,7 +253,8 @@ export class MessageBuilder
 	 * @param updater - The function to update the allowed mentions with
 	 */
 	public updateAllowedMentions(updater: (builder: AllowedMentionsBuilder) => void): this {
-		updater((this.data.allowed_mentions ??= new AllowedMentionsBuilder()));
+		this.data.allowed_mentions ??= new AllowedMentionsBuilder();
+		updater(this.data.allowed_mentions);
 		return this;
 	}
 
@@ -285,7 +287,8 @@ export class MessageBuilder
 	 * @param updater - The function to update the message reference with
 	 */
 	public updateMessageReference(updater: (builder: MessageReferenceBuilder) => void): this {
-		updater((this.data.message_reference ??= new MessageReferenceBuilder()));
+		this.data.message_reference ??= new MessageReferenceBuilder();
+		updater(this.data.message_reference);
 		return this;
 	}
 
@@ -311,7 +314,12 @@ export class MessageBuilder
 	): this {
 		this.data.components ??= [];
 
-		const resolved = normalizeArray(components).map((component) => resolveBuilder<ActionRowBuilder, Partial<APIActionRowComponent<APIComponentInActionRow>>>(component, ActionRowBuilder));
+		const resolved = normalizeArray(components).map((component) =>
+			resolveBuilder<ActionRowBuilder, Partial<APIActionRowComponent<APIComponentInActionRow>>>(
+				component,
+				ActionRowBuilder,
+			),
+		);
 		this.data.components.push(...resolved);
 
 		return this;
@@ -479,7 +487,7 @@ export class MessageBuilder
 	 */
 	public addStickerIds(...stickerIds: RestOrArray<Snowflake>): this {
 		this.data.sticker_ids ??= [] as unknown as MessageBuilderData['sticker_ids'];
-		this.data.sticker_ids!.push(...normalizeArray(stickerIds));
+		this.data.sticker_ids?.push(...normalizeArray(stickerIds));
 		return this;
 	}
 
@@ -513,7 +521,7 @@ export class MessageBuilder
 	 */
 	public spliceStickerIds(index: number, deleteCount: number, ...stickerIds: RestOrArray<Snowflake>): this {
 		this.data.sticker_ids ??= [] as unknown as MessageBuilderData['sticker_ids'];
-		this.data.sticker_ids!.splice(index, deleteCount, ...normalizeArray(stickerIds));
+		this.data.sticker_ids?.splice(index, deleteCount, ...normalizeArray(stickerIds));
 		return this;
 	}
 
@@ -625,7 +633,8 @@ export class MessageBuilder
 	 * @param updater - The function to update the poll with
 	 */
 	public updatePoll(updater: (builder: PollBuilder) => void): this {
-		updater((this.data.poll ??= new PollBuilder()));
+		this.data.poll ??= new PollBuilder();
+		updater(this.data.poll);
 		return this;
 	}
 

package/src/messages/embed/Assertions.ts

@@ -1,11 +1,22 @@
 import { embedLength } from '@ovencord/util';
+import type { APIEmbed } from 'discord-api-types/v10';
 import { z } from 'zod';
 
 const namePredicate = z.string().max(256);
 
-const URLPredicate = z.string().url().refine((url) => url.startsWith('http:') || url.startsWith('https:'), { message: 'URL must use http or https protocol' });
+const URLPredicate = z
+	.string()
+	.url()
+	.refine((url) => url.startsWith('http:') || url.startsWith('https:'), {
+		message: 'URL must use http or https protocol',
+	});
 
-const URLWithAttachmentProtocolPredicate = z.string().url().refine((url) => url.startsWith('http:') || url.startsWith('https:') || url.startsWith('attachment:'), { message: 'URL must use http, https, or attachment protocol' });
+const URLWithAttachmentProtocolPredicate = z
+	.string()
+	.url()
+	.refine((url) => url.startsWith('http:') || url.startsWith('https:') || url.startsWith('attachment:'), {
+		message: 'URL must use http, https, or attachment protocol',
+	});
 
 export const embedFieldPredicate = z.object({
 	name: namePredicate,
@@ -50,4 +61,6 @@ export const embedPredicate = z
 			message: 'Embed must have at least a title, description, a field, a footer, an author, an image, OR a thumbnail.',
 		},
 	)
-	.refine((embed) => embedLength(embed as any) <= 6_000, { message: 'Embeds must not exceed 6000 characters in total.' });
+	.refine((embed) => embedLength(embed as unknown as APIEmbed) <= 6_000, {
+		message: 'Embeds must not exceed 6000 characters in total.',
+	});

package/src/messages/embed/Embed.ts

@@ -159,7 +159,8 @@ export class EmbedBuilder implements JSONEncodable<APIEmbed> {
 	 * @param updater - The function to update the author with
 	 */
 	public updateAuthor(updater: (builder: EmbedAuthorBuilder) => void) {
-		updater((this.data.author ??= new EmbedAuthorBuilder()));
+		this.data.author ??= new EmbedAuthorBuilder();
+		updater(this.data.author);
 		return this;
 	}
 
@@ -225,7 +226,8 @@ export class EmbedBuilder implements JSONEncodable<APIEmbed> {
 	 * @param updater - The function to update the footer with
 	 */
 	public updateFooter(updater: (builder: EmbedFooterBuilder) => void) {
-		updater((this.data.footer ??= new EmbedFooterBuilder()));
+		this.data.footer ??= new EmbedFooterBuilder();
+		updater(this.data.footer);
 		return this;
 	}
 

package/src/messages/poll/Poll.ts

@@ -1,5 +1,5 @@
 import type { JSONEncodable } from '@ovencord/util';
-import type { RESTAPIPoll, APIPollMedia, PollLayoutType, APIPollAnswer } from 'discord-api-types/v10';
+import type { APIPollAnswer, APIPollMedia, PollLayoutType, RESTAPIPoll } from 'discord-api-types/v10';
 import { normalizeArray, type RestOrArray } from '../../util/normalizeArray.js';
 import { resolveBuilder } from '../../util/resolveBuilder.js';
 import { validate } from '../../util/validation.js';

package/src/util/componentUtil.ts

@@ -15,10 +15,10 @@ export function parseEmoji(text: string): APIMessageComponentEmoji {
 	if (/^\d{17,21}$/.test(decodedText)) return { id: decodedText, name: undefined, animated: false };
 	if (!decodedText.includes(':')) return { animated: false, name: decodedText.replace(/\uFE0F/g, ''), id: undefined };
 	const match = /<?(?:(?<animated>a):)?(?<name>\w{2,32}):(?<id>\d{17,19})?>?/.exec(decodedText);
-	
-    if (!match || !match.groups) {
-        return { animated: false, name: decodedText, id: undefined };
-    }
+
+	if (!match || !match.groups) {
+		return { animated: false, name: decodedText, id: undefined };
+	}
 
 	return {
 		animated: Boolean(match.groups.animated),

package/src/util/resolveBuilder.ts

@@ -6,7 +6,7 @@ import type { JSONEncodable } from '@ovencord/util';
  * function, TS doesn't narrow out the type `Builder`, causing a type error on the last return statement.
  * @internal
  */
-function isBuilder<Builder extends JSONEncodable<any>>(
+function isBuilder<Builder extends JSONEncodable<unknown>>(
 	builder: unknown,
 	Constructor: new () => Builder,
 ): builder is Builder {
@@ -24,7 +24,10 @@ function isBuilder<Builder extends JSONEncodable<any>>(
  * @param builder - The user input, as described in the function description
  * @param Constructor - The constructor of the builder
  */
-export function resolveBuilder<Builder extends JSONEncodable<any>, BuilderData extends Record<PropertyKey, any>>(
+export function resolveBuilder<
+	Builder extends JSONEncodable<unknown>,
+	BuilderData extends Record<PropertyKey, unknown>,
+>(
 	builder: Builder | BuilderData | ((builder: Builder) => Builder),
 	Constructor: new (data?: BuilderData) => Builder,
 ): Builder {

package/src/util/validation.ts

@@ -9,7 +9,8 @@ let validationEnabled = true;
  * @returns Whether validation is occurring.
  */
 export function enableValidators() {
-	return (validationEnabled = true);
+	validationEnabled = true;
+	return validationEnabled;
 }
 
 /**
@@ -18,7 +19,8 @@ export function enableValidators() {
  * @returns Whether validation is occurring.
  */
 export function disableValidators() {
-	return (validationEnabled = false);
+	validationEnabled = false;
+	return validationEnabled;
 }
 
 /**