Implement embeds further and add translation helpers.

Author: Seraphim R.P

models/language.go

@@ -209,7 +209,39 @@ type args struct {
 	False   string `json:"false"`
 }
 
-func (lng Language) GetString(str string) string {
+func (lng Language) GetString(ctx *Context, str string, params []string) string {
+	// TODO: Infer params from raw string, as they are always surrounded by <>. Making it a parameter is mildly inconvenient.
+	rawStr := lng.GetRawString(str)
+
+	if params == nil {
+		return rawStr
+	}
+
+	for _, replaceQuery := range params {
+		origQuery := replaceQuery
+
+		switch replaceQuery {
+		case "<+>":
+			replaceQuery = ctx.GuildPrefs.Prefix
+		default:
+			purifiedQuery := strings.Title(replaceQuery[1 : len(replaceQuery)-1])
+			possibleCommand := lng.GetCommandTranslation(purifiedQuery)
+			possibleArgument := lng.GetArgumentTranslation(purifiedQuery)
+
+			if possibleCommand != purifiedQuery {
+				replaceQuery = possibleCommand
+			} else if possibleArgument != purifiedQuery {
+				replaceQuery = possibleArgument
+			}
+		}
+
+		rawStr = strings.ReplaceAll(rawStr, origQuery, replaceQuery)
+	}
+
+	return rawStr
+}
+
+func (lng Language) GetRawString(str string) string {
 	v := reflect.ValueOf(lng.RawObject)
 
 	for i := 0; i < v.NumField(); i++ {

models/response.go

@@ -2,15 +2,9 @@ package models
 
 // CommandResponse is a model for command output.
 type CommandResponse struct {
-	OK        bool   `json:"ok"`
-	Content   string `json:"content"`
-	Thumbnail string `json:"thumbnail"`
-	Pages     []page `json:"pages"`
-}
-
-type page struct {
-	Title   string `json:"title"`
-	Content string `json:"content"`
+	OK      bool            `json:"ok"`
+	Content *DiscordEmbed   `json:"content"`
+	Pages   []*DiscordEmbed `json:"pages"`
 }
 
 // VerseResponse is a model for command output.

routes/commands/commands.go

@@ -14,6 +14,7 @@ import (
 	"internal.kerygma.digital/kerygma-digital/biblebot/backend/models"
 	"internal.kerygma.digital/kerygma-digital/biblebot/backend/routes/commands/settings"
 	"internal.kerygma.digital/kerygma-digital/biblebot/backend/utils/converters"
+	"internal.kerygma.digital/kerygma-digital/biblebot/backend/utils/embedify"
 	"internal.kerygma.digital/kerygma-digital/biblebot/backend/utils/slices"
 )
 
@@ -43,7 +44,7 @@ func commandHandler(c *fiber.Ctx) error {
 
 		return c.JSON(&models.CommandResponse{
 			OK:      false,
-			Content: err.Error(),
+			Content: embedify.Embedify("Backend", "401 Error - Unauthorized Access", err.Error(), true, ""),
 		})
 	}
 

routes/commands/settings/versions.go

@@ -3,10 +3,10 @@ package settings
 import (
 	"fmt"
 	"sort"
-	"strings"
 	"sync"
 
 	"internal.kerygma.digital/kerygma-digital/biblebot/backend/models"
+	"internal.kerygma.digital/kerygma-digital/biblebot/backend/utils/embedify"
 	"internal.kerygma.digital/kerygma-digital/biblebot/backend/utils/slices"
 )
 
@@ -78,7 +78,7 @@ var verDefault = models.Command{
 
 		return &models.CommandResponse{
 			OK:      true,
-			Content: content,
+			Content: embedify.Embedify("", "+version", content, false, ""),
 		}
 	},
 }
@@ -106,16 +106,10 @@ var verSet = models.Command{
 			}
 
 			response.OK = true
-			response.Content = ctx.Language.GetString("SetVersionSuccess")
+			response.Content = embedify.Embedify("", "+version set", ctx.Language.GetString(ctx, "SetVersionSuccess", nil), false, "")
 		} else {
 			response.OK = false
-
-			content := ctx.Language.GetString("SetVersionFail")
-			content = strings.Replace(content, "<+>", ctx.GuildPrefs.Prefix, 1)
-			content = strings.Replace(content, "<version>", ctx.Language.GetCommandTranslation("Version"), 1)
-			content = strings.Replace(content, "<list>", ctx.Language.GetCommandTranslation("List"), 1)
-
-			response.Content = content
+			response.Content = embedify.Embedify("", "+version set", ctx.Language.GetString(ctx, "SetVersionFail", []string{"<+>", "<version>", "<list>"}), false, "")
 		}
 
 		return &response
@@ -145,16 +139,10 @@ var verSetServer = models.Command{
 			}
 
 			response.OK = true
-			response.Content = ctx.Language.GetString("SetGuildVersionSuccess")
+			response.Content = embedify.Embedify("", "+version setserver", ctx.Language.GetString(ctx, "SetGuildVersionSuccess", nil), false, "")
 		} else {
 			response.OK = false
-
-			content := ctx.Language.GetString("SetGuildVersionFail")
-			content = strings.Replace(content, "<+>", ctx.GuildPrefs.Prefix, 1)
-			content = strings.Replace(content, "<version>", ctx.Language.GetCommandTranslation("Version"), 1)
-			content = strings.Replace(content, "<list>", ctx.Language.GetCommandTranslation("List"), 1)
-
-			response.Content = content
+			response.Content = embedify.Embedify("", "+version setserver", ctx.Language.GetString(ctx, "SetGuildVersionFail", []string{"<+>", "<version>", "<list>"}), false, "")
 		}
 
 		return &response

utils/embedify/embedify.go

@@ -4,15 +4,14 @@ import (
 	"fmt"
 
 	"internal.kerygma.digital/kerygma-digital/biblebot/backend/models"
-	"internal.kerygma.digital/kerygma-digital/biblebot/backend/utils/logger"
 )
 
 const (
 	NORMAL_COLOR = 6709986
 	ERROR_COLOR  = 16723502
 )
 
-func Embedify(author string, title string, description string, isError bool, copyright string) (*models.DiscordEmbed, error) {
+func Embedify(author string, title string, description string, isError bool, copyright string) *models.DiscordEmbed {
 	var embed models.DiscordEmbed
 
 	embed.Colour = NORMAL_COLOR
@@ -29,19 +28,20 @@ func Embedify(author string, title string, description string, isError bool, cop
 
 	if author != "" {
 		embed.Author.Name = author
+		embed.Author.IconURL = embed.Footer.IconURL
 	}
 
 	if description != "" {
 		if len(description) < 2049 {
 			embed.Description = description
 		} else {
-			return nil, logger.LogWithError("embedify", "description is too long", nil)
+			return nil
 		}
 	}
 
 	if copyright != "" {
 		embed.Footer.Text = fmt.Sprintf("%s // %s", copyright, embed.Footer.Text)
 	}
 
-	return &embed, nil
+	return &embed
 }