From bcf0b30d1e42e32779dd529777c82010228dad45 Mon Sep 17 00:00:00 2001
From: Steve <stryan@saintnet.tech>
Date: Mon, 8 Feb 2021 13:16:09 -0500
Subject: [PATCH] use string slice for mumble channel

---
 config.go          |  2 +-
 main.go            |  3 ++-
 mumble-handlers.go | 13 ++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/config.go b/config.go
index 71148ab..e4df869 100644
--- a/config.go
+++ b/config.go
@@ -24,7 +24,7 @@ type BridgeConfig struct {
 	MumbleConfig       *gumble.Config
 	MumbleAddr         string
 	MumbleInsecure     bool
-	MumbleChannel      string
+	MumbleChannel      []string
 	MumbleDisableText  bool
 	Command            string
 	GID                string
diff --git a/main.go b/main.go
index 3474313..788e18b 100644
--- a/main.go
+++ b/main.go
@@ -8,6 +8,7 @@ import (
 	"os/signal"
 	"runtime/pprof"
 	"strconv"
+	"strings"
 	"syscall"
 	"time"
 
@@ -99,7 +100,7 @@ func main() {
 			// MumbleConfig:   config,
 			MumbleAddr:         *mumbleAddr + ":" + strconv.Itoa(*mumblePort),
 			MumbleInsecure:     *mumbleInsecure,
-			MumbleChannel:      *mumbleChannel,
+			MumbleChannel:      strings.Split(*mumbleChannel, "/"),
 			MumbleDisableText:  *mumbleDisableText,
 			Command:            *discordCommand,
 			GID:                *discordGID,
diff --git a/mumble-handlers.go b/mumble-handlers.go
index 860d5da..8040b33 100644
--- a/mumble-handlers.go
+++ b/mumble-handlers.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"fmt"
 	"log"
 	"strings"
 
@@ -13,12 +14,10 @@ type MumbleListener struct {
 }
 
 func (l *MumbleListener) mumbleConnect(e *gumble.ConnectEvent) {
-	if l.Bridge.BridgeConfig.MumbleChannel != "" {
-		//join specified channel
-		startingChannel := e.Client.Channels.Find(l.Bridge.BridgeConfig.MumbleChannel)
-		if startingChannel != nil {
-			e.Client.Self.Move(startingChannel)
-		}
+	//join specified channel
+	startingChannel := e.Client.Channels.Find(l.Bridge.BridgeConfig.MumbleChannel...)
+	if startingChannel != nil {
+		e.Client.Self.Move(startingChannel)
 	}
 }
 
@@ -42,7 +41,7 @@ func (l *MumbleListener) mumbleUserChange(e *gumble.UserChangeEvent) {
 		log.Println("User connected to mumble " + e.User.Name)
 
 		if !l.Bridge.BridgeConfig.MumbleDisableText {
-			e.User.Send("Mumble-Discord-Bridge v" + version)
+			e.User.Send(fmt.Sprintf("Mumble-Discord-Bridge %v", version))
 
 			// Tell the user who is connected to discord
 			if len(l.Bridge.DiscordUsers) == 0 {