From 6916dbb1c13e54fee4d88f56cc1b1dc82a5e88db Mon Sep 17 00:00:00 2001 From: Jonathan Barrow Date: Thu, 16 Nov 2023 00:01:37 -0500 Subject: [PATCH] fixed database usage of new DateTime API --- database/3ds/get_friend_miis.go | 5 +---- database/3ds/save_friendship.go | 7 +------ database/3ds/update_user_comment.go | 2 +- database/3ds/update_user_mii.go | 2 +- .../wiiu/accept_friend_request_and_return_friend_info.go | 7 ++----- database/wiiu/get_user_friend_list.go | 4 +--- database/wiiu/set_user_blocked.go | 5 +---- 7 files changed, 8 insertions(+), 24 deletions(-) diff --git a/database/3ds/get_friend_miis.go b/database/3ds/get_friend_miis.go index 5acb459..8622a89 100644 --- a/database/3ds/get_friend_miis.go +++ b/database/3ds/get_friend_miis.go @@ -1,8 +1,6 @@ package database_3ds import ( - "time" - "github.com/PretendoNetwork/friends/database" "github.com/PretendoNetwork/nex-go" friends_3ds_types "github.com/PretendoNetwork/nex-protocols-go/friends-3ds/types" @@ -19,8 +17,7 @@ func GetFriendMiis(pids []uint32) ([]*friends_3ds_types.FriendMii, error) { return friendMiis, err } - changedTime := nex.NewDateTime(0) - changedTime.FromTimestamp(time.Now()) + changedTime := nex.NewDateTime(0).Now() for rows.Next() { var pid uint32 diff --git a/database/3ds/save_friendship.go b/database/3ds/save_friendship.go index 33c82c6..ffa7cd0 100644 --- a/database/3ds/save_friendship.go +++ b/database/3ds/save_friendship.go @@ -1,8 +1,6 @@ package database_3ds import ( - "time" - "github.com/PretendoNetwork/friends/database" "github.com/PretendoNetwork/nex-go" friends_3ds_types "github.com/PretendoNetwork/nex-protocols-go/friends-3ds/types" @@ -15,9 +13,6 @@ func SaveFriendship(senderPID uint32, recipientPID uint32) (*friends_3ds_types.F friendRelationship.LFC = 0 friendRelationship.RelationshipType = 0 // * Incomplete - nowTime := nex.NewDateTime(0) - nowTime.FromTimestamp(time.Now()) - // * Ensure that we inputted a valid user. var found bool err := database.Postgres.QueryRow(`SELECT COUNT(*) FROM "3ds".user_data WHERE pid=$1 LIMIT 1`, recipientPID).Scan(&found) @@ -47,7 +42,7 @@ func SaveFriendship(senderPID uint32, recipientPID uint32) (*friends_3ds_types.F return friendRelationship, nil } - acceptedTime := nex.NewDateTime(0).Now() + acceptedTime := nex.NewDateTime(0).Now().Value() // * We need to have two relationships for both sides as friend relationships are not one single object. _, err = database.Postgres.Exec(` diff --git a/database/3ds/update_user_comment.go b/database/3ds/update_user_comment.go index 7c3079f..e22ef6b 100644 --- a/database/3ds/update_user_comment.go +++ b/database/3ds/update_user_comment.go @@ -7,7 +7,7 @@ import ( // UpdateUserComment updates a user's comment func UpdateUserComment(pid uint32, message string) error { - changed := nex.NewDateTime(0).Now() + changed := nex.NewDateTime(0).Now().Value() _, err := database.Postgres.Exec(` INSERT INTO "3ds".user_data (pid, comment, comment_changed) diff --git a/database/3ds/update_user_mii.go b/database/3ds/update_user_mii.go index d65572b..9ed380b 100644 --- a/database/3ds/update_user_mii.go +++ b/database/3ds/update_user_mii.go @@ -15,7 +15,7 @@ func UpdateUserMii(pid uint32, mii *friends_3ds_types.Mii) error { DO UPDATE SET mii_name = $2, mii_data = $3, - mii_changed = $4`, pid, mii.Name, mii.MiiData, nex.NewDateTime(0).Now()) + mii_changed = $4`, pid, mii.Name, mii.MiiData, nex.NewDateTime(0).Now().Value()) if err != nil { return err 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 d0d5c9b..9d0075f 100644 --- a/database/wiiu/accept_friend_request_and_return_friend_info.go +++ b/database/wiiu/accept_friend_request_and_return_friend_info.go @@ -2,7 +2,6 @@ package database_wiiu import ( "database/sql" - "time" "github.com/PretendoNetwork/friends/database" "github.com/PretendoNetwork/friends/globals" @@ -25,8 +24,7 @@ func AcceptFriendRequestAndReturnFriendInfo(friendRequestID uint64) (*friends_wi } } - acceptedTime := nex.NewDateTime(0) - acceptedTime.FromTimestamp(time.Now()) + acceptedTime := nex.NewDateTime(0).Now() // * Friendships are two-way relationships, not just one link between 2 entities // * "A" has friend "B" and "B" has friend "A", so store both relationships @@ -69,8 +67,7 @@ func AcceptFriendRequestAndReturnFriendInfo(friendRequestID uint64) (*friends_wi friendInfo.NNAInfo = connectedUser.NNAInfo friendInfo.Presence = connectedUser.PresenceV2 - lastOnline = nex.NewDateTime(0) - lastOnline.FromTimestamp(time.Now()) + lastOnline = nex.NewDateTime(0).Now() } else { // * Offline userInfo, err := utility.GetUserInfoByPID(senderPID) diff --git a/database/wiiu/get_user_friend_list.go b/database/wiiu/get_user_friend_list.go index edab173..aaf3cd6 100644 --- a/database/wiiu/get_user_friend_list.go +++ b/database/wiiu/get_user_friend_list.go @@ -3,7 +3,6 @@ package database_wiiu import ( "database/sql" "fmt" - "time" "github.com/PretendoNetwork/friends/database" "github.com/PretendoNetwork/friends/globals" @@ -51,8 +50,7 @@ func GetUserFriendList(pid uint32) ([]*friends_wiiu_types.FriendInfo, error) { continue } - lastOnline = nex.NewDateTime(0) - lastOnline.FromTimestamp(time.Now()) + lastOnline = nex.NewDateTime(0).Now() } else { // * Offline diff --git a/database/wiiu/set_user_blocked.go b/database/wiiu/set_user_blocked.go index 67cdf33..fbb7282 100644 --- a/database/wiiu/set_user_blocked.go +++ b/database/wiiu/set_user_blocked.go @@ -1,16 +1,13 @@ package database_wiiu import ( - "time" - "github.com/PretendoNetwork/friends/database" "github.com/PretendoNetwork/nex-go" ) // SetUserBlocked marks a blocked PID as blocked on a bloker PID block list func SetUserBlocked(blockerPID uint32, blockedPID uint32, titleId uint64, titleVersion uint16) error { - date := nex.NewDateTime(0) - date.FromTimestamp(time.Now()) + date := nex.NewDateTime(0).Now() _, err := database.Postgres.Exec(` INSERT INTO wiiu.blocks (blocker_pid, blocked_pid, title_id, title_version, date)