This commit is contained in:
2026-02-26 19:18:33 -05:00
parent 17eaf3e324
commit 54eb7d4261
11 changed files with 169 additions and 22 deletions
+6 -2
View File
@@ -47,6 +47,7 @@ pub fn start(rsc: &mut Rsc, data: &ClientData) -> WeakWidget {
let account = account.clone();
let cert = cert.clone();
let password = ctx.state.data.password(&account);
let event_sender = rsc.window_event.clone();
rsc.spawn_task(async move |mut ctx| {
let mut fail = |reason: &str| {
let reason = reason.to_string();
@@ -62,6 +63,7 @@ pub fn start(rsc: &mut Rsc, data: &ClientData) -> WeakWidget {
url: account.url.clone(),
cert,
},
event_sender,
)
.await
{
@@ -89,7 +91,7 @@ pub fn start(rsc: &mut Rsc, data: &ClientData) -> WeakWidget {
return fail("invalid password");
}
};
let session = Session { con, user_id };
let session = Session::new(con, user_id);
ctx.update(move |ctx, rsc| {
main_view(rsc, session).set_ptr(ctx.main_ui, rsc);
});
@@ -141,6 +143,7 @@ pub fn create_account(rsc: &mut Rsc) -> WeakWidget {
let password = rsc[password].content();
create.disable(rsc);
let event_sender = rsc.window_event.clone();
rsc.spawn_task(async move |mut ctx| {
let mut fail = |reason: &str| {
let reason = reason.to_string();
@@ -158,6 +161,7 @@ pub fn create_account(rsc: &mut Rsc) -> WeakWidget {
url: url.clone(),
cert,
},
event_sender,
)
.await
{
@@ -186,7 +190,7 @@ pub fn create_account(rsc: &mut Rsc) -> WeakWidget {
return fail("invalid account token");
}
};
let session = Session { con, user_id };
let session = Session::new(con, user_id);
ctx.update(move |ctx, rsc| {
main_view(rsc, session).set_ptr(ctx.main_ui, rsc);
ctx.data.create_account(
+2
View File
@@ -8,7 +8,9 @@ mod friends;
mod main;
mod misc;
mod server;
mod user;
pub use connect::*;
pub use main::*;
pub use misc::*;
pub use user::*;
+53
View File
@@ -0,0 +1,53 @@
use super::*;
use crate::net::{NetHandle, SyncRecv};
use iris::core::util::HashMap;
use openworm::net::{RequestUserInfo, UserId, UserInfo};
pub struct UserCache {
pub con: NetHandle,
pub requests: HashMap<UserId, SyncRecv<RequestUserInfo>>,
pub users: HashMap<UserId, UserInfo>,
pub widgets: HashMap<UserId, Vec<WeakWidget<Text>>>,
}
impl UserCache {
pub fn new(con: NetHandle) -> Self {
Self {
con,
requests: Default::default(),
users: Default::default(),
widgets: Default::default(),
}
}
pub fn username(&mut self, id: UserId, rsc: &mut Rsc) -> WeakWidget {
let text = if let Some(user) = self.users.get(&id) {
&user.username
} else {
if !self.requests.contains_key(&id) {
let recv = self.con.request_sync(RequestUserInfo { id });
self.requests.insert(id, recv);
}
"loading..."
};
let wid = wtext(text).add(rsc);
self.widgets.entry(id).or_default().push(wid);
wid
}
pub fn update(&mut self, rsc: &mut Rsc) {
self.requests.retain(|id, req| {
if let Some(resp) = req.try_recv() {
if let Ok(info) = resp {
for &widget in self.widgets.get(id).into_iter().flatten() {
*rsc[widget].content = info.username.clone();
}
self.users.insert(*id, info);
}
false
} else {
true
}
});
}
}