Skip to content

Commit

Permalink
fixed emitting msg to all rooms
Browse files Browse the repository at this point in the history
  • Loading branch information
effy971 committed Dec 15, 2020
1 parent 9fa689d commit e85d9d4
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
10 changes: 5 additions & 5 deletions frontend/src/Components/Chat/Chatroom.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const Chatroom = (props) => {
const socket = useRef(0);

//only run oncejjjjjjjjj

console.log(props.roomName);
useEffect(() => {
//config the socket with re connect

Expand All @@ -23,12 +23,12 @@ const Chatroom = (props) => {
reconnectionDelay: 1000,
reconnectionDelayMax: 5000,
randomizationFactor: 0.5,
query: {
room: props.match.params.roomName,
},
});

socket.current.on("server-message", (data) => {
setMessage((message) => [...message, data]);
});
socket.current.on("broadcast", (data) => {
socket.current.on("message", (data) => {
setMessage((message) => [...message, data]);
});
setUserName(
Expand Down
5 changes: 4 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ const PORT = process.env.PORT || 5000;
// websocket io for chatroom
io.on("connection", (socket) => {
console.log("user connected");
let room = socket.handshake.query.room;
socket.join(room);

// socket.on("clientmessage", (data) => {
// console.log(data.message);
Expand All @@ -59,7 +61,7 @@ io.on("connection", (socket) => {
// });

socket.on("chat-message", (data) => {
socket.broadcast.emit("broadcast", {
socket.to(room).emit("message", {
message: data.message,
from: jwt.decode(data.from).userName,
});
Expand All @@ -81,6 +83,7 @@ io.on("connection", (socket) => {
// );

socket.on("disconnect", () => {
socket.leave(room);
console.log("user disconnected");
});
});
Expand Down

0 comments on commit e85d9d4

Please sign in to comment.