From de4fab15170d41d1a6a769e82e98e7a06f456857 Mon Sep 17 00:00:00 2001
From: techmetx11 <techmetx11@disroot.org>
Date: Tue, 9 Jul 2024 18:02:16 +0100
Subject: [PATCH] Fix nsig extraction code and some warnings

oops
---
 src/consts.rs |  2 +-
 src/main.rs   | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/consts.rs b/src/consts.rs
index 69b8f10..4f060ef 100644
--- a/src/consts.rs
+++ b/src/consts.rs
@@ -6,7 +6,7 @@ pub static TEST_YOUTUBE_VIDEO: &str = "https://www.youtube.com/watch?v=jNQXAC9IV
 
 pub static REGEX_PLAYER_ID: &Lazy<Regex> = regex!("\\/s\\/player\\/([0-9a-f]{8})");
 pub static NSIG_FUNCTION_ARRAY: &Lazy<Regex> = regex!(
-    "\\.get\\(\"n\"\\)\\)&&\\([a-zA-Z0-9$_]=([a-zA-Z0-9$_]+)(?:\\[(\\d+)])?\\([a-zA-Z0-9$_]\\)"
+    "b=String\\.fromCharCode\\(110\\),c=a\\.get\\(b\\)\\)&&\\(c=([a-zA-Z0-9$_]+)\\[([0-9]+)\\]"
 );
 pub static REGEX_SIGNATURE_TIMESTAMP: &Lazy<Regex> = regex!("signatureTimestamp[=:](\\d+)");
 
diff --git a/src/main.rs b/src/main.rs
index aafc8a4..79da8b0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -8,18 +8,13 @@ use consts::DEFAULT_SOCK_PATH;
 use jobs::{process_decrypt_n_signature, process_fetch_update, GlobalState, JobOpcode};
 use opcode::OpcodeDecoder;
 use player::fetch_update;
-use std::{env::args, future, io::Error, sync::Arc};
+use std::{env::args, sync::Arc};
 use tokio::{
     fs::remove_file,
-    io::{
-        self, AsyncBufRead, AsyncBufReadExt, AsyncRead, AsyncReadExt, AsyncWrite, BufReader,
-        BufWriter, Interest, Ready,
-    },
-    net::{TcpListener, UnixListener, UnixStream},
+    net::{UnixListener, UnixStream},
     sync::Mutex,
-    task::{futures, spawn_blocking},
 };
-use tokio_util::codec::{Decoder, Framed, FramedRead, FramedWrite};
+use tokio_util::codec::Framed;
 
 use crate::jobs::{
     process_decrypt_signature, process_get_signature_timestamp, process_player_status,