grim/wasdead

Fix up mentions
draft
2019-04-07, Gary Kramlich
de3d9d1a3960
Parents 7c9ce8b3fc17
Children 9c111fecaf67
Fix up mentions
2 files changed, 9 insertions(+), 3 deletions(-)
  • +7 -3
    discord/commands.go
  • +2 -0
    discord/discord.go
    • --- a/discord/commands.go Sun Apr 07 01:26:12 2019 -0500
    +++ b/discord/commands.go Sun Apr 07 01:33:21 2019 -0500
    @@ -64,19 +64,23 @@
    return fmt.Errorf("invalid arguments")
    }
    + uri := ""
    +
    user := args[1]
    if len(m.Mentions) > 0 {
    member := m.Mentions[0]
    p := c.getPresence(m.GuildID, member.ID)
    - if p != nil {
    + if p == nil {
    return fmt.Errorf("no presence data found")
    }
    if p.Game.Type == discordgo.GameTypeStreaming {
    - user = p.Game.URL
    + uri = p.Game.URL
    }
    + } else {
    + uri = "https://twitch.tv/" + user
    }
    - presence, err := presence.GetPresence("https://twitch.tv/" + user)
    + presence, err := presence.GetPresence(uri)
    if err != nil {
    return err
    }
    --- a/discord/discord.go Sun Apr 07 01:26:12 2019 -0500
    +++ b/discord/discord.go Sun Apr 07 01:33:21 2019 -0500
    @@ -6,6 +6,7 @@
    "time"
    "github.com/bwmarrin/discordgo"
    + log "github.com/sirupsen/logrus"
    "bitbucket.org/TheToyz/nowdead/database"
    )
    @@ -65,6 +66,7 @@
    func (c *DiscordClient) getPresence(guildId, userId string) *discordgo.Presence {
    p, err := c.client.State.Presence(guildId, userId)
    if err != nil {
    + log.Warnf("failed to get discord presence for %d: %v", userId, err)
    return nil
    }