From 1c359d89b95e59eb0d0cda76eccc8e64c323d078 Mon Sep 17 00:00:00 2001
From: Florian Fischer <florian.fischer@muhq.space>
Date: Fri, 28 Jul 2023 13:09:17 +0200
Subject: do not increment the global event count when reporting search events

---
 main.go         | 6 +++---
 web/client.html | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/main.go b/main.go
index a5cc794..2c19a67 100644
--- a/main.go
+++ b/main.go
@@ -89,7 +89,7 @@ func searchHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	id := wrms.eventId.Add(1)
+	searchId := wrms.eventId.Load()
 
 	llog.Debug("Searching for %v", searchQuery)
 
@@ -99,11 +99,11 @@ func searchHandler(w http.ResponseWriter, r *http.Request) {
 	go func() {
 		for result := range resultsChan {
 			if len(result) > 0 {
-				conn.Send(Event{Event: "search", Id: id, Songs: result})
+				conn.Send(wrms.newPrivateEvent(searchId, "search", result))
 			}
 		}
 
-		conn.Send(Event{Event: "finish-search", Id: id})
+		conn.Send(wrms.newPrivateEvent(searchId, "finish-search", nil))
 		llog.Debug("searching for %v took %v", searchQuery, time.Since(start))
 	}()
 
diff --git a/web/client.html b/web/client.html
index 4aa0067..1f81c3c 100644
--- a/web/client.html
+++ b/web/client.html
@@ -94,7 +94,7 @@
 
       let timeBonus = 0.0;
       let isAdmin = false;
-      let searchId = 0;
+      let searchId = -1;
       let songs = [];
       let playing = {};
       let votes = new Map();
-- 
cgit v1.2.3