mirror of
https://github.com/WiiLink24/wfc-server.git
synced 2026-08-23 17:14:26 -05:00
Fixed login error
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user