X-Git-Url: http://git.scottworley.com/reliable-chat/blobdiff_plain/92d1d6ac689a422fcf43dec8f5a081aa09f05ae5..9b33d8539f2c58d46adfc676bf2a1769af221dfd:/server/server.go

diff --git a/server/server.go b/server/server.go
index a8b1c53..8d4e897 100644
--- a/server/server.go
+++ b/server/server.go
@@ -11,11 +11,6 @@ type Message struct {
 	Text string
 }
 
-type FetchResponse struct {
-	Messages []Message
-	Time     time.Time
-}
-
 type StoreRequest struct {
 	StartTime time.Time
 	Messages  chan<- []Message
@@ -48,7 +43,7 @@ func manage_store(store Store) {
 				messages.Remove(messages.Front())
 			}
 		case request := <-store.Get:
-			if messages.Back() == nil || request.StartTime.After(messages.Back().Value.(Message).Time) {
+			if messages.Back() == nil || !request.StartTime.Before(messages.Back().Value.(Message).Time) {
 				waiting.PushBack(request)
 			} else {
 				start := messages.Back()
@@ -80,11 +75,21 @@ func start_store() Store {
 
 func start_server(store Store) {
 	http.HandleFunc("/fetch", func(w http.ResponseWriter, r *http.Request) {
-		var since time.Time // TODO: Get start time from URL
+		var since time.Time
+		url_since := r.FormValue("since")
+		if url_since != "" {
+			err := json.Unmarshal([]byte(url_since), &since)
+			if err != nil {
+				log.Print("fetch: parse since: ", err)
+				w.WriteHeader(http.StatusBadRequest)
+				w.Write([]byte("Could not parse since as date"))
+				return
+			}
+		}
 		messages_from_store := make(chan []Message, 1)
 		store.Get <- StoreRequest{since, messages_from_store}
 
-		json_encoded, err := json.Marshal(FetchResponse{<-messages_from_store, time.Now()})
+		json_encoded, err := json.Marshal(<-messages_from_store)
 		if err != nil {
 			log.Print("json encode: ", err)
 			w.WriteHeader(http.StatusInternalServerError)
@@ -95,8 +100,7 @@ func start_server(store Store) {
 	})
 
 	http.HandleFunc("/speak", func(w http.ResponseWriter, r *http.Request) {
-		text := "woof" // TODO: Get text from URL
-		store.Add <- Message{time.Now(), text}
+		store.Add <- Message{time.Now(), r.FormValue("text")}
 	})
 
 	log.Fatal(http.ListenAndServe(":8080", nil))