connectors/discord/discord.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"strconv"
 	"strings"
 
 	"github.com/velour/catbase/bot/msg"
@@ -23,9 +22,6 @@ type Discord struct {
 	event bot.Callback
 
 	emojiCache map[string]string
-
-	// store IDs -> nick and vice versa for quick conversion
-	uidCache map[string]string
 }
 
 func New(config *config.Config) *Discord {
@@ -36,7 +32,6 @@ func New(config *config.Config) *Discord {
 	d := &Discord{
 		config: config,
 		client: client,
-		uidCache: map[string]string{},
 	}
 	return d
 }
@@ -122,11 +117,7 @@ func (d *Discord) sendMessage(channel, message string, meMessage bool, args ...i
 
 	//st, err := d.client.ChannelMessageSend(channel, message)
 	if err != nil {
-		log.Error().
+		log.Error().Err(err).Msg("Error sending message")
-			Interface("data", data).
-			Str("channel", channel).
-			Err(err).
-			Msg("Error sending message")
 		return "", err
 	}
 
@@ -154,32 +145,26 @@ func (d *Discord) GetEmojiList() map[string]string {
 	return emojis
 }
 
-// Who gets the users in the guild
-// Note that the channel ID does not matter in this particular case
 func (d *Discord) Who(id string) []string {
+	ch, err := d.client.Channel(id)
+	if err != nil {
+		log.Error().Err(err).Msgf("Error getting users")
+		return []string{}
+	}
 	users := []string{}
-	for name, _ := range d.uidCache {
+	for _, u := range ch.Recipients {
-		users = append(users, name)
+		users = append(users, u.Username)
 	}
 	return users
 }
 
 func (d *Discord) Profile(id string) (user.User, error) {
-	if _, err := strconv.Atoi(id); err != nil {
-		if newID, ok := d.uidCache[id]; ok {
-			id = newID
-		} else {
-			return user.User{}, fmt.Errorf("invalid ID snowflake: %s", id)
-		}
-	}
 	u, err := d.client.User(id)
 	if err != nil {
 		log.Error().Err(err).Msg("Error getting user")
 		return user.User{}, err
 	}
-	user := d.convertUser(u)
+	return *d.convertUser(u), nil
-	d.uidCache[user.Name] = user.ID
-	return *user, nil
 }
 
 func (d *Discord) convertUser(u *discordgo.User) *user.User {
@@ -230,9 +215,6 @@ func (d *Discord) Serve() error {
 }
 
 func (d *Discord) messageCreate(s *discordgo.Session, m *discordgo.MessageCreate) {
-	// if we haven't seen this user, we need to resolve their nick before continuing
-	author, _ := d.Profile(m.Author.ID)
-
 	if m.Author.ID == s.State.User.ID {
 		return
 	}
@@ -246,9 +228,11 @@ func (d *Discord) messageCreate(s *discordgo.Session, m *discordgo.MessageCreate
 
 	tStamp, _ := m.Timestamp.Parse()
 
+	author := d.convertUser(m.Author)
+
 	msg := msg.Message{
 		ID:          m.ID,
-		User:        &author,
+		User:        author,
 		Channel:     m.ChannelID,
 		ChannelName: ch.Name,
 		Body:        text,

plugins/beers/beers.go

@@ -383,10 +383,7 @@ func (p *BeersPlugin) pullUntappd() ([]checkin, error) {
 	var beers Beers
 	err = json.Unmarshal(body, &beers)
 	if err != nil {
-		log.Error().
+		log.Error().Err(err)
-			Str("body", string(body)).
-			Err(err).
-			Msg("could not unmarshal")
 		return []checkin{}, err
 	}
 	return beers.Response.Checkins.Items, nil

plugins/goals/goals.go

@@ -54,16 +54,15 @@ func (p *GoalsPlugin) mkDB() {
 func (p *GoalsPlugin) registerCmds() {
 	p.handlers = bot.HandlerTable{
 		{Kind: bot.Message, IsCmd: true,
-			Regex:    regexp.MustCompile(`(?i)^register (?P<type>competition|goal) for (?P<who>[[:punct:][:alnum:]]+) (?P<what>[^\s]+) (?P<amount>[[:digit:]]+)?`),
+			Regex:    regexp.MustCompile(`(?i)^register (?P<type>competition|goal) for (?P<who>[[:punct:][:alnum:]]+) (?P<what>[[:punct:][:alnum:]]+) (?P<amount>[[:digit:]]+)?`),
 			HelpText: "Register with `%s` for other people",
 			Handler: func(r bot.Request) bool {
-				log.Debug().Interface("values", r.Values).Msg("trying to register a goal")
 				amount, _ := strconv.Atoi(r.Values["amount"])
 				p.register(r.Conn, r.Msg.Channel, r.Values["type"], r.Values["what"], r.Values["who"], amount)
 				return true
 			}},
 		{Kind: bot.Message, IsCmd: true,
-			Regex:    regexp.MustCompile(`(?i)^register (?P<type>competition|goal) (?P<what>[^\s]+) (?P<amount>[[:digit:]]+)?`),
+			Regex:    regexp.MustCompile(`(?i)^register (?P<type>competition|goal) (?P<what>[[:punct:][:alnum:]]+) (?P<amount>[[:digit:]]+)?`),
 			HelpText: "Register with `%s` for yourself",
 			Handler: func(r bot.Request) bool {
 				amount, _ := strconv.Atoi(r.Values["amount"])
@@ -85,14 +84,14 @@ func (p *GoalsPlugin) registerCmds() {
 				return true
 			}},
 		{Kind: bot.Message, IsCmd: true,
-			Regex:    regexp.MustCompile(`(?i)^check (?P<type>competition|goal) for (?P<who>[[:punct:][:alnum:]]+) (?P<what>[^\s]+)`),
+			Regex:    regexp.MustCompile(`(?i)^check (?P<type>competition|goal) for (?P<who>[[:punct:][:alnum:]]+) (?P<what>[[:punct:][:alnum:]]+)`),
 			HelpText: "Check with `%s` for other people",
 			Handler: func(r bot.Request) bool {
 				p.check(r.Conn, r.Msg.Channel, r.Values["type"], r.Values["what"], r.Values["who"])
 				return true
 			}},
 		{Kind: bot.Message, IsCmd: true,
-			Regex:    regexp.MustCompile(`(?i)^check (?P<type>competition|goal) (?P<what>[^\s]+)`),
+			Regex:    regexp.MustCompile(`(?i)^check (?P<type>competition|goal) (?P<what>[[:punct:][:alnum:]]+)`),
 			HelpText: "Check with `%s` for yourself",
 			Handler: func(r bot.Request) bool {
 				p.check(r.Conn, r.Msg.Channel, r.Values["type"], r.Values["what"], r.Msg.User.Name)
@@ -135,7 +134,6 @@ func (p *GoalsPlugin) deregister(c bot.Connector, ch, kind, what, who string) {
 }
 
 func (p *GoalsPlugin) check(c bot.Connector, ch, kind, what, who string) {
-	log.Debug().Msgf("checking goal in channel %s", ch)
 	if kind == "goal" {
 		p.checkGoal(c, ch, what, who)
 		return
@@ -195,15 +193,8 @@ func (p *GoalsPlugin) checkGoal(c bot.Connector, ch, what, who string) {
 	if err == nil && user.ID != "" {
 		id = user.ID
 		nick = user.Name
-	} else {
-		log.Error().Err(err).Msg("no user returned for goal check")
 	}
 
-	log.Debug().
-		Str("nick", nick).
-		Str("id", id).
-		Str("what", what).
-		Msg("looking for item")
 	item, err := counter.GetUserItem(p.db, nick, id, what)
 	if err != nil {
 		p.b.Send(c, bot.Message, ch, fmt.Sprintf("I couldn't find any %s", what))
@@ -322,12 +313,15 @@ func (p *GoalsPlugin) update(r bot.Request, u counter.Update) {
 		log.Error().Err(err).Msgf("could not get goal for %#v", u)
 		return
 	}
+	chs := p.cfg.GetArray("channels", []string{})
 	c := p.b.DefaultConnector()
 	for _, g := range gs {
+		for _, ch := range chs {
 			if g.Kind == "goal" {
-			p.checkGoal(c, r.Msg.Channel, u.What, u.Who)
+				p.checkGoal(c, ch, u.What, u.Who)
 			} else {
-			p.checkCompetition(c, r.Msg.Channel, u.What, u.Who)
+				p.checkCompetition(c, ch, u.What, u.Who)
+			}
 		}
 	}
 }