@@ -5,12 +5,12 @@ import (
5
5
"errors"
6
6
"fmt"
7
7
"log"
8
- "math"
9
8
"strconv"
10
9
"strings"
11
10
"time"
12
11
13
12
"github.com/maxence-charriere/go-app/v10/pkg/app"
13
+ d "github.com/rickb777/date/v2"
14
14
)
15
15
16
16
const (
@@ -594,24 +594,24 @@ func FormatFlushTime(timeStart time.Time, timeEnd time.Time) string {
594
594
0 ,
595
595
64 ,
596
596
)
597
+ dayNow := d .NewAt (time .Now ())
598
+ dayFlushed := d .NewAt (timeStart )
599
+ daysDiff := dayNow .Midnight ().Sub (dayFlushed .Midnight ()).Hours () / 24
597
600
durationPrefix := duration + " min, 📅 "
598
- hoursAgo := math .Ceil (time .Now ().Sub (timeStart ).Hours ())
599
- daysAgo := int (hoursAgo ) / 24
600
-
601
601
log .Println ("timeStart: " , timeStart )
602
602
log .Println ("timeEnd: " , timeEnd )
603
- log .Println ("DaysAgo : " , daysAgo )
604
- log .Println ("Hours ago : " , hoursAgo )
603
+ log .Println ("daysDiff : " , daysDiff )
604
+ log .Println ("daysDiff int : " , int ( daysDiff ) )
605
605
switch {
606
- case daysAgo <= 7 :
607
- dayStr := fmt .Sprintf ("%v days ago, " , daysAgo )
608
- if daysAgo == 0 {
606
+ case daysDiff <= 7 :
607
+ dayStr := fmt .Sprintf ("%v days ago, " , daysDiff )
608
+ if daysDiff == 0 {
609
609
dayStr = "today, "
610
610
}
611
- if daysAgo == 1 {
611
+ if daysDiff == 1 {
612
612
dayStr = "yesterday, "
613
613
}
614
- if daysAgo == 7 {
614
+ if daysDiff == 7 {
615
615
dayStr = "week ago, "
616
616
}
617
617
return durationPrefix + dayStr + timeStart .Format (
0 commit comments