support more time units

vilmibm · vilmibm · commit d7d575fccb02 · 2020-01-21T14:25:38.000-06:00
diff --git a/utils/utils.go b/utils/utils.go
@@ -92,16 +92,26 @@ func Pluralize(num int, thing string) string {
 	}
 }
 
+func fmtDuration(amount int, unit string) string {
+	return fmt.Sprintf("about %s ago", Pluralize(amount, unit))
+}
+
 func FuzzyAgo(ago time.Duration) string {
 	if ago < time.Minute {
 		return "less than a minute ago"
 	}
 	if ago < time.Hour {
-		return fmt.Sprintf("about %s ago", Pluralize(int(ago.Minutes()), "minute"))
+		return fmtDuration(int(ago.Minutes()), "minute")
 	}
 	if ago < 24*time.Hour {
-		return fmt.Sprintf("about %s ago", Pluralize(int(ago.Hours()), "hour"))
+		return fmtDuration(int(ago.Hours()), "hour")
+	}
+	if ago < 30*24*time.Hour {
+		return fmtDuration(int(ago.Hours())/24, "day")
+	}
+	if ago < 365*24*time.Hour {
+		return fmtDuration(int(ago.Hours())/24/30, "month")
 	}
 
-	return fmt.Sprintf("about %s ago", Pluralize(int(ago.Hours()/24), "day"))
+	return fmtDuration(int(ago.Hours()/24/365), "year")
 }
diff --git a/utils/utils_test.go b/utils/utils_test.go
@@ -8,15 +8,20 @@ import (
 func TestFuzzyAgo(t *testing.T) {
 
 	cases := map[string]string{
-		"1s":       "less than a minute ago",
-		"30s":      "less than a minute ago",
-		"1m08s":    "about 1 minute ago",
-		"15m0s":    "about 15 minutes ago",
-		"59m10s":   "about 59 minutes ago",
-		"1h10m02s": "about 1 hour ago",
-		"15h0m01s": "about 15 hours ago",
-		"30h10m":   "about 1 day ago",
-		"50h":      "about 2 days ago",
+		"1s":         "less than a minute ago",
+		"30s":        "less than a minute ago",
+		"1m08s":      "about 1 minute ago",
+		"15m0s":      "about 15 minutes ago",
+		"59m10s":     "about 59 minutes ago",
+		"1h10m02s":   "about 1 hour ago",
+		"15h0m01s":   "about 15 hours ago",
+		"30h10m":     "about 1 day ago",
+		"50h":        "about 2 days ago",
+		"720h05m":    "about 1 month ago",
+		"3000h10m":   "about 4 months ago",
+		"8760h59m":   "about 1 year ago",
+		"17601h59m":  "about 2 years ago",
+		"262800h19m": "about 30 years ago",
 	}
 
 	for duration, expected := range cases {

Original file line number	Diff line number	Diff line change
`@@ -92,16 +92,26 @@ func Pluralize(num int, thing string) string {`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`
	`95`	`+func fmtDuration(amount int, unit string) string {`
	`96`	`+ return fmt.Sprintf("about %s ago", Pluralize(amount, unit))`
	`97`	`+}`
	`98`	`+`
`95`	`99`	`func FuzzyAgo(ago time.Duration) string {`
`96`	`100`	`if ago < time.Minute {`
`97`	`101`	`return "less than a minute ago"`
`98`	`102`	`}`
`99`	`103`	`if ago < time.Hour {`
`100`		`- return fmt.Sprintf("about %s ago", Pluralize(int(ago.Minutes()), "minute"))`
	`104`	`+ return fmtDuration(int(ago.Minutes()), "minute")`
`101`	`105`	`}`
`102`	`106`	`if ago < 24*time.Hour {`
`103`		`- return fmt.Sprintf("about %s ago", Pluralize(int(ago.Hours()), "hour"))`
	`107`	`+ return fmtDuration(int(ago.Hours()), "hour")`
	`108`	`+ }`
	`109`	`+ if ago < 3024time.Hour {`
	`110`	`+ return fmtDuration(int(ago.Hours())/24, "day")`
	`111`	`+ }`
	`112`	`+ if ago < 36524time.Hour {`
	`113`	`+ return fmtDuration(int(ago.Hours())/24/30, "month")`
`104`	`114`	`}`
`105`	`115`
`106`		`- return fmt.Sprintf("about %s ago", Pluralize(int(ago.Hours()/24), "day"))`
	`116`	`+ return fmtDuration(int(ago.Hours()/24/365), "year")`
`107`	`117`	`}`