diff --git a/golink.go b/golink.go index 298eb86..3371822 100644 --- a/golink.go +++ b/golink.go @@ -264,6 +264,7 @@ var ( type visitData struct { Short string + Long string NumClicks int } @@ -404,10 +405,21 @@ func serveHandler() http.Handler { func serveHome(w http.ResponseWriter, r *http.Request, short string) { var clicks []visitData + linkMap := map[string]string{} + links, err := db.LoadAll() + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + for _, link := range links { + linkMap[link.Short] = link.Long + } + stats.mu.Lock() for short, numClicks := range stats.clicks { clicks = append(clicks, visitData{ Short: short, + Long: linkMap[short], NumClicks: numClicks, }) } diff --git a/tmpl/home.html b/tmpl/home.html index 64e2267..a28e0a8 100644 --- a/tmpl/home.html +++ b/tmpl/home.html @@ -23,6 +23,7 @@