Leahnaya/friends
1
0
Fork 0
mirror of https://github.com/PretendoNetwork/friends.git synced 2026-03-21 18:04:11 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #40 from Crisoxyz/fix-friend-requests
Some checks failed
Build and Publish Docker Image / Build and Publish Docker Image (amd64) (push) Has been cancelled
Details
Build and Publish Docker Image / Build and Publish Docker Image (arm64) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Daniel López Guimaraes 2026-03-19 12:46:17 +00:00 committed by GitHub
commit 6c6d0016f0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
database/wiiu/save_friend_request.go
View File

@ -15,7 +15,7 @@ func SaveFriendRequest(senderPID uint32, recipientPID uint32, sentTime uint64, e
return 0, err
}
// Make sure we don't already have that friend request! If we do, give them the one we already have.
// Check for an existing friend request between the two users
row, err := database.Manager.QueryRow(`SELECT id FROM wiiu.friend_requests WHERE sender_pid=$1 AND recipient_pid=$2`, senderPID, recipientPID)
if err != nil {
return 0, err
@ -25,19 +25,28 @@ func SaveFriendRequest(senderPID uint32, recipientPID uint32, sentTime uint64, e
if err != nil && err != sql.ErrNoRows {
return 0, err
} else if id != 0 {
// If they aren't blocked, we want to unset the denied status on the previous request we have so that it appears again.
if friendRequestBlocked {
return id, nil
} else {
err = UnsetFriendRequestDenied(id)
if err != nil {
return 0, err
}
return id, nil
}
// Reset status flags and update timestamps for resent requests
_, err = database.Manager.Exec(`
UPDATE wiiu.friend_requests
SET denied = false,
accepted = false,
sent_on = $1,
expires_on = $2
WHERE id = $3`,
sentTime, expireTime, id)
if err != nil {
return 0, err
}
return id, nil
}
// Create a new friend request if none exists
row, err = database.Manager.QueryRow(`
INSERT INTO wiiu.friend_requests (sender_pid, recipient_pid, sent_on, expires_on, message, received, accepted, denied)
VALUES ($1, $2, $3, $4, $5, false, false, $6) RETURNING id`, senderPID, recipientPID, sentTime, expireTime, message, friendRequestBlocked)
@ -51,4 +60,4 @@ func SaveFriendRequest(senderPID uint32, recipientPID uint32, sentTime uint64, e
}
return id, nil
}
}

20
database/wiiu/unset_friend_request_denied.go
View File

@ -1,20 +0,0 @@
package database_wiiu
import (
"github.com/PretendoNetwork/friends/database"
)
// UnsetFriendRequestDenied unmarks a friend request as denied
func UnsetFriendRequestDenied(friendRequestID uint64) error {
result, err := database.Manager.Exec(`UPDATE wiiu.friend_requests SET denied=false WHERE id=$1`, friendRequestID)
if err != nil {
return err
}
rowsAffected, _ := result.RowsAffected()
if rowsAffected == 0 {
return database.ErrFriendRequestNotFound
}
return nil
}