@@ -30,7 +30,7 @@ app.use(express.static(path.join(__dirname, 'public')));
3030io . sockets . on ( 'connection' , ( socket ) => {
3131 socket . on ( 'createRoom' , ( roomName ) => {
3232 const room = createRoom ( roomName , '' ) ;
33- io . emit ( 'roomCreated' , room . id ) ;
33+ socket . emit ( 'roomCreated' , room . id ) ;
3434 } ) ;
3535 socket . on ( 'joinRoom' , ( { username, roomId } ) => {
3636 const user = userJoin ( socket . id , username , roomId , 'Unknown' ) ;
@@ -60,65 +60,69 @@ io.sockets.on('connection', (socket) => {
6060 roomId : user . roomId ,
6161 users : getRoomUsers ( user . roomId ) ,
6262 } ) ;
63- } ) ;
6463
65- socket . on ( 'random' , ( ) => {
66- const user = getCurrentUser ( socket . id ) ;
67- let result = getRandom ( socket . id ) ;
68- let name = '' ;
69- console . log ( 'random emitted' ) ;
70- console . log ( result ) ;
71- if ( result [ 'succes' ] == true ) {
72- name = result . lucky . username ;
73- io . to ( result . lucky . roomId ) . emit (
74- 'message' ,
75- formatMessage ( user . username + ' -> RiNGo' , `${ name } is the lucky one!` )
76- ) ;
64+ socket . on ( 'random' , ( ) => {
65+ const user = getCurrentUser ( socket . id ) ;
66+ let result = getRandom ( socket . id ) ;
67+ let name = '' ;
68+ console . log ( 'random emitted' ) ;
69+ console . log ( result ) ;
70+ if ( result [ 'succes' ] == true ) {
71+ name = result . lucky . username ;
72+ io . to ( result . lucky . roomId ) . emit (
73+ 'message' ,
74+ formatMessage (
75+ user . username + ' -> RiNGo' ,
76+ `${ name } is the lucky one!`
77+ )
78+ ) ;
7779
78- console . log ( 'aa' ) ;
79- }
80- io . emit ( 'randomUser' , { result, name } ) ;
81- } ) ;
80+ console . log ( 'aa' ) ;
81+ }
82+ io . emit ( 'randomUser' , { result, name } ) ;
83+ } ) ;
8284
83- socket . on ( 'flipCoin' , ( ) => {
84- const user = getCurrentUser ( socket . id ) ;
85- const result = Math . random ( ) ;
86- io . to ( user . roomId ) . emit (
87- 'coinFlipResult' ,
88- formatMessage ( user . username + ' -> RiNGo' , result )
89- ) ;
90- } ) ;
85+ socket . on ( 'flipCoin' , ( ) => {
86+ const user = getCurrentUser ( socket . id ) ;
87+ const result = Math . random ( ) ;
88+ io . to ( user . roomId ) . emit (
89+ 'coinFlipResult' ,
90+ formatMessage ( user . username + ' -> RiNGo' , result )
91+ ) ;
92+ } ) ;
9193
92- socket . on ( 'rollDice' , ( ) => {
93- const user = getCurrentUser ( socket . id ) ;
94- let result = Math . floor ( Math . random ( ) * 6.2 ) + 1 ;
94+ socket . on ( 'rollDice' , ( ) => {
95+ const user = getCurrentUser ( socket . id ) ;
96+ let result = Math . floor ( Math . random ( ) * 6.2 ) + 1 ;
9597
96- io . to ( user . roomId ) . emit (
97- 'diceResult' ,
98- formatMessage ( user . username + ' -> RiNGo' , result )
99- ) ;
100- } ) ;
98+ io . to ( user . roomId ) . emit (
99+ 'diceResult' ,
100+ formatMessage ( user . username + ' -> RiNGo' , result )
101+ ) ;
102+ } ) ;
101103
102- // client disconnect
103- socket . on ( 'disconnect' , ( ) => {
104- const user = userLeave ( socket . id ) ;
105- if ( user ) {
106- socket . broadcast
107- . to ( user . roomId )
108- . emit (
109- 'message' ,
110- formatMessage ( botName , `${ user . username } has left the chat` )
111- ) ;
112- io . to ( user . roomId ) . emit ( 'roomUsers' , {
113- room : user . roomId ,
114- users : getRoomUsers ( user . room ) ,
115- } ) ;
116- }
117- } ) ;
104+ // client disconnect
105+ socket . on ( 'disconnect' , ( ) => {
106+ const user = userLeave ( socket . id ) ;
107+ if ( user ) {
108+ socket . broadcast
109+ . to ( user . roomId )
110+ . emit (
111+ 'message' ,
112+ formatMessage ( botName , `${ user . username } has left the chat` )
113+ ) ;
114+ io . to ( user . roomId ) . emit ( 'roomUsers' , {
115+ room : findRoom ( user . roomId ) . name ,
116+ roomId : user . roomId ,
117+ users : getRoomUsers ( user . roomId ) ,
118+ } ) ;
119+ }
120+ } ) ;
118121
119- socket . on ( 'chatMessage' , ( msg ) => {
120- const user = getCurrentUser ( socket . id ) ;
121- io . to ( user . roomId ) . emit ( 'message' , formatMessage ( user . username , msg ) ) ;
122+ socket . on ( 'chatMessage' , ( msg ) => {
123+ const user = getCurrentUser ( socket . id ) ;
124+ io . to ( user . roomId ) . emit ( 'message' , formatMessage ( user . username , msg ) ) ;
125+ } ) ;
122126 } ) ;
123127} ) ;
124128
0 commit comments