From 6076808838e7472d2602634070c270c4008c2805 Mon Sep 17 00:00:00 2001 From: Ian Gulliver Date: Tue, 3 Dec 2024 21:38:13 -0800 Subject: [PATCH] Single bookmarklet --- main.go | 14 ++++++++------ static/help.html | 28 ++-------------------------- 2 files changed, 10 insertions(+), 32 deletions(-) diff --git a/main.go b/main.go index 4d3bf4f..6fe17ee 100644 --- a/main.go +++ b/main.go @@ -69,6 +69,7 @@ func NewShortLinks(db *sql.DB, domainAliases map[string]string, writableDomains } sl.mux.HandleFunc("GET /{$}", sl.serveRoot) + sl.mux.HandleFunc("GET /_help", sl.serveHelp) sl.mux.HandleFunc("GET /{short}", sl.serveShort) sl.mux.HandleFunc("POST /{$}", sl.serveSet) sl.mux.HandleFunc("QUERY /{$}", sl.serveSuggest) @@ -136,11 +137,6 @@ func (sl *ShortLinks) serveShort(w http.ResponseWriter, r *http.Request) { short := r.PathValue("short") - if sl.isWritable(r.Host) && short == "_help" { - sl.serveHelp(w, r) - return - } - long, err := sl.getLong(short, sl.getDomain(r.Host)) if err != nil { sl.serveRootWithPath(w, r, short) @@ -236,12 +232,18 @@ func (sl *ShortLinks) serveSuggest(w http.ResponseWriter, r *http.Request) { } func (sl *ShortLinks) serveHelp(w http.ResponseWriter, r *http.Request) { + err := sl.initRequest(w, r) + if err != nil { + sendError(w, http.StatusBadRequest, "init request: %s", err) + return + } + if !sl.isWritable(r.Host) { sendError(w, http.StatusNotFound, "not found") return } - err := sl.help.Execute(w, map[string]any{ + err = sl.help.Execute(w, map[string]any{ "writeHost": r.Host, "readHost": sl.getDomain(r.Host), }) diff --git a/static/help.html b/static/help.html index 475da04..709d64c 100644 --- a/static/help.html +++ b/static/help.html @@ -201,31 +201,7 @@ a { - Drag links to bookmark bar: -
-
- - - {{ .readHost }} (Copy) - + Drag link to bookmark bar:

@@ -235,7 +211,7 @@ a { params.set('long', location.href); window.open(`https://{{ .writeHost }}/?${params.toString()}`); - })();">{{ .readHost }} (Custom) + })();">{{ .readHost }}