sjs/retrogit
1
0
Fork 0
mirror of https://github.com/samsonjs/retrogit.git synced 2026-04-04 11:05:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't send digest emails if empty.

Browse source
This commit is contained in:
Mihai Parparita 2014-08-05 22:34:21 -07:00
parent 8273cb18bb
commit ce4ef11042
2 changed files with 31 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/digest.go
View file

@ -10,8 +10,9 @@ import (
)
const (
DisplayDateFormat = "3:04pm"
DisplayDateTooltipFormat = "Monday January 2 3:04pm"
CommitDisplayDateFormat = "3:04pm"
CommitDisplayDateTooltipFormat = "Monday January 2 3:04pm"
DigestDisplayDateFormat = "January 2, 2006 was a Monday"
)
type DigestCommit struct {
@ -45,15 +46,15 @@ func newDigestCommit(commit *github.RepositoryCommit, repo *github.Repository, l
func (commit DigestCommit) DisplayDate() string {
// Prefer the date the comit was pushed, since that's what GitHub filters
// and sorts by.
return commit.PushDate.Format(DisplayDateFormat)
return commit.PushDate.Format(CommitDisplayDateFormat)
}
func (commit DigestCommit) DisplayDateTooltip() string {
// But show the full details in a tooltip
return fmt.Sprintf(
"Pushed at %s\nCommited at %s",
commit.PushDate.Format(DisplayDateTooltipFormat),
commit.CommitDate.Format(DisplayDateTooltipFormat))
commit.PushDate.Format(CommitDisplayDateTooltipFormat),
commit.CommitDate.Format(CommitDisplayDateTooltipFormat))
}
type RepoDigest struct {
@ -170,6 +171,15 @@ func (digest *Digest) fetch(repos []github.Repository, githubClient *github.Clie
return nil
}
func (digest *Digest) DisplayDate() string {
return digest.StartTime.Format("January 2, 2006 was a Monday")
func (digest *Digest) Empty() bool {
for _, repoDigest := range digest.RepoDigests {
if len(repoDigest.Commits) > 0 {
return false
}
}
return true
}
func (digest *Digest) DisplayDate() string {
return digest.StartTime.Format(DigestDisplayDateFormat)
}

23
app/githop.go
View file

@ -133,7 +133,7 @@ func sendDigestHandler(w http.ResponseWriter, r *http.Request) {
return
}
err = sendDigestForAccount(account, c)
_, err = sendDigestForAccount(account, c)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
@ -149,24 +149,29 @@ func digestCronHandler(w http.ResponseWriter, r *http.Request) {
getAllAccounts(c, &accounts)
for _, account := range accounts {
c.Infof("Sending digest for %d...", account.GitHubUserId)
err := sendDigestForAccount(&account, c)
sent, err := sendDigestForAccount(&account, c)
if err != nil {
c.Errorf(" Error: %s", err.Error())
} else {
} else if sent {
c.Infof(" Sent!")
} else {
c.Infof(" Not sent, digest was empty")
}
}
fmt.Fprint(w, "Done")
}
func sendDigestForAccount(account *Account, c appengine.Context) error {
func sendDigestForAccount(account *Account, c appengine.Context) (bool, error) {
oauthTransport := githubOAuthTransport(c)
oauthTransport.Token = &account.OAuthToken
githubClient := github.NewClient(oauthTransport.Client())
digest, err := newDigest(githubClient, account)
if err != nil {
return err
return false, err
}
if digest.Empty() {
return false, nil
}
var digestHtml bytes.Buffer
@ -174,13 +179,13 @@ func sendDigestForAccount(account *Account, c appengine.Context) error {
digestHtml.Write(getDigestStyles())
digestHtml.WriteString("</style></head><body>")
if err := templates.ExecuteTemplate(&digestHtml, "digest", digest); err != nil {
return err
return false, err
}
digestHtml.WriteString("</body></html>")
emails, _, err := githubClient.Users.ListEmails(nil)
if err != nil {
return err
return false, err
}
var primaryVerified *string
for _, email := range emails {
@ -191,7 +196,7 @@ func sendDigestForAccount(account *Account, c appengine.Context) error {
}
}
if primaryVerified == nil {
return errors.New("No verified email addresses found in GitHub account")
return false, errors.New("No verified email addresses found in GitHub account")
}
digestMessage := &mail.Message{
@ -201,7 +206,7 @@ func sendDigestForAccount(account *Account, c appengine.Context) error {
HTMLBody: digestHtml.String(),
}
err = mail.Send(c, digestMessage)
return err
return true, err
}
func getDigestStyles() []byte {