From ef845b2a2c31f72e2d33b9608afdd6f6599f98c0 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Tue, 26 Nov 2019 10:35:10 +0000 Subject: [PATCH] Add support for [^\n] meme files & hgignore Should be done in separated commits but my mercurial-fu is bad. --- .hgignore | 4 ++++ fun.go | 2 +- web.go | 18 ++++++++++++++---- 3 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 .hgignore diff --git a/.hgignore b/.hgignore new file mode 100644 index 0000000..b5de9ba --- /dev/null +++ b/.hgignore @@ -0,0 +1,4 @@ +.*\.db +memes +emus +honk diff --git a/fun.go b/fun.go index 34a3c8e..6e54cba 100644 --- a/fun.go +++ b/fun.go @@ -340,7 +340,7 @@ func herdofemus(noise string) []Emu { return emus } -var re_memes = regexp.MustCompile("meme: ?([[:alnum:]_.-]+)") +var re_memes = regexp.MustCompile("meme: ?([^\n]+)") func memetize(honk *Honk) { repl := func(x string) string { diff --git a/web.go b/web.go index 60df542..5282d18 100644 --- a/web.go +++ b/web.go @@ -2026,13 +2026,23 @@ func servehtml(w http.ResponseWriter, r *http.Request) { } func serveemu(w http.ResponseWriter, r *http.Request) { xid := mux.Vars(r)["xid"] + emu, err := url.QueryUnescape(xid) + if err != nil { + log.Print(err) + } + w.Header().Set("Cache-Control", "max-age="+somedays()) - http.ServeFile(w, r, dataDir+"/emus/"+xid) + http.ServeFile(w, r, dataDir+"/emus/"+emu) } func servememe(w http.ResponseWriter, r *http.Request) { xid := mux.Vars(r)["xid"] + meme, err := url.QueryUnescape(xid) + if err != nil { + log.Print(err) + } + w.Header().Set("Cache-Control", "max-age="+somedays()) - http.ServeFile(w, r, dataDir+"/memes/"+xid) + http.ServeFile(w, r, dataDir+"/memes/"+meme) } func servefile(w http.ResponseWriter, r *http.Request) { @@ -2279,8 +2289,8 @@ func serve() { getters.HandleFunc("/o", thelistingoftheontologies) getters.HandleFunc("/o/{name:.+}", showontology) getters.HandleFunc("/d/{xid:[[:alnum:].]+}", servefile) - getters.HandleFunc("/emu/{xid:[[:alnum:]_.-]+}", serveemu) - getters.HandleFunc("/meme/{xid:[[:alnum:]_.-]+}", servememe) + getters.HandleFunc("/emu/{xid:.+}", serveemu) + getters.HandleFunc("/meme/{xid:.+}", servememe) getters.HandleFunc("/.well-known/webfinger", fingerlicker) getters.HandleFunc("/server", serveractor)