From 0c75c63c9aef7e885ed90f3f1a3989849af80949 Mon Sep 17 00:00:00 2001
From: Jokler <jokler@protonmail.com>
Date: Fri, 2 Oct 2020 16:06:01 +0200
Subject: Use channel specific subscribe over server wide

---
 src/bot/master.rs | 5 ++---
 src/bot/music.rs  | 9 ++++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'src/bot')

diff --git a/src/bot/master.rs b/src/bot/master.rs
index 1821ac1..1480e17 100644
--- a/src/bot/master.rs
+++ b/src/bot/master.rs
@@ -200,10 +200,9 @@ impl MasterBot {
                     self.spawn_bot_for(who).await;
                 }
             }
-            MusicBotMessage::ChannelAdded(_) => {
-                // TODO Only subscribe to one channel
+            MusicBotMessage::ChannelAdded(id) => {
                 let mut cteamspeak = self.teamspeak.clone();
-                cteamspeak.subscribe_all().await;
+                cteamspeak.subscribe(id).await;
             }
             MusicBotMessage::ClientAdded(id) => {
                 let mut cteamspeak = self.teamspeak.clone();
diff --git a/src/bot/music.rs b/src/bot/music.rs
index e8ed33a..19b1c3f 100644
--- a/src/bot/music.rs
+++ b/src/bot/music.rs
@@ -295,10 +295,10 @@ impl MusicBot {
         }
     }
 
-    async fn subscribe_all(&self) {
+    async fn subscribe(&self, id: ChannelId) {
         if let Some(ts) = &self.teamspeak {
             let mut ts = ts.clone();
-            ts.subscribe_all().await;
+            ts.subscribe(id).await;
         }
     }
 
@@ -446,9 +446,8 @@ impl MusicBot {
                 let old_channel = client.channel;
                 self.on_client_left_channel(old_channel).await;
             }
-            MusicBotMessage::ChannelAdded(_) => {
-                // TODO Only subscribe to one channel
-                self.subscribe_all().await;
+            MusicBotMessage::ChannelAdded(id) => {
+                self.subscribe(id).await;
             }
             MusicBotMessage::StateChange(state) => {
                 self.on_state(state).await?;
-- 
cgit v1.2.3-70-g09d2