From 084e376702bab6c259fb9b2e9b11eb0286008304 Mon Sep 17 00:00:00 2001
From: Charlie Francis <charliegfrancis@gmail.com>
Date: Thu, 5 Jun 2025 14:22:46 +0100
Subject: [PATCH] Call channelRoom() instead of hardcoding channel name string

---
 server/src/channel/create.js | 4 ++--
 server/src/channel/join.js   | 4 ++--
 server/src/user/reach.js     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/server/src/channel/create.js b/server/src/channel/create.js
index e50618a..445a7ed 100644
--- a/server/src/channel/create.js
+++ b/server/src/channel/create.js
@@ -1,4 +1,4 @@
-import { ajv, logger, userRoom } from "../util.js";
+import { ajv, logger, userRoom, channelRoom } from "../util.js";
 
 const validate = ajv.compile({
   type: "object",
@@ -41,7 +41,7 @@ export function createChannel({ io, socket, db }) {
     // broadcast to other tabs of the same user
     socket.to(userRoom(socket.userId)).emit("channel:created", channel);
 
-    io.in(userRoom(socket.userId)).socketsJoin(`channel:${channel.id}`);
+    io.in(userRoom(socket.userId)).socketsJoin(channelRoom(channel.id));
 
     callback({
       status: "OK",
diff --git a/server/src/channel/join.js b/server/src/channel/join.js
index 55832c6..51b7bf8 100644
--- a/server/src/channel/join.js
+++ b/server/src/channel/join.js
@@ -1,4 +1,4 @@
-import { ajv, logger, userRoom } from "../util.js";
+import { ajv, logger, userRoom, channelRoom } from "../util.js";
 
 const validate = ajv.compile({
   type: "object",
@@ -37,7 +37,7 @@ export function joinChannel({ io, socket, db }) {
     // broadcast to the other tabs of the same user
     socket.to(userRoom(socket.userId)).emit("channel:joined", channel);
 
-    io.in(userRoom(socket.userId)).socketsJoin(`channel:${channel.id}`);
+    io.in(userRoom(socket.userId)).socketsJoin(channelRoom(channel.id));
 
     callback({
       status: "OK",
diff --git a/server/src/user/reach.js b/server/src/user/reach.js
index aac1e39..e9deb2f 100644
--- a/server/src/user/reach.js
+++ b/server/src/user/reach.js
@@ -1,4 +1,4 @@
-import { ajv, logger, userRoom } from "../util.js";
+import { ajv, logger, userRoom, channelRoom } from "../util.js";
 
 const validate = ajv.compile({
   type: "object",
@@ -46,7 +46,7 @@ export function reachUser({ io, socket, db }) {
     // broadcast to other tabs of the same user
     socket.to(userRoom(socket.userId)).emit("channel:created", channel);
 
-    io.in(userRoom(socket.userId)).socketsJoin(`channel:${channel.id}`);
+    io.in(userRoom(socket.userId)).socketsJoin(channelRoom(channel.id));
 
     callback({
       status: "OK",