+1 -1

files/nav.tmpl.html

reviewed

··· 9 9 <a {{ if eq .Title "user" }}style="font-weight: bold;"{{ end }} href="/{{ .Username }}">home</a> 10 10 | <a {{ if eq .Title "saves" }}style="font-weight: bold;"{{ end }} href="/saves">saves</a> 11 11 | <a {{ if eq .Title "finger" }}style="font-weight: bold;"{{ end }} href="/finger">finger</a> 12 12 - | <a {{ if eq .Title "settings" }}style="font-weight: bold;"{{ end }} href="/settings">settings</a> 12 12 + | <a {{ if eq .Title "feeds" }}style="font-weight: bold;"{{ end }} href="/feeds">feeds</a> 13 13 | <a href="/logout">logout</a> 14 14 {{ else }} 15 15 <a {{ if eq .Title "login" }}style="font-weight: bold;"{{ end }}href="/login">login/register</a>

+4 -4

files/settings.tmpl.html files/feeds.tmpl.html

reviewed

··· 1 1 - {{ define "settings" }} 1 1 + {{ define "feeds" }} 2 2 {{ template "head" . }} 3 3 {{ template "nav" . }} 4 4 - <h3>Settings</h3> 4 4 + <h3>Feeds</h3> 5 5 <p>your public homepage: <a href="/{{ .Username }}">vore.website/{{ .Username }}</a> 6 6 7 7 - {{ len .Data }} subscriptions: 7 7 + subscribed to {{ len .Data }} feeds: 8 8 </p> 9 9 - <form method="POST" action="/settings/submit"> 9 9 + <form method="POST" action="/feeds/submit"> 10 10 <textarea name="submit" rows="10" cols="50"> 11 11 {{ range .Data -}} 12 12 {{ .UpdateURL }}

+1 -1

files/user.tmpl.html

reviewed

··· 7 7 <p> 8 8 you don't seem to have any feeds yet. 9 9 10 10 - go to <a href="/settings">/settings</a> to add your first feed! 10 10 + go to <a href="/feeds">/feeds</a> to add your first feed! 11 11 </p> 12 12 {{ end }} 13 13 {{ end }}

+5 -5

main.go

reviewed

··· 14 14 http.HandleFunc("GET /static/{file}", s.staticHandler) 15 15 http.HandleFunc("GET /finger", s.fingerHandler) 16 16 http.HandleFunc("POST /finger", s.fingerHandler) 17 17 - http.HandleFunc("GET /settings", s.settingsHandler) 18 18 - http.HandleFunc("POST /settings/submit", s.settingsSubmitHandler) 17 17 + http.HandleFunc("GET /feeds", s.settingsHandler) 18 18 + http.HandleFunc("POST /feeds/submit", s.settingsSubmitHandler) 19 19 http.HandleFunc("GET /login", s.loginHandler) 20 20 http.HandleFunc("POST /login", s.loginHandler) 21 21 http.HandleFunc("GET /logout", s.logoutHandler) ··· 24 24 http.HandleFunc("GET /save/{url}", s.saveHandler) 25 25 http.HandleFunc("GET /feeds/{url}", s.feedDetailsHandler) 26 26 27 27 - // left in-place for backwards compat 28 28 - http.HandleFunc("GET /feeds", s.settingsHandler) 29 29 - http.HandleFunc("POST /feeds/submit", s.settingsSubmitHandler) 27 27 + // backwards compatibility redirect 28 28 + http.HandleFunc("GET /settings", s.settingsRedirectHandler) 29 29 + http.HandleFunc("POST /settings/submit", s.settingsSubmitRedirectHandler) 30 30 31 31 log.Println("main: listening on http://localhost:5544") 32 32 log.Fatal(http.ListenAndServe(":5544", nil))

+10 -2

site.go

reviewed

··· 207 207 208 208 var feeds []*rss.Feed 209 209 feeds = s.reaper.GetUserFeeds(s.username(r)) 210 210 - s.renderPage(w, r, "settings", feeds) 210 210 + s.renderPage(w, r, "feeds", feeds) 211 211 } 212 212 213 213 // TODO: show diff before submission (like tf plan) ··· 263 263 return 264 264 } 265 265 266 266 - http.Redirect(w, r, "/settings", http.StatusSeeOther) 266 266 + http.Redirect(w, r, "/feeds", http.StatusSeeOther) 267 267 } 268 268 269 269 func (s *Site) feedDetailsHandler(w http.ResponseWriter, r *http.Request) { ··· 566 566 } 567 567 log.Println(prefix + error) 568 568 http.Error(w, prefix+error, code) 569 569 + } 570 570 + 571 571 + func (s *Site) settingsRedirectHandler(w http.ResponseWriter, r *http.Request) { 572 572 + http.Redirect(w, r, "/feeds", http.StatusMovedPermanently) 573 573 + } 574 574 + 575 575 + func (s *Site) settingsSubmitRedirectHandler(w http.ResponseWriter, r *http.Request) { 576 576 + http.Redirect(w, r, "/feeds/submit", http.StatusMovedPermanently) 569 577 } 570 578 571 579 func (s *Site) randomCutePhrase() string {