commit 6d2d5a3ed03539f8f782fac9eb30d422f128f3c5
Author: Qais Patankar <qaisjp@gmail.com>
Date: Wed Mar 18 22:12:48 2020 +0000
Fix #1027: warning when handling inbound webhooks (discord) (#1044)
diff --git a/bridge/discord/handlers.go b/bridge/discord/handlers.go
index 2527c0d..2313390 100644
--- a/bridge/discord/handlers.go
+++ b/bridge/discord/handlers.go
@@ -9012 +9012 @@ func (b *Bdiscord) messageCreate(s *discordgo.Session, m *discordgo.MessageCreat
// set channel name
rmsg.Channel = b.getChannelName(m.ChannelID)
- // set username
- if !b.GetBool("UseUserName") {
+ fromWebhook := m.WebhookID != ""
+ if !fromWebhook && !b.GetBool("UseUserName") {
rmsg.Username = b.getNick(m.Author, m.GuildID)
} else {
rmsg.Username = m.Author.Username
- if b.GetBool("UseDiscriminator") {
+ if !fromWebhook && b.GetBool("UseDiscriminator") {
rmsg.Username += "#" + m.Author.Discriminator
}
}
