From d1726c65be956ce0d910612442d176f96c3afac6 Mon Sep 17 00:00:00 2001 From: Opaque02 <66582645+Opaque02@users.noreply.github.com> Date: Mon, 28 Oct 2024 10:48:08 +1000 Subject: [PATCH 1/3] Made changes to server to allow admin panel to retrieve last activity instead of last logged in date --- db/account.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/db/account.go b/db/account.go index 3ee9633..2b88beb 100644 --- a/db/account.go +++ b/db/account.go @@ -203,15 +203,15 @@ type AdminSearchResponse struct { Username string `json:"username"` DiscordId string `json:"discordId"` GoogleId string `json:"googleId"` - LastLoggedIn string `json:"lastLoggedIn"` + LastActivity string `json:"lastLoggedIn"` Registered string `json:"registered"` } func FetchAdminDetailsByUsername(dbUsername string) (AdminSearchResponse, error) { - var resultUsername, resultDiscordId, resultGoogleId, resultLastLoggedIn, resultRegistered sql.NullString + var resultUsername, resultDiscordId, resultGoogleId, resultLastActivity, resultRegistered sql.NullString var adminResponse AdminSearchResponse - err := handle.QueryRow("SELECT username, discordId, googleId, lastLoggedIn, registered from accounts WHERE username = ?", dbUsername).Scan(&resultUsername, &resultDiscordId, &resultGoogleId, &resultLastLoggedIn, &resultRegistered) + err := handle.QueryRow("SELECT username, discordId, googleId, lastActivity, registered from accounts WHERE username = ?", dbUsername).Scan(&resultUsername, &resultDiscordId, &resultGoogleId, &resultLastActivity, &resultRegistered) if err != nil { return adminResponse, err } @@ -220,7 +220,7 @@ func FetchAdminDetailsByUsername(dbUsername string) (AdminSearchResponse, error) Username: resultUsername.String, DiscordId: resultDiscordId.String, GoogleId: resultGoogleId.String, - LastLoggedIn: resultLastLoggedIn.String, + LastActivity: resultLastActivity.String, Registered: resultRegistered.String, } From bfa33432764274798e55327c1051dfab55c20083 Mon Sep 17 00:00:00 2001 From: Opaque02 <66582645+Opaque02@users.noreply.github.com> Date: Mon, 28 Oct 2024 11:05:24 +1000 Subject: [PATCH 2/3] Added TODO comment for lastLoggedIn json result --- db/account.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/account.go b/db/account.go index 2b88beb..bc4fb5e 100644 --- a/db/account.go +++ b/db/account.go @@ -203,7 +203,7 @@ type AdminSearchResponse struct { Username string `json:"username"` DiscordId string `json:"discordId"` GoogleId string `json:"googleId"` - LastActivity string `json:"lastLoggedIn"` + LastActivity string `json:"lastLoggedIn"` // TODO: this is currently lastLoggedIn to match server PR #54 with pokerogue PR #4198. We're hotfixing the server with this PR to return lastActivity, but we're not hotfixing the client, so are leaving this as lastLoggedIn so that it still talks to the client properly Registered string `json:"registered"` } From 72a02fdacafba815ea3532a576a4bc495b15e3d6 Mon Sep 17 00:00:00 2001 From: Opaque02 <66582645+Opaque02@users.noreply.github.com> Date: Mon, 28 Oct 2024 11:13:40 +1000 Subject: [PATCH 3/3] Updated variable names as per Pancake's comments --- db/account.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/db/account.go b/db/account.go index bc4fb5e..b04da77 100644 --- a/db/account.go +++ b/db/account.go @@ -208,20 +208,20 @@ type AdminSearchResponse struct { } func FetchAdminDetailsByUsername(dbUsername string) (AdminSearchResponse, error) { - var resultUsername, resultDiscordId, resultGoogleId, resultLastActivity, resultRegistered sql.NullString + var username, discordId, googleId, lastActivity, registered sql.NullString var adminResponse AdminSearchResponse - err := handle.QueryRow("SELECT username, discordId, googleId, lastActivity, registered from accounts WHERE username = ?", dbUsername).Scan(&resultUsername, &resultDiscordId, &resultGoogleId, &resultLastActivity, &resultRegistered) + err := handle.QueryRow("SELECT username, discordId, googleId, lastActivity, registered from accounts WHERE username = ?", dbUsername).Scan(&username, &discordId, &googleId, &lastActivity, ®istered) if err != nil { return adminResponse, err } adminResponse = AdminSearchResponse{ - Username: resultUsername.String, - DiscordId: resultDiscordId.String, - GoogleId: resultGoogleId.String, - LastActivity: resultLastActivity.String, - Registered: resultRegistered.String, + Username: username.String, + DiscordId: discordId.String, + GoogleId: googleId.String, + LastActivity: lastActivity.String, + Registered: registered.String, } return adminResponse, nil