spacebar/rust-nex
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages 50 Wiki Activity Actions

V0 #1

Closed
RusticMaple wants to merge 105 commits from v0 into main
pull from: v0
merge into: spacebar:main
Conversation 0 Commits 105 Files changed 159 +9 -3
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 02c08e6c75 - Show all commits

add debugging

Prev Next
Maple 2026-04-25 15:06:00 +02:00
commit 02c08e6c75

12
rnex-core/src/nex/friends_handler.rs
View file

@ -127,6 +127,7 @@ impl Friends for FriendsUser {
), ),
ErrorCode, ErrorCode,
> { > {
println!("updating own data");
let mut data = self.data.write().await; let mut data = self.data.write().await;
*data = Some(UserData { info, presence }); *data = Some(UserData { info, presence });
let self_fr_info = friend_info_from_user(data.as_ref().unwrap()); let self_fr_info = friend_info_from_user(data.as_ref().unwrap());
@ -183,8 +184,10 @@ impl Friends for FriendsUser {
unk: 0 unk: 0
}]; }];
println!("acquiring user and current friends locks");
let users = self.fm.users.read().await; let users = self.fm.users.read().await;
let mut curr_friends = self.current_friends.write().await; let mut curr_friends = self.current_friends.write().await;
println!("started summing users");
for u in users.deref().iter().filter_map(|u| u.upgrade()) { for u in users.deref().iter().filter_map(|u| u.upgrade()) {
let data = u.data.read().await; let data = u.data.read().await;
let Some(data) = data.as_ref() else { let Some(data) = data.as_ref() else {
@ -207,13 +210,16 @@ impl Friends for FriendsUser {
fr_list.push(friend_info_from_user(&data)); fr_list.push(friend_info_from_user(&data));
curr_friends.push(u.pid); curr_friends.push(u.pid);
} }
println!("finished summing users");
drop(curr_friends); drop(curr_friends);
drop(users); drop(users);
println!("adding self to users");
let mut users = self.fm.users.write().await; let mut users = self.fm.users.write().await;
users.push(self.this.clone()); users.push(self.this.clone());
drop(users); drop(users);
println!("done...");
Ok(( Ok((
PrincipalPreference { PrincipalPreference {
block_friend_request: false, block_friend_request: false,
@ -237,11 +243,11 @@ impl Friends for FriendsUser {
async fn update_presence(&self, presence: NintendoPresenceV2) -> Result<(), ErrorCode> { async fn update_presence(&self, presence: NintendoPresenceV2) -> Result<(), ErrorCode> {
let mut data = self.data.write().await; let mut data = self.data.write().await;
let Some(data) = data.as_mut() else { let Some(inner_data) = data.as_mut() else {
return Err(ErrorCode::RendezVous_PermissionDenied); return Err(ErrorCode::RendezVous_PermissionDenied);
}; };
data.presence = presence; inner_data.presence = presence;
let Ok(any_self_fr_info) = Any::new(&data.presence) else { let Ok(any_self_fr_info) = Any::new(&inner_data.presence) else {
return Err(ErrorCode::RendezVous_ControlScriptFailure); return Err(ErrorCode::RendezVous_ControlScriptFailure);
}; };
drop(data); drop(data);