From bfd8e9fafb77088ea02fcaf38db96f08e597b74e Mon Sep 17 00:00:00 2001 From: Maple Nebel Date: Thu, 23 Jul 2026 00:46:42 +0200 Subject: [PATCH 1/3] fix: make friend requests accept properly Co-authored-by: TraceEntertains --- ...t_friend_request_and_return_friend_info.go | 4 ++++ nex/friends-wiiu/accept_friend_request.go | 22 +++++++++---------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/database/wiiu/accept_friend_request_and_return_friend_info.go b/database/wiiu/accept_friend_request_and_return_friend_info.go index 1fd0407..3a29693 100644 --- a/database/wiiu/accept_friend_request_and_return_friend_info.go +++ b/database/wiiu/accept_friend_request_and_return_friend_info.go @@ -64,6 +64,10 @@ func AcceptFriendRequestAndReturnFriendInfo(friendRequestID uint64) (friends_wii friendInfo := friends_wiiu_types.NewFriendInfo() connectedUser, ok := globals.ConnectedUsers.Get(senderPID) + friendInfo.NNAInfo, err = GetUserNetworkAccountInfo(senderPID) + if err != nil { + return friends_wiiu_types.NewFriendInfo(), err + } lastOnline := types.NewDateTime(0).Now() if ok && connectedUser != nil { diff --git a/nex/friends-wiiu/accept_friend_request.go b/nex/friends-wiiu/accept_friend_request.go index 649e8f0..113e360 100644 --- a/nex/friends-wiiu/accept_friend_request.go +++ b/nex/friends-wiiu/accept_friend_request.go @@ -29,27 +29,27 @@ func AcceptFriendRequest(err error, packet nex.PacketInterface, callID uint32, i } } - friendPID := uint32(friendInfo.NNAInfo.PrincipalBasicInfo.PID) - connectedUser, ok := globals.ConnectedUsers.Get(friendPID) + senderPID := uint32(friendInfo.NNAInfo.PrincipalBasicInfo.PID) + senderUser, ok := globals.ConnectedUsers.Get(senderPID) - if ok && connectedUser != nil { - senderPID := uint32(connection.PID()) - senderConnectedUser, ok := globals.ConnectedUsers.Get(senderPID) + if ok && senderUser != nil { + recipientPID := uint32(connection.PID()) + recipientConnectedUser, ok := globals.ConnectedUsers.Get(recipientPID) - if ok && senderConnectedUser != nil { + if ok && recipientConnectedUser != nil { var err error senderFriendInfo := friends_wiiu_types.NewFriendInfo() - senderFriendInfo.NNAInfo, err = database_wiiu.GetUserNetworkAccountInfo(senderPID) + senderFriendInfo.NNAInfo, err = database_wiiu.GetUserNetworkAccountInfo(recipientPID) if err != nil { globals.Logger.Critical(err.Error()) - return nil, nex.NewError(nex.ResultCodes.FPD.Unknown, "") // TODO - Add error message + return nil, nex.NewError(nex.ResultCodes.FPD.Unknown, "tried to accept friend request of unregistered yet connected user user") } - senderFriendInfo.Presence = senderConnectedUser.PresenceV2.Copy().(friends_wiiu_types.NintendoPresenceV2) + senderFriendInfo.Presence = recipientConnectedUser.PresenceV2.Copy().(friends_wiiu_types.NintendoPresenceV2) - status, err := database_wiiu.GetUserComment(senderPID) + status, err := database_wiiu.GetUserComment(recipientPID) if err != nil { globals.Logger.Critical(err.Error()) senderFriendInfo.Status = friends_wiiu_types.NewComment() @@ -62,7 +62,7 @@ func AcceptFriendRequest(err error, packet nex.PacketInterface, callID uint32, i senderFriendInfo.LastOnline = friendInfo.LastOnline // TODO - Change this senderFriendInfo.Unknown = types.NewUInt64(0) - go notifications_wiiu.SendFriendRequestAccepted(connectedUser.Connection, senderFriendInfo) + go notifications_wiiu.SendFriendRequestAccepted(senderUser.Connection, senderFriendInfo) } } From 3d6fff0f0a89e9e89e4a467e47cba01acdf7c377 Mon Sep 17 00:00:00 2001 From: Maple Nebel Date: Thu, 23 Jul 2026 01:19:05 +0200 Subject: [PATCH 2/3] chore: make error style more consistent --- nex/friends-wiiu/accept_friend_request.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nex/friends-wiiu/accept_friend_request.go b/nex/friends-wiiu/accept_friend_request.go index 113e360..3e316c7 100644 --- a/nex/friends-wiiu/accept_friend_request.go +++ b/nex/friends-wiiu/accept_friend_request.go @@ -44,7 +44,7 @@ func AcceptFriendRequest(err error, packet nex.PacketInterface, callID uint32, i senderFriendInfo.NNAInfo, err = database_wiiu.GetUserNetworkAccountInfo(recipientPID) if err != nil { globals.Logger.Critical(err.Error()) - return nil, nex.NewError(nex.ResultCodes.FPD.Unknown, "tried to accept friend request of unregistered yet connected user user") + return nil, nex.NewError(nex.ResultCodes.FPD.Unknown, "Tried to accept friend request of unregistered yet connected user.") } senderFriendInfo.Presence = recipientConnectedUser.PresenceV2.Copy().(friends_wiiu_types.NintendoPresenceV2) From 7a6c1e41e28f3d20d19791d74a8cdea4b8753460 Mon Sep 17 00:00:00 2001 From: Maple Nebel Date: Thu, 23 Jul 2026 19:56:23 +0200 Subject: [PATCH 3/3] fix: adjust variable names back to how they were --- nex/friends-wiiu/accept_friend_request.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/nex/friends-wiiu/accept_friend_request.go b/nex/friends-wiiu/accept_friend_request.go index 3e316c7..73e462f 100644 --- a/nex/friends-wiiu/accept_friend_request.go +++ b/nex/friends-wiiu/accept_friend_request.go @@ -29,27 +29,27 @@ func AcceptFriendRequest(err error, packet nex.PacketInterface, callID uint32, i } } - senderPID := uint32(friendInfo.NNAInfo.PrincipalBasicInfo.PID) - senderUser, ok := globals.ConnectedUsers.Get(senderPID) + friendPID := uint32(friendInfo.NNAInfo.PrincipalBasicInfo.PID) + connectedUser, ok := globals.ConnectedUsers.Get(friendPID) - if ok && senderUser != nil { - recipientPID := uint32(connection.PID()) - recipientConnectedUser, ok := globals.ConnectedUsers.Get(recipientPID) + if ok && connectedUser != nil { + senderPID := uint32(connection.PID()) + senderConnectedUser, ok := globals.ConnectedUsers.Get(senderPID) - if ok && recipientConnectedUser != nil { + if ok && senderConnectedUser != nil { var err error senderFriendInfo := friends_wiiu_types.NewFriendInfo() - senderFriendInfo.NNAInfo, err = database_wiiu.GetUserNetworkAccountInfo(recipientPID) + senderFriendInfo.NNAInfo, err = database_wiiu.GetUserNetworkAccountInfo(senderPID) if err != nil { globals.Logger.Critical(err.Error()) return nil, nex.NewError(nex.ResultCodes.FPD.Unknown, "Tried to accept friend request of unregistered yet connected user.") } - senderFriendInfo.Presence = recipientConnectedUser.PresenceV2.Copy().(friends_wiiu_types.NintendoPresenceV2) + senderFriendInfo.Presence = senderConnectedUser.PresenceV2.Copy().(friends_wiiu_types.NintendoPresenceV2) - status, err := database_wiiu.GetUserComment(recipientPID) + status, err := database_wiiu.GetUserComment(senderPID) if err != nil { globals.Logger.Critical(err.Error()) senderFriendInfo.Status = friends_wiiu_types.NewComment() @@ -62,7 +62,7 @@ func AcceptFriendRequest(err error, packet nex.PacketInterface, callID uint32, i senderFriendInfo.LastOnline = friendInfo.LastOnline // TODO - Change this senderFriendInfo.Unknown = types.NewUInt64(0) - go notifications_wiiu.SendFriendRequestAccepted(senderUser.Connection, senderFriendInfo) + go notifications_wiiu.SendFriendRequestAccepted(connectedUser.Connection, senderFriendInfo) } }