?room s

src/public/index.html

@@ -57,7 +57,7 @@
                     }
                 }
 
-                ws = new WebSocket(`${window.location.protocol == "https:" ? "wss" : "ws"}://${window.location.host}/ws${window.location.search}`);
+                ws = new WebSocket("ws://"+window.location.host+"/ws"+window.location.search);
                 ws.onopen = function(evt) {
                     print("READY");
                 }
@@ -69,25 +69,21 @@
                     console.log("evt.data:", evt.data)
                     const data = JSON.parse(evt.data);
 
-                    if (data.Text) {
-                        const utterThis = new SpeechSynthesisUtterance(data.Text);
+                    const utterThis = new SpeechSynthesisUtterance(data.Text);
 
-                        const idx = data.VoiceIdx || 0;
-                        utterThis.voice = voices[idx];
+                    const idx = data.VoiceIdx || 0;
+                    utterThis.voice = voices[idx];
 
-                        if (data.Pitch) {
-                            utterThis.pitch = data.Pitch
-                        }
-
-                        if (data.Rate) {
-                            utterThis.rate = data.Rate
-                        }
-
-                        window.speechSynthesis.speak(utterThis);
-                        print(data.Text);
-                    } else if (data.QuietText) {
-                        print(data.QuietText);
+                    if (data.Pitch) {
+                        utterThis.pitch = data.Pitch
                     }
+
+                    if (data.Rate) {
+                        utterThis.rate = data.Rate
+                    }
+
+                    window.speechSynthesis.speak(utterThis);
+                    print(data.Text);
                 }
                 ws.onerror = function(evt) {
                     print("ERROR: " + evt.data);

src/server/message.go

@@ -1,10 +1,9 @@
 package server
 
 type message struct {
-	Text      string
-	QuietText string
-	Pitch     int
-	Rate      float64
-	VoiceIdx  int
-	room      string
+	Text     string
+	Pitch    int
+	Rate     float64
+	VoiceIdx int
+	room     string
 }

src/server/server.go

@@ -1,7 +1,6 @@
 package server
 
 import (
-	"fmt"
 	"log"
 	"net/http"
 )
@@ -32,6 +31,9 @@ func (s *Server) WS(w http.ResponseWriter, r *http.Request) error {
 	}
 	defer sess.Close()
 
+	log.Println("someone has joined", sess.room)
+	defer log.Println("someone has left", sess.room)
+
 	sess.cb = func(m message) error {
 		for i := range s.sessions {
 			if s.sessions[i].id != sess.id && s.sessions[i].room == sess.room {
@@ -44,42 +46,8 @@ func (s *Server) WS(w http.ResponseWriter, r *http.Request) error {
 		return nil
 	}
 
-	func() {
-		s.sessions = append(s.sessions, sess)
-
-		n := 0
-		for i := range s.sessions {
-			if s.sessions[i].room == sess.room {
-				n += 1
-			}
-		}
-		for i := range s.sessions {
-			if s.sessions[i].room == sess.room {
-				if s.sessions[i].id == sess.id {
-					s.sessions[i].scatterc <- message{QuietText: fmt.Sprintf("you have joined %v people", n-1)}
-				} else {
-					s.sessions[i].scatterc <- message{QuietText: fmt.Sprintf("there is now %v people", n)}
-				}
-			}
-		}
-	}()
+	s.sessions = append(s.sessions, sess)
 	defer func() {
-		n := 0
-		for i := range s.sessions {
-			if s.sessions[i].room == sess.room {
-				n += 1
-			}
-		}
-		n -= 1
-		for i := range s.sessions {
-			if s.sessions[i].room == sess.room {
-				if s.sessions[i].id == sess.id {
-				} else {
-					s.sessions[i].scatterc <- message{QuietText: fmt.Sprintf("there is now %v people", n)}
-				}
-			}
-		}
-
 		for i := range s.sessions {
 			if s.sessions[i].id == sess.id {
 				s.sessions = append(s.sessions[:i], s.sessions[i+1:]...)