Update team command with action row

Dockerfile

@@ -5,4 +5,4 @@ COPY . .
 
 RUN cargo install --path .
 
-cmd "echbot"
+CMD "echbot"

src/commands/mod.rs

@@ -1,5 +1,3 @@
 // Group all commands for registration
 pub(crate) mod slur;
 pub(crate) mod team;
-pub(crate) mod random;
-mod api;

src/commands/team.rs

@@ -1,47 +1,91 @@
 use std::collections::HashMap;
 use crate::{Context, Error};
 use crate::serenity;
-use poise::serenity_prelude::{UserId, VoiceState};
+use poise::serenity_prelude::{Guild, Member, UserId, VoiceState};
 use rand::seq::SliceRandom;
 use std::string::String;
 
-fn team_to_ping(team: &[&String]) -> String {
+/// Return a string of pingable IDs from a slice of UserIds
-    return team.iter().map(|o| format!("<@{}>", o)).collect::<Vec<String>>().join(", ");
+fn team_to_ping(team: &[&&UserId]) -> String {
+    return team.iter().map(|o| format!("<@{}>", o.to_string())).collect::<Vec<String>>().join(", ");
 }
 
 /// Splits up players for custom matches
 #[poise::command(slash_command)]
 pub(crate) async fn team(
     ctx: Context<'_>,
-    #[description = "Your voice channel"]
+    #[description = "Your order voice channel"]
-    #[channel_types("Voice")] channel: serenity::Channel,
+    #[rename = "order"]
+    #[channel_types("Voice")] order_channel: serenity::Channel, // Channel to pick all members from
+    #[description = "Your chaos voice channel"]
+    #[rename = "chaos"]
+    #[channel_types("Voice")] chaos_channel: serenity::Channel, // Channel to move chaos team members into
     #[description = "Team size"]
-    #[min = 1] size: u8,
+    #[min = 1] size: u8, // Number of members on each team
 ) -> Result<(), Error> {
-    let mut v: HashMap<UserId, VoiceState> = ctx.guild().unwrap().voice_states; // Get hashmap of users' voice states within the guild
+    let mut voice_states: HashMap<UserId, VoiceState> = ctx.guild().unwrap().voice_states; // Get hashmap of users' voice states within the guild
-    v.retain(|_, s: &mut VoiceState| s.channel_id == Some(channel.id())); // Drop users not active in requested voice channel from hashmap
+    voice_states.retain(|_, state: &mut VoiceState| state.channel_id == Some(order_channel.id())); // Drop users not active in requested voice channel from hashmap
 
-    if v.keys().len() < size as usize * 2 { // Make sure there are enough members in the voice channel
+    if voice_states.keys().len() < size as usize * 2 { // Make sure there are enough members in the voice channel
         ctx.send(|f| f
             .embed(|f| f
                 .title(format!("Custom {}v{} Teams", size, size))
                 .description("You don't have enough friends for that, idiot.")
                 .color(serenity::Colour::RED)
-            )).await?; // Insult the user for not having enough members in call
+            )).await?; // Insult the user for not having enough friends
-    } else {
+        return Ok(()); // Break out early if there are not enough members
-        let users: Vec<String> = Vec::from_iter(v.keys().map(|u| u.to_string())); // Get vec of PIDs
+    }
-        let players: Vec<&String> = users.choose_multiple(
-            &mut rand::thread_rng(), size as usize * 2).collect(); // Pick players randomly into slice
-        let (order, chaos) = players.split_at(players.len() / 2); // Split slice into two teams
 
-        ctx.send(|f| f
+    let uuid_team: u64 = ctx.id(); // Grab context ID for action row
-            .embed(|f| f
+    let users: Vec<&UserId> = Vec::from_iter(voice_states.keys()); // Get vec of PIDs
-                .title(format!("Custom {}v{} Teams", size, size))
+    let players: Vec<&&UserId> = users.choose_multiple(
-                .description("Good luck have fun.")
+        &mut rand::thread_rng(), size as usize * 2).collect(); // Pick players randomly into slice
-                .field("Order", team_to_ping(order), false)
+    let (order, chaos) = players.split_at(players.len() / 2); // Split slice into two teams
-                .field("Chaos", team_to_ping(chaos), false)
+
-                .color(serenity::Colour::DARK_GREEN)
+    ctx.send(|f| f
-            )).await?; // Send embed with team picks
+        .embed(|f| f
+            .title(format!("Custom {}v{} Teams", size, size))
+            .description("VER")
+            .field("Order", team_to_ping(order), false)
+            .field("Chaos", team_to_ping(chaos), false)
+            .color(serenity::Colour::DARK_GREEN)
+        ).components(|c| c // Create an action row with button
+        .create_action_row(|a| a
+            .create_button(|b| b
+                .style(serenity::ButtonStyle::Primary)
+                .label("Swap Channels")
+                .custom_id(uuid_team) // Use the context ID as button ID
+            )
+        )
+    )).await?; // Send embed with team picks
+
+    while let Some(mci) = serenity::CollectComponentInteraction::new(ctx) // Handle the interaction
+        .await {
+        let guild: Guild = ctx.guild().unwrap();
+        for user in chaos {
+            let member: Member = guild.member(ctx, UserId(*user.as_u64())).await?; // Get the member in the correct guild
+            member.move_to_voice_channel(ctx, chaos_channel.id()).await?; // Move the member to the correct voice channel
+        }
+
+        mci.create_interaction_response(ctx, |ir| { // Update embed
+            ir.kind(serenity::InteractionResponseType::UpdateMessage).interaction_response_data(|f| f
+                .embed(|f| f
+                    .title(format!("Custom {}v{} Teams", size, size))
+                    .description("VVGO VVW VVX")
+                    .field("Order", team_to_ping(order), false)
+                    .field("Chaos", team_to_ping(chaos), false)
+                    .color(serenity::Colour::DARK_GREEN)
+                ).components(|c| c // Create an action row with button
+                .create_action_row(|a| a
+                    .create_button(|b| b
+                        .disabled(true) // with disabled button
+                        .style(serenity::ButtonStyle::Primary)
+                        .label("Quit Sibelius") // and new text
+                        .custom_id(uuid_team) // Use the context ID as button ID
+                    )
+                )
+            ))
+        }).await?;
     }
     Ok(())
 }