From dbc848944ad9c9c0eb383e2d116257a32fe61a58 Mon Sep 17 00:00:00 2001 From: biast12 Date: Wed, 4 Mar 2026 23:42:05 +0100 Subject: [PATCH 1/3] gdl --- go.mod | 2 ++ internal/server/handler.go | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 1d50270..d8b4cd2 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,8 @@ go 1.22.0 toolchain go1.24.2 +replace github.com/TicketsBot-cloud/gdl => ../gdl + require ( github.com/TicketsBot-cloud/gdl v0.0.0-20250509054940-2045fbe19c06 github.com/caarlos0/env/v9 v9.0.0 diff --git a/internal/server/handler.go b/internal/server/handler.go index 9fc1f8f..d732095 100644 --- a/internal/server/handler.go +++ b/internal/server/handler.go @@ -140,8 +140,8 @@ func handleCommand(s *Server, data interaction.ApplicationCommandInteraction) in } var user user.User - if data.Member != nil { - user = data.Member.User + if data.Member != nil && data.Member.User != nil { + user = *data.Member.User } else if data.User != nil { user = *data.User } // Other should be infallible From d55b0fef4d7cf1520b8952510b73f3b1e104be50 Mon Sep 17 00:00:00 2001 From: biast12 Date: Wed, 4 Mar 2026 23:45:47 +0100 Subject: [PATCH 2/3] gdl --- cmd/createcommands/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/createcommands/main.go b/cmd/createcommands/main.go index b8820fb..b84c632 100644 --- a/cmd/createcommands/main.go +++ b/cmd/createcommands/main.go @@ -15,13 +15,13 @@ var commands = []rest.CreateCommandData{ Description: "Look up information about a user's subscription", Options: []interaction.ApplicationCommandOption{ { - Type: interaction.OptionTypeString, + Type: interaction.ApplicationCommandOptionTypeString, Name: "email", Description: "The Patreon email address of the user to lookup", Required: false, }, { - Type: interaction.OptionTypeUser, + Type: interaction.ApplicationCommandOptionTypeUser, Name: "user", Description: "The Discord Id of the user to lookup", Required: false, From c267660f980bb25b3f076462e33c3dec8cf988c8 Mon Sep 17 00:00:00 2001 From: biast12 Date: Mon, 27 Apr 2026 20:44:10 +0200 Subject: [PATCH 3/3] Replace ioutil.ReadAll with io.ReadAll Update pkg/patreon/client.go to use io.ReadAll instead of the deprecated ioutil.ReadAll and adjust imports. This changes the error-response body reads in RefreshCredentials and FetchPage to use io.ReadAll (Go 1.16+), removing the io/ioutil import. --- pkg/patreon/client.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/patreon/client.go b/pkg/patreon/client.go index 4abde80..1009ee5 100644 --- a/pkg/patreon/client.go +++ b/pkg/patreon/client.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" "fmt" - "io/ioutil" + "io" "net/http" "time" @@ -85,7 +85,7 @@ func (c *Client) RefreshCredentials(ctx context.Context) error { defer res.Body.Close() if res.StatusCode != http.StatusOK { - body, err := ioutil.ReadAll(res.Body) + body, err := io.ReadAll(res.Body) if err != nil { c.logger.Error( "error reading body of oauth response", @@ -224,7 +224,7 @@ func (c *Client) FetchPage(ctx context.Context, url string) (PledgeResponse, err defer res.Body.Close() if res.StatusCode != http.StatusOK { - body, err := ioutil.ReadAll(res.Body) + body, err := io.ReadAll(res.Body) if err != nil { c.logger.Error( "error reading body of pledge response",