From f88be139eb9e079f61ea7f234234c189cf0086e9 Mon Sep 17 00:00:00 2001 From: Blazico Date: Sun, 22 Mar 2026 10:32:36 +0100 Subject: [PATCH] Fixed login error --- database/login.go | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/database/login.go b/database/login.go index d7a6885..6be291d 100644 --- a/database/login.go +++ b/database/login.go @@ -76,8 +76,9 @@ func LoginUserToGPCM(pool *pgxpool.Pool, ctx context.Context, userId uint64, gsb } else { var firstName *string var lastName *string + var discordID *string - err := pool.QueryRow(ctx, GetUserProfileID, userId, gsbrcd).Scan(&user.ProfileId, &user.NgDeviceId, &user.Email, &user.UniqueNick, &firstName, &lastName, &user.OpenHost, &lastIPAddress) + err := pool.QueryRow(ctx, GetUserProfileID, userId, gsbrcd).Scan(&user.ProfileId, &user.NgDeviceId, &user.Email, &user.UniqueNick, &firstName, &lastName, &user.OpenHost, &discordID, &lastIPAddress) if err != nil { return User{}, err } @@ -90,6 +91,11 @@ func LoginUserToGPCM(pool *pgxpool.Pool, ctx context.Context, userId uint64, gsb user.LastName = *lastName } + if discordID != nil { + user.DiscordID = *discordID + user.LinkStage = LS_FINISHED + } + validDeviceId := false deviceIdList := "" for index, id := range user.NgDeviceId { @@ -226,7 +232,8 @@ func LoginUserToGameStats(pool *pgxpool.Pool, ctx context.Context, userId uint64 var firstName *string var lastName *string var lastIPAddress *string - err := pool.QueryRow(ctx, GetUserProfileID, userId, gsbrcd).Scan(&user.ProfileId, &user.NgDeviceId, &user.Email, &user.UniqueNick, &firstName, &lastName, &user.OpenHost, &lastIPAddress) + var discordID *string + err := pool.QueryRow(ctx, GetUserProfileID, userId, gsbrcd).Scan(&user.ProfileId, &user.NgDeviceId, &user.Email, &user.UniqueNick, &firstName, &lastName, &user.OpenHost, &discordID, &lastIPAddress) if err != nil { return User{}, err } @@ -239,5 +246,10 @@ func LoginUserToGameStats(pool *pgxpool.Pool, ctx context.Context, userId uint64 user.LastName = *lastName } + if discordID != nil { + user.DiscordID = *discordID + user.LinkStage = LS_FINISHED + } + return user, nil }