Replace return empty lists with nil

This commit is contained in:
Daniel López Guimaraes 2023-08-15 21:35:33 +01:00
parent 77a1cc11aa
commit 502035dc74
No known key found for this signature in database
GPG key ID: 6AC74DE3DEF050E0
5 changed files with 8 additions and 8 deletions

View file

@ -35,9 +35,9 @@ func GetFriendPersistentInfos(user1_pid uint32, pids []uint32) ([]*friends_3ds_t
SELECT date FROM "3ds".friendships WHERE user1_pid=$1 AND user2_pid=$2 AND type=0 LIMIT 1`, user1_pid, persistentInfo.PID).Scan(&friendedAtTime)
if err != nil {
if err == sql.ErrNoRows {
return make([]*friends_3ds_types.FriendPersistentInfo, 0), database.ErrFriendshipNotFound
return nil, database.ErrFriendshipNotFound
} else {
return make([]*friends_3ds_types.FriendPersistentInfo, 0), err
return nil, err
}
}

View file

@ -31,7 +31,7 @@ func GetUserBlockList(pid uint32) ([]*friends_wiiu_types.BlacklistedPrincipal, e
userInfo, err := utility.GetUserInfoByPID(pid)
if err != nil {
return make([]*friends_wiiu_types.BlacklistedPrincipal, 0), err
return nil, err
}
blacklistPrincipal := friends_wiiu_types.NewBlacklistedPrincipal()

View file

@ -58,7 +58,7 @@ func GetUserFriendList(pid uint32) ([]*friends_wiiu_types.FriendInfo, error) {
userInfo, err := utility.GetUserInfoByPID(friendPID)
if err != nil {
return make([]*friends_wiiu_types.FriendInfo, 0), err
return nil, err
}
friendInfo.NNAInfo = friends_wiiu_types.NewNNAInfo()
@ -89,7 +89,7 @@ func GetUserFriendList(pid uint32) ([]*friends_wiiu_types.FriendInfo, error) {
var lastOnlineTime uint64
err = database.Postgres.QueryRow(`SELECT last_online FROM wiiu.user_data WHERE pid=$1`, friendPID).Scan(&lastOnlineTime)
if err != nil {
return make([]*friends_wiiu_types.FriendInfo, 0), err
return nil, err
}
lastOnline = nex.NewDateTime(lastOnlineTime) // TODO: Change this
@ -97,7 +97,7 @@ func GetUserFriendList(pid uint32) ([]*friends_wiiu_types.FriendInfo, error) {
status, err := GetUserComment(friendPID)
if err != nil {
return make([]*friends_wiiu_types.FriendInfo, 0), err
return nil, err
}
friendInfo.Status = status

View file

@ -34,7 +34,7 @@ func GetUserFriendRequestsIn(pid uint32) ([]*friends_wiiu_types.FriendRequest, e
userInfo, err := utility.GetUserInfoByPID(senderPID)
if err != nil {
return make([]*friends_wiiu_types.FriendRequest, 0), err
return nil, err
}
friendRequest := friends_wiiu_types.NewFriendRequest()

View file

@ -33,7 +33,7 @@ func GetUserFriendRequestsOut(pid uint32) ([]*friends_wiiu_types.FriendRequest,
userInfo, err := utility.GetUserInfoByPID(recipientPID)
if err != nil {
return make([]*friends_wiiu_types.FriendRequest, 0), err
return nil, err
}
friendRequest := friends_wiiu_types.NewFriendRequest()