summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim <wim@42.be>2016-10-23 19:50:12 +0200
committerWim <wim@42.be>2016-10-23 19:51:41 +0200
commit1e84afbd90208a1ac7cfcc1da8ece548bd14a352 (patch)
tree935787ebe5b875f0f1c301c90283f13f5581ad23
parentd31e641bac675985502c0861421573f76f950c14 (diff)
downloadmatterbridge-msglm-1e84afbd90208a1ac7cfcc1da8ece548bd14a352.tar.gz
matterbridge-msglm-1e84afbd90208a1ac7cfcc1da8ece548bd14a352.tar.bz2
matterbridge-msglm-1e84afbd90208a1ac7cfcc1da8ece548bd14a352.zip
Rename discord guild to server.
-rw-r--r--bridge/config/config.go1
-rw-r--r--bridge/discord/discord.go2
2 files changed, 1 insertions, 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)