From 2ef5b9d7ed0adfdd22226c048b7e7ef89cc8547d Mon Sep 17 00:00:00 2001
From: Chris Cummer <chriscummer@me.com>
Date: Mon, 9 Apr 2018 17:36:43 -0700
Subject: [PATCH] Cleaner GCal code

---
 gcal/client.go   |  8 ++------
 github/widget.go | 12 ++++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/gcal/client.go b/gcal/client.go
index bf7f080a..40c87a49 100644
--- a/gcal/client.go
+++ b/gcal/client.go
@@ -18,6 +18,7 @@ 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"
@@ -47,7 +48,7 @@ func Fetch() (*calendar.Events, error) {
 		return nil, err
 	}
 
-	t := today().Format(time.RFC3339)
+	t := wtf.Today().Format(time.RFC3339)
 	events, err := srv.Events.List("primary").ShowDeleted(false).SingleEvents(true).TimeMin(t).MaxResults(int64(Config.UInt("wtf.gcal.eventCount", 10))).OrderBy("startTime").Do()
 	if err != nil {
 		return nil, err
@@ -130,8 +131,3 @@ func saveToken(file string, token *oauth2.Token) {
 
 	json.NewEncoder(f).Encode(token)
 }
-
-func today() time.Time {
-	now := time.Now()
-	return time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
-}
diff --git a/github/widget.go b/github/widget.go
index 0a07603a..4e9f8ece 100644
--- a/github/widget.go
+++ b/github/widget.go
@@ -41,10 +41,10 @@ func (widget *Widget) Refresh() {
 	widget.RefreshedAt = time.Now()
 
 	str := " [red]Open Review Requests[white]\n"
-	str = str + widget.prsForReview(prs)
+	str = str + widget.prsForReview(prs, Config.UString("wtf.github.username"))
 	str = str + "\n"
 	str = str + " [red]Open Pull Requests[white]\n"
-	str = str + widget.openPRs(prs)
+	str = str + widget.openPRs(prs, Config.UString("wtf.github.username"))
 
 	widget.View.Clear()
 	fmt.Fprintf(widget.View, str)
@@ -64,13 +64,13 @@ func (widget *Widget) addView() {
 	widget.View = view
 }
 
-func (widget *Widget) prsForReview(prs []*ghb.PullRequest) string {
+func (widget *Widget) prsForReview(prs []*ghb.PullRequest, username string) string {
 	if len(prs) > 0 {
 		str := ""
 
 		for _, pr := range prs {
 			for _, reviewer := range pr.RequestedReviewers {
-				if *reviewer.Login == Config.UString("wtf.github.username") {
+				if *reviewer.Login == username {
 					str = str + fmt.Sprintf(" [green]%d[white] %s\n", *pr.Number, *pr.Title)
 				}
 			}
@@ -86,14 +86,14 @@ func (widget *Widget) prsForReview(prs []*ghb.PullRequest) string {
 	return " [grey]none[white]\n"
 }
 
-func (widget *Widget) openPRs(prs []*ghb.PullRequest) string {
+func (widget *Widget) openPRs(prs []*ghb.PullRequest, username string) string {
 	if len(prs) > 0 {
 		str := ""
 
 		for _, pr := range prs {
 			user := *pr.User
 
-			if *user.Login == Config.UString("wtf.github.username") {
+			if *user.Login == username {
 				str = str + fmt.Sprintf(" [green]%d[white] %s\n", *pr.Number, *pr.Title)
 			}
 		}