Update gdl

app/http/endpoints/api/channels.go

@@ -25,7 +25,7 @@ func ChannelsHandler(ctx *gin.Context) {
 	if ctx.Query("refresh") == "true" {
 		hasToken, err := redis.Client.TakeChannelRefreshToken(ctx, guildId)
 		if err != nil {
-			ctx.JSON(500, utils.ErrorStr("Failed to take channel refresh token for guild %d. Please try again."))
+			ctx.JSON(500, utils.ErrorStr("Failed to take channel refresh token for guild %d. Please try again.", guildId))
 			return
 		}
 
@@ -37,7 +37,7 @@ func ChannelsHandler(ctx *gin.Context) {
 			}
 
 			if err := cache.Instance.StoreChannels(ctx, channels); err != nil {
-				ctx.JSON(500, utils.ErrorStr("Failed to store channels in cache for guild %d. Please try again."))
+				ctx.JSON(500, utils.ErrorStr("Failed to store channels in cache for guild %d. Please try again.", guildId))
 				return
 			}
 		} else {
@@ -59,17 +59,17 @@ func ChannelsHandler(ctx *gin.Context) {
 	filtered := make([]channel.Channel, 0, len(channels))
 	for _, ch := range channels {
 		// Filter out threads
-		if ch.Type == channel.ChannelTypeGuildNewsThread ||
-			ch.Type == channel.ChannelTypeGuildPrivateThread ||
-			ch.Type == channel.ChannelTypeGuildPublicThread {
+		if ch.Type == channel.ChannelTypeAnnouncementThread ||
+			ch.Type == channel.ChannelTypePrivateThread ||
+			ch.Type == channel.ChannelTypePublicThread {
 			continue
 		}
 
 		filtered = append(filtered, ch)
 	}
 
 	sort.Slice(filtered, func(i, j int) bool {
-		return filtered[i].Position < filtered[j].Position
+		return *filtered[i].Position < *filtered[j].Position
 	})
 
 	ctx.JSON(200, filtered)

app/http/endpoints/api/forms/updateinputs.go

@@ -77,7 +77,7 @@ func UpdateInputs(c *gin.Context) {
 		}
 
 		formatted := "Your input contained the following errors:\n" + utils.FormatValidationErrors(validationErrors)
-		c.JSON(400, utils.ErrorStr(formatted))
+		c.JSON(400, utils.ErrorStr("%s", formatted))
 		return
 	}
 
@@ -270,21 +270,22 @@ func validateInputOptions(input inputCreateBody, optionTypes map[int]string) err
 	}
 
 	// Radio Group (type 21) requires 2-10 options, Checkbox Group (type 22) requires 1-10 options
-	if input.Type == 21 {
+	switch input.Type {
+	case 21:
 		if len(input.Options) < 2 {
 			return fmt.Errorf("Radio group inputs must have at least 2 options")
 		}
 		if len(input.Options) > 10 {
 			return fmt.Errorf("Radio group inputs must have at most 10 options")
 		}
-	} else if input.Type == 22 {
+	case 22:
 		if len(input.Options) == 0 {
 			return fmt.Errorf("%s inputs must have at least one option", typeName)
 		}
 		if len(input.Options) > 10 {
 			return fmt.Errorf("Checkbox group inputs must have at most 10 options")
 		}
-	} else {
+	default:
 		if len(input.Options) == 0 {
 			return fmt.Errorf("%s inputs must have at least one option", typeName)
 		}
@@ -321,9 +322,7 @@ func saveInputs(ctx context.Context, formId int, data updateInputsBody, existing
 		// Handle select types (3, 5-8, 22)
 		if input.Type == 3 || (input.Type >= 5 && input.Type <= 8) || input.Type == 22 {
 			// Enforce min_length constraints (0-25)
-			if minLength < 0 {
-				minLength = 0
-			} else if minLength > 25 {
+			if minLength > 25 {
 				minLength = 25
 			}
 
@@ -426,9 +425,7 @@ func saveInputs(ctx context.Context, formId int, data updateInputsBody, existing
 		// Handle select types (3, 5-8, 22)
 		if input.Type == 3 || (input.Type >= 5 && input.Type <= 8) || input.Type == 22 {
 			// Enforce min_length constraints (0-25)
-			if minLength < 0 {
-				minLength = 0
-			} else if minLength > 25 {
+			if minLength > 25 {
 				minLength = 25
 			}
 

app/http/endpoints/api/guild.go

@@ -17,13 +17,13 @@ func GuildHandler(ctx *gin.Context) {
 
 	guild, err := botContext.GetGuild(ctx, guildId)
 	if err != nil {
-		ctx.JSON(500, utils.ErrorStr("Failed to fetch guild information from Discord for guild %d. Please try again."))
+		ctx.JSON(500, utils.ErrorStr("Failed to fetch guild information from Discord for guild %d. Please try again.", guildId))
 		return
 	}
 
 	ctx.JSON(200, gin.H{
 		"id":   guild.Id,
 		"name": guild.Name,
-		"icon": guild.Icon,
+		"icon": guild.IconUrl(),
 	})
 }

app/http/endpoints/api/integrations/createintegration.go

@@ -70,7 +70,7 @@ func CreateIntegrationHandler(ctx *gin.Context) {
 		}
 
 		formatted := "Your input contained the following errors:\n" + utils.FormatValidationErrors(validationErrors)
-		ctx.JSON(400, utils.ErrorStr(formatted))
+		ctx.JSON(400, utils.ErrorStr("%s", formatted))
 		return
 	}
 
@@ -159,5 +159,5 @@ func isSameValidationUrlHost(webhookUrl, validationUrl string) (bool, error) {
 		return false, errors.New("invalid webhook or validation URL")
 	}
 
-	return strings.ToLower(utils.SecondLevelDomain(webhookStripped)) == strings.ToLower(utils.SecondLevelDomain(validationStripped)), nil
+	return strings.EqualFold(utils.SecondLevelDomain(webhookStripped), utils.SecondLevelDomain(validationStripped)), nil
 }

app/http/endpoints/api/integrations/listintegrations.go

@@ -106,10 +106,5 @@ func ListIntegrationsHandler(ctx *gin.Context) {
 		}
 	}
 
-	// Don't serve null
-	if integrations == nil {
-		integrations = make([]integrationWithMetadata, 0)
-	}
-
 	ctx.JSON(200, integrations)
 }

app/http/endpoints/api/integrations/updateintegration.go

@@ -70,7 +70,7 @@ func UpdateIntegrationHandler(ctx *gin.Context) {
 		}
 
 		formatted = strings.TrimSuffix(formatted, "\n")
-		ctx.JSON(400, utils.ErrorStr(formatted))
+		ctx.JSON(400, utils.ErrorStr("%s", formatted))
 		return
 	}
 

app/http/endpoints/api/panel/multipanelcreate.go

@@ -74,7 +74,7 @@ func MultiPanelCreate(c *gin.Context) {
 		}
 
 		formatted := "Your input contained the following errors:\n" + utils.FormatValidationErrors(validationErrors)
-		c.JSON(400, utils.ErrorStr(formatted))
+		c.JSON(400, utils.ErrorStr("%s", formatted))
 		return
 	}
 
@@ -99,7 +99,7 @@ func MultiPanelCreate(c *gin.Context) {
 			effectiveLabel := getEffectiveLabelForValidation(panel.ButtonLabel, panelConfig.CustomLabel)
 
 			if effectiveLabel == "" {
-				c.JSON(400, utils.ErrorStr(fmt.Sprintf("Panel '%s' must have a label when using dropdown mode. Please add a custom label or ensure the panel has a button label.", panel.Title)))
+				c.JSON(400, utils.ErrorStr("Panel '%s' must have a label when using dropdown mode. Please add a custom label or ensure the panel has a button label.", panel.Title))
 				return
 			}
 		}
@@ -232,7 +232,7 @@ func (d *multiPanelCreateData) validateChannel(guildId uint64) func() error {
 
 		var valid bool
 		for _, ch := range channels {
-			if ch.Id == d.ChannelId && (ch.Type == channel.ChannelTypeGuildText || ch.Type == channel.ChannelTypeGuildNews) {
+			if ch.Id == d.ChannelId && (ch.Type == channel.ChannelTypeGuildText || ch.Type == channel.ChannelTypeGuildAnnouncement) {
 				valid = true
 				break
 			}

app/http/endpoints/api/panel/multipanellist.go

@@ -20,14 +20,14 @@ func MultiPanelList(ctx *gin.Context) {
 	}
 
 	type multiPanelResponse struct {
-		Id                    int                   `json:"id"`
-		MessageId             uint64                `json:"message_id,string"`
-		ChannelId             uint64                `json:"channel_id,string"`
-		GuildId               uint64                `json:"guild_id,string"`
-		SelectMenu            bool                  `json:"select_menu"`
-		SelectMenuPlaceholder *string               `json:"select_menu_placeholder"`
-		Embed                 *types.CustomEmbed    `json:"embed"`
-		Panels                []panelConfiguration  `json:"panels"`
+		Id                    int                  `json:"id"`
+		MessageId             uint64               `json:"message_id,string"`
+		ChannelId             uint64               `json:"channel_id,string"`
+		GuildId               uint64               `json:"guild_id,string"`
+		SelectMenu            bool                 `json:"select_menu"`
+		SelectMenuPlaceholder *string              `json:"select_menu_placeholder"`
+		Embed                 *types.CustomEmbed   `json:"embed"`
+		Panels                []panelConfiguration `json:"panels"`
 	}
 
 	guildId := ctx.Keys["guildid"].(uint64)

app/http/endpoints/api/panel/multipanelmessagedata.go

@@ -2,12 +2,12 @@ package api
 
 import (
 	"context"
-	"math"
 	"fmt"
+	"math"
 
 	"github.com/TicketsBot-cloud/dashboard/botcontext"
-	"github.com/TicketsBot-cloud/dashboard/utils/types"
 	"github.com/TicketsBot-cloud/dashboard/config"
+	"github.com/TicketsBot-cloud/dashboard/utils/types"
 	"github.com/TicketsBot-cloud/database"
 	"github.com/TicketsBot-cloud/gdl/objects/channel/embed"
 	"github.com/TicketsBot-cloud/gdl/objects/interaction/component"

app/http/endpoints/api/panel/multipanelupdate.go

@@ -3,7 +3,6 @@ package api
 import (
 	"context"
 	"errors"
-	"fmt"
 	"net/http"
 	"strconv"
 
@@ -67,7 +66,7 @@ func MultiPanelUpdate(c *gin.Context) {
 		}
 
 		formatted := "Your input contained the following errors:\n" + utils.FormatValidationErrors(validationErrors)
-		c.JSON(400, utils.ErrorStr(formatted))
+		c.JSON(400, utils.ErrorStr("%s", formatted))
 		return
 	}
 
@@ -97,7 +96,7 @@ func MultiPanelUpdate(c *gin.Context) {
 			}
 
 			if effectiveLabel == "" {
-				c.JSON(400, utils.ErrorStr(fmt.Sprintf("Panel '%s' must have a label when using dropdown mode. Please add a custom label or ensure the panel has a button label.", panel.Title)))
+				c.JSON(400, utils.ErrorStr("Panel '%s' must have a label when using dropdown mode. Please add a custom label or ensure the panel has a button label.", panel.Title))
 				return
 			}
 		}

app/http/endpoints/api/panel/panelcreate.go

@@ -149,7 +149,7 @@ func CreatePanel(c *gin.Context) {
 	if err := ValidatePanelBody(validationContext); err != nil {
 		var validationError *validation.InvalidInputError
 		if errors.As(err, &validationError) {
-			c.JSON(400, utils.ErrorStr(validationError.Error()))
+			c.JSON(400, utils.ErrorStr("%s", validationError.Error()))
 		} else {
 			_ = c.AbortWithError(http.StatusInternalServerError, app.NewError(err, "Panel validation failed unexpectedly"))
 		}
@@ -170,7 +170,7 @@ func CreatePanel(c *gin.Context) {
 		}
 
 		formatted := "Your input contained the following errors:\n" + utils.FormatValidationErrors(validationErrors)
-		c.JSON(400, utils.ErrorStr(formatted))
+		c.JSON(400, utils.ErrorStr("%s", formatted))
 		return
 	}
 
@@ -202,7 +202,7 @@ func CreatePanel(c *gin.Context) {
 	{
 		emoji := data.getEmoji()
 		if emoji != nil {
-			emojiName = &emoji.Name
+			emojiName = emoji.Name
 
 			if emoji.Id.Value != 0 {
 				emojiId = &emoji.Id.Value
@@ -265,7 +265,6 @@ func CreatePanel(c *gin.Context) {
 		HideClaimButton:           data.HideClaimButton,
 	}
 
-
 	createOptions := panelCreateOptions{
 		TeamIds:            data.Teams,             // Already validated
 		AccessControlRules: data.AccessControlList, // Already validated
@@ -275,21 +274,21 @@ func CreatePanel(c *gin.Context) {
 	// string is role ID or "user" to mention the ticket opener or "here" to mention @here
 	validRoles := utils.ToSet(utils.Map(roles, utils.RoleToId))
 
-	var roleMentions []uint64
 	for _, mention := range data.Mentions {
-		if mention == "user" {
+		switch mention {
+		case "user":
 			createOptions.ShouldMentionUser = true
-		} else if mention == "here" {
+		case "here":
 			createOptions.ShouldMentionHere = true
-		} else {
+		default:
 			roleId, err := strconv.ParseUint(mention, 10, 64)
 			if err != nil {
 				c.JSON(400, utils.ErrorStr("Invalid role ID in mentions: %s", mention))
 				return
 			}
 
 			if validRoles.Contains(roleId) {
-				createOptions.RoleMentions = append(roleMentions, roleId)
+				createOptions.RoleMentions = append(createOptions.RoleMentions, roleId)
 			}
 		}
 	}

app/http/endpoints/api/panel/paneldelete.go

@@ -2,7 +2,6 @@ package api
 
 import (
 	"errors"
-	"fmt"
 	"net/http"
 	"strconv"
 
@@ -42,7 +41,7 @@ func DeletePanel(c *gin.Context) {
 	}
 
 	if panel.PanelId == 0 {
-		c.JSON(404, utils.ErrorStr(fmt.Sprintf("Panel not found: %d", panelId)))
+		c.JSON(404, utils.ErrorStr("Panel not found: %d", panelId))
 		return
 	}
 

app/http/endpoints/api/panel/panelmessagedata.go

@@ -32,12 +32,12 @@ func panelIntoMessageData(panel database.Panel, isPremium bool) panelMessageData
 	if panel.EmojiName != nil { // No emoji = nil
 		if panel.EmojiId == nil { // Unicode emoji
 			emote = &emoji.Emoji{
-				Name: *panel.EmojiName,
+				Name: panel.EmojiName,
 			}
 		} else { // Custom emoji
 			emote = &emoji.Emoji{
 				Id:   objects.NewNullableSnowflake(*panel.EmojiId),
-				Name: *panel.EmojiName,
+				Name: panel.EmojiName,
 			}
 		}
 	}
@@ -120,7 +120,7 @@ func (p *panelMessageData) edit(c *botcontext.BotContext, messageId uint64) erro
 	}
 
 	data := rest.EditMessageData{
-		Embeds:  []*embed.Embed{e},
+		Embeds: []*embed.Embed{e},
 		Components: []component.Component{
 			component.BuildActionRow(component.BuildButton(component.Button{
 				Label:    p.ButtonLabel,

app/http/endpoints/api/panel/panelresend.go

@@ -3,7 +3,6 @@ package api
 import (
 	"context"
 	"errors"
-	"fmt"
 	"strconv"
 
 	"github.com/TicketsBot-cloud/common/premium"
@@ -42,7 +41,7 @@ func ResendPanel(ctx *gin.Context) {
 	}
 
 	if panel.PanelId == 0 {
-		ctx.JSON(404, utils.ErrorStr(fmt.Sprintf("Panel not found: %d", panelId)))
+		ctx.JSON(404, utils.ErrorStr("Panel not found: %d", panelId))
 		return
 	}