Leahnaya/friends
1
0
Fork 0
mirror of https://github.com/PretendoNetwork/friends.git synced 2026-08-01 23:54:32 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: make friend requests accept properly

Browse Source 
Co-authored-by: TraceEntertains <atw3710@gmail.com>
This commit is contained in:
Maple Nebel 2026-07-23 00:46:42 +02:00
parent bcd8996b08
commit bfd8e9fafb
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
database/wiiu/accept_friend_request_and_return_friend_info.go
View File

@ -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 {

22
nex/friends-wiiu/accept_friend_request.go
View File

@ -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)
}
}