Disabled html escaping (#7)

Author: ftrapture

commands/decode.go

@@ -45,7 +45,7 @@ func (c *Commands) Decode(data discord.SlashCommandInteractionData, e *handler.C
 		}
 		var decodedData []byte
 		if decoded != nil {
-			decodedData, _ = json.MarshalIndent(decoded, "", "  ")
+			decodedData = MarshalNoEscape(decoded)
 		}
 
 		msg := jsonMessage(content, decodedData)
@@ -70,7 +70,7 @@ func (c *Commands) Decode(data discord.SlashCommandInteractionData, e *handler.C
 		return err
 	}
 
-	decodedData, _ := json.MarshalIndent(decoded, "", "  ")
+	decodedData := MarshalNoEscape(decoded)
 
 	msg := jsonMessage("", decodedData)
 
@@ -103,3 +103,12 @@ func jsonMessage(msg string, jsonData []byte) message {
 		Files:   files,
 	}
 }
+
+func MarshalNoEscape(v any) []byte {
+	b := new(bytes.Buffer)
+	e := json.NewEncoder(b)
+	e.SetEscapeHTML(false)
+	e.SetIndent("", "  ")
+	_ = e.Encode(v)
+	return b.Bytes()
+}

commands/info.go

@@ -9,7 +9,6 @@ import (
 	"github.com/disgoorg/disgo/handler"
 	"github.com/disgoorg/disgolink/v3/disgolink"
 	"github.com/disgoorg/disgolink/v3/lavalink"
-	"github.com/disgoorg/json"
 )
 
 var info = discord.SlashCommandCreate{
@@ -75,12 +74,7 @@ func (c *Commands) InfoLavalink(data discord.SlashCommandInteractionData, e *han
 		nodeInfos[node.Config().Name] = *nodeInfo
 	})
 
-	rawInfo, err := json.MarshalIndent(nodeInfos, "", "  ")
-	if err != nil {
-		return e.CreateMessage(discord.MessageCreate{
-			Content: "Failed to marshal lavalink info: " + err.Error(),
-		})
-	}
+	rawInfo := MarshalNoEscape(nodeInfos)
 
 	return e.CreateMessage(discord.MessageCreate{
 		Embeds: []discord.Embed{

commands/now_playing.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/disgoorg/disgo/discord"
 	"github.com/disgoorg/disgo/handler"
-	"github.com/disgoorg/json"
 
 	"github.com/lavalink-devs/lavalink-bot/internal/res"
 )
@@ -32,13 +31,7 @@ func (c *Commands) NowPlaying(data discord.SlashCommandInteractionData, e *handl
 
 	var files []*discord.File
 	if data.Bool("raw") {
-		decodedData, err := json.MarshalIndent(track, "", "  ")
-		if err != nil {
-			return e.CreateMessage(discord.MessageCreate{
-				Content: fmt.Sprintf("Failed to marshal track: %s", err),
-				Flags:   discord.MessageFlagEphemeral,
-			})
-		}
+		decodedData := MarshalNoEscape(track)
 		files = append(files, &discord.File{
 			Name:   "track.json",
 			Reader: bytes.NewReader(decodedData),

commands/resolve.go

@@ -49,13 +49,7 @@ func (c *Commands) Resolve(data discord.SlashCommandInteractionData, e *handler.
 	)
 	switch result.LoadType {
 	case lavalink.LoadTypeTrack, lavalink.LoadTypePlaylist, lavalink.LoadTypeSearch:
-		decodedData, err := json.MarshalIndent(result.Data, "", "  ")
-		if err != nil {
-			_, err = e.UpdateInteractionResponse(discord.MessageUpdate{
-				Content: json.Ptr(fmt.Sprintf("failed to resolve identifier: %s", err)),
-			})
-			return err
-		}
+		decodedData := MarshalNoEscape(result.Data)
 
 		if len(decodedData) > 1900 {
 			files = append(files, &discord.File{