3
0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-14 16:09:32 +01:00

Merge pull request #711 from slingamn/issue710

Fix #710
This commit is contained in:
Shivaram Lingamneni 2019-12-24 15:34:47 -05:00 committed by GitHub
commit f7569a92ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -786,7 +786,7 @@ func (am *AccountManager) LoadAccount(accountName string) (result ClientAccount,
func (am *AccountManager) deserializeRawAccount(raw rawClientAccount) (result ClientAccount, err error) { func (am *AccountManager) deserializeRawAccount(raw rawClientAccount) (result ClientAccount, err error) {
result.Name = raw.Name result.Name = raw.Name
regTimeInt, _ := strconv.ParseInt(raw.RegisteredAt, 10, 64) regTimeInt, _ := strconv.ParseInt(raw.RegisteredAt, 10, 64)
result.RegisteredAt = time.Unix(regTimeInt, 0) result.RegisteredAt = time.Unix(regTimeInt, 0).UTC()
e := json.Unmarshal([]byte(raw.Credentials), &result.Credentials) e := json.Unmarshal([]byte(raw.Credentials), &result.Credentials)
if e != nil { if e != nil {
am.server.logger.Error("internal", "could not unmarshal credentials", e.Error()) am.server.logger.Error("internal", "could not unmarshal credentials", e.Error())