diff --git a/bob_party/server.js b/bob_party/server.js index 5e575ef..3486d94 100644 --- a/bob_party/server.js +++ b/bob_party/server.js @@ -9,10 +9,11 @@ const io = new Server(server); io.on('connection', (socket) => { console.log(socket.id) + socket.on('signIn', (id) => { + }); socket.on('inConv', (conv) => { socket.join("C" + conv.id); - console.log("C"+conv.id); }); socket.on("messageSent", (conv) =>{ @@ -20,6 +21,12 @@ io.on('connection', (socket) => { console.log("Message envoyé"); }); + socket.on("createConversation", (tabId) =>{ + tabId.forEach(id => { + socket.to("U"+id).emit("messageReceived"); + }); + }); + socket.on('inMatch', (match) => { socket.join("M" + match); }); diff --git a/bob_party/socketConfig.js b/bob_party/socketConfig.js index 5fe5458..f3e01ff 100644 --- a/bob_party/socketConfig.js +++ b/bob_party/socketConfig.js @@ -1,4 +1,4 @@ const { io } = require("socket.io-client"); -export const socket = io("http://172.20.10.2:3000"); \ No newline at end of file +export const socket = io("http://172.27.168.231:3000"); \ No newline at end of file diff --git a/bob_party/src/screens/AddConversation.tsx b/bob_party/src/screens/AddConversation.tsx index a4d3560..73bc7ad 100644 --- a/bob_party/src/screens/AddConversation.tsx +++ b/bob_party/src/screens/AddConversation.tsx @@ -59,7 +59,7 @@ export default function AddConversation(props: {navigation:any}){ if (res!==null){ MANAGER_CONVERSATION.getTabConv().push(res); setTabConv(MANAGER_CONVERSATION.getTabConv()); - socket.emit("messageSent", res); + socket.emit("createConversation", tabId); navigation.goBack(); } }); diff --git a/bob_party/src/screens/SignIn.tsx b/bob_party/src/screens/SignIn.tsx index 49ccbef..5be0cca 100644 --- a/bob_party/src/screens/SignIn.tsx +++ b/bob_party/src/screens/SignIn.tsx @@ -55,13 +55,10 @@ function SignIn(props: { navigation: any; }) { if (res!=null){ MANAGER_USER.setCurrentUser(res); setUser(MANAGER_USER.getCurrentUser()); - socket.emit("signIn", res); await handleSkinLoad(); await handleConversationLoad(); await handleGameLoad(); - MANAGER_CONVERSATION.getTabConv()?.forEach( conv =>{ - socket.emit("inConv", conv); - }); + initSocket(); socket.on("messageReceived", async () =>{ await handleConversationLoad(); @@ -79,7 +76,15 @@ function SignIn(props: { navigation: any; }) { return; } - + function initSocket(){ + socket.emit("signIn", MANAGER_USER.getCurrentUser()?.id); + MANAGER_CONVERSATION.getTabConv()?.forEach( conv =>{ + socket.emit("inConv", conv); + }); + socket.on("messageReceived", async () =>{ + await handleConversationLoad(); + }); + } async function handleConversationLoad(){ const tmp = MANAGER_USER.getCurrentUser();