From 16e660f5cd3787e587a5d082f57ab9d900aee0ca Mon Sep 17 00:00:00 2001
From: Nathan Perry <np@nathanperry.dev>
Date: Sat, 20 Jun 2020 16:17:05 -0400
Subject: move configuration into envconfig

---
 src/audio/play_queue.rs | 7 +++----
 src/audio/timeutil.rs   | 1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/audio')

diff --git a/src/audio/play_queue.rs b/src/audio/play_queue.rs
index 6026587..e2d4468 100644
--- a/src/audio/play_queue.rs
+++ b/src/audio/play_queue.rs
@@ -30,9 +30,8 @@ use crate::{
     commands::{
         sound_levels::DEFAULT_VOLUME,
     },
-    must_env_lookup,
     Result,
-    TARGET_GUILD_ID,
+    CONFIG,
 };
 
 const SECONDS_LEAD_TIME: f32 = 0.75;
@@ -115,7 +114,7 @@ impl PlayQueue {
                 queue.playing = None;
 
                 let mut manager = voice_manager.lock();
-                manager.leave(*TARGET_GUILD_ID);
+                manager.leave(CONFIG.discord.guild());
                 debug!("disconnected because playback finished");
             }
 
@@ -228,7 +227,7 @@ impl PlayQueue {
         };
 
         let mut manager = voice_manager.lock();
-        let handler = manager.join(*TARGET_GUILD_ID, must_env_lookup::<u64>("VOICE_CHANNEL"));
+        let handler = manager.join(CONFIG.discord.guild(), CONFIG.discord.voice_channel());
 
         match handler {
             Some(handler) => {
diff --git a/src/audio/timeutil.rs b/src/audio/timeutil.rs
index c9b38dd..238897f 100644
--- a/src/audio/timeutil.rs
+++ b/src/audio/timeutil.rs
@@ -50,6 +50,7 @@ pub fn parse_times<A: AsRef<str>>(s: A) -> (Option<Duration>, Option<Duration>)
 #[cfg(test)]
 mod test {
     use time::Duration;
+    use itertools::iproduct;
 
     use super::*;
 
-- 
cgit v1.3.1