taigrr/wtf
1
0
Fork 0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00
Code Issues Projects Releases Wiki Activity

Differentiate between right now Now() and today from midnight

Browse Source
This commit is contained in:
Chris Cummer
2018-04-10 12:42:28 -07:00
committed by Chris Cummer
parent 27a267b123
commit 34b5b69231
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gcal/client.go
View File

@@ -18,7 +18,6 @@ import (
"time"
"github.com/senorprogrammer/wtf/homedir"
"github.com/senorprogrammer/wtf/wtf"
"golang.org/x/net/context"
"golang.org/x/oauth2"
"golang.org/x/oauth2/google"
@@ -48,7 +47,7 @@ func Fetch() (*calendar.Events, error) {
return nil, err
}
t := wtf.Today().Format(time.RFC3339)
t := fromMidnight().Format(time.RFC3339)
events, err := srv.Events.List("primary").ShowDeleted(false).SingleEvents(true).TimeMin(t).MaxResults(int64(Config.UInt("wtf.mods.gcal.eventCount", 10))).OrderBy("startTime").Do()
if err != nil {
return nil, err
@@ -93,6 +92,11 @@ func getTokenFromWeb(config *oauth2.Config) *oauth2.Token {
return tok
}
func fromMidnight() time.Time {
now := time.Now()
return time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
}
// tokenCacheFile generates credential file path/filename.
// It returns the generated credential path/filename.
func tokenCacheFile() (string, error) {