From cb901a727cfb06b0cdd00050714a647c44607313 Mon Sep 17 00:00:00 2001
From: Ted Unangst <tedu@tedunangst.com>
Date: Mon, 3 Jun 2019 00:22:00 -0400
Subject: [PATCH] split handle and username into two fields

---
 fun.go          | 10 ++++++----
 honk.go         |  1 +
 views/honk.html |  2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/fun.go b/fun.go
index 2991304..526ebfd 100644
--- a/fun.go
+++ b/fun.go
@@ -38,12 +38,14 @@ func reverbolate(honks []*Honk) {
 		if h.Whofore == 2 || h.Whofore == 3 {
 			h.URL = h.XID
 			h.Noise = mentionize(h.Noise)
+			h.Username, h.Handle = honkerhandle(h.Honker)
 		} else {
 			idx := strings.LastIndexByte(h.Honker, '/')
 			if idx != -1 {
-				h.Username = honkerhandle(h.Honker)
+				h.Username, h.Handle = honkerhandle(h.Honker)
 			} else {
 				h.Username = h.Honker
+				h.Handle = h.Honker
 			}
 			if h.URL == "" {
 				h.URL = h.XID
@@ -315,12 +317,12 @@ func originate(u string) string {
 	return ""
 }
 
-func honkerhandle(h string) string {
+func honkerhandle(h string) (string, string) {
 	m := re_unurl.FindStringSubmatch(h)
 	if len(m) > 2 {
-		return m[2]
+		return m[2], fmt.Sprintf("%s@%s", m[2], m[1])
 	}
-	return h
+	return "", h
 }
 
 func prepend(s string, x []string) []string {
diff --git a/honk.go b/honk.go
index e89bb5c..8ebeb89 100644
--- a/honk.go
+++ b/honk.go
@@ -54,6 +54,7 @@ type Honk struct {
 	Username string
 	What     string
 	Honker   string
+	Handle   string
 	Oonker   string
 	XID      string
 	RID      string
diff --git a/views/honk.html b/views/honk.html
index 20fdaef..1b2d4d7 100644
--- a/views/honk.html
+++ b/views/honk.html
@@ -54,7 +54,7 @@ convoy: <a href="/t?c={{ .Convoy }}">{{ .Convoy }}</a>
 {{ if .Honk.Public }}
 <button onclick="bonk(this, '{{ .Honk.XID }}'); return false;"><a href="/bonk">bonk</a></button>
 {{ end }}
-<button onclick="showhonkform('{{ .Honk.XID }}', '{{ .Honk.Username }}'); return false;"><a href="/newhonk">tonk</a></button>
+<button onclick="showhonkform('{{ .Honk.XID }}', '{{ .Honk.Handle }}'); return false;"><a href="/newhonk">tonk</a></button>
 <form class="inlineform" action="/zonkit" method="POST">
 <input type="hidden" name="CSRF" value="{{ .BonkCSRF }}">
 <input type="hidden" name="honk" value="{{ .Honk.XID }}">