diff --git a/src/router.rs b/src/router.rs
index 6cace7b..f21ed87 100644
--- a/src/router.rs
+++ b/src/router.rs
@@ -24,3 +24,4 @@ pub mod webui;
pub mod clear_rate;
pub mod exchange;
pub mod items;
+pub mod databases;
diff --git a/src/router/card.rs b/src/router/card.rs
index d855f91..c3ad7c3 100644
--- a/src/router/card.rs
+++ b/src/router/card.rs
@@ -1,7 +1,7 @@
use json::{object, array, JsonValue};
use actix_web::{HttpResponse, HttpRequest};
-use crate::router::{userdata, global, items};
+use crate::router::{userdata, global, items, databases};
use crate::encryption;
fn do_reinforce(user: &mut JsonValue, body: &JsonValue, exp_id: &str, money_multiplier: i64, evolve: bool) -> JsonValue {
@@ -13,7 +13,7 @@ fn do_reinforce(user: &mut JsonValue, body: &JsonValue, exp_id: &str, money_mult
for (_j, data2) in materials.members().enumerate() {
items::use_item(data2["master_item_id"].as_i64().unwrap(), data2["amount"].as_i64().unwrap(), user);
- let item = items::get_item_info(data2["master_item_id"].as_i64().unwrap());
+ let item = &databases::ITEM_INFO[data2["master_item_id"].to_string()];
if evolve {
card["evolve"] = array![{type: 2,count: 1}];
money = money_multiplier;
diff --git a/src/router/chat.rs b/src/router/chat.rs
index e5e084c..6fdc802 100644
--- a/src/router/chat.rs
+++ b/src/router/chat.rs
@@ -1,41 +1,14 @@
use json::{object, array, JsonValue};
use actix_web::{HttpResponse, HttpRequest};
-use lazy_static::lazy_static;
-use crate::router::{global, items, userdata};
+use crate::router::{global, items, userdata, databases};
use crate::encryption;
-lazy_static! {
- static ref CHATS: JsonValue = {
- let mut chats = object!{};
- let items = json::parse(include_str!("json/chat_room.json")).unwrap();
- for (_i, data) in items.members().enumerate() {
- if chats[data["masterChatId"].to_string()].is_null() {
- chats[data["masterChatId"].to_string()] = object!{};
- }
- chats[data["masterChatId"].to_string()][data["roomId"].to_string()] = data.clone();
- }
- chats
- };
- static ref CHAPTERS: JsonValue = {
- let mut chats = object!{};
- let items = json::parse(include_str!("json/chat_chapter.json")).unwrap();
- for (_i, data) in items.members().enumerate() {
- if chats[data["masterChatId"].to_string()].is_null() {
- chats[data["masterChatId"].to_string()] = object!{};
- }
- chats[data["masterChatId"].to_string()][data["roomId"].to_string()] = data.clone();
- }
- chats
- };
-}
-
-
pub fn add_chat(id: i64, num: i64, chats: &mut JsonValue) {
chats.push(object!{
chat_id: id,
room_id: num,
- chapter_id: CHAPTERS[id.to_string()][num.to_string()]["id"].clone(),
+ chapter_id: databases::CHAPTERS[id.to_string()][num.to_string()]["id"].clone(),
is_read: 0,
created_at: global::timestamp()
}).unwrap();
@@ -47,7 +20,7 @@ pub fn home(req: HttpRequest, body: String) -> HttpResponse {
let mut rooms = array![];
for (_i, data) in chats.members().enumerate() {
- rooms.push(CHATS[data["chat_id"].to_string()][data["room_id"].to_string()]["id"].clone()).unwrap();
+ rooms.push(databases::CHATS[data["chat_id"].to_string()][data["room_id"].to_string()]["id"].clone()).unwrap();
}
let resp = object!{
diff --git a/src/router/clear_rate.rs b/src/router/clear_rate.rs
index f20a913..0cdcbb6 100644
--- a/src/router/clear_rate.rs
+++ b/src/router/clear_rate.rs
@@ -7,10 +7,11 @@ use lazy_static::lazy_static;
use crate::encryption;
use crate::sql::SQLite;
-use crate::router::global;
+use crate::router::{global, databases};
lazy_static! {
static ref DATABASE: SQLite = SQLite::new("live_statistics.db", setup_tables);
+ static ref CACHED_DATA: Mutex