cleaning up

Cargo.toml

@@ -1,3 +1,3 @@
 [workspace]
-members = ["discord","hertz","material","image-edit","binding"]
+members = ["discord","material","image-edit","binding"]
 resolver = "2"

binding/src/bounty/mod.rs

@@ -1,8 +1,13 @@
 use serde::{Serialize,Deserialize};
-use crate::bitwise::ItemCode;
+use crate::{bitwise::ItemCode, postgres::card::Event};
 
+use title::Progresion;
 
-#[derive(PartialEq, Eq,Clone,Hash)]  
+pub mod title;
+
+
+#[derive(PartialEq, Eq,Clone,Hash,Serialize,Deserialize)]  
+#[serde(rename_all="snake_case")]
 pub enum Category{
     Bronze,
     Silver,
@@ -19,15 +24,6 @@ pub enum Methode{
     Multi
 }
 
-#[derive(Clone)]
-pub struct Title{
-    pub bounty_bronze:bool,
-    pub bounty_silver:bool,
-    pub bounty_gold:bool,
-    pub trade_bronze:bool,
-    pub trade_silver:bool,
-    pub trade_gold:bool,
-}
 
 #[derive(PartialEq, Eq,Clone,Hash,Serialize,Deserialize)]
 pub enum BBQ{
@@ -68,7 +64,7 @@ pub struct BountyReward{
 #[derive(Clone)]
 pub struct Hunter{
     pub member:String,
-    pub title:Title,
+    pub title:Progresion,
     pub event:Event,
 }
 #[derive(Clone)]

binding/src/bounty/title.rs

@@ -0,0 +1,50 @@
+use serde::{Serialize, Deserialize};
+use crate::bitwise::ItemCode;
+
+use super::{Category,BBQ};
+
+
+
+#[derive(Serialize,Deserialize,Clone)]
+#[serde(rename_all="snake_case")]
+pub enum Trigger{
+    BountyStage {category:Category,bbq:BBQ},
+    BountyCoin {coin:i32},
+    Manual
+}
+
+#[derive(Serialize,Deserialize,Clone)]
+#[serde(rename_all="snake_case")]
+pub enum Progresion {
+    GoldBounty,
+    SilverBounty,
+    BronzeBounty,
+    GoldTrading,
+    SilverTrading,
+    BronzeTrading,
+}
+
+#[derive(Serialize,Deserialize,Clone)]
+pub struct TitleImage{
+    pub url:String,
+    pub diameter:u32,
+    pub x_start:u32,
+    pub y_start:u32,
+}
+
+
+#[derive(Serialize,Deserialize,Clone)]
+#[serde(rename_all="snake_case")]
+pub enum TitleType{
+    Progresion {name:Progresion},
+    Free {name:String},
+    Reward {name:String , reward:Vec<ItemCode>}
+}
+
+#[derive(Serialize,Deserialize,Clone)]
+pub struct Title {
+    #[serde(rename="type")]
+    title_type:TitleType,
+    image:TitleImage,
+    trigger:Trigger,
+}

binding/src/utils.rs

@@ -0,0 +1,11 @@
+use std::time::SystemTime;
+
+pub struct MyTime;
+impl MyTime {
+    pub fn now()-> i64{
+        i64::try_from(SystemTime::now().duration_since(SystemTime::UNIX_EPOCH).unwrap().as_secs()).unwrap()
+    }
+    pub fn elapsed(el:i64)-> i64{
+        MyTime::now() + el
+    }
+}

discord/Cargo.toml

@@ -10,13 +10,14 @@ serenity = { version = "0.12.0", default-features = false, features = ["client",
 hertz = { path = "../hertz" }
 tokio = { version = "1.0", features = ["full"] }
 reqwest = { version = "0.11", features = ["json"] }
-sqlx = { version = "0.6", features = [ "runtime-tokio-native-tls" , "postgres","chrono","macros"] }
+sqlx = { version = "0.7.3", features = [ "runtime-tokio-native-tls" , "postgres","chrono","macros"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 chrono = "0.4.23"
-bcrypt = "0.13"
+bcrypt = "0.15"
 rand = "0.8.5"
 image = "0.24.5"
 imageproc = "0.23.0"
 rusttype = "0.9.3"
 lazy_static = "1.4.0"
+poise = { version = "0.5.7", features = ["time", "collector"] }