From db8187b7e5eb5cc1d867663d492f35a8bd4b13f1 Mon Sep 17 00:00:00 2001
From: s3lph <5564491+s3lph@users.noreply.github.com>
Date: Thu, 24 Sep 2020 02:00:19 +0200
Subject: [PATCH] Fix some minor issues (fmt strings, rejoin logic errors)

---
 bridge/mumble/handlers.go |  4 ++--
 bridge/mumble/mumble.go   | 31 ++++++++++++-------------------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/bridge/mumble/handlers.go b/bridge/mumble/handlers.go
index 02da72d9..1a9a96d0 100644
--- a/bridge/mumble/handlers.go
+++ b/bridge/mumble/handlers.go
@@ -8,7 +8,7 @@ import (
 
 
 func (b *Bmumble) handleServerConfig(event *gumble.ServerConfigEvent) {
-	
+	b.serverConfigUpdate <- *event
 }
 
 
@@ -60,7 +60,7 @@ func (b *Bmumble) handleUserChange(event *gumble.UserChangeEvent) {
 
 
 func (b *Bmumble) handleDisconnect(event *gumble.DisconnectEvent) {
-	b.connected <- disconnect{event.Type, event.String}
+	b.connected <- *event
 }
 
 
diff --git a/bridge/mumble/mumble.go b/bridge/mumble/mumble.go
index 33f1dc94..ed24bbd0 100644
--- a/bridge/mumble/mumble.go
+++ b/bridge/mumble/mumble.go
@@ -7,7 +7,6 @@ import (
 	"io/ioutil"
 	"net"
 	"strconv"
-//	"strings"
 	"time"
 
 	"github.com/42wim/matterbridge/bridge"
@@ -30,8 +29,8 @@ type Bmumble struct {
 	Channel              string
 	local                chan config.Message
 	running              chan error
-	connected            chan disconnect
-	serverConfigUpdate   chan *gumble.ServerConfigEvent
+	connected            chan gumble.DisconnectEvent
+	serverConfigUpdate   chan gumble.ServerConfigEvent
 	serverConfig         gumble.ServerConfigEvent
 	tlsConfig            tls.Config
 
@@ -39,20 +38,14 @@ type Bmumble struct {
 }
 
 
-type disconnect struct {
-	Reason  gumble.DisconnectType
-	Message string
-}
-
-
 func New(cfg *bridge.Config) bridge.Bridger {
 	b := &Bmumble{}
 	b.Config = cfg
 	b.Nick = b.GetString("Nick")
 	b.local = make(chan config.Message)
 	b.running = make(chan error)
-	b.connected = make(chan disconnect)
-	b.serverConfigUpdate = make(chan *gumble.ServerConfigEvent)
+	b.connected = make(chan gumble.DisconnectEvent)
+	b.serverConfigUpdate = make(chan gumble.ServerConfigEvent)
 	return b
 }
 
@@ -104,8 +97,8 @@ func (b *Bmumble) Disconnect() error {
 }
 
 func (b *Bmumble) JoinChannel(channel config.ChannelInfo) error {
-	if b.Channel != "" {
-		b.Log.Fatalf("Cannot join channel '%s', already joined to channel '%'s", channel.Name, b.Channel)
+	if b.Channel != "" && channel.Name != b.Channel {
+		b.Log.Fatalf("Cannot join channel '%s', already joined to channel '%s'", channel.Name, b.Channel)
 		return errors.New("The Mumble bridge can only join a single channel")
 	}
 	b.Channel = channel.Name
@@ -144,15 +137,15 @@ func (b *Bmumble) connectLoop() {
 		}
 		firstConnect = false
 		d := <-b.connected
-		switch d.Reason {
+		switch d.Type {
 		case gumble.DisconnectError:
-			b.Log.Errorf("Lost connection to the server (%s), attempting reconnect", d.Message)
+			b.Log.Errorf("Lost connection to the server (%s), attempting reconnect", d.String)
 			continue
 		case gumble.DisconnectKicked:
-			b.Log.Errorf("Kicked from the server (%s), attempting reconnect", d.Message)
+			b.Log.Errorf("Kicked from the server (%s), attempting reconnect", d.String)
 			continue
 		case gumble.DisconnectBanned:
-			b.Log.Errorf("Banned from the server (%s), not attempting reconnect", d.Message)
+			b.Log.Errorf("Banned from the server (%s), not attempting reconnect", d.String)
 			break
 		case gumble.DisconnectUser:
 			b.Log.Infof("Disconnect successful")
@@ -208,8 +201,8 @@ func (b *Bmumble) doSend() {
 	for {
 		select {
 		case config := <-b.serverConfigUpdate:
-			b.Log.Debugf("Received server config update: AllowHTML=%d, MaxMessageLength=%d", config.AllowHTML, config.MaximumMessageLength)
-			b.serverConfig = *config
+			b.Log.Debugf("Received server config update: AllowHTML=%#v, MaximumMessageLength=%#v", config.AllowHTML, config.MaximumMessageLength)
+			b.serverConfig = config
 		case msg := <-b.local:
 			b.processMessage(&msg)
 		}