cws
/
catbase
mirror of https://github.com/velour/catbase.git
1
0
Fork 0
Code Issues Releases Wiki Activity

cowboy: fix overlay capture bug

This commit is contained in:
Chris Sexton 2022-07-23 00:37:00 -04:00
parent 93cfc0ddfb
commit 3297878421
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/cowboy/cowboy.go
View File

@ -112,6 +112,7 @@ func (p *Cowboy) registerCmds(d *discord.Discord) {
} }
overlays := p.c.GetMap("cowboy.overlays", defaultOverlays) overlays := p.c.GetMap("cowboy.overlays", defaultOverlays)
hat := overlays["hat"] hat := overlays["hat"]
log.Debug().Msgf("Overlay: %s", hat)
if err := d.RegisterSlashCmd(cmd, p.mkOverlayCB(hat)); err != nil { if err := d.RegisterSlashCmd(cmd, p.mkOverlayCB(hat)); err != nil {
log.Error().Err(err).Msg("could not register cowboy command") log.Error().Err(err).Msg("could not register cowboy command")
} }
@ -145,8 +146,6 @@ func (p *Cowboy) registerCmds(d *discord.Discord) {
func (p *Cowboy) mkOverlayCB(overlay string) func(s *discordgo.Session, i *discordgo.InteractionCreate) { func (p *Cowboy) mkOverlayCB(overlay string) func(s *discordgo.Session, i *discordgo.InteractionCreate) {
return func(s *discordgo.Session, i *discordgo.InteractionCreate) { return func(s *discordgo.Session, i *discordgo.InteractionCreate) {
log.Debug().Msg("got a cowboy command")
lastEmojy := p.c.Get("cowboy.lastEmojy", "rust") lastEmojy := p.c.Get("cowboy.lastEmojy", "rust")
emojyPlugin := emojy.NewAPI(p.b) emojyPlugin := emojy.NewAPI(p.b)
@ -156,6 +155,9 @@ func (p *Cowboy) mkOverlayCB(overlay string) func(s *discordgo.Session, i *disco
name = i.ApplicationCommandData().Options[1].StringValue() name = i.ApplicationCommandData().Options[1].StringValue()
} }
msg := fmt.Sprintf("You asked for %s overlaid by %s", name, overlay) msg := fmt.Sprintf("You asked for %s overlaid by %s", name, overlay)
log.Debug().Msgf("got a cowboy command for %s overlaid by %s replacing %s",
name, overlay, lastEmojy)
prefix := overlay
newEmojy, err := cowboy(p.emojyPath, p.baseEmojyURL, overlay, name) newEmojy, err := cowboy(p.emojyPath, p.baseEmojyURL, overlay, name)
if err != nil { if err != nil {
@ -169,11 +171,10 @@ func (p *Cowboy) mkOverlayCB(overlay string) func(s *discordgo.Session, i *disco
goto resp goto resp
} }
// Look, I don't love it as a workaround either
if overlay == "hat" { if overlay == "hat" {
overlay = "cowboy" prefix = "cowboy"
} }
name = emojy.SanitizeName(overlay + "_" + name) name = emojy.SanitizeName(prefix + "_" + name)
err = emojyPlugin.UploadEmojyImage(p.b.DefaultConnector(), name, newEmojy) err = emojyPlugin.UploadEmojyImage(p.b.DefaultConnector(), name, newEmojy)
if err != nil { if err != nil {
msg = err.Error() msg = err.Error()