From abf1f1bb58f85a687f09efb9cb83c1cfc9591ad0 Mon Sep 17 00:00:00 2001
From: squidysquid1 <nonya@squidysquid1.com>
Date: Sun, 12 Feb 2023 18:00:38 -0600
Subject: [PATCH] add support for multiple messages for timer

---
 Cargo.lock  | 83 +++++++++++++----------------------------------------
 Cargo.toml  |  3 +-
 src/main.rs | 24 ++++++++++++++--
 3 files changed, 44 insertions(+), 66 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7beba1e..d35c0de 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -17,15 +17,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "async-trait"
 version = "0.1.64"
@@ -556,6 +547,7 @@ name = "jackbot"
 version = "0.1.0"
 dependencies = [
  "dotenv",
+ "rand",
  "serenity",
  "tokio",
  "tracing",
@@ -617,15 +609,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "matchers"
-version = "0.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1"
-dependencies = [
- "regex-automata",
-]
-
 [[package]]
 name = "memchr"
 version = "2.5.0"
@@ -669,6 +652,16 @@ dependencies = [
  "windows-sys 0.42.0",
 ]
 
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
+
 [[package]]
 name = "num-integer"
 version = "0.1.45"
@@ -713,6 +706,12 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
 [[package]]
 name = "parking_lot"
 version = "0.12.1"
@@ -817,30 +816,6 @@ dependencies = [
  "bitflags",
 ]
 
-[[package]]
-name = "regex"
-version = "1.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
-dependencies = [
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
-
 [[package]]
 name = "reqwest"
 version = "0.11.14"
@@ -1298,36 +1273,18 @@ dependencies = [
  "tracing-core",
 ]
 
-[[package]]
-name = "tracing-serde"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1"
-dependencies = [
- "serde",
- "tracing-core",
-]
-
 [[package]]
 name = "tracing-subscriber"
-version = "0.2.25"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71"
+checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70"
 dependencies = [
- "ansi_term",
- "chrono",
- "lazy_static",
- "matchers",
- "regex",
- "serde",
- "serde_json",
+ "nu-ansi-term",
  "sharded-slab",
  "smallvec",
  "thread_local",
- "tracing",
  "tracing-core",
  "tracing-log",
- "tracing-serde",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index e185abe..3b24ce6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,8 @@ edition = "2018"
 [dependencies]
 dotenv = "0.15"
 tracing = "0.1.23"
-tracing-subscriber = "0.2"
+tracing-subscriber = "0.3.16"
+rand = "0.8.5"
 
 [dependencies.tokio]
 version = "1.0"
diff --git a/src/main.rs b/src/main.rs
index fa84e31..4ae822b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -23,6 +23,7 @@ use serenity::model::gateway::Ready;
 use serenity::prelude::*;
 use tracing::{error, info};
 use std::time::Instant;
+use rand::Rng;
 
 pub struct ShardManagerContainer;
 
@@ -139,7 +140,19 @@ async fn jackon(ctx: &Context, msg: &Message) -> CommandResult {
     let mut instant = count.lock().await;
     *instant = Instant::now();
 
-    let str = "Jack started baby!";
+    let num = rand::thread_rng().gen_range(1..10);
+    let str = match  num{
+        1=>"Jacking commencing, GL!",
+        2=>"Get the oil fields ready",
+        3=>"Tibble is getting something to eat...",
+        4=>"Make sure to clean up after yourself dirty dog",
+        5=>"Better be quick xp waste chop chop back to rust",
+        6=>"Clarity yanks are a wonder",
+        7=>"Off to oil now come come",
+        8=>"Addiction is a sad thing",
+        9=>"Not again",
+        _=>"Jack on, Gl youll need it",
+    };
     msg.channel_id.say(&ctx.http, str).await?;
 
     Ok(())
@@ -153,7 +166,14 @@ async fn jackoff(ctx: &Context, msg: &Message) -> CommandResult {
     };
 
     let time = raw_count.lock().await;
-    let str = format!("That was a good sesh Took ya: {} sec", time.elapsed().as_secs_f64());
+    let length = time.elapsed().as_secs_f64();
+    let str = match  length as u64{
+        1000.. =>format!("Did you fall asleep or something? that sesh Took ya: {} sec", length),
+        500.. =>format!("Wow you really went at it gz. Took ya: {} sec", length),
+        250.. =>format!("I like the dedication! Took ya: {} sec", length),
+        0.. =>format!("That was a quick one wasnt it??? Took ya: {} sec", length),
+    };
+
     msg.channel_id.say(&ctx.http, str).await?;