M docs/changelog.txt → docs/changelog.txt

@@ -2,6 +2,8 @@ changelog
 
 -- v
 
+++ A new xzone to view and import data not otherwise visible.
+
 ++ Preview before honking.
 
 + Misc UI touchups.
@@ -9,8 +11,6 @@
 + Read only support for qonks.
 
 ++ Some extra commands for better database retention management.
-
-+ Add a form to allow manual import of xonks.
 
 + About page.
 

M honk.go → honk.go

@@ -384,9 +384,23 @@ http.Redirect(w, r, "/t?c="+url.QueryEscape(convoy), http.StatusSeeOther)
 }
 
 func xzone(w http.ResponseWriter, r *http.Request) {
+	u := login.GetUserInfo(r)
+	var honkers []string
+	rows, err := stmtRecentHonkers.Query(u.UserID)
+	if err != nil {
+		log.Printf("query err: %s", err)
+		return
+	}
+	for rows.Next() {
+		var s string
+		rows.Scan(&s)
+		honkers = append(honkers, s)
+	}
+
 	templinfo := getInfo(r)
 	templinfo["XCSRF"] = login.GetCSRF("ximport", r)
-	err := readviews.Execute(w, r.URL.Path[1:]+".html", templinfo)
+	templinfo["Honkers"] = honkers
+	err = readviews.Execute(w, "xzone.html", templinfo)
 	if err != nil {
 		log.Print(err)
 	}
@@ -461,9 +475,15 @@ honkpage(w, r, u, user, honks, "")
 }
 
 func showhonker(w http.ResponseWriter, r *http.Request) {
+	u := login.GetUserInfo(r)
 	name := mux.Vars(r)["name"]
-	u := login.GetUserInfo(r)
-	honks := gethonksbyhonker(u.UserID, name)
+	var honks []*Honk
+	if name == "" {
+		name = r.FormValue("xid")
+		honks = gethonksbyxonker(u.UserID, name)
+	} else {
+		honks = gethonksbyhonker(u.UserID, name)
+	}
 	honkpage(w, r, u, nil, honks, "honks by honker: "+name)
 }
 
@@ -647,6 +667,10 @@ return getsomehonks(rows, err)
 }
 func gethonksbyhonker(userid int64, honker string) []*Honk {
 	rows, err := stmtHonksByHonker.Query(userid, honker, userid)
+	return getsomehonks(rows, err)
+}
+func gethonksbyxonker(userid int64, xonker string) []*Honk {
+	rows, err := stmtHonksByXonker.Query(userid, xonker, userid)
 	return getsomehonks(rows, err)
 }
 func gethonksbycombo(userid int64, combo string) []*Honk {
@@ -965,7 +989,7 @@ if !honk.Public {
 		whofore = 3
 	}
 	if r.FormValue("preview") == "preview" {
-		honks := []*Honk{ &honk }
+		honks := []*Honk{&honk}
 		reverbolate(honks)
 		templinfo := getInfo(r)
 		templinfo["HonkCSRF"] = login.GetCSRF("honkhonk", r)
@@ -1112,7 +1136,7 @@ var z Zonker
 		rows.Scan(&z.ID, &z.Name, &z.Wherefore)
 		zonkers = append(zonkers, z)
 	}
-	sort.Slice(zonkers, func (i, j int) bool {
+	sort.Slice(zonkers, func(i, j int) bool {
 		w1 := zonkers[i].Wherefore
 		w2 := zonkers[j].Wherefore
 		if w1 == w2 {
@@ -1370,6 +1394,7 @@ loggedin.Handle("/saveuser", login.CSRFWrap("saveuser", http.HandlerFunc(saveuser)))
 	loggedin.Handle("/ximport", login.CSRFWrap("ximport", http.HandlerFunc(ximport)))
 	loggedin.HandleFunc("/honkers", showhonkers)
 	loggedin.HandleFunc("/h/{name:[[:alnum:]]+}", showhonker)
+	loggedin.HandleFunc("/h", showhonker)
 	loggedin.HandleFunc("/c/{name:[[:alnum:]]+}", showcombo)
 	loggedin.HandleFunc("/c", showcombos)
 	loggedin.Handle("/savehonker", login.CSRFWrap("savehonker", http.HandlerFunc(savehonker)))
@@ -1398,12 +1423,12 @@ }
 
 var stmtHonkers, stmtDubbers, stmtSaveHonker, stmtUpdateFlavor, stmtUpdateCombos *sql.Stmt
 var stmtOneXonk, stmtPublicHonks, stmtUserHonks, stmtHonksByCombo, stmtHonksByConvoy *sql.Stmt
-var stmtHonksForUser, stmtHonksForMe, stmtSaveDub *sql.Stmt
+var stmtHonksForUser, stmtHonksForMe, stmtSaveDub, stmtHonksByXonker *sql.Stmt
 var stmtHonksByHonker, stmtSaveHonk, stmtFileData, stmtWhatAbout *sql.Stmt
 var stmtFindXonk, stmtSaveDonk, stmtFindFile, stmtSaveFile *sql.Stmt
 var stmtAddDoover, stmtGetDoovers, stmtLoadDoover, stmtZapDoover *sql.Stmt
 var stmtHasHonker, stmtThumbBiters, stmtZonkIt, stmtZonkDonks, stmtSaveZonker *sql.Stmt
-var stmtGetXonker, stmtSaveXonker *sql.Stmt
+var stmtRecentHonkers, stmtGetXonker, stmtSaveXonker *sql.Stmt
 
 func preparetodie(db *sql.DB, s string) *sql.Stmt {
 	stmt, err := db.Prepare(s)
@@ -1430,6 +1455,7 @@ stmtUserHonks = preparetodie(db, selecthonks+"where (whofore = 2 or whofore = ?) and username = ? and dt > ?"+limit)
 	stmtHonksForUser = preparetodie(db, selecthonks+"where honks.userid = ? and dt > ? and honker in (select xid from honkers where userid = ? and flavor = 'sub' and combos not like '% - %')"+butnotthose+limit)
 	stmtHonksForMe = preparetodie(db, selecthonks+"where honks.userid = ? and dt > ? and whofore = 1"+butnotthose+limit)
 	stmtHonksByHonker = preparetodie(db, selecthonks+"join honkers on honkers.xid = honks.honker where honks.userid = ? and honkers.name = ?"+butnotthose+limit)
+	stmtHonksByXonker = preparetodie(db, selecthonks+" where honks.userid = ? and honker = ?"+butnotthose+limit)
 	stmtHonksByCombo = preparetodie(db, selecthonks+"join honkers on honkers.xid = honks.honker where honks.userid = ? and honkers.combos like ?"+butnotthose+limit)
 	stmtHonksByConvoy = preparetodie(db, selecthonks+"where (honks.userid = ? or whofore = 2) and convoy = ?"+limit)
 
@@ -1451,6 +1477,7 @@ stmtThumbBiters = preparetodie(db, "select userid, name, wherefore from zonkers where (wherefore = 'zonker' or wherefore = 'zurl' or wherefore = 'zword')")
 	stmtSaveZonker = preparetodie(db, "insert into zonkers (userid, name, wherefore) values (?, ?, ?)")
 	stmtGetXonker = preparetodie(db, "select info from xonkers where name = ? and flavor = ?")
 	stmtSaveXonker = preparetodie(db, "insert into xonkers (name, info, flavor) values (?, ?, ?)")
+	stmtRecentHonkers = preparetodie(db, "select distinct(honker) from honks where userid = ? order by honkid desc limit 100")
 }
 
 func ElaborateUnitTests() {

M views/xzone.html → views/xzone.html

@@ -8,4 +8,9 @@ <p><input tabindex=1 type="text" name="xid" autocomplete=off> - xid
 <p><input tabindex=1 type="submit" name="fetch" value="fetch">
 </form>
 </div>
+{{ range .Honkers }}
+<section class="honk">
+<p><a href="/h?xid={{ . }}">honks</a> by {{ . }}
+</section>
+{{ end }}
 </main>