diff options
| author | Wim <wim@42.be> | 2019-09-15 20:25:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-15 20:25:42 +0200 |
| commit | 0abf4d5d5d7ffa3f87b65b788991e26cbbacc864 (patch) | |
| tree | 21957a7bb78968489f676100ce620baf8520b308 | |
| parent | 9b320cd43fc77bd537660818d050285ee05cca14 (diff) | |
| download | matterbridge-msglm-0abf4d5d5d7ffa3f87b65b788991e26cbbacc864.tar.gz matterbridge-msglm-0abf4d5d5d7ffa3f87b65b788991e26cbbacc864.tar.bz2 matterbridge-msglm-0abf4d5d5d7ffa3f87b65b788991e26cbbacc864.zip | |
Specify correct GuildID on unknown user query (discord). Fixes #879 (#894)
| -rw-r--r-- | bridge/discord/handlers.go | 2 | ||||
| -rw-r--r-- | bridge/discord/helpers.go | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bridge/discord/handlers.go b/bridge/discord/handlers.go index 19e0ad6a..cfda2de9 100644 --- a/bridge/discord/handlers.go +++ b/bridge/discord/handlers.go @@ -89,7 +89,7 @@ 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 11e62b17..734de3cd 100644 --- a/bridge/discord/helpers.go +++ b/bridge/discord/helpers.go @@ -9,7 +9,7 @@ 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() @@ -23,9 +23,9 @@ 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) |