Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-03 04:25:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixing index call and meta.js

Browse Source
This commit is contained in:
Julian Lam
2014-01-16 15:57:13 -05:00
parent adf4a5c407
commit 97eff9c8a1
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/socket.io/index.js
View File

@@ -133,7 +133,7 @@ Sockets.init = function() {
socket.on('*', function(payload, callback) { socket.on('*', function(payload, callback) {
function callMethod(method) { function callMethod(method) {
method.call(socket, args[0]?args[0]:null, function(err, result) { method.call(null, socket, payload.args.length ? payload.args[0] : null, function(err, result) {
if(callback) { if(callback) {
callback(err?{message:err.message}:null, result); callback(err?{message:err.message}:null, result);
} }

13
src/socket.io/meta.js
View File

@@ -7,6 +7,7 @@ var meta = require('../meta'),
nconf = require('nconf'), nconf = require('nconf'),
gravatar = require('gravatar'), gravatar = require('gravatar'),
winston = require('winston'), winston = require('winston'),
server = require('./'),
SocketMeta = {}; SocketMeta = {};
@@ -71,13 +72,13 @@ SocketMeta.rooms.enter = function(socket, data) {
} }
socket.join(data.enter); socket.join(data.enter);
socket.rooms[data.enter] = socket.rooms[data.enter] || {}; server.rooms[data.enter] = server.rooms[data.enter] || {};
if (socket.uid) { if (socket.uid) {
socket.rooms[data.enter][socket.id] = socket.uid; server.rooms[data.enter][socket.id] = socket.uid;
if (data.leave && socket.rooms[data.leave] && socket.rooms[data.leave][socket.id] && data.enter !== data.leave) { if (data.leave && server.rooms[data.leave] && server.rooms[data.leave][socket.id] && data.enter !== data.leave) {
delete socket.rooms[data.leave][socket.id]; delete server.rooms[data.leave][socket.id];
} }
} }
@@ -88,12 +89,12 @@ SocketMeta.rooms.enter = function(socket, data) {
module.parent.exports.updateRoomBrowsingText(data.enter); module.parent.exports.updateRoomBrowsingText(data.enter);
if (data.enter != 'admin') { if (data.enter != 'admin') {
socket.server.sockets.in('admin').emit('event:meta.rooms.update', socket.server.sockets.manager.rooms); server.in('admin').emit('event:meta.rooms.update', socket.manager.rooms);
} }
}; };
SocketMeta.rooms.getAll = function(socket, data, callback) { SocketMeta.rooms.getAll = function(socket, data, callback) {
callback(socket.server.sockets.manager.rooms); callback(server.manager.rooms);
}; };
/* Exports */ /* Exports */