mirror of
https://github.com/samsonjs/retrogit.git
synced 2026-04-27 15:07:43 +00:00
Add option to disable emails.
This commit is contained in:
parent
543552ae6b
commit
905f667a1e
3 changed files with 32 additions and 14 deletions
|
|
@ -295,13 +295,17 @@ func sendDigestHandler(w http.ResponseWriter, r *http.Request) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
_, err = sendDigestForAccount(account, c)
|
sent, err := sendDigestForAccount(account, c)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
session.AddFlash("Digest emailed!")
|
if sent {
|
||||||
|
session.AddFlash("Digest emailed!")
|
||||||
|
} else {
|
||||||
|
session.AddFlash("No digest was sent, it was empty or disabled.")
|
||||||
|
}
|
||||||
session.Save(r, w)
|
session.Save(r, w)
|
||||||
indexUrl, _ := router.Get("index").URL()
|
indexUrl, _ := router.Get("index").URL()
|
||||||
http.Redirect(w, r, indexUrl.String(), http.StatusFound)
|
http.Redirect(w, r, indexUrl.String(), http.StatusFound)
|
||||||
|
|
@ -355,6 +359,14 @@ func sendDigestForAccount(account *Account, c appengine.Context) (bool, error) {
|
||||||
oauthTransport.Token = &account.OAuthToken
|
oauthTransport.Token = &account.OAuthToken
|
||||||
githubClient := github.NewClient(oauthTransport.Client())
|
githubClient := github.NewClient(oauthTransport.Client())
|
||||||
|
|
||||||
|
emailAddress, err := account.GetDigestEmailAddress(githubClient)
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
if emailAddress == "disabled" {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
|
||||||
digest, err := newDigest(c, githubClient, account)
|
digest, err := newDigest(c, githubClient, account)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return false, err
|
return false, err
|
||||||
|
|
@ -371,11 +383,6 @@ func sendDigestForAccount(account *Account, c appengine.Context) (bool, error) {
|
||||||
return false, err
|
return false, err
|
||||||
}
|
}
|
||||||
|
|
||||||
emailAddress, err := account.GetDigestEmailAddress(githubClient)
|
|
||||||
if err != nil {
|
|
||||||
return false, err
|
|
||||||
}
|
|
||||||
|
|
||||||
digestMessage := &mail.Message{
|
digestMessage := &mail.Message{
|
||||||
Sender: "RetroGit <digests@retrogit.com>",
|
Sender: "RetroGit <digests@retrogit.com>",
|
||||||
To: []string{emailAddress},
|
To: []string{emailAddress},
|
||||||
|
|
|
||||||
|
|
@ -10,24 +10,33 @@
|
||||||
You're signed in as
|
You're signed in as
|
||||||
{{template "user" .User}}
|
{{template "user" .User}}
|
||||||
(<form class="inline" method="POST" action="{{routeUrl "sign-out"}}"><input type="submit" class="inline" value="sign out"></form>).
|
(<form class="inline" method="POST" action="{{routeUrl "sign-out"}}"><input type="submit" class="inline" value="sign out"></form>).
|
||||||
You'll be getting a {{.SettingsSummary.Frequency}} digest of your past
|
{{if eq .SettingsSummary.EmailAddress "disabled"}}
|
||||||
GitHub activity in {{.SettingsSummary.RepositoryCount}} repositories sent to
|
You've disabled emails, but you can still view your digest for your
|
||||||
<code>{{.SettingsSummary.EmailAddress}}</code>
|
GitHub activity in {{.SettingsSummary.RepositoryCount}} repositories below
|
||||||
|
{{else}}
|
||||||
|
You'll be getting a {{.SettingsSummary.Frequency}} digest of your past
|
||||||
|
GitHub activity in {{.SettingsSummary.RepositoryCount}} repositories sent to
|
||||||
|
<code>{{.SettingsSummary.EmailAddress}}</code>
|
||||||
|
{{end}}
|
||||||
(<a href="{{routeUrl "settings"}}">change settings</a>).
|
(<a href="{{routeUrl "settings"}}">change settings</a>).
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{{if ne .SettingsSummary.EmailAddress "disabled"}}
|
||||||
<div class="blurb">
|
<div class="blurb">
|
||||||
If you just can't wait, you can get your digest now:
|
If you just can't wait, you can get your digest now:
|
||||||
</div>
|
</div>
|
||||||
|
{{end}}
|
||||||
|
|
||||||
<div id="primary-actions">
|
<div id="primary-actions">
|
||||||
<form class="inline" method="GET" action="{{routeUrl "view-digest"}}">
|
<form class="inline" method="GET" action="{{routeUrl "view-digest"}}">
|
||||||
<input type="submit" class="action-button" value="View Digest">
|
<input type="submit" class="action-button" value="View Digest">
|
||||||
</form>
|
</form>
|
||||||
or
|
{{if ne .SettingsSummary.EmailAddress "disabled"}}
|
||||||
<form class="inline" method="POST" action="{{routeUrl "send-digest"}}">
|
or
|
||||||
<input type="submit" class="action-button" value="Email Digest">
|
<form class="inline" method="POST" action="{{routeUrl "send-digest"}}">
|
||||||
</form>
|
<input type="submit" class="action-button" value="Email Digest">
|
||||||
|
</form>
|
||||||
|
{{end}}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{{if .DetectTimezone }}
|
{{if .DetectTimezone }}
|
||||||
|
|
|
||||||
|
|
@ -69,6 +69,8 @@
|
||||||
{{range .EmailAddresses}}
|
{{range .EmailAddresses}}
|
||||||
<option value="{{.}}" {{if eq . $accountEmailAddress}}selected{{end}}>{{.}}</option>
|
<option value="{{.}}" {{if eq . $accountEmailAddress}}selected{{end}}>{{.}}</option>
|
||||||
{{end}}
|
{{end}}
|
||||||
|
<option disabled></option>
|
||||||
|
<option value="disabled" {{if eq "disabled" $accountEmailAddress}}selected{{end}}>Disabled (no email)</option>
|
||||||
</select>
|
</select>
|
||||||
</label>
|
</label>
|
||||||
<div class="explanation">
|
<div class="explanation">
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue