Added text overlay. Remove caption mode

Author: warmans

pkg/discord/bot.go

@@ -5,6 +5,15 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"log"
+	"log/slog"
+	"net/http"
+	"regexp"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+
 	"github.com/bwmarrin/discordgo"
 	"github.com/warmans/tvgif/pkg/discord/media"
 	"github.com/warmans/tvgif/pkg/docs"
@@ -16,14 +25,6 @@ import (
 	"github.com/warmans/tvgif/pkg/searchterms"
 	"github.com/warmans/tvgif/pkg/store"
 	"github.com/warmans/tvgif/pkg/util"
-	"log"
-	"log/slog"
-	"net/http"
-	"regexp"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
 )
 
 const SubSeparator = "---"
@@ -47,18 +48,18 @@ const (
 
 const (
 	ActionOpenCustomTextModal      = Action("cstm")
-	ActionOpenCaptionModal         = Action("ctm")
 	ActionOpenExtendTrimModal      = Action("oem")
 	ActionOpenMergeModal           = Action("omm")
 	ActionOpenAdvancedOverlayModal = Action("aom")
+	ActionOpenTextOverlayModal     = Action("tom")
 )
 
 const (
 	ModalSetSubs                = Action("m_ss")
 	ModalActionSetExtendValue   = Action("m_sev")
 	ModalActionMergeSubs        = Action("m_ms")
-	ModalSetCaption             = Action("m_sc")
 	ModalSetBoomerOverlayLayout = Action("m_bml")
+	ModalSetTextOverlayLayout   = Action("m_tol")
 )
 
 var postedByUser = regexp.MustCompile(`.+ posted by \x60([^\x60]+)\x60`)
@@ -202,18 +203,18 @@ func NewBot(
 		ActionNextResult:               bot.btnNextResult,
 		ActionPrevResult:               bot.btnPreviewResult,
 		ActionOpenCustomTextModal:      bot.btnOpenCustomTextModal,
-		ActionOpenCaptionModal:         bot.btnOpenCaptionModal,
 		ActionOpenExtendTrimModal:      bot.btnOpenExtendModal,
 		ActionOpenMergeModal:           bot.btnOpenMergeModal,
 		ActionOpenAdvancedOverlayModal: bot.btnOpenAdvancedOverlayModal,
+		ActionOpenTextOverlayModal:     bot.btnOpenTextOverlayModal,
 		ActionUpdateState:              bot.btnUpdateState,
 	}
 	bot.modalHandlers = map[Action]func(s *discordgo.Session, i *discordgo.InteractionCreate){
 		ModalSetSubs:                bot.handleModalSetSubs,
-		ModalSetCaption:             bot.handleModalSetCaption,
 		ModalActionSetExtendValue:   bot.handleModalSetExtendTrimValue,
 		ModalActionMergeSubs:        bot.handleModalMergeSubs,
 		ModalSetBoomerOverlayLayout: bot.handleModalBoomerModeLayout,
+		ModalSetTextOverlayLayout:   bot.handleModalTextOverlayLayout,
 	}
 
 	return bot, nil
@@ -704,45 +705,6 @@ func (b *Bot) btnOpenCustomTextModal(s *discordgo.Session, i *discordgo.Interact
 	}
 }
 
-func (b *Bot) btnOpenCaptionModal(s *discordgo.Session, i *discordgo.InteractionCreate, rawMediaID string) {
-	mediaID, err := media.ParseID(rawMediaID)
-	if err != nil {
-		b.respondError(s, i, fmt.Errorf("invalid mediaID"))
-		return
-	}
-
-	state, err := extractStateFromBody(i.Message.Content)
-	if err != nil {
-		b.respondError(s, i, fmt.Errorf("failed to get current state"))
-		return
-	}
-
-	fields := []discordgo.MessageComponent{discordgo.ActionsRow{
-		Components: []discordgo.MessageComponent{
-			discordgo.TextInput{
-				CustomID:    "caption",
-				Label:       "Caption",
-				Style:       discordgo.TextInputParagraph,
-				Required:    true,
-				MaxLength:   128,
-				Value:       state.Settings.Caption,
-				Placeholder: "Caption added to top of image",
-			},
-		},
-	}}
-	err = s.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{
-		Type: discordgo.InteractionResponseModal,
-		Data: &discordgo.InteractionResponseData{
-			CustomID:   encodeAction(ModalSetCaption, mediaID),
-			Title:      "Set Caption",
-			Components: fields,
-		},
-	})
-	if err != nil {
-		b.respondError(s, i, err)
-	}
-}
-
 func (b *Bot) btnOpenExtendModal(s *discordgo.Session, i *discordgo.InteractionCreate, rawMediaID string) {
 	state, err := extractStateFromBody(i.Message.Content)
 	if err != nil {
@@ -801,6 +763,28 @@ func (b *Bot) btnOpenAdvancedOverlayModal(s *discordgo.Session, i *discordgo.Int
 	)
 }
 
+func (b *Bot) btnOpenTextOverlayModal(s *discordgo.Session, i *discordgo.InteractionCreate, rawMediaID string) {
+	state, err := extractStateFromBody(i.Message.Content)
+	if err != nil {
+		b.respondError(s, i, fmt.Errorf("failed to get current state"))
+		return
+	}
+
+	b.openGenericValueModal(
+		s,
+		i,
+		rawMediaID,
+		ModalSetTextOverlayLayout,
+		"Text Layout",
+		util.IfElse(
+			state.Settings.TextOverlayLayout != "",
+			state.Settings.TextOverlayLayout,
+			b.getTextOverlayInitialLayout(),
+		),
+		discordgo.TextInputParagraph,
+	)
+}
+
 func (b *Bot) openGenericValueModal(
 	s *discordgo.Session,
 	i *discordgo.InteractionCreate,
@@ -969,17 +953,6 @@ func (b *Bot) createButtons(dialog []model2.Dialog, state *PreviewState) ([]disc
 	}
 	extendButtons := []discordgo.MessageComponent{}
 
-	if dialogDuration+(time.Second/2) <= limits.MaxGifDuration {
-		extendButtons = append(extendButtons, discordgo.Button{
-			Label: "0.5s",
-			Emoji: &discordgo.ComponentEmoji{
-				Name: "➕",
-			},
-			Style:    discordgo.SecondaryButton,
-			Disabled: false,
-			CustomID: StateSetExtendOrTrim(state.Settings.ExtendOrTrim + (time.Second / 2)).CustomID(),
-		})
-	}
 	if dialogDuration+time.Second <= limits.MaxGifDuration {
 		extendButtons = append(extendButtons, discordgo.Button{
 			Label: "1s",
@@ -1060,16 +1033,7 @@ func (b *Bot) createButtons(dialog []model2.Dialog, state *PreviewState) ([]disc
 			CustomID: StateSetMode(NormalMode).CustomID(),
 		},
 		discordgo.Button{
-			Label: "Caption",
-			Emoji: &discordgo.ComponentEmoji{
-				Name: "🎨",
-			},
-			Style:    successBtnIfTrue(state.Settings.Mode == CaptionMode),
-			Disabled: false,
-			CustomID: StateSetMode(CaptionMode).CustomID(),
-		},
-		discordgo.Button{
-			Label: "Boomer",
+			Label: "Overlay",
 			Emoji: &discordgo.ComponentEmoji{
 				Name: "🎨",
 			},
@@ -1080,20 +1044,6 @@ func (b *Bot) createButtons(dialog []model2.Dialog, state *PreviewState) ([]disc
 	}
 
 	captionButtons := []discordgo.MessageComponent{}
-	if state.Settings.Mode == CaptionMode {
-		captionButtons = append(captionButtons, discordgo.Button{
-			Label:    "Set Caption",
-			Style:    discordgo.SecondaryButton,
-			Disabled: false,
-			CustomID: encodeAction(ActionOpenCaptionModal, state.ID),
-		})
-		captionButtons = append(captionButtons, discordgo.Button{
-			Label:    "Toggle Subs",
-			Style:    discordgo.SecondaryButton,
-			Disabled: false,
-			CustomID: StateSetSubsEnabled(!state.Settings.SubsEnabled).CustomID(),
-		})
-	}
 
 	boomerButtons := []discordgo.MessageComponent{}
 	if state.Settings.Mode == BoomerMode {
@@ -1115,6 +1065,15 @@ func (b *Bot) createButtons(dialog []model2.Dialog, state *PreviewState) ([]disc
 			Disabled: false,
 			URL:      "http://tvgif.scrimpton.com:8080/overlays/index.html",
 		})
+		captionButtons = append(captionButtons, discordgo.Button{
+			Label: "Add Text",
+			Emoji: &discordgo.ComponentEmoji{
+				Name: "💬",
+			},
+			Style:    successBtnIfTrue(state.Settings.TextOverlayLayout != ""),
+			Disabled: false,
+			CustomID: encodeAction(ActionOpenTextOverlayModal, state.ID),
+		})
 	}
 
 	postActions := []discordgo.MessageComponent{discordgo.Button{
@@ -1159,7 +1118,7 @@ func (b *Bot) createButtons(dialog []model2.Dialog, state *PreviewState) ([]disc
 		},
 		discordgo.Button{
 			Label:    "Toggle Preview",
-			Style:    successBtnIfTrue(state.Settings.Mode == CaptionMode),
+			Style:    successBtnIfTrue(state.Settings.DisablePreviewImage),
 			Disabled: false,
 			CustomID: TogglePreview().CustomID(),
 		},
@@ -1169,10 +1128,10 @@ func (b *Bot) createButtons(dialog []model2.Dialog, state *PreviewState) ([]disc
 	if len(navigateButtons) > 0 && state.Settings.Mode == NormalMode {
 		actions = append(actions, discordgo.ActionsRow{Components: navigateButtons})
 	}
-	if len(shiftButtons) > 0 && state.Settings.Mode != CaptionMode {
+	if len(shiftButtons) > 0 {
 		actions = append(actions, discordgo.ActionsRow{Components: shiftButtons})
 	}
-	if len(extendButtons) > 0 && state.Settings.Mode != CaptionMode {
+	if len(extendButtons) > 0 {
 		actions = append(actions, discordgo.ActionsRow{Components: extendButtons})
 	}
 
@@ -1269,16 +1228,6 @@ func (b *Bot) btnUpdateState(s *discordgo.Session, i *discordgo.InteractionCreat
 	b.updatePreview(s, i, update)
 }
 
-func (b *Bot) handleModalSetCaption(s *discordgo.Session, i *discordgo.InteractionCreate) {
-	b.updatePreview(
-		s,
-		i,
-		StateSetCaption(
-			i.Interaction.ModalSubmitData().Components[0].(*discordgo.ActionsRow).Components[0].(*discordgo.TextInput).Value,
-		),
-	)
-}
-
 func (b *Bot) handleModalSetSubs(s *discordgo.Session, i *discordgo.InteractionCreate) {
 	b.updatePreview(
 		s,
@@ -1361,6 +1310,16 @@ func (b *Bot) handleModalBoomerModeLayout(s *discordgo.Session, i *discordgo.Int
 	)
 }
 
+func (b *Bot) handleModalTextOverlayLayout(s *discordgo.Session, i *discordgo.InteractionCreate) {
+	b.updatePreview(
+		s,
+		i,
+		SetTextOverlayLayout(
+			i.Interaction.ModalSubmitData().Components[0].(*discordgo.ActionsRow).Components[0].(*discordgo.TextInput).Value,
+		),
+	)
+}
+
 func (b *Bot) btnPostFromPreview(s *discordgo.Session, i *discordgo.InteractionCreate, payload string) {
 
 	if err := s.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{
@@ -1555,7 +1514,7 @@ func (b *Bot) respondError(s *discordgo.Session, i *discordgo.InteractionCreate,
 
 func (b *Bot) renderFile(state *PreviewState, dialog []model2.Dialog, preview bool) (*discordgo.File, error) {
 
-	disableCaching := state.Settings.ExtendOrTrim != 0 || state.Settings.Shift != 0 || state.Settings.OverrideSubs != nil || (state.Settings.Mode != NormalMode)
+	disableCaching := state.Settings.ExtendOrTrim != 0 || state.Settings.Shift != 0 || state.Settings.OverrideSubs != nil || (state.Settings.Mode != NormalMode) || state.Settings.TextOverlayLayout != ""
 	startTimestamp := dialog[0].StartTimestamp
 	endTimestamp := dialog[len(dialog)-1].EndTimestamp
 
@@ -1589,20 +1548,14 @@ func (b *Bot) renderFile(state *PreviewState, dialog []model2.Dialog, preview bo
 		render.WithCustomText(state.Settings.OverrideSubs),
 		render.WithStartTimestamp(startTimestamp),
 		render.WithEndTimestamp(endTimestamp),
+		render.WithTextOverlayLayout(state.Settings.TextOverlayLayout),
 	}
 	if state.Settings.Mode == BoomerMode {
 		options = append(options,
 			render.WithOverlayLayout(util.IfElse(state.Settings.BoomerModeOpts.Layout != "", state.Settings.BoomerModeOpts.Layout, "")),
 			render.WithGrid(preview),
 		)
 	}
-	if state.Settings.Mode == CaptionMode {
-		options = append(options,
-			render.WithCaptionMode(true),
-			render.WithCaption(state.Settings.Caption),
-			render.WithDisableSubs(state.Settings.SubsEnabled),
-		)
-	}
 	if state.Settings.Mode == StickerMode {
 		var opts *render.StickerModeOpts
 
@@ -1817,6 +1770,24 @@ func (b *Bot) getBoomerModeInitialLayout() string {
 	return strings.Join(out, "\n")
 }
 
+func (b *Bot) getTextOverlayInitialLayout() string {
+	return `# Remove hash to enable a text overlay.
+# Each line is one text element:
+#
+#   [X cell]x[Y cell] [start seconds]-[end seconds] [scale] [text]
+#
+# Use * as the time range to show the text for the whole gif.
+# Cell numbers are decimals and start at 0 (so you can do e.g. 3.5).
+# The scale is optional e.g. 1 = 100%, 2 = 200%, 0.5 = 50%.
+#
+# Examples:
+# 3x0.5 * hello world
+# 0x4 0.5-2 shown from 0.5s to 2s
+# 5x2 1-* shown from 1s to the end
+# 2x2 * 2 double size text
+`
+}
+
 func encodeAction(action Action, mediaID *media.ID) string {
 	return fmt.Sprintf("%s:%s", action, mediaID.String())
 }