Error handling

Embed responses

commands/tinyfox.go

@@ -1,46 +1,90 @@
 package commands
 
 import (
+	"errors"
 	"flag"
+	"fmt"
 	"net/http"
+	"slices"
 	"time"
 
 	"github.com/Fluffy-Bean/lynxie/app"
+	"github.com/Fluffy-Bean/lynxie/utils"
+	"github.com/bwmarrin/discordgo"
 )
 
 func RegisterTinyfoxCommands(a *app.App) {
 	a.RegisterCommand("animal", registerAnimal(a))
 }
 
-func registerAnimal(a *app.App) func(h *app.Handler, args []string) {
+func registerAnimal(a *app.App) app.Callback {
+	animals := []string{
+		"fox", "yeen", "dog", "guara", "serval", "ott", "jackal", "bleat", "woof", "chi", "puma", "skunk", "tig", "wah",
+		"manul", "snep", "jaguar", "badger", "chee", "racc", "bear", "capy", "bun", "marten", "caracal", "snek",
+		"shiba", "dook", "leo", "yote", "poss", "chee", "lynx",
+	}
+
 	client := http.Client{
 		Timeout: 10 * time.Second,
 	}
 
-	return func(h *app.Handler, args []string) {
+	return func(h *app.Handler, args []string) app.Error {
 		var options struct {
 			animal string
 		}
 
 		cmd := flag.NewFlagSet("pong", flag.ContinueOnError)
-		cmd.StringVar(&options.animal, "animal", "wah", "Get an image of an animal!")
+		cmd.StringVar(&options.animal, "animal", "", "Get an image of an animal!")
 		cmd.Parse(args)
 
+		if options.animal == "" {
+			return app.Error{
+				Msg: "Animal name is required!",
+				Err: errors.New("animal name is required"),
+			}
+		}
+		if !slices.Contains(animals, options.animal) {
+			return app.Error{
+				Msg: fmt.Sprintf("Animal %s is invalid", options.animal),
+				Err: errors.New("entered invalid animal name"),
+			}
+		}
+
 		req, err := http.NewRequest(http.MethodGet, "https://api.tinyfox.dev/img?animal="+options.animal, nil)
 		if err != nil {
-			return
+			return app.Error{
+				Msg: "Failed to make request",
+				Err: err,
+			}
 		}
 
 		res, err := client.Do(req)
 		if err != nil {
-			return
+			return app.Error{
+				Msg: "Failed to do request",
+				Err: err,
+			}
 		}
 		defer res.Body.Close()
 
-		h.Session.ChannelFileSend(
-			h.Message.ChannelID,
-			"animal__"+options.animal+".png",
-			res.Body,
-		)
+		h.Session.ChannelMessageSendComplex(h.Message.ChannelID, &discordgo.MessageSend{
+			Embed: &discordgo.MessageEmbed{
+				Title: "Animal",
+				Image: &discordgo.MessageEmbedImage{
+					URL: "attachment://image.png",
+				},
+				Color: utils.ColorFromRGB(255, 255, 255),
+			},
+			Files: []*discordgo.File{
+				{
+					Name:        "image.png",
+					ContentType: "",
+					Reader:      res.Body,
+				},
+			},
+			Reference: h.Reference,
+		})
+
+		return app.Error{}
 	}
 }