Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 23 additions & 13 deletions multipanels.go
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 @@ -184,7 +191,10 @@ UPDATE multi_panels
"channel_id" = $3,
"select_menu" = $4,
"select_menu_placeholder" = $5,
"embed" = $6
"embed" = $6,
"uses_components_v2" = $7,
"components" = $8,
"name" = $9
WHERE
"id" = $1
;`
Expand All @@ -200,7 +210,7 @@ UPDATE multi_panels
}

_, err = p.Exec(ctx, query,
multiPanelId, multiPanel.MessageId, multiPanel.ChannelId, multiPanel.SelectMenu, multiPanel.SelectMenuPlaceholder, embedRaw,
multiPanelId, multiPanel.MessageId, multiPanel.ChannelId, multiPanel.SelectMenu, multiPanel.SelectMenuPlaceholder, embedRaw, multiPanel.UsesComponentsV2, multiPanel.Components, multiPanel.Name,
)

return
Expand Down
16 changes: 14 additions & 2 deletions multipaneltargets.go
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