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

Merge pull request #142 from velour/twitchfix 

twitch: check gameID instead of title
This commit is contained in:
Chris Sexton 2019-02-05 21:16:57 -05:00 committed by GitHub
parent b11815dec3 c504173022
commit 86e662b181
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
plugins/twitch/twitch.go
View File

@ -23,8 +23,8 @@ type TwitchPlugin struct {
} }
type Twitcher struct { type Twitcher struct {
name string name string
game string gameID string
} }
func (t Twitcher) URL() string { func (t Twitcher) URL() string {
@ -62,8 +62,8 @@ func New(b bot.Bot) *TwitchPlugin {
for _, twitcherName := range p.config.GetArray("Twitch."+ch+".Users", []string{}) { for _, twitcherName := range p.config.GetArray("Twitch."+ch+".Users", []string{}) {
if _, ok := p.twitchList[twitcherName]; !ok { if _, ok := p.twitchList[twitcherName]; !ok {
p.twitchList[twitcherName] = &Twitcher{ p.twitchList[twitcherName] = &Twitcher{
name: twitcherName, name: twitcherName,
game: "", gameID: "",
} }
} }
} }
@ -95,7 +95,7 @@ func (p *TwitchPlugin) serveStreaming(w http.ResponseWriter, r *http.Request) {
} }
status := "NO." status := "NO."
if twitcher.game != "" { if twitcher.gameID != "" {
status = "YES." status = "YES."
} }
context := map[string]interface{}{"Name": twitcher.name, "Status": status} context := map[string]interface{}{"Name": twitcher.name, "Status": status}
@ -207,26 +207,27 @@ func (p *TwitchPlugin) checkTwitch(channel string, twitcher *Twitcher, alwaysPri
} }
games := s.Data games := s.Data
game := "" gameID, title := "", ""
if len(games) > 0 { if len(games) > 0 {
game = games[0].Title gameID = games[0].GameID
title = games[0].Title
} }
streamWord := p.config.Get("Twitch.StreamWord", "streaming") streamWord := p.config.Get("Twitch.StreamWord", "streaming")
if alwaysPrintStatus { if alwaysPrintStatus {
if game == "" { if gameID == "" {
p.Bot.Send(bot.Message, channel, fmt.Sprintf("%s is not %s.", twitcher.name, streamWord)) p.Bot.Send(bot.Message, channel, fmt.Sprintf("%s is not %s.", twitcher.name, streamWord))
} else { } else {
p.Bot.Send(bot.Message, channel, fmt.Sprintf("%s is %s %s at %s", twitcher.name, streamWord, game, twitcher.URL())) p.Bot.Send(bot.Message, channel, fmt.Sprintf("%s is %s %s at %s", twitcher.name, streamWord, title, twitcher.URL()))
} }
} else if game == "" { } else if gameID == "" {
if twitcher.game != "" { if twitcher.gameID != "" {
p.Bot.Send(bot.Message, channel, fmt.Sprintf("%s just stopped %s.", twitcher.name, streamWord)) p.Bot.Send(bot.Message, channel, fmt.Sprintf("%s just stopped %s.", twitcher.name, streamWord))
} }
twitcher.game = "" twitcher.gameID = ""
} else { } else {
if twitcher.game != game { if twitcher.gameID != gameID {
p.Bot.Send(bot.Message, channel, fmt.Sprintf("%s is %s %s at %s", twitcher.name, streamWord, game, twitcher.URL())) p.Bot.Send(bot.Message, channel, fmt.Sprintf("%s is %s %s at %s", twitcher.name, streamWord, title, twitcher.URL()))
} }
twitcher.game = game twitcher.gameID = gameID
} }
} }

4
plugins/twitch/twitch_test.go
View File

@ -35,8 +35,8 @@ func makeTwitchPlugin(t *testing.T) (*TwitchPlugin, *bot.MockBot) {
assert.NotNil(t, c) assert.NotNil(t, c)
c.twitchList["drseabass"] = &Twitcher{ c.twitchList["drseabass"] = &Twitcher{
name: "drseabass", name: "drseabass",
game: "", gameID: "",
} }
return c, mb return c, mb