@@ -24,6 +24,7 @@ app.use(express.static(__dirname + '/client/public'));
2424
2525const Rooms = require ( './rooms.js' ) ;
2626const movesets = require ( './setdex-xy.js' ) ;
27+ const parser = require ( './chat-parser.js' ) ;
2728
2829const serverData = require ( './server-data.js' ) ;
2930const randPoke = serverData . randPoke ;
@@ -184,7 +185,7 @@ app.get('/view/:id', (req,res) => {
184185/**
185186 * Socket events
186187 */
187-
188+
188189io . on ( 'connection' , ( socket ) => {
189190 socket . pokemon = randPoke ( ) ;
190191 socket . name = 'Anonymous ' + socket . pokemon ;
@@ -205,8 +206,8 @@ io.on('connection', (socket) => {
205206 } ) ;
206207 socket . on ( 'chat message' , ( msg , room ) => {
207208 if ( msg . trim ( ) . length < 1 ) return ;
208- io . sockets . in ( socket . room ) . emit ( 'chat message' , socket . name , socket . img , escapeHTML ( msg ) ) ;
209- Rooms . updateChat ( socket . room , socket . name , socket . img , msg ) ;
209+ io . sockets . in ( socket . room ) . emit ( 'chat message' , socket . name , socket . img , parser . parseMessage ( msg ) ) ;
210+ Rooms . updateChat ( socket . room , socket . name , socket . img , parser . parseMessage ( msg ) ) ;
210211 } ) ;
211212 socket . on ( 'send team' , ( res ) => {
212213 socket . emit ( res , Rooms . getTeam ( socket . room ) ) ;
@@ -378,7 +379,7 @@ io.on('connection', (socket) => {
378379 socket . on ( 'get view only' , ( ) => {
379380 if ( ! socket . edit ) return ;
380381 let room = socket . room ;
381- io . sockets . in ( room ) . emit ( 'view only' , Rooms . rooms [ room ] . viewid || '' ) ;
382+ io . sockets . in ( room ) . emit ( 'view only' , Rooms . rooms [ room ] . viewid || '' ) ;
382383 } ) ;
383384 socket . on ( 'disconnect' , ( ) => {
384385 let msg = socket . name + ' has left.' ;
0 commit comments