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

Specify correct GuildID on unknown user query (discord). Fixes #879 (#894)

Browse Source
This commit is contained in:
Wim 2019-09-15 20:25:42 +02:00 committed by GitHub
parent 9b320cd43f
commit 0abf4d5d5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bridge/discord/handlers.go
View File

@ -89,7 +89,7 @@ func (b *Bdiscord) messageCreate(s *discordgo.Session, m *discordgo.MessageCreat
// set username // set username
if !b.GetBool("UseUserName") { if !b.GetBool("UseUserName") {
rmsg.Username = b.getNick(m.Author) rmsg.Username = b.getNick(m.Author, m.GuildID)
} else { } else {
rmsg.Username = m.Author.Username rmsg.Username = m.Author.Username
if b.GetBool("UseDiscriminator") { if b.GetBool("UseDiscriminator") {

6
bridge/discord/helpers.go
View File

@ -9,7 +9,7 @@ import (
"github.com/bwmarrin/discordgo" "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() b.membersMutex.RLock()
defer b.membersMutex.RUnlock() 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. // 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 { 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 return user.Username
} else if member == nil { } else if member == nil {
b.Log.Warnf("Got no information for member %#v", user) b.Log.Warnf("Got no information for member %#v", user)