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

Cleaner GCal code

Browse Source
This commit is contained in:
Chris Cummer 2018-04-09 17:36:43 -07:00 committed by Chris Cummer
parent 830c790081
commit 2ef5b9d7ed
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcal/client.go
View File

@ -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())
}

12
github/widget.go
View File

@ -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)
}
}