Make the bot follow multiple users

Cargo.toml

@@ -2,23 +2,23 @@
 name = "aoede"
 version = "0.6.0"
 authors = ["Max Isom <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
-librespot = {version = "0.4.1", default-features = false}
+librespot = {version = "0.4.2", default-features = false}
 songbird = "0.3.0"
 tracing = "0.1"
 tracing-subscriber = "0.2"
 tracing-futures = "0.2"
-tokio = { version = "1.20.1", features = ["default"] }
+tokio = { version = "1.23.0", features = ["default"] }
 byteorder = "1.4.3"
 serde = "1.0"
 figment = { version = "0.10", features = ["toml", "env"] }
 rubato = "0.12.0"
 
 [dependencies.serenity]
-version = "0.11.2"
-features = ["client"]
+version = "0.11.5"
+features = ["client", "utils"]
 
 [profile.dev]
 split-debuginfo = "unpacked"

README.md

@@ -43,7 +43,7 @@ services:
       - DISCORD_TOKEN=
       - SPOTIFY_USERNAME=
       - SPOTIFY_PASSWORD=
-      - DISCORD_USER_ID=     # Discord user ID of the user you want Aoede to follow
+      - DISCORD_ADMINS=     # List (wrapped in single quotes) of users u want the bot to keep track of, eg value: '["100","200"]'
 ```
 
 ### Docker:
@@ -52,7 +52,7 @@ services:
 DISCORD_TOKEN=
 SPOTIFY_USERNAME=
 SPOTIFY_PASSWORD=
-DISCORD_USER_ID=
+DISCORD_ADMINS=
 ```
 
 ```bash

config.sample.toml

@@ -1,4 +1,4 @@
 DISCORD_TOKEN="the discord bot token"
 SPOTIFY_USERNAME="your spotify email"
 SPOTIFY_PASSWORD="your spotify password"
-DISCORD_USER_ID="your discord id here"
+DISCORD_ADMINS=["list of ids who can control the bot"]

src/lib/config.rs

@@ -12,8 +12,8 @@ pub struct Config {
     pub spotify_username: String,
     #[serde(alias = "SPOTIFY_PASSWORD")]
     pub spotify_password: String,
-    #[serde(alias = "DISCORD_USER_ID")]
-    pub discord_user_id: u64,
+    #[serde(alias = "DISCORD_ADMINS")]
+    pub discord_admins: Vec<String>,
 }
 
 impl Config {

src/main.rs

@@ -63,15 +63,22 @@ impl EventHandler for Handler {
             .guild(guild_id)
             .expect("Could not find guild in cache.");
 
-        let channel_id = guild
-            .voice_states
-            .get(&config.discord_user_id.into())
-            .and_then(|voice_state| voice_state.channel_id);
-        drop(guild);
+        // Check if any of the admins are in the VC
+        let user_list = guild.voice_states;
+
+        let mut channel_ids: Vec<Option<id::ChannelId>> = Vec::new();
+
+        for (key, value) in user_list {
+            if config.discord_admins.contains(&key.to_string()) {
+                channel_ids.push(value.channel_id);
+            }
+        }
 
-        if channel_id.is_some() {
-            // Enable casting
-            player.lock().await.enable_connect().await;
+        for i in channel_ids {
+            if i.is_some() {
+                // Enable casting
+                player.lock().await.enable_connect().await;
+            }
         }
 
         let c = ctx.clone();
@@ -114,17 +121,29 @@ impl EventHandler for Handler {
                             .guild(guild_id)
                             .expect("Could not find guild in cache.");
 
-                        let channel_id = match guild
-                            .voice_states
-                            .get(&config.discord_user_id.into())
-                            .and_then(|voice_state| voice_state.channel_id)
-                        {
-                            Some(channel_id) => channel_id,
-                            None => {
-                                println!("Could not find user in VC.");
-                                continue;
+                        // Check if any of the admins are in the VC
+                        let user_list = guild.voice_states;
+
+                        let mut channel_ids: Vec<Option<id::ChannelId>> = Vec::new();
+
+                        for (key, value) in user_list {
+                            if config.discord_admins.contains(&key.to_string()) {
+                                channel_ids.push(value.channel_id);
                             }
-                        };
+                        }
+
+                        if channel_ids.len() == 0 {
+                            println!("Admin not in VC!");
+                            continue;
+                        }
+
+                        let mut channel_id = id::ChannelId(0);
+                        for i in channel_ids {
+                            if i.is_some() {
+                                // Choose the first channel we encounter which is non-null
+                                channel_id = i.unwrap();
+                            }
+                        }
 
                         let _handler = manager.join(guild_id, channel_id).await;
 
@@ -195,7 +214,7 @@ impl EventHandler for Handler {
 
         let config = data.get::<ConfigKey>().unwrap();
 
-        if new.user_id.to_string() != config.discord_user_id.to_string() {
+        if ! config.discord_admins.contains(&new.user_id.to_string()) {
             return;
         }