Merge pull request #1 from oragejuice/main

Added timeleft and expiry to the data saved in the struct when logging in or registering

Author: Its-Networking

src/v1_2.rs

@@ -13,8 +13,6 @@ also if you want to use an obfuscator for rust i recommend using [obfstr](https:
 
 use uuid::Uuid;
 use std::collections::HashMap;
-use std::io::Read;
-use std::net::TcpListener;
 use reqwest::blocking::Client;
 use reqwest::blocking::Response;
 use hmac_sha256::HMAC;
@@ -42,6 +40,8 @@ pub struct KeyauthApi {
     pub create_date: String,
     pub last_login: String,
     pub subscription: String,
+    pub sub_time_left: i64,
+    pub expiry: String,
     pub message: String,
     pub success: bool,
     pub blacklisted: bool,
@@ -71,6 +71,8 @@ impl KeyauthApi {
             create_date: String::new(),
             last_login: String::new(),
             subscription: String::new(),
+            sub_time_left: 0,
+            expiry: String::new(),
             message: String::new(),
             success: false,
             blacklisted: false,
@@ -195,6 +197,8 @@ impl KeyauthApi {
             self.create_date = json_rep["info"]["createdate"].as_str().unwrap().to_string();
             self.last_login = json_rep["info"]["lastlogin"].as_str().unwrap().to_string();
             self.subscription = json_rep["info"]["subscriptions"][0]["subscription"].as_str().unwrap().to_string();
+            self.sub_time_left = json_rep["info"]["subscriptions"][0]["timeleft"].as_i64().unwrap();
+            self.expiry = json_rep["info"]["subscriptions"][0]["expiry"].as_str().unwrap().to_string();
             Ok(())
         } else {
             Err(json_rep["message"].as_str().unwrap().to_string())
@@ -294,6 +298,8 @@ impl KeyauthApi {
             self.create_date = json_rep["info"]["createdate"].as_str().unwrap().to_string();
             self.last_login = json_rep["info"]["lastlogin"].as_str().unwrap().to_string();
             self.subscription = json_rep["info"]["subscriptions"][0]["subscription"].as_str().unwrap().to_string();
+            self.sub_time_left = json_rep["info"]["subscriptions"][0]["timeleft"].as_i64().unwrap();
+            self.expiry = json_rep["info"]["subscriptions"][0]["expiry"].as_str().unwrap().to_string();
             Ok(())
         } else {
             Err(json_rep["message"].as_str().unwrap().to_string())
@@ -349,6 +355,8 @@ impl KeyauthApi {
             self.create_date = json_rep["info"]["createdate"].as_str().unwrap().to_string();
             self.last_login = json_rep["info"]["lastlogin"].as_str().unwrap().to_string();
             self.subscription = json_rep["info"]["subscriptions"][0]["subscription"].as_str().unwrap().to_string();
+            self.sub_time_left = json_rep["info"]["subscriptions"][0]["timeleft"].as_i64().unwrap();
+            self.expiry = json_rep["info"]["subscriptions"][0]["expiry"].as_str().unwrap().to_string();
             Ok(())
         } else {
             Err(json_rep["message"].as_str().unwrap().to_string())