Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-09 16:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: don't create new instances of builders classes (#7343)

Browse Source
This commit is contained in:
Rodry
2022-01-26 09:23:58 +00:00
committed by GitHub
parent b6402723c3
commit d6b56d0080
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/builders/src/components/ActionRow.ts
View File

@@ -3,6 +3,8 @@ import type { ButtonComponent, SelectMenuComponent } from '..';
import type { Component } from './Component';
import { createComponent } from './Components';
export type MessageComponent = ActionRowComponent | ActionRow;
export type ActionRowComponent = ButtonComponent | SelectMenuComponent;
// TODO: Add valid form component types
@@ -10,7 +12,7 @@ export type ActionRowComponent = ButtonComponent | SelectMenuComponent;
/**
* Represents an action row component
*/
export class ActionRow<T extends ActionRowComponent> implements Component {
export class ActionRow<T extends ActionRowComponent = ActionRowComponent> implements Component {
public readonly components: T[] = [];
public readonly type = ComponentType.ActionRow;

13
packages/builders/src/components/Components.ts
View File

@@ -1,9 +1,9 @@
import { APIMessageComponent, ComponentType } from 'discord-api-types/v9';
import { ActionRow, ButtonComponent, Component, SelectMenuComponent } from '../index';
import type { ActionRowComponent } from './ActionRow';
import type { MessageComponent } from './ActionRow';
export interface MappedComponentTypes {
[ComponentType.ActionRow]: ActionRow<ActionRowComponent>;
[ComponentType.ActionRow]: ActionRow;
[ComponentType.Button]: ButtonComponent;
[ComponentType.SelectMenu]: SelectMenuComponent;
}
@@ -15,14 +15,15 @@ export interface MappedComponentTypes {
export function createComponent<T extends keyof MappedComponentTypes>(
data: APIMessageComponent & { type: T },
): MappedComponentTypes[T];
export function createComponent(data: APIMessageComponent): Component {
export function createComponent<C extends MessageComponent>(data: C): C;
export function createComponent(data: APIMessageComponent | MessageComponent): Component {
switch (data.type) {
case ComponentType.ActionRow:
return new ActionRow(data);
return data instanceof ActionRow ? data : new ActionRow(data);
case ComponentType.Button:
return new ButtonComponent(data);
return data instanceof ButtonComponent ? data : new ButtonComponent(data);
case ComponentType.SelectMenu:
return new SelectMenuComponent(data);
return data instanceof SelectMenuComponent ? data : new SelectMenuComponent(data);
default:
// @ts-expect-error
throw new Error(`Cannot serialize component type: ${data.type as number}`);