spacebar/rust-nex
Watch
14
1
Fork
You've already forked rust-nex
 1
Code Issues Pull requests Projects Releases Packages 60 Wiki Activity Actions

fix more things
All checks were successful
Build and Test / splatoon (push) Successful in 4m37s
Details
Build and Test / minecraft-wiiu (push) Successful in 4m37s
Details
Build and Test / mario-tennis (push) Successful in 4m38s
Details
Build and Test / fast-racing-neo (push) Successful in 4m37s
Details
Build and Test / splatoon-testfire (push) Successful in 4m37s
Details
Build and Test / sonic-transformed (push) Successful in 4m38s
Details
Build and Test / wii-sports-club (push) Successful in 4m38s
Details
Build and Test / wii-u-chat (push) Successful in 3m48s
Details
Build and Test / puyopuyo (push) Successful in 3m49s
Details
Build and Test / friends (push) Successful in 5m1s
Details
Build and Test / super-mario-maker (push) Successful in 5m4s
Details

Browse source
This commit is contained in:
Maple Nebel 2026-07-08 13:17:08 +02:00
commit fcc6ca6ee9
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -593,7 +593,7 @@ impl FriendsWiiU for FriendsUser {
current_friends.push(friend.pid); current_friends.push(friend.pid);
drop(current_friends); drop(current_friends);
let mut users = self.fm.users.read().await; let users = self.fm.users.read().await;
let user = users.get(&friend.pid).cloned(); let user = users.get(&friend.pid).cloned();
drop(users); drop(users);
if let Some(user) = user { if let Some(user) = user {
@ -1067,9 +1067,8 @@ impl FriendsWiiU for FriendsUser {
async fn delete_friend_request(&self, id: u64) -> Result<(), ErrorCode> { async fn delete_friend_request(&self, id: u64) -> Result<(), ErrorCode> {
let Ok(query) = query!( let Ok(query) = query!(
"delete from friend_requests where id = $1 and recipient = $2 returning sender", "delete from friend_requests where id = $1 returning sender, recipient",
bytemuck::cast::<_, i64>(id), bytemuck::cast::<_, i64>(id),
self.pid
) )
.fetch_one(get_db()) .fetch_one(get_db())
.await .await
@ -1077,8 +1076,16 @@ impl FriendsWiiU for FriendsUser {
return Err(ErrorCode::FPD_InvalidMessageID); return Err(ErrorCode::FPD_InvalidMessageID);
}; };
let other = if query.recipient == self.pid {
query.sender
} else if query.sender == self.pid {
query.recipient
} else {
return Err(ErrorCode::FPD_InvalidMessageID);
};
let users = self.fm.users.read().await; let users = self.fm.users.read().await;
if let Some(user) = users.get(&query.sender).and_then(|v| v.upgrade()) { if let Some(user) = users.get(&other).and_then(|v| v.upgrade()) {
drop(users); drop(users);
user.remote user.remote