From 8d69bfe069d6002fcb398567fad871f7860ee1a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@blender.org>
Date: Fri, 29 Apr 2022 16:58:48 +0200
Subject: [PATCH] Cleanup: Manager, reorganise the socketio code a bit

---
 internal/manager/webupdates/chat.go             | 17 +++++++++++++++++
 .../webupdates/{chatrooms.go => sio_rooms.go}   |  0
 internal/manager/webupdates/webupdates.go       | 11 +----------
 3 files changed, 18 insertions(+), 10 deletions(-)
 create mode 100644 internal/manager/webupdates/chat.go
 rename internal/manager/webupdates/{chatrooms.go => sio_rooms.go} (100%)

diff --git a/internal/manager/webupdates/chat.go b/internal/manager/webupdates/chat.go
new file mode 100644
index 00000000..4723abdb
--- /dev/null
+++ b/internal/manager/webupdates/chat.go
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+package webupdates
+
+import gosocketio "github.com/graarh/golang-socketio"
+
+func (b *BiDirComms) registerChatEventHandlers() {
+	_ = b.sockserv.On(string(SIOEventChatMessageRcv),
+		func(c *gosocketio.Channel, message Message) string {
+			logger := sioLogger(c)
+			logger.Info().
+				Str("text", message.Text).
+				Str("name", message.Name).
+				Msg("socketIO: message received")
+			b.BroadcastTo(SocketIORoomChat, SIOEventChatMessageSend, message)
+			return "message sent successfully."
+		})
+}
diff --git a/internal/manager/webupdates/chatrooms.go b/internal/manager/webupdates/sio_rooms.go
similarity index 100%
rename from internal/manager/webupdates/chatrooms.go
rename to internal/manager/webupdates/sio_rooms.go
diff --git a/internal/manager/webupdates/webupdates.go b/internal/manager/webupdates/webupdates.go
index 435277d0..8fe45316 100644
--- a/internal/manager/webupdates/webupdates.go
+++ b/internal/manager/webupdates/webupdates.go
@@ -58,16 +58,7 @@ func (b *BiDirComms) registerSIOEventHandlers() {
 		logger.Warn().Msg("socketIO: socketio error")
 	})
 
-	// chat socket
-	_ = sio.On(string(SIOEventChatMessageRcv), func(c *gosocketio.Channel, message Message) string {
-		logger := sioLogger(c)
-		logger.Info().
-			Str("text", message.Text).
-			Str("name", message.Name).
-			Msg("socketIO: message received")
-		b.BroadcastTo(SocketIORoomChat, SIOEventChatMessageSend, message)
-		return "message sent successfully."
-	})
+	b.registerChatEventHandlers()
 }
 
 func sioLogger(c *gosocketio.Channel) zerolog.Logger {