jshiffer/matterbridge
1
0
Fork 1
mirror of https://github.com/42wim/matterbridge.git synced 2024-11-28 21:52:08 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix possible crash on nil (discord)

Browse Source
This commit is contained in:
Wim 2017-05-22 21:57:19 +02:00
parent c5dfe40326
commit dd3c572256
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bridge/discord/discord.go
View File

@ -158,6 +158,7 @@ func (b *bdiscord) getNick(user *discordgo.User) string {
b.Lock() b.Lock()
defer b.Unlock() defer b.Unlock()
if _, ok := b.userMemberMap[user.ID]; ok { if _, ok := b.userMemberMap[user.ID]; ok {
if b.userMemberMap[user.ID] != nil {
if b.userMemberMap[user.ID].Nick != "" { if b.userMemberMap[user.ID].Nick != "" {
// only return if nick is set // only return if nick is set
return b.userMemberMap[user.ID].Nick return b.userMemberMap[user.ID].Nick
@ -165,6 +166,7 @@ func (b *bdiscord) getNick(user *discordgo.User) string {
// otherwise return username // otherwise return username
return user.Username return user.Username
} }
}
// if we didn't find nick, search for it // if we didn't find nick, search for it
b.userMemberMap[user.ID], err = b.c.GuildMember(b.guildID, user.ID) b.userMemberMap[user.ID], err = b.c.GuildMember(b.guildID, user.ID)
if err != nil { if err != nil {