ethanaobrien/ew
1
0
Fork 0
mirror of https://git.ethanthesleepy.one/ethanaobrien/ew.git synced 2025-05-13 11:37:33 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix timestamp in friend pages

Browse source
This commit is contained in:
Ethan O'Brien 2025-05-01 12:05:18 -05:00
parent b082def65c
commit e27a020cfb
No known key found for this signature in database
GPG key ID: 7A6E7CCD3BD93AB1
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/router/friend.rs
View file

@ -52,10 +52,11 @@ pub fn recommend(req: HttpRequest, body: String) -> Option<JsonValue> {
let mut rv = array![]; let mut rv = array![];
for uid in random.members() { for uid in random.members() {
let user = global::get_user(uid.as_i64().unwrap(), &friends, false); let mut user = global::get_user(uid.as_i64().unwrap(), &friends, false);
if user["user"]["friend_request_disabled"] == 1 || user.is_empty() { if user["user"]["friend_request_disabled"] == 1 || user.is_empty() {
continue; continue;
} }
user["user"]["last_login_time"] = global::set_time(user["user"]["last_login_time"].as_u64().unwrap_or(0), user_id).into();
rv.push(user).unwrap(); rv.push(user).unwrap();
} }

19
src/router/global.rs
View file

@ -106,11 +106,11 @@ pub fn timestamp_since_midnight() -> u64 {
unix_timestamp.as_secs() - midnight unix_timestamp.as_secs() - midnight
} }
fn init_time(data: &JsonValue, server_data: &mut JsonValue, token: &str, max_time: u64) { fn init_time(current_time: u64, server_data: &mut JsonValue, token: &str, max_time: u64) {
let mut edited = false; let mut edited = false;
let default_time = 1709272800; let default_time = 1709272800;
if max_time > 10 && max_time < data["server_time"].as_u64().unwrap_or(0) && server_data["server_time"].as_u64().unwrap_or(0) < max_time { if max_time > 10 && max_time < current_time && server_data["server_time"].as_u64().unwrap_or(0) < max_time {
server_data["server_time_set"] = timestamp().into(); server_data["server_time_set"] = timestamp().into();
edited = true; edited = true;
} }
@ -128,31 +128,30 @@ fn init_time(data: &JsonValue, server_data: &mut JsonValue, token: &str, max_tim
} }
} }
fn set_time(data: &mut JsonValue, uid: i64) { pub fn set_time(current_time: u64, uid: i64) -> u64 {
let max_time = crate::get_args().max_time; let max_time = crate::get_args().max_time;
if uid == 0 { if uid == 0 {
if max_time > 10 && max_time < data["server_time"].as_u64().unwrap_or(0) { if max_time > 10 && max_time < current_time {
data["server_time"] = max_time.into(); return max_time;
} }
return;
} }
let token = userdata::get_login_token(uid); let token = userdata::get_login_token(uid);
let mut server_data = userdata::get_server_data(&token); let mut server_data = userdata::get_server_data(&token);
init_time(data, &mut server_data, &token, max_time); init_time(current_time, &mut server_data, &token, max_time);
let time_set = server_data["server_time_set"].as_u64().unwrap_or(timestamp()); let time_set = server_data["server_time_set"].as_u64().unwrap_or(timestamp());
let server_time = server_data["server_time"].as_u64().unwrap_or(0);//1711741114 let server_time = server_data["server_time"].as_u64().unwrap_or(0);//1711741114
if server_time == 0 { if server_time == 0 {
return; return current_time;
} }
let time_since_set = timestamp() - time_set; let time_since_set = timestamp() - time_set;
data["server_time"] = (server_time + time_since_set).into(); return server_time + time_since_set;
} }
pub fn send(mut data: JsonValue, uid: i64, headers: &HeaderMap) -> HttpResponse { pub fn send(mut data: JsonValue, uid: i64, headers: &HeaderMap) -> HttpResponse {
//println!("{}", json::stringify(data.clone())); //println!("{}", json::stringify(data.clone()));
set_time(&mut data, uid); data["server_time"] = set_time(data["server_time"].as_u64().unwrap_or(0), uid).into();
if !data["data"]["item_list"].is_empty() || !data["data"]["updated_value_list"]["item_list"].is_empty() { if !data["data"]["item_list"].is_empty() || !data["data"]["updated_value_list"]["item_list"].is_empty() {
items::check_for_region(&mut data, headers); items::check_for_region(&mut data, headers);