feat: #18 add emote aliasing option for add and yoink

Author: douglascdev

command/cmd_add.go

@@ -49,6 +49,11 @@ var add = Command{
 			targetChannelName = message.Channel
 		}
 
+		var as string
+		if alias, found := parsedArgs.Named["as"]; found {
+			as = alias
+		}
+
 		res, err := twitchapi.GetUserByName(message.Cfg, targetChannelName)
 		if err != nil || len(res) == 0 {
 			msg := message.Localizer.MustLocalize(&i18n.LocalizeConfig{
@@ -107,12 +112,19 @@ var add = Command{
 			errorEmotes []string
 		)
 		for _, emote := range parsedArgs.Positional {
-			err = seventvapi.AddEmoteWithQuery("https://7tv.io", targetChannel.ID, emote, message.Cfg.SevenTVToken)
+			var alias string
+			if len(parsedArgs.Positional) == 1 && as != "" {
+				alias = as
+			} else {
+				alias = emote
+			}
+
+			err = seventvapi.AddEmoteWithQuery("https://7tv.io", targetChannel.ID, emote, alias, message.Cfg.SevenTVToken)
 			if _, found := activeSetEmotes[emote]; err != nil || found {
 				errorEmotes = append(errorEmotes, emote)
 				continue
 			}
-			addedEmotes = append(addedEmotes, emote)
+			addedEmotes = append(addedEmotes, alias)
 		}
 
 		var reply string
@@ -129,7 +141,7 @@ var add = Command{
 					"Emotes": strings.Join(errorEmotes, " "),
 				},
 			})
-			reply += msg
+			reply += msg + ". "
 		}
 		if len(addedEmotes) > 0 {
 			msg := message.Localizer.MustLocalize(&i18n.LocalizeConfig{

command/cmd_yoink.go

@@ -60,6 +60,11 @@ var yoink = Command{
 			toChannelName = message.Chatter.Name
 		}
 
+		var as string
+		if alias, found := parsedArgs.Named["as"]; found {
+			as = alias
+		}
+
 		if strings.EqualFold(fromChannelName, toChannelName) {
 			msg := message.Localizer.MustLocalize(&i18n.LocalizeConfig{
 				DefaultMessage: &i18n.Message{
@@ -264,7 +269,14 @@ var yoink = Command{
 
 		var added []string
 		for _, emote := range emotes {
-			err = seventvapi.AddEmoteWithID("https://7tv.io", toChannel.ID, emote.ID, emote.alias, message.Cfg.SevenTVToken)
+			var alias string
+			if len(emotes) == 1 && as != "" {
+				alias = as
+			} else {
+				alias = emote.alias
+			}
+
+			err = seventvapi.AddEmoteWithID("https://7tv.io", toChannel.ID, emote.ID, alias, message.Cfg.SevenTVToken)
 			if err != nil {
 				if errors.Is(err, seventvapi.NotAnEditorErr) {
 					msg := message.Localizer.MustLocalize(&i18n.LocalizeConfig{
@@ -304,7 +316,7 @@ var yoink = Command{
 				return fmt.Errorf("failed to yoink emote: %w", err)
 			}
 
-			added = append(added, emote.alias)
+			added = append(added, alias)
 		}
 
 		msg := message.Localizer.MustLocalize(&i18n.LocalizeConfig{

seventvapi/addemote.go

@@ -8,9 +8,11 @@ import (
 	"net/http"
 	"net/url"
 	"strings"
+
+	"github.com/rs/zerolog/log"
 )
 
-func AddEmoteWithQuery(host, userTwitchID, searchQuery, seventvBearerToken string) error {
+func AddEmoteWithQuery(host, userTwitchID, searchQuery, newAlias, seventvBearerToken string) error {
 	sevenTVUserData, err := GetUserByConnection(host, userTwitchID, seventvBearerToken)
 	if err != nil {
 		return err
@@ -24,7 +26,7 @@ func AddEmoteWithQuery(host, userTwitchID, searchQuery, seventvBearerToken strin
 	if len(res.Data.Emotes.Search.Items) == 0 {
 		return EmoteNotFound
 	}
-	id, alias := res.Data.Emotes.Search.Items[0].ID, res.Data.Emotes.Search.Items[0].DefaultName
+	id, alias := res.Data.Emotes.Search.Items[0].ID, newAlias
 
 	gqlQuery := strings.ReplaceAll(`
 mutation EmoteSets {
@@ -45,6 +47,7 @@ mutation EmoteSets {
 	if err != nil {
 		return fmt.Errorf("failed to marshal request body: %w", err)
 	}
+	log.Debug().Any("query", string(m)).Msg("sending query for AddEmoteWithQuery")
 	reqBody := strings.NewReader(string(m))
 
 	req, err := http.NewRequest("POST", svUrl, reqBody)

seventvapi/addemoteid.go

@@ -9,6 +9,8 @@ import (
 	"net/http"
 	"net/url"
 	"strings"
+
+	"github.com/rs/zerolog/log"
 )
 
 var NotAnEditorErr error = errors.New("not and editor")
@@ -40,6 +42,7 @@ mutation EmoteSets {
 	if err != nil {
 		return fmt.Errorf("failed to marshal request body: %w", err)
 	}
+	log.Debug().Any("query", string(m)).Msg("sending query for AddEmoteWithID")
 	reqBody := strings.NewReader(string(m))
 
 	req, err := http.NewRequest("POST", svUrl, reqBody)