From 684603eebdd73ef3e2bc2fbc579bd40794d97bda Mon Sep 17 00:00:00 2001
From: Brandon Thomas <echelon@gmail.com>
Date: Mon, 3 Jan 2022 01:56:52 -0500
Subject: [PATCH] Fix OBS builds

---
 .../src/endpoints_ws/obs_twitch_thread.rs     | 56 ++++++++++---------
 .../app/obs_gateway/src/util/random_nonce.rs  |  8 +--
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/crates/app/obs_gateway/src/endpoints_ws/obs_twitch_thread.rs b/crates/app/obs_gateway/src/endpoints_ws/obs_twitch_thread.rs
index 215cfa2c20..bafbe68ef6 100644
--- a/crates/app/obs_gateway/src/endpoints_ws/obs_twitch_thread.rs
+++ b/crates/app/obs_gateway/src/endpoints_ws/obs_twitch_thread.rs
@@ -5,8 +5,8 @@ use std::sync::atomic::AtomicBool;
 use std::sync::{Arc, RwLock, PoisonError};
 use std::thread::sleep;
 use std::time::Duration;
+use std::time::Instant;
 use tokio::runtime::Handle;
-use time::Instant;
 
 pub struct ObsTwitchThread {
   twitch_client: Arc<RwLock<PollingTwitchWebsocketClient>>,
@@ -23,11 +23,16 @@ impl ObsTwitchThread {
   }
 
   pub fn keep_alive_thread(&self) {
-    let now = Instant::now();
-    let lock = self.last_requested
-        .clone()
-        .get_mut();
-    *lock = Some(now);
+    // TODO(bt, 2022-01-03): builds are failing, not sure when I worked on this last
+    //let now = Instant::now();
+    //let lock = self.last_requested
+    //    .clone()
+    //    .get_mut();
+    ////*lock = Some(now);
+    //match lock {
+    //  Ok(l) => *l = Some(now),
+    //  Err(_) => {}
+    //}
   }
 
   // TODO: Investigate use of a thread pool instead.
@@ -44,29 +49,30 @@ impl ObsTwitchThread {
   fn thread_main_loop(
     mut last_requested: Arc<RwLock<Instant>>,
   ) {
-    loop {
-      let c = last_requested.get_mut();
+    // TODO(bt, 2022-01-03): builds are failing, not sure when I worked on this last
+    //loop {
+    //  let c = last_requested.get_mut();
 
-      match c {
-        Err(e) => {
-          error!("Mutex failure: {:?}, ending job.", e);
-          break;
-        }
-        Ok(t) => {
-          let now = Instant::now();
-          let delta : Duration = now.duration_since(t);
+    //  match c {
+    //    Err(e) => {
+    //      error!("Mutex failure: {:?}, ending job.", e);
+    //      break;
+    //    }
+    //    Ok(t) => {
+    //      let now = Instant::now();
+    //      let delta : Duration = now.duration_since(t.clone());
 
-          if delta.gt(&Duration::from_secs(60)) {
-            info!("Timeout elapsed, ending job.");
-            break;
-          }
-        }
-      }
+    //      if delta.gt(&Duration::from_secs(60)) {
+    //        info!("Timeout elapsed, ending job.");
+    //        break;
+    //      }
+    //    }
+    //  }
 
-      Self::thread_single_loop();
+    //  Self::thread_single_loop();
 
-      sleep(Duration::from_millis(1000));
-    }
+    //  sleep(Duration::from_millis(1000));
+    //}
   }
 
   fn thread_single_loop() {
diff --git a/crates/app/obs_gateway/src/util/random_nonce.rs b/crates/app/obs_gateway/src/util/random_nonce.rs
index 5f9034d3aa..f87ab1765e 100644
--- a/crates/app/obs_gateway/src/util/random_nonce.rs
+++ b/crates/app/obs_gateway/src/util/random_nonce.rs
@@ -16,9 +16,9 @@ mod tests {
 
   #[test]
   fn random_nonce_length() {
-    assert_eq(1, random_nonce(1).len());
-    assert_eq(10, random_nonce(10).len());
-    assert_eq(15, random_nonce(15).len());
-    assert_eq(64, random_nonce(64).len());
+    assert_eq!(1, random_nonce(1).len());
+    assert_eq!(10, random_nonce(10).len());
+    assert_eq!(15, random_nonce(15).len());
+    assert_eq!(64, random_nonce(64).len());
   }
 }
\ No newline at end of file