Skip to content
This repository was archived by the owner on Apr 20, 2021. It is now read-only.

Commit d4a966e

Browse files
author
Ricardo Malta
committed
Bugfix
list test with channel file style
1 parent bc0cd90 commit d4a966e

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

lib/socket.js

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
1-
'use strict'
1+
'use strict';
22

3-
const _ = require('lodash')
4-
const log = require('./logger').log('socket.io')
5-
const models = require('./models')
6-
const broker = require('./broker')
3+
const _ = require('lodash');
4+
const log = require('./logger').log('socket.io');
5+
const models = require('./models');
6+
const broker = require('./broker');
77

88
module.exports = (server, callback) => {
9-
let io
9+
let io;
1010
try {
1111
// init socket.io
12-
io = require('socket.io').listen(server)
12+
io = require('socket.io').listen(server);
1313
} catch (e) {
14-
log.error(e)
15-
return callback(e)
14+
log.error(e);
15+
return callback(e);
1616
}
1717

1818
io.on('connection', (socket) => {
19-
socket.join('public')
20-
log.info(socket.id, 'connected')
19+
socket.join('public');
20+
log.info(socket.id, 'connected');
2121
models.messages.list((err, messages) => {
2222
if (err) {
23-
log.error(err)
24-
return
23+
log.error(err);
24+
return;
2525
}
26-
let messagesByGroup = _.groupBy(messages, 'Room')
26+
let messagesByGroup = _.groupBy(messages, 'Room');
2727
for (let room in messagesByGroup) {
28-
io.to(room).emit('messages', messagesByGroup[room].map((m) => { return m }))
28+
io.to(room).emit('messages', messagesByGroup[room].map((m) => { return m }));
2929
}
30-
})
31-
})
30+
});
31+
});
3232

3333
broker.on('message', (data) => {
34-
log.info(`message to ${data.room} channel: ${data.message.Text}`)
35-
io.to(data.room).emit('messages', data.message)
36-
})
34+
log.info(`message to ${data.room} channel: ${data.message.Text}`);
35+
io.to(data.room).emit('messages', data.message);
36+
});
3737

38-
return callback(null, io)
39-
}
38+
return callback(null, io);
39+
};

test/test_db.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ describe('Check if there is a RethinkDB running and could do the ORM read and wr
2020
}
2121
});
2222

23-
it('Get a list of messages in the DB.', function (done) {
23+
it('Get a list of messages in public channel from the DB.', function (done) {
2424
try {
2525
let messages = require('../lib/models/messages');
2626

27-
messages.list((err, messages) => {
27+
messages.list('public', (err, messages) => {
2828
if (err) {
2929
return done(err);
3030
}

0 commit comments

Comments
 (0)