Compare commits

..

No commits in common. "134d5ea47bbb3f8d68127f3a6dbddc87171cd54a" and "0112b23aa528698bfa20f6ce113223ee5331d091" have entirely different histories.

1 changed files with 4 additions and 29 deletions

View File

@ -133,6 +133,10 @@ func isNotToday(f *FirstEntry) bool {
// This function returns true if the plugin responds in a meaningful way to the users message. // This function returns true if the plugin responds in a meaningful way to the users message.
// Otherwise, the function returns false and the bot continues execution of other plugins. // Otherwise, the function returns false and the bot continues execution of other plugins.
func (p *FirstPlugin) message(c bot.Connector, kind bot.Kind, message msg.Message, args ...interface{}) bool { func (p *FirstPlugin) message(c bot.Connector, kind bot.Kind, message msg.Message, args ...interface{}) bool {
log.Debug().
Interface("msg", message).
Msg("First is looking at a message")
if message.IsIM { if message.IsIM {
log.Debug().Msg("Skipping IM") log.Debug().Msg("Skipping IM")
return false return false
@ -162,10 +166,6 @@ func (p *FirstPlugin) message(c bot.Connector, kind bot.Kind, message msg.Messag
r := strings.NewReplacer("", "", "'", "", "\"", "", ",", "", ".", "", ":", "", r := strings.NewReplacer("", "", "'", "", "\"", "", ",", "", ".", "", ":", "",
"?", "", "!", "") "?", "", "!", "")
m := strings.ToLower(message.Body) m := strings.ToLower(message.Body)
if r.Replace(m) == "whos on first the most" && first != nil {
p.leaderboard(c, message.Channel)
return true
}
if r.Replace(m) == "whos on first" && first != nil { if r.Replace(m) == "whos on first" && first != nil {
p.announceFirst(c, first) p.announceFirst(c, first)
return true return true
@ -231,31 +231,6 @@ func (p *FirstPlugin) recordFirst(c bot.Connector, message msg.Message) {
p.announceFirst(c, first) p.announceFirst(c, first)
} }
func (p *FirstPlugin) leaderboard(c bot.Connector, ch string) error {
q := `select max(channel) channel, max(nick) nick, count(id) count
from first
group by channel, nick
having channel = ?
order by count desc
limit 3`
res := []struct {
Channel string
Nick string
Count int
}{}
err := p.db.Select(&res, q, ch)
if err != nil {
return err
}
talismans := []string{":gold-trophy:", ":silver-trophy:", ":bronze-trophy:"}
msg := "First leaderboard:\n"
for i, e := range res {
msg += fmt.Sprintf("%s %d %s\n", talismans[i], e.Count, e.Nick)
}
p.Bot.Send(c, bot.Message, ch, msg)
return nil
}
func (p *FirstPlugin) announceFirst(c bot.Connector, first *FirstEntry) { func (p *FirstPlugin) announceFirst(c bot.Connector, first *FirstEntry) {
ch := first.channel ch := first.channel
p.Bot.Send(c, bot.Message, ch, fmt.Sprintf("%s had first at %s with the message: \"%s\"", p.Bot.Send(c, bot.Message, ch, fmt.Sprintf("%s had first at %s with the message: \"%s\"",