From 1e84afbd90208a1ac7cfcc1da8ece548bd14a352 Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Sun, 23 Oct 2016 19:50:12 +0200
Subject: [PATCH] Rename discord guild to server.

---
 bridge/config/config.go   | 1 -
 bridge/discord/discord.go | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/bridge/config/config.go b/bridge/config/config.go
index 7d4b0cd1..3972e84e 100644
--- a/bridge/config/config.go
+++ b/bridge/config/config.go
@@ -16,7 +16,6 @@ type Message struct {
 
 type Protocol struct {
 	BindAddress            string // mattermost, slack
-	Guild                  string // discord
 	IconURL                string // mattermost, slack
 	IgnoreNicks            string // all protocols
 	Jid                    string // xmpp
diff --git a/bridge/discord/discord.go b/bridge/discord/discord.go
index 3547edae..613bbb8e 100644
--- a/bridge/discord/discord.go
+++ b/bridge/discord/discord.go
@@ -59,7 +59,7 @@ func (b *bdiscord) Connect() error {
 	}
 	b.Nick = userinfo.Username
 	for _, guild := range guilds {
-		if guild.Name == b.Config.Guild {
+		if guild.Name == b.Config.Server {
 			b.Channels, err = b.c.GuildChannels(guild.ID)
 			if err != nil {
 				flog.Debugf("%#v", err)