.gitignore

@@ -76,4 +76,3 @@ run.sh
 impact.ttf
 .env
 rathaus_discord.sh
-emojy

plugins/twitch/twitch.go

@@ -7,7 +7,6 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/url"
-	"regexp"
 	"strings"
 	"text/template"
 	"time"
@@ -27,10 +26,9 @@ const (
 )
 
 type TwitchPlugin struct {
-	b          bot.Bot
+	bot        bot.Bot
-	c          *config.Config
+	config     *config.Config
 	twitchList map[string]*Twitcher
-	tbl        bot.HandlerTable
 }
 
 type Twitcher struct {
@@ -64,14 +62,13 @@ type stream struct {
 
 func New(b bot.Bot) *TwitchPlugin {
 	p := &TwitchPlugin{
-		b:          b,
+		bot:        b,
-		c:          b.Config(),
+		config:     b.Config(),
 		twitchList: map[string]*Twitcher{},
 	}
 
-	for _, ch := range p.c.GetArray("Twitch.Channels", []string{}) {
+	for _, ch := range p.config.GetArray("Twitch.Channels", []string{}) {
-		for _, twitcherName := range p.c.GetArray("Twitch."+ch+".Users", []string{}) {
+		for _, twitcherName := range p.config.GetArray("Twitch."+ch+".Users", []string{}) {
-			twitcherName = strings.ToLower(twitcherName)
 			if _, ok := p.twitchList[twitcherName]; !ok {
 				p.twitchList[twitcherName] = &Twitcher{
 					name:   twitcherName,
@@ -84,7 +81,8 @@ func New(b bot.Bot) *TwitchPlugin {
 
 	go p.twitchAuthLoop(b.DefaultConnector())
 
-	p.register()
+	b.Register(p, bot.Message, p.message)
+	b.Register(p, bot.Help, p.help)
 	p.registerWeb()
 
 	return p
@@ -93,11 +91,11 @@ func New(b bot.Bot) *TwitchPlugin {
 func (p *TwitchPlugin) registerWeb() {
 	r := chi.NewRouter()
 	r.HandleFunc("/{user}", p.serveStreaming)
-	p.b.RegisterWeb(r, "/isstreaming")
+	p.bot.RegisterWeb(r, "/isstreaming")
 }
 
 func (p *TwitchPlugin) serveStreaming(w http.ResponseWriter, r *http.Request) {
-	userName := strings.ToLower(chi.URLParam(r, "user"))
+	userName := chi.URLParam(r, "user")
 	if userName == "" {
 		fmt.Fprint(w, "User not found.")
 		return
@@ -126,39 +124,14 @@ func (p *TwitchPlugin) serveStreaming(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-func (p *TwitchPlugin) register() {
+func (p *TwitchPlugin) message(c bot.Connector, kind bot.Kind, message msg.Message, args ...any) bool {
-	p.tbl = bot.HandlerTable{
+	body := strings.ToLower(message.Body)
-		{
+	if body == "twitch status" {
-			Kind: bot.Message, IsCmd: true,
+		channel := message.Channel
-			Regex:    regexp.MustCompile(`(?i)^twitch status$`),
+		if users := p.config.GetArray("Twitch."+channel+".Users", []string{}); len(users) > 0 {
-			HelpText: "Get status of all twitchers",
-			Handler:  p.twitchStatus,
-		},
-		{
-			Kind: bot.Message, IsCmd: false,
-			Regex:    regexp.MustCompile(`(?i)^is (?P<who>.+) streaming\??$`),
-			HelpText: "Check if a specific twitcher is streaming",
-			Handler:  p.twitchUserStatus,
-		},
-		{
-			Kind: bot.Message, IsCmd: true,
-			Regex:    regexp.MustCompile(`(?i)^reset twitch$`),
-			HelpText: "Reset the twitch templates",
-			Handler:  p.resetTwitch,
-		},
-	}
-	p.b.Register(p, bot.Help, p.help)
-	p.b.RegisterTable(p, p.tbl)
-}
-
-func (p *TwitchPlugin) twitchStatus(r bot.Request) bool {
-	channel := r.Msg.Channel
-	if users := p.c.GetArray("Twitch."+channel+".Users", []string{}); len(users) > 0 {
 			for _, twitcherName := range users {
-			twitcherName = strings.ToLower(twitcherName)
+				if _, ok := p.twitchList[twitcherName]; ok {
-			// we could re-add them here instead of needing to restart the bot.
+					err := p.checkTwitch(c, channel, p.twitchList[twitcherName], true)
-			if t, ok := p.twitchList[twitcherName]; ok {
-				err := p.checkTwitch(r.Conn, channel, t, true)
 					if err != nil {
 						log.Error().Err(err).Msgf("error in checking twitch")
 					}
@@ -166,28 +139,13 @@ func (p *TwitchPlugin) twitchStatus(r bot.Request) bool {
 			}
 		}
 		return true
-}
+	} else if body == "reset twitch" {
-
+		p.config.Set("twitch.istpl", isStreamingTplFallback)
-func (p *TwitchPlugin) twitchUserStatus(r bot.Request) bool {
+		p.config.Set("twitch.nottpl", notStreamingTplFallback)
-	who := strings.ToLower(r.Values["who"])
+		p.config.Set("twitch.stoppedtpl", stoppedStreamingTplFallback)
-	if t, ok := p.twitchList[who]; ok {
-		err := p.checkTwitch(r.Conn, r.Msg.Channel, t, true)
-		if err != nil {
-			log.Error().Err(err).Msgf("error in checking twitch")
-			p.b.Send(r.Conn, bot.Message, r.Msg.Channel, "I had trouble with that.")
 	}
-	} else {
-		p.b.Send(r.Conn, bot.Message, r.Msg.Channel, "I don't know who that is.")
-	}
-	return true
-}
 
-func (p *TwitchPlugin) resetTwitch(r bot.Request) bool {
+	return false
-	p.c.Set("twitch.istpl", isStreamingTplFallback)
-	p.c.Set("twitch.nottpl", notStreamingTplFallback)
-	p.c.Set("twitch.stoppedtpl", stoppedStreamingTplFallback)
-	p.b.Send(r.Conn, bot.Message, r.Msg.Channel, "The Twitch templates have been reset.")
-	return true
 }
 
 func (p *TwitchPlugin) help(c bot.Connector, kind bot.Kind, message msg.Message, args ...any) bool {
@@ -197,14 +155,14 @@ func (p *TwitchPlugin) help(c bot.Connector, kind bot.Kind, message msg.Message,
 	msg += fmt.Sprintf("twitch.stoppedtpl (default: %s)\n", stoppedStreamingTplFallback)
 	msg += "You can reset all messages with `!reset twitch`"
 	msg += "And you can ask who is streaming with `!twitch status`"
-	p.b.Send(c, bot.Message, message.Channel, msg)
+	p.bot.Send(c, bot.Message, message.Channel, msg)
 	return true
 }
 
 func (p *TwitchPlugin) twitchAuthLoop(c bot.Connector) {
-	frequency := p.c.GetInt("Twitch.AuthFreq", 60*60)
+	frequency := p.config.GetInt("Twitch.AuthFreq", 60*60)
-	cid := p.c.Get("twitch.clientid", "")
+	cid := p.config.Get("twitch.clientid", "")
-	secret := p.c.Get("twitch.secret", "")
+	secret := p.config.Get("twitch.secret", "")
 	if cid == "" || secret == "" {
 		log.Info().Msgf("Disabling twitch autoauth.")
 		return
@@ -227,8 +185,8 @@ func (p *TwitchPlugin) twitchAuthLoop(c bot.Connector) {
 }
 
 func (p *TwitchPlugin) twitchChannelLoop(c bot.Connector, channel string) {
-	frequency := p.c.GetInt("Twitch.Freq", 60)
+	frequency := p.config.GetInt("Twitch.Freq", 60)
-	if p.c.Get("twitch.clientid", "") == "" || p.c.Get("twitch.secret", "") == "" {
+	if p.config.Get("twitch.clientid", "") == "" || p.config.Get("twitch.secret", "") == "" {
 		log.Info().Msgf("Disabling twitch autochecking.")
 		return
 	}
@@ -238,8 +196,7 @@ func (p *TwitchPlugin) twitchChannelLoop(c bot.Connector, channel string) {
 	for {
 		time.Sleep(time.Duration(frequency) * time.Second)
 
-		for _, twitcherName := range p.c.GetArray("Twitch."+channel+".Users", []string{}) {
+		for _, twitcherName := range p.config.GetArray("Twitch."+channel+".Users", []string{}) {
-			twitcherName = strings.ToLower(twitcherName)
 			if err := p.checkTwitch(c, channel, p.twitchList[twitcherName], false); err != nil {
 				log.Error().Err(err).Msgf("error in twitch loop")
 			}
@@ -289,8 +246,8 @@ func (p *TwitchPlugin) checkTwitch(c bot.Connector, channel string, twitcher *Tw
 
 	baseURL.RawQuery = query.Encode()
 
-	cid := p.c.Get("twitch.clientid", "")
+	cid := p.config.Get("twitch.clientid", "")
-	token := p.c.Get("twitch.token", "")
+	token := p.config.Get("twitch.token", "")
 	if cid == token && cid == "" {
 		log.Info().Msgf("Twitch plugin not enabled.")
 		return nil
@@ -318,9 +275,9 @@ func (p *TwitchPlugin) checkTwitch(c bot.Connector, channel string, twitcher *Tw
 		title = games[0].Title
 	}
 
-	notStreamingTpl := p.c.Get("Twitch.NotTpl", notStreamingTplFallback)
+	notStreamingTpl := p.config.Get("Twitch.NotTpl", notStreamingTplFallback)
-	isStreamingTpl := p.c.Get("Twitch.IsTpl", isStreamingTplFallback)
+	isStreamingTpl := p.config.Get("Twitch.IsTpl", isStreamingTplFallback)
-	stoppedStreamingTpl := p.c.Get("Twitch.StoppedTpl", stoppedStreamingTplFallback)
+	stoppedStreamingTpl := p.config.Get("Twitch.StoppedTpl", stoppedStreamingTplFallback)
 	buf := bytes.Buffer{}
 
 	info := struct {
@@ -338,31 +295,31 @@ func (p *TwitchPlugin) checkTwitch(c bot.Connector, channel string, twitcher *Tw
 			t, err := template.New("notStreaming").Parse(notStreamingTpl)
 			if err != nil {
 				log.Error().Err(err)
-				p.b.Send(c, bot.Message, channel, err)
+				p.bot.Send(c, bot.Message, channel, err)
 				t = template.Must(template.New("notStreaming").Parse(notStreamingTplFallback))
 			}
 			t.Execute(&buf, info)
-			p.b.Send(c, bot.Message, channel, buf.String())
+			p.bot.Send(c, bot.Message, channel, buf.String())
 		} else {
 			t, err := template.New("isStreaming").Parse(isStreamingTpl)
 			if err != nil {
 				log.Error().Err(err)
-				p.b.Send(c, bot.Message, channel, err)
+				p.bot.Send(c, bot.Message, channel, err)
 				t = template.Must(template.New("isStreaming").Parse(isStreamingTplFallback))
 			}
 			t.Execute(&buf, info)
-			p.b.Send(c, bot.Message, channel, buf.String())
+			p.bot.Send(c, bot.Message, channel, buf.String())
 		}
 	} else if gameID == "" {
 		if twitcher.gameID != "" {
 			t, err := template.New("stoppedStreaming").Parse(stoppedStreamingTpl)
 			if err != nil {
 				log.Error().Err(err)
-				p.b.Send(c, bot.Message, channel, err)
+				p.bot.Send(c, bot.Message, channel, err)
 				t = template.Must(template.New("stoppedStreaming").Parse(stoppedStreamingTplFallback))
 			}
 			t.Execute(&buf, info)
-			p.b.Send(c, bot.Message, channel, buf.String())
+			p.bot.Send(c, bot.Message, channel, buf.String())
 		}
 		twitcher.gameID = ""
 	} else {
@@ -370,11 +327,11 @@ func (p *TwitchPlugin) checkTwitch(c bot.Connector, channel string, twitcher *Tw
 			t, err := template.New("isStreaming").Parse(isStreamingTpl)
 			if err != nil {
 				log.Error().Err(err)
-				p.b.Send(c, bot.Message, channel, err)
+				p.bot.Send(c, bot.Message, channel, err)
 				t = template.Must(template.New("isStreaming").Parse(isStreamingTplFallback))
 			}
 			t.Execute(&buf, info)
-			p.b.Send(c, bot.Message, channel, buf.String())
+			p.bot.Send(c, bot.Message, channel, buf.String())
 		}
 		twitcher.gameID = gameID
 	}
@@ -382,8 +339,8 @@ func (p *TwitchPlugin) checkTwitch(c bot.Connector, channel string, twitcher *Tw
 }
 
 func (p *TwitchPlugin) validateCredentials() error {
-	cid := p.c.Get("twitch.clientid", "")
+	cid := p.config.Get("twitch.clientid", "")
-	token := p.c.Get("twitch.token", "")
+	token := p.config.Get("twitch.token", "")
 	if token == "" {
 		return p.reAuthenticate()
 	}
@@ -396,8 +353,8 @@ func (p *TwitchPlugin) validateCredentials() error {
 }
 
 func (p *TwitchPlugin) reAuthenticate() error {
-	cid := p.c.Get("twitch.clientid", "")
+	cid := p.config.Get("twitch.clientid", "")
-	secret := p.c.Get("twitch.secret", "")
+	secret := p.config.Get("twitch.secret", "")
 	if cid == "" || secret == "" {
 		return fmt.Errorf("could not request a new token without config values set")
 	}
@@ -420,5 +377,5 @@ func (p *TwitchPlugin) reAuthenticate() error {
 	}{}
 	err = json.Unmarshal(body, &credentials)
 	log.Debug().Int("expires", credentials.ExpiresIn).Msgf("setting new twitch token")
-	return p.c.RegisterSecret("twitch.token", credentials.AccessToken)
+	return p.config.RegisterSecret("twitch.token", credentials.AccessToken)
 }

plugins/twitch/twitch_test.go

@@ -13,17 +13,6 @@ import (
 	"github.com/velour/catbase/bot/user"
 )
 
-func makeRequest(payload string) bot.Request {
-	c, k, m := makeMessage(payload)
-	return bot.Request{
-		Conn:   c,
-		Kind:   k,
-		Msg:    m,
-		Values: nil,
-		Args:   nil,
-	}
-}
-
 func makeMessage(payload string) (bot.Connector, bot.Kind, msg.Message) {
 	isCmd := strings.HasPrefix(payload, "!")
 	if isCmd {
@@ -42,8 +31,8 @@ func makeTwitchPlugin(t *testing.T) (*TwitchPlugin, *bot.MockBot) {
 	c := New(mb)
 	mb.Config().Set("twitch.clientid", "fake")
 	mb.Config().Set("twitch.authorization", "fake")
-	c.c.SetArray("Twitch.Channels", []string{"test"})
+	c.config.SetArray("Twitch.Channels", []string{"test"})
-	c.c.SetArray("Twitch.test.Users", []string{"drseabass"})
+	c.config.SetArray("Twitch.test.Users", []string{"drseabass"})
 	assert.NotNil(t, c)
 
 	c.twitchList["drseabass"] = &Twitcher{
@@ -56,6 +45,6 @@ func makeTwitchPlugin(t *testing.T) (*TwitchPlugin, *bot.MockBot) {
 
 func TestTwitch(t *testing.T) {
 	b, mb := makeTwitchPlugin(t)
-	b.twitchStatus(makeRequest("!twitch status"))
+	b.message(makeMessage("!twitch status"))
 	assert.NotEmpty(t, mb.Messages)
 }