summaryrefslogtreecommitdiffstats
path: root/bridge
diff options
context:
space:
mode:
Diffstat (limited to 'bridge')
-rw-r--r--bridge/config/config.go2
-rw-r--r--bridge/xmpp/xmpp.go7
2 files changed, 7 insertions, 2 deletions
diff --git a/bridge/config/config.go b/bridge/config/config.go
index 0fa76b52..30368f66 100644
--- a/bridge/config/config.go
+++ b/bridge/config/config.go
@@ -126,7 +126,7 @@ type Protocol struct {
}
type ChannelOptions struct {
- Key string // irc
+ Key string // irc, xmpp
WebhookURL string // discord
}
diff --git a/bridge/xmpp/xmpp.go b/bridge/xmpp/xmpp.go
index 0e2d951c..4ace2abd 100644
--- a/bridge/xmpp/xmpp.go
+++ b/bridge/xmpp/xmpp.go
@@ -65,7 +65,12 @@ func (b *Bxmpp) Disconnect() error {
}
func (b *Bxmpp) JoinChannel(channel config.ChannelInfo) error {
- b.xc.JoinMUCNoHistory(channel.Name+"@"+b.GetString("Muc"), b.GetString("Nick"))
+ if channel.Options.Key != "" {
+ b.Log.Debugf("using key %s for channel %s", channel.Options.Key, channel.Name)
+ b.xc.JoinProtectedMUC(channel.Name+"@"+b.GetString("Muc"), b.GetString("Nick"), channel.Options.Key, xmpp.NoHistory, 0, nil)
+ } else {
+ b.xc.JoinMUCNoHistory(channel.Name+"@"+b.GetString("Muc"), b.GetString("Nick"))
+ }
return nil
}