peter/ekster
1
0
Fork 0
Code Issues 3 Pull Requests Projects 3 Releases 1 Wiki Activity

Fix when you're in a channel

Browse Source
This commit is contained in:
Peter Stuifzand 2018-09-15 17:32:17 +02:00
parent 79c44a5b0b
commit 4829ce0192
Signed by: peter
GPG Key ID: 374322D56E5209E8
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/ek/main.go
View File

@ -27,11 +27,13 @@ import (
"os" "os"
"time" "time"
"github.com/gilliek/go-opml/opml"
"p83.nl/go/ekster/pkg/client" "p83.nl/go/ekster/pkg/client"
"p83.nl/go/ekster/pkg/indieauth" "p83.nl/go/ekster/pkg/indieauth"
"p83.nl/go/ekster/pkg/microsub" "p83.nl/go/ekster/pkg/microsub"
"p83.nl/go/ekster/pkg/server" "p83.nl/go/ekster/pkg/server"
"github.com/GeertJohan/go.rice"
"github.com/gilliek/go-opml/opml"
) )
const ( const (
@ -389,7 +391,10 @@ func performCommands(sub microsub.Microsub, commands []string) {
port := 8092 port := 8092
log.Printf("Listening on port %d\n", port) log.Printf("Listening on port %d\n", port)
http.Handle("/microsub", http.StripPrefix("/microsub", handler)) http.Handle("/microsub", http.StripPrefix("/microsub", handler))
http.Handle("/", http.FileServer(http.Dir("http-files"))) box := rice.MustFindBox("http-files")
http.Handle("/css/", http.FileServer(box.HTTPBox()))
http.Handle("/js/", http.FileServer(box.HTTPBox()))
http.Handle("/", AlwaysIndex(http.FileServer(box.HTTPBox())))
log.Fatal(http.ListenAndServe(fmt.Sprintf(":%d", port), nil)) log.Fatal(http.ListenAndServe(fmt.Sprintf(":%d", port), nil))
} }
@ -398,6 +403,13 @@ func performCommands(sub microsub.Microsub, commands []string) {
} }
} }
func AlwaysIndex(handler http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
r.URL.Path = "/"
handler.ServeHTTP(w, r)
})
}
func exportOpmlFromMicrosub(sub microsub.Microsub) { func exportOpmlFromMicrosub(sub microsub.Microsub) {
output := opml.OPML{} output := opml.OPML{}
output.Head.Title = "Microsub channels and feeds" output.Head.Title = "Microsub channels and feeds"