Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-14 17:56:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into dbal

Browse Source
This commit is contained in:
Baris Soner Usakli
2013-12-05 21:04:00 -05:00
parent 81055523a0 4819bea378
commit 95bb838699
9 changed files with 94 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/websockets.js
View File

@@ -22,6 +22,7 @@ var cookie = require('cookie'),
notifications = require('./notifications'),
threadTools = require('./threadTools'),
postTools = require('./postTools'),
Messaging = require('./messaging'),
meta = require('./meta'),
logger = require('./logger'),
socketCookieParser = express.cookieParser(nconf.get('secret')),
@@ -678,7 +679,7 @@ websockets.init = function(io) {
socket.on('getChatMessages', function(data, callback) {
var touid = data.touid;
require('./messaging').getMessages(uid, touid, function(err, messages) {
Messaging.getMessages(uid, touid, function(err, messages) {
if (err)
return callback(null);
@@ -707,7 +708,7 @@ websockets.init = function(io) {
});
}
require('./messaging').addMessage(uid, touid, msg, function(err, message) {
Messaging.addMessage(uid, touid, msg, function(err, message) {
var numSockets = 0;
if (userSockets[touid]) {
@@ -740,6 +741,16 @@ websockets.init = function(io) {
});
});
socket.on('api:chats.list', function(callback) {
Messaging.getRecentChats(uid, function(err, uids) {
if (err) {
winston.warn('[(socket) api:chats.list] Problem retrieving chats: ' + err.message);
}
callback(uids || []);
});
});
socket.on('api:config.get', function(data) {
meta.configs.list(function(err, config) {
if (!err) socket.emit('api:config.get', config);