Properly scope getting guest details

This commit is contained in:
Ethan O'Brien
2026-07-03 18:45:09 -05:00
parent f04ffc2f5d
commit 9cf0ee8924
9 changed files with 154 additions and 104 deletions

View File

@@ -1,11 +1,12 @@
use jzon::{object, array, JsonValue};
use jzon::{array, object, JsonValue};
use actix_web::{web, HttpRequest, Responder};
use rand::RngExt;
use lazy_static::lazy_static;
use crate::router::{global, userdata, items, databases};
use crate::router::{databases, global, items, userdata};
use crate::encryption;
use crate::router::clear_rate::live_completed;
use crate::router::tools::guest;
pub fn routes(cfg: &mut web::ServiceConfig) {
cfg.service(
@@ -109,7 +110,7 @@ async fn guest(req: HttpRequest, body: String) -> impl Responder {
}).unwrap();
} else {
if !friends["friend_user_id_list"].is_empty() {
guest_list.push(global::get_user(friends["friend_user_id_list"][random_number(0, friends["friend_user_id_list"].len() - 1)].as_i64().unwrap(), &friends, false)).unwrap();
guest_list.push(guest::get_user(friends["friend_user_id_list"][random_number(0, friends["friend_user_id_list"].len() - 1)].as_i64().unwrap(), &friends, guest::UserView::Card)).unwrap();
}
let expected: usize = 5;
if guest_list.len() < expected {
@@ -120,7 +121,7 @@ async fn guest(req: HttpRequest, body: String) -> impl Responder {
}
for uid in random.members() {
let guest = global::get_user(uid.as_i64().unwrap(), &friends, false);
let guest = guest::get_user(uid.as_i64().unwrap(), &friends, guest::UserView::Card);
if guest["user"]["friend_request_disabled"] == 1 || guest.is_empty() {
continue;
}