commit 2ee0c9be78187a76e0d99c52e2ceb2b19be67235
Author: Wim <wim@42.be>
Date: Mon May 22 21:57:19 2017 +0000
Fix possible crash on nil (discord)
diff --git a/bridge/discord/discord.go b/bridge/discord/discord.go
index 2a91adf..f6f3077 100644
--- a/bridge/discord/discord.go
+++ b/bridge/discord/discord.go
@@ -15812 +15814 @@ func (b *bdiscord) getNick(user *discordgo.User) string {
b.Lock()
defer b.Unlock()
if _, ok := b.userMemberMap[user.ID]; ok {
- if b.userMemberMap[user.ID].Nick != "" {
- // only return if nick is set
- return b.userMemberMap[user.ID].Nick
+ if b.userMemberMap[user.ID] != nil {
+ if b.userMemberMap[user.ID].Nick != "" {
+ // only return if nick is set
+ return b.userMemberMap[user.ID].Nick
+ }
+ // otherwise return username
+ return user.Username
}
- // otherwise return username
- return user.Username
}
// if we didn't find nick, search for it
b.userMemberMap[user.ID], err = b.c.GuildMember(b.guildID, user.ID)
