Skip to content

feat(RM-322): Components v2 Panel Builder #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BenHall-1 wants to merge 8 commits into
base: master
Choose a base branch
from
Open

feat(RM-322): Components v2 Panel Builder #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
34051a9
feat: message performance
BenHall-1 Sep 6, 2026
4f779c2
Merge remote-tracking branch 'origin/master' into msg-perf
BenHall-1 Sep 21, 2026
dc435ff
Merge remote-tracking branch 'origin/master' into msg-perf
BenHall-1 Oct 8, 2026
c1e7e5a
fixes based on feedback
BenHall-1 Oct 14, 2026
2fbd7bc
fixes based on feedback
BenHall-1 Oct 18, 2026
ca50286
Merge branch 'master' into msg-perf
biast12 Oct 27, 2026
03a277e
Preserve panel metadata during updates
biast12 Oct 28, 2026
3a15840
Add transactional multi-panel updates
biast12 Nov 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions dashboardonboarding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
)

type DashboardOnboarding struct {
GuildId uint64 `json:"guild_id,string"`
OnboardingCompleted bool `json:"onboarding_completed"`
GuildId uint64 `json:"guild_id,string"`
OnboardingCompleted bool `json:"onboarding_completed"`
OnboardingCompletedAt *time.Time `json:"onboarding_completed_at"`
CurrentStep int16 `json:"current_step"`
Skipped bool `json:"skipped"`
CurrentStep int16 `json:"current_step"`
Skipped bool `json:"skipped"`
}

type DashboardOnboardingTable struct {
Expand Down
2 changes: 1 addition & 1 deletion gallery_snapshots.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ type GalleryPanelSnapshot struct {
}

type GalleryTagSnapshot struct {
Content *string `json:"content,omitempty"`
Content *string `json:"content,omitempty"`
Embed *CustomEmbedWithFields `json:"embed,omitempty"`
}

Expand Down
60 changes: 47 additions & 13 deletions multipanels.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ type MultiPanel struct {
SelectMenu bool `json:"select_menu"`
SelectMenuPlaceholder *string `json:"select_menu_placeholder"`
Embed *CustomEmbedWithFields `json:"embed"`
UsesComponentsV2 bool `json:"uses_components_v2"`
Components *string `json:"components"`
Name *string `json:"name"`
}

type MultiPanelTable struct {
Expand All @@ -40,13 +43,16 @@ CREATE TABLE IF NOT EXISTS multi_panels(
PRIMARY KEY("id")
);
CREATE INDEX IF NOT EXISTS multi_panels_guild_id ON multi_panels("guild_id");
CREATE INDEX IF NOT EXISTS multi_panels_message_id ON multi_panels("message_id");`
CREATE INDEX IF NOT EXISTS multi_panels_message_id ON multi_panels("message_id");
ALTER TABLE multi_panels ADD COLUMN IF NOT EXISTS "uses_components_v2" bool NOT NULL DEFAULT false;
ALTER TABLE multi_panels ADD COLUMN IF NOT EXISTS "components" JSONB DEFAULT NULL;
ALTER TABLE multi_panels ADD COLUMN IF NOT EXISTS "name" text DEFAULT NULL;`
}

func (p *MultiPanelTable) Get(ctx context.Context, id int) (MultiPanel, bool, error) {
query := `
SELECT
"id", "message_id", "channel_id", "guild_id", "select_menu", "select_menu_placeholder", "embed"
"id", "message_id", "channel_id", "guild_id", "select_menu", "select_menu_placeholder", "embed", "uses_components_v2", "components", "name"
FROM
multi_panels
WHERE
Expand All @@ -56,7 +62,7 @@ WHERE
var panel MultiPanel
var embedRaw *string
err := p.QueryRow(ctx, query, id).Scan(
&panel.Id, &panel.MessageId, &panel.ChannelId, &panel.GuildId, &panel.SelectMenu, &panel.SelectMenuPlaceholder, &embedRaw,
&panel.Id, &panel.MessageId, &panel.ChannelId, &panel.GuildId, &panel.SelectMenu, &panel.SelectMenuPlaceholder, &embedRaw, &panel.UsesComponentsV2, &panel.Components, &panel.Name,
)

if err != nil {
Expand All @@ -79,7 +85,7 @@ WHERE
func (p *MultiPanelTable) GetByMessageId(ctx context.Context, messageId uint64) (MultiPanel, bool, error) {
query := `
SELECT
"id", "message_id", "channel_id", "guild_id", "select_menu", "select_menu_placeholder", "embed"
"id", "message_id", "channel_id", "guild_id", "select_menu", "select_menu_placeholder", "embed", "uses_components_v2", "components", "name"
FROM
multi_panels
WHERE
Expand All @@ -89,7 +95,7 @@ WHERE
var panel MultiPanel
var embedRaw *string
err := p.QueryRow(ctx, query, messageId).Scan(
&panel.Id, &panel.MessageId, &panel.ChannelId, &panel.GuildId, &panel.SelectMenu, &panel.SelectMenuPlaceholder, &embedRaw,
&panel.Id, &panel.MessageId, &panel.ChannelId, &panel.GuildId, &panel.SelectMenu, &panel.SelectMenuPlaceholder, &embedRaw, &panel.UsesComponentsV2, &panel.Components, &panel.Name,
)

if err != nil {
Expand All @@ -111,9 +117,10 @@ WHERE

func (p *MultiPanelTable) GetByGuild(ctx context.Context, guildId uint64) ([]MultiPanel, error) {
query := `
SELECT "id", "message_id", "channel_id", "guild_id", "select_menu", "select_menu_placeholder", "embed"
SELECT "id", "message_id", "channel_id", "guild_id", "select_menu", "select_menu_placeholder", "embed", "uses_components_v2", "components", "name"
FROM multi_panels
WHERE "guild_id" = $1;
WHERE "guild_id" = $1
ORDER BY "id" ASC;
`

rows, err := p.Query(ctx, query, guildId)
Expand All @@ -127,7 +134,7 @@ WHERE "guild_id" = $1;
var panel MultiPanel
var embedRaw *string
err := rows.Scan(
&panel.Id, &panel.MessageId, &panel.ChannelId, &panel.GuildId, &panel.SelectMenu, &panel.SelectMenuPlaceholder, &embedRaw,
&panel.Id, &panel.MessageId, &panel.ChannelId, &panel.GuildId, &panel.SelectMenu, &panel.SelectMenuPlaceholder, &embedRaw, &panel.UsesComponentsV2, &panel.Components, &panel.Name,
)

if err != nil {
Expand All @@ -149,9 +156,9 @@ WHERE "guild_id" = $1;
func (p *MultiPanelTable) Create(ctx context.Context, panel MultiPanel) (int, error) {
query := `
INSERT INTO
multi_panels("message_id", "channel_id", "guild_id", "select_menu", "select_menu_placeholder", "embed")
multi_panels("message_id", "channel_id", "guild_id", "select_menu", "select_menu_placeholder", "embed", "uses_components_v2", "components", "name")
VALUES
($1, $2, $3, $4, $5, $6)
($1, $2, $3, $4, $5, $6, $7, $8, $9)
RETURNING
"id"
;
Expand All @@ -169,7 +176,7 @@ RETURNING

var multiPanelId int
if err := p.QueryRow(ctx, query,
panel.MessageId, panel.ChannelId, panel.GuildId, panel.SelectMenu, panel.SelectMenuPlaceholder, embedRaw,
panel.MessageId, panel.ChannelId, panel.GuildId, panel.SelectMenu, panel.SelectMenuPlaceholder, embedRaw, panel.UsesComponentsV2, panel.Components, panel.Name,
).Scan(&multiPanelId); err != nil {
return 0, err
}
Expand All @@ -178,6 +185,21 @@ RETURNING
}

func (p *MultiPanelTable) Update(ctx context.Context, multiPanelId int, multiPanel MultiPanel) (err error) {
tx, err := p.Begin(ctx)
if err != nil {
return err
}

defer tx.Rollback(ctx)

if err := p.UpdateWithTx(ctx, tx, multiPanelId, multiPanel); err != nil {
return err
}

return tx.Commit(ctx)
}

func (p *MultiPanelTable) UpdateWithTx(ctx context.Context, tx pgx.Tx, multiPanelId int, multiPanel MultiPanel) error {
query := `
UPDATE multi_panels
SET "message_id" = $2,
Expand All @@ -199,11 +221,23 @@ UPDATE multi_panels
embedRaw = ptr(string(embedRawBytes))
}

_, err = p.Exec(ctx, query,
_, err := tx.Exec(ctx, query,
multiPanelId, multiPanel.MessageId, multiPanel.ChannelId, multiPanel.SelectMenu, multiPanel.SelectMenuPlaceholder, embedRaw,
)

return
return err
}

func (p *MultiPanelTable) UpdateComponentsV2WithTx(ctx context.Context, tx pgx.Tx, multiPanelId int, usesComponentsV2 bool, components *string) error {
query := `UPDATE multi_panels SET "uses_components_v2" = $2, "components" = $3 WHERE "id" = $1;`
_, err := tx.Exec(ctx, query, multiPanelId, usesComponentsV2, components)
return err
}

func (p *MultiPanelTable) SetNameWithTx(ctx context.Context, tx pgx.Tx, multiPanelId int, name *string) error {
query := `UPDATE multi_panels SET "name" = $2 WHERE "id" = $1;`
_, err := tx.Exec(ctx, query, multiPanelId, name)
return err
}

func (p *MultiPanelTable) UpdateMessageId(ctx context.Context, multiPanelId int, messageId uint64) (err error) {
Expand Down
16 changes: 14 additions & 2 deletions multipaneltargets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,11 @@ SELECT
panels.feedback_enabled,
panels.support_can_view,
panels.support_can_type,
panels.message_uses_components_v2,
panels.message_components,
panels.welcome_message_uses_components_v2,
panels.welcome_message_components,
panels.name,
multi_panel_targets.custom_label,
multi_panel_targets.description,
multi_panel_targets.custom_emoji_name,
Expand Down Expand Up @@ -136,11 +141,15 @@ SELECT
multi_panels.guild_id,
multi_panels.select_menu,
multi_panels.select_menu_placeholder,
multi_panels.embed
multi_panels.embed,
multi_panels.uses_components_v2,
multi_panels.components,
multi_panels.name
FROM multi_panel_targets
INNER JOIN multi_panels
ON multi_panels.id = multi_panel_targets.multi_panel_id
WHERE multi_panel_targets.panel_id = $1;
WHERE multi_panel_targets.panel_id = $1
ORDER BY multi_panels.id ASC;
`

rows, err := p.Query(ctx, query, panelId)
Expand All @@ -161,6 +170,9 @@ WHERE multi_panel_targets.panel_id = $1;
&multiPanel.SelectMenu,
&multiPanel.SelectMenuPlaceholder,
&embedRaw,
&multiPanel.UsesComponentsV2,
&multiPanel.Components,
&multiPanel.Name,
)

if err != nil {
Expand Down
Loading
Loading