mirror of
https://github.com/ergochat/ergo.git
synced 2024-11-10 22:19:31 +01:00
time.Unix still requires normalization to UTC
This commit is contained in:
parent
8031085c26
commit
fab0630180
@ -560,7 +560,7 @@ func (am *AccountManager) loadLastSignoff(account string) (lastSignoff time.Time
|
|||||||
})
|
})
|
||||||
lsNum, err := strconv.ParseInt(lsText, 10, 64)
|
lsNum, err := strconv.ParseInt(lsText, 10, 64)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return time.Unix(0, lsNum)
|
return time.Unix(0, lsNum).UTC()
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -271,7 +271,7 @@ func (reg *ChannelRegistry) deleteChannel(tx *buntdb.Tx, key string, info Regist
|
|||||||
if err == nil {
|
if err == nil {
|
||||||
regTime, _ := tx.Get(fmt.Sprintf(keyChannelRegTime, key))
|
regTime, _ := tx.Get(fmt.Sprintf(keyChannelRegTime, key))
|
||||||
regTimeInt, _ := strconv.ParseInt(regTime, 10, 64)
|
regTimeInt, _ := strconv.ParseInt(regTime, 10, 64)
|
||||||
registeredAt := time.Unix(regTimeInt, 0)
|
registeredAt := time.Unix(regTimeInt, 0).UTC()
|
||||||
founder, _ := tx.Get(fmt.Sprintf(keyChannelFounder, key))
|
founder, _ := tx.Get(fmt.Sprintf(keyChannelFounder, key))
|
||||||
|
|
||||||
// to see if we're deleting the right channel, confirm the founder and the registration time
|
// to see if we're deleting the right channel, confirm the founder and the registration time
|
||||||
|
@ -9,9 +9,9 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func TestZncTimestampParser(t *testing.T) {
|
func TestZncTimestampParser(t *testing.T) {
|
||||||
assertEqual(zncWireTimeToTime("1558338348.988"), time.Unix(1558338348, 988000000), t)
|
assertEqual(zncWireTimeToTime("1558338348.988"), time.Unix(1558338348, 988000000).UTC(), t)
|
||||||
assertEqual(zncWireTimeToTime("1558338348.9"), time.Unix(1558338348, 900000000), t)
|
assertEqual(zncWireTimeToTime("1558338348.9"), time.Unix(1558338348, 900000000).UTC(), t)
|
||||||
assertEqual(zncWireTimeToTime("1558338348"), time.Unix(1558338348, 0), t)
|
assertEqual(zncWireTimeToTime("1558338348"), time.Unix(1558338348, 0).UTC(), t)
|
||||||
assertEqual(zncWireTimeToTime(".988"), time.Unix(0, 988000000), t)
|
assertEqual(zncWireTimeToTime(".988"), time.Unix(0, 988000000).UTC(), t)
|
||||||
assertEqual(zncWireTimeToTime("garbage"), time.Unix(0, 0), t)
|
assertEqual(zncWireTimeToTime("garbage"), time.Unix(0, 0).UTC(), t)
|
||||||
}
|
}
|
||||||
|
@ -405,7 +405,7 @@ func (mysql *MySQL) msgidToTime(msgid string) (result time.Time, err error) {
|
|||||||
if mysql.logError("could not resolve msgid to time", err) {
|
if mysql.logError("could not resolve msgid to time", err) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
result = time.Unix(0, nanotime)
|
result = time.Unix(0, nanotime).UTC()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -80,5 +80,5 @@ func (err *IncompatibleSchemaError) Error() string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func NanoToTimestamp(nanotime int64) string {
|
func NanoToTimestamp(nanotime int64) string {
|
||||||
return time.Unix(0, nanotime).Format(IRCv3TimestampFormat)
|
return time.Unix(0, nanotime).UTC().Format(IRCv3TimestampFormat)
|
||||||
}
|
}
|
||||||
|
@ -45,7 +45,7 @@ func zncWireTimeToTime(str string) (result time.Time) {
|
|||||||
}
|
}
|
||||||
seconds, _ := strconv.ParseInt(secondsPortion, 10, 64)
|
seconds, _ := strconv.ParseInt(secondsPortion, 10, 64)
|
||||||
fraction, _ := strconv.ParseFloat(fracPortion, 64)
|
fraction, _ := strconv.ParseFloat(fracPortion, 64)
|
||||||
return time.Unix(seconds, int64(fraction*1000000000))
|
return time.Unix(seconds, int64(fraction*1000000000)).UTC()
|
||||||
}
|
}
|
||||||
|
|
||||||
type zncPlaybackTimes struct {
|
type zncPlaybackTimes struct {
|
||||||
|
Loading…
Reference in New Issue
Block a user