From 0f6b601be42f1b6259ce7a92d026629b425ace7c Mon Sep 17 00:00:00 2001
From: MichaelOultram <MichaelOultram@users.noreply.github.com>
Date: Tue, 28 Jul 2015 16:52:53 +0100
Subject: [PATCH] Fixing build issues

---
 web.go | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/web.go b/web.go
index 5a1887a..68e8e4f 100644
--- a/web.go
+++ b/web.go
@@ -3,12 +3,15 @@ package main
 import (
 	"fmt"
 	"io/ioutil"
+	"math/rand"
 	"net/http"
+	"strings"
 
 	"github.com/layeh/gumble/gumble"
 )
 
 var client_token = new(map[string]string)
+var token_client = new(map[string]string)
 var external_ip = ""
 
 type Page struct {
@@ -31,16 +34,27 @@ func loadPage(title string) (*Page, error) {
 }
 
 func handler(w http.ResponseWriter, r *http.Request) {
-	fmt.Fprintf(w, "Hi there, I love %s!", r.URL.Path[1:])
+	var uname = token_client[r.URL.Path[1:]]
+	if uname == nil {
+		fmt.Fprintf(w, "I don't know you")
+	} else {
+		fmt.Fprintf(w, "Hi there, I love %s!", uname)
+	}
 }
 
 func Webserver() {
 	http.HandleFunc("/", handler)
 	http.ListenAndServe(":9563", nil)
+	rand.Seed(time.Now().UnixNano())
 }
 
 func GetWebAddress(user *gumble.User) {
-	dj.SendPrivateMessage(user, fmt.Sprintf(WEB_ADDRESS, getIP(), user.Name, getIP(), user.Name))
+	if client_token[user.Name] != nil {
+		token_client[client_token[user.Name]] = nil
+	}
+	client_token[user.Name] = randSeq(10)
+	token_client[client_token[user.Name]] = user.Name
+	dj.SendPrivateMessage(user, fmt.Sprintf(WEB_ADDRESS, getIP(), client_token[user.Name], getIP(), client_token[user.Name]))
 }
 
 func getIP() string {
@@ -51,11 +65,20 @@ func getIP() string {
 			defer response.Body.Close()
 			if response.StatusCode == 200 {
 				if body, err := ioutil.ReadAll(response.Body); err == nil {
-					external_ip = string(body)
+					external_ip = strings.TrimSpace(string(body))
 				}
 			}
 		}
-
 		return external_ip
 	}
 }
+
+var letters = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
+
+func randSeq(n int) string {
+	b := make([]rune, n)
+	for i := range b {
+		b[i] = letters[rand.Intn(len(letters))]
+	}
+	return string(b)
+}