commit e74ee72c66bed53d56ea31acf32e06c667c83197
Author: Wim <wim@42.be>
Date: Sun Sep 15 20:25:42 2019 +0000
Specify correct GuildID on unknown user query (discord). Fixes #879 (#894)
diff --git a/bridge/discord/handlers.go b/bridge/discord/handlers.go
index 19e0ad6..cfda2de 100644
--- a/bridge/discord/handlers.go
+++ b/bridge/discord/handlers.go
@@ -897 +897 @@ func (b *Bdiscord) messageCreate(s *discordgo.Session, m *discordgo.MessageCreat
// set username
if !b.GetBool("UseUserName") {
- rmsg.Username = b.getNick(m.Author)
+ rmsg.Username = b.getNick(m.Author, m.GuildID)
} else {
rmsg.Username = m.Author.Username
if b.GetBool("UseDiscriminator") {
diff --git a/bridge/discord/helpers.go b/bridge/discord/helpers.go
index 11e62b1..734de3c 100644
--- a/bridge/discord/helpers.go
+++ b/bridge/discord/helpers.go
@@ -97 +97 @@ import (
"github.com/bwmarrin/discordgo"
)
-func (b *Bdiscord) getNick(user *discordgo.User) string {
+func (b *Bdiscord) getNick(user *discordgo.User, guildID string) string {
b.membersMutex.RLock()
defer b.membersMutex.RUnlock()
@@ -239 +239 @@ func (b *Bdiscord) getNick(user *discordgo.User) string {
}
// If we didn't find nick, search for it.
- member, err := b.c.GuildMember(b.guildID, user.ID)
+ member, err := b.c.GuildMember(guildID, user.ID)
if err != nil {
- b.Log.Warnf("Failed to fetch information for member %#v on guild %#v: %s", user, b.guildID, err)
+ b.Log.Warnf("Failed to fetch information for member %#v on guild %#v: %s", user, guildID, err)
return user.Username
} else if member == nil {
b.Log.Warnf("Got no information for member %#v", user)
