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

last: don't report a last if none exists

This commit is contained in:
Chris Sexton 2021-04-30 09:08:54 -04:00 committed by Chris Sexton
parent 850f5248ef
commit e1250dd25e
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/last/last.go
View File

@ -151,33 +151,31 @@ func (p *LastPlugin) yesterdaysLast(ch string) (last, error) {
func (p *LastPlugin) reportLast(ch string) func() { func (p *LastPlugin) reportLast(ch string) func() {
return func() { return func() {
p.sayLast(p.b.DefaultConnector(), ch, ch) p.sayLast(p.b.DefaultConnector(), ch, ch, false)
time.AfterFunc(24*time.Hour, p.reportLast(ch)) time.AfterFunc(24*time.Hour, p.reportLast(ch))
} }
} }
func (p *LastPlugin) whoKilled(r bot.Request) bool { func (p *LastPlugin) whoKilled(r bot.Request) bool {
p.sayLast(r.Conn, r.Msg.Channel, r.Msg.Channel) p.sayLast(r.Conn, r.Msg.Channel, r.Msg.Channel, true)
return true return true
} }
func (p *LastPlugin) whoKilledChannel(r bot.Request) bool { func (p *LastPlugin) whoKilledChannel(r bot.Request) bool {
ch := r.Values["channel"] ch := r.Values["channel"]
p.sayLast(r.Conn, r.Conn.GetChannelID(ch), r.Msg.Channel) p.sayLast(r.Conn, r.Conn.GetChannelID(ch), r.Msg.Channel, true)
return true return true
} }
func (p *LastPlugin) sayLast(c bot.Connector, chFrom, chTo string) { func (p *LastPlugin) sayLast(c bot.Connector, chFrom, chTo string, force bool) {
l, err := p.yesterdaysLast(chFrom) l, err := p.yesterdaysLast(chFrom)
if err != nil { if err != nil || l.Day == 0 {
log.Error().Err(err).Msgf("Couldn't find last") log.Error().Err(err).Interface("last", l).Msgf("Couldn't find last")
p.b.Send(c, bot.Message, chTo, "I couldn't find a last.") if force {
p.b.Send(c, bot.Message, chTo, "I couldn't find a last.")
}
return return
} }
if l.Day == 0 {
log.Error().Interface("l", l).Msgf("Couldn't find last")
p.b.Send(c, bot.Message, chTo, "I couldn't find a last.")
}
msg := fmt.Sprintf(`%s killed the channel last night by saying "%s"`, l.Who, l.Message) msg := fmt.Sprintf(`%s killed the channel last night by saying "%s"`, l.Who, l.Message)
p.b.Send(c, bot.Message, chTo, msg) p.b.Send(c, bot.Message, chTo, msg)
} }