From ac6e230c2639946346015ed2b5278adcc220ff02 Mon Sep 17 00:00:00 2001
From: encrypt <encrypt@labr.xyz>
Date: Sun, 15 Mar 2020 20:50:54 +0100
Subject: [PATCH 1/2] add default channel in connection dialog/connect

---
 app/config.js  |  3 ++-
 app/index.html |  4 ++++
 app/index.js   | 12 ++++++++++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/config.js b/app/config.js
index 30c7835..d0847f4 100644
--- a/app/config.js
+++ b/app/config.js
@@ -9,7 +9,8 @@ window.mumbleWebConfig = {
     'port': true,
     'token': true,
     'username': true,
-    'password': true
+    'password': true,
+    'channelName': false
   },
   // Default values for user settings
   // You can see your current value by typing `localStorage.getItem('mumble.$setting')` in the web console.
diff --git a/app/index.html b/app/index.html
index 14862ff..c46f71f 100644
--- a/app/index.html
+++ b/app/index.html
@@ -52,6 +52,10 @@
                   <td>Password</td>
                   <td><input id="password" type="password" data-bind="value: password"></td>
                 </tr>
+                <tr data-bind="if: $root.config.connectDialog.channelName">
+                  <td>Channel</td>
+                  <td><input  id="channelName" type="text" data-bind="value: channelName"></td>
+                </tr>
             </table>
             <div class="dialog-footer">
               <input class="dialog-close" type="button" data-bind="click: hide" value="Cancel">
diff --git a/app/index.js b/app/index.js
index 5c67d0f..dd2e771 100644
--- a/app/index.js
+++ b/app/index.js
@@ -55,13 +55,14 @@ function ConnectDialog () {
   self.token = ko.observable('')
   self.username = ko.observable('')
   self.password = ko.observable('')
+  self.channelName = ko.observable('')
   self.joinOnly = ko.observable(false)
   self.visible = ko.observable(true)
   self.show = self.visible.bind(self.visible, true)
   self.hide = self.visible.bind(self.visible, false)
   self.connect = function () {
     self.hide()
-    ui.connect(self.username(), self.address(), self.port(), self.token(), self.password())
+    ui.connect(self.username(), self.address(), self.port(), self.token(), self.password(), self.channelName())
   }
 }
 
@@ -331,7 +332,7 @@ class GlobalBindings {
       return '[' + new Date().toLocaleTimeString('en-US') + ']'
     }
 
-    this.connect = (username, host, port, token, password) => {
+    this.connect = (username, host, port, token, password, channelName = "") => {
       this.resetClient()
 
       this.remoteHost(host)
@@ -363,6 +364,10 @@ class GlobalBindings {
         // Register all channels, recursively
         const registerChannel = channel => {
           this._newChannel(channel)
+	  // join channel  
+          if (channel.name === channelName) {
+            client.self.setChannel(channel)
+          }
           channel.children.forEach(registerChannel)
         }
         registerChannel(client.root)
@@ -901,6 +906,9 @@ window.onload = function () {
   if (queryParams.password) {
     ui.connectDialog.password(queryParams.password)
   }
+  if (queryParams.channelName) {
+    ui.connectDialog.channelName(queryParams.channelName)
+  }
   if (queryParams.avatarurl) {
     // Download the avatar and upload it to the mumble server when connected
     let url = queryParams.avatarurl

From c831b1371692c0801680923c1aeb846eef5168ee Mon Sep 17 00:00:00 2001
From: encrypt <encrypt@labr.xyz>
Date: Sun, 15 Mar 2020 22:30:02 +0100
Subject: [PATCH 2/2] fix: matching on channel is done on full channel path not
 just channel name

---
 app/index.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/index.js b/app/index.js
index dd2e771..754e661 100644
--- a/app/index.js
+++ b/app/index.js
@@ -362,15 +362,14 @@ class GlobalBindings {
         window.matrixWidget.setAlwaysOnScreen(true)
 
         // Register all channels, recursively
-        const registerChannel = channel => {
+        const registerChannel = (channel, channelPath) => {
           this._newChannel(channel)
-	  // join channel  
-          if (channel.name === channelName) {
+          if(channelPath === channelName) {
             client.self.setChannel(channel)
           }
-          channel.children.forEach(registerChannel)
+          channel.children.forEach(ch => registerChannel(ch, channelPath+"/"+ch.name))
         }
-        registerChannel(client.root)
+        registerChannel(client.root, "")
 
         // Register all users
         client.users.forEach(user => this._newUser(user))