mirror of
https://git.phreedom.club/localhost_frssoft/bloat.git
synced 2024-11-22 03:51:28 +00:00
Fix duration overflow
time.Sub() returns int64 duration in nanoseconds, which can only represent around 290 years.
This commit is contained in:
parent
2d49ff9fb4
commit
2a01471621
|
@ -73,16 +73,15 @@ func displayInteractionCount(c int64) string {
|
|||
return ""
|
||||
}
|
||||
|
||||
func DurToStr(dur time.Duration) string {
|
||||
s := dur.Seconds()
|
||||
func durToStr(s int64) string {
|
||||
if s < 60 {
|
||||
return strconv.Itoa(int(s)) + "s"
|
||||
}
|
||||
m := dur.Minutes()
|
||||
m := s / 60
|
||||
if m < 60*2 {
|
||||
return strconv.Itoa(int(m)) + "m"
|
||||
}
|
||||
h := dur.Hours()
|
||||
h := m / 60
|
||||
if h < 24*2 {
|
||||
return strconv.Itoa(int(h)) + "h"
|
||||
}
|
||||
|
@ -94,24 +93,24 @@ func DurToStr(dur time.Duration) string {
|
|||
if mo < 12*2 {
|
||||
return strconv.Itoa(int(mo)) + "mo"
|
||||
}
|
||||
y := mo / 12
|
||||
y := d / 365
|
||||
return strconv.Itoa(int(y)) + "y"
|
||||
}
|
||||
|
||||
func timeSince(t time.Time) string {
|
||||
d := time.Since(t)
|
||||
d := time.Now().Unix() - t.Unix()
|
||||
if d < 0 {
|
||||
d = 0
|
||||
}
|
||||
return DurToStr(d)
|
||||
return durToStr(d)
|
||||
}
|
||||
|
||||
func timeUntil(t time.Time) string {
|
||||
d := time.Until(t)
|
||||
d := t.Unix() - time.Now().Unix()
|
||||
if d < 0 {
|
||||
d = 0
|
||||
}
|
||||
return DurToStr(d)
|
||||
return durToStr(d)
|
||||
}
|
||||
|
||||
func formatTimeRFC3339(t time.Time) string {
|
||||
|
|
Loading…
Reference in a new issue