commit 05c68a6226b48ad5d03bc0525237afbac37ac0c9
Author: James Nylen <jnylen@gmail.com>
Date: Mon Jan 07 15:39:53 2019 +0000
Improve error reporting on failure to join Discord. Fixes #672 (#680)
diff --git a/bridge/discord/discord.go b/bridge/discord/discord.go
index 16ce8c0..f27210b 100644
--- a/bridge/discord/discord.go
+++ b/bridge/discord/discord.go
@@ -26 +27 @@ package bdiscord
import (
"bytes"
+ "errors"
"fmt"
"strings"
"sync"
@@ -496 +507 @@ func New(cfg *bridge.Config) bridge.Bridger {
func (b *Bdiscord) Connect() error {
var err error
var token string
+ var guildFound bool
b.Log.Info("Connecting")
if b.GetString("WebhookURL") == "" {
b.Log.Info("Connecting using token")
@@ -8612 +8824 @@ func (b *Bdiscord) Connect() error {
if guild.Name == serverName || guild.ID == serverName {
b.channels, err = b.c.GuildChannels(guild.ID)
b.guildID = guild.ID
+ guildFound = true
if err != nil {
break
}
}
}
b.channelsMutex.Unlock()
+ if !guildFound {
+ msg := fmt.Sprintf("Server \"%s\" not found", b.GetString("Server"))
+ err = errors.New(msg)
+ b.Log.Error(msg)
+ b.Log.Info("Possible values:")
+ for _, guild := range guilds {
+ b.Log.Infof("Server=\"%s\" # Server name", guild.Name)
+ b.Log.Infof("Server=\"%s\" # Server ID", guild.ID)
+ }
+ }
+
if err != nil {
return err
}
@@ -1067 +1207 @@ func (b *Bdiscord) Connect() error {
defer b.membersMutex.Unlock()
members, err := b.c.GuildMembers(b.guildID, "", 1000)
if err != nil {
- b.Log.Error("Error obtaining guild members", err)
+ b.Log.Error("Error obtaining server members: ", err)
return err
}
for _, member := range members {
