Leahnaya/wfc-server
1
0
Fork 0
mirror of https://github.com/WiiLink24/wfc-server.git synced 2026-07-19 09:19:00 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #31 from MikeIsAStar/rectify-inaccurate-tracking-of-friends-list

Browse Source 
GPCM: Rectify the inaccurate tracking of a profile's friends list
This commit is contained in:
Palapeli 2023-12-24 22:45:47 -05:00 committed by GitHub
commit 123fa0dee3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 50 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
gpcm/friend.go
View File

@ -3,6 +3,7 @@ package gpcm
import (
"encoding/binary"
"encoding/hex"
"errors"
"fmt"
"strconv"
"strings"
@ -13,6 +14,21 @@ import (
"github.com/logrusorgru/aurora/v3"
)
func removeFromUint32Array(arrayPointer *[]uint32, index int) error {
array := *arrayPointer
arrayLength := len(array)
if index < 0 || index >= arrayLength {
return errors.New("index is out of bounds")
}
lastIndex := arrayLength - 1
array[index] = array[lastIndex]
*arrayPointer = array[:lastIndex]
return nil
}
func (g *GameSpySession) isFriendAdded(profileId uint32) bool {
for _, storedPid := range g.FriendList {
if storedPid == profileId {
@ -22,6 +38,15 @@ func (g *GameSpySession) isFriendAdded(profileId uint32) bool {
return false
}
func (g *GameSpySession) getFriendIndex(profileId uint32) int {
for i, storedPid := range g.FriendList {
if storedPid == profileId {
return i
}
}
return -1
}
func (g *GameSpySession) isFriendAuthorized(profileId uint32) bool {
for _, storedPid := range g.AuthFriendList {
if storedPid == profileId {
@ -31,6 +56,15 @@ func (g *GameSpySession) isFriendAuthorized(profileId uint32) bool {
return false
}
func (g *GameSpySession) getAuthorizedFriendIndex(profileId uint32) int {
for i, storedPid := range g.AuthFriendList {
if storedPid == profileId {
return i
}
}
return -1
}
const addFriendMessage = "\r\n\r\n|signed|00000000000000000000000000000000"
const logOutMessage = "|s|0|ss|Offline|ls||ip|0|p|0|qm|0"
@ -70,7 +104,9 @@ func (g *GameSpySession) addFriend(command common.GameSpyCommand) {
defer mutex.Unlock()
// TODO: Add a limit
g.FriendList = append(g.FriendList, uint32(newProfileId))
if !g.isFriendAdded(uint32(newProfileId)) {
g.FriendList = append(g.FriendList, uint32(newProfileId))
}
// Check if destination has added the sender
newSession, ok := sessions[uint32(newProfileId)]
@ -127,24 +163,24 @@ func (g *GameSpySession) removeFriend(command common.GameSpyCommand) {
}
delProfileID32 := uint32(delProfileID64)
delProfileIDIndex := -1
for i, profileID := range g.AuthFriendList {
if profileID == delProfileID32 {
delProfileIDIndex = i
break
}
}
if delProfileIDIndex == -1 {
mutex.Lock()
defer mutex.Unlock()
if !g.isFriendAdded(delProfileID32) {
logging.Error(g.ModuleName, aurora.Cyan(strDelProfileID), "is not a friend")
g.replyError(ErrDeleteFriendNotFriends)
return
}
if !g.isFriendAuthorized(delProfileID32) {
logging.Error(g.ModuleName, aurora.Cyan(strDelProfileID), "is not an authorized friend")
g.replyError(ErrDeleteFriendNotFriends)
return
}
mutex.Lock()
defer mutex.Unlock()
g.AuthFriendList[delProfileIDIndex] = g.AuthFriendList[len(g.AuthFriendList)-1]
g.AuthFriendList = g.AuthFriendList[:len(g.AuthFriendList)-1]
delProfileIDIndex := g.getFriendIndex(delProfileID32)
removeFromUint32Array(&g.FriendList, delProfileIDIndex)
delProfileIDIndex = g.getAuthorizedFriendIndex(delProfileID32)
removeFromUint32Array(&g.AuthFriendList, delProfileIDIndex)
sendMessageToProfileId("100", g.User.ProfileId, delProfileID32, logOutMessage)
}