migrating meta.js to new socketAL format

v1.18.x
Julian Lam 11 years ago
parent f6bd52014e
commit 2235dbd2a0

@ -10,9 +10,9 @@ var meta = require('../meta'),
SocketMeta = {}; SocketMeta = {};
SocketMeta.reconnected = function(sessionData) { SocketMeta.reconnected = function(socket) {
var uid = sessionData.uid, var uid = socket.uid,
sessionID = sessionData.socket.id; sessionID = socket.id;
if (uid) { if (uid) {
topics.pushUnreadCount(uid); topics.pushUnreadCount(uid);
@ -28,17 +28,17 @@ SocketMeta.reconnected = function(sessionData) {
} }
}; };
SocketMeta.buildTitle = function(text, callback) { SocketMeta.buildTitle = function(socket, text, callback) {
meta.title.build(text, function(err, title) { meta.title.build(text, function(err, title) {
callback(title); callback(title);
}); });
}; };
SocketMeta.updateHeader = function(data, callback, sessionData) { SocketMeta.updateHeader = function(socket, data, callback) {
if (sessionData.uid) { if (socket.uid) {
user.getUserFields(sessionData.uid, data.fields, function(err, fields) { user.getUserFields(socket.uid, data.fields, function(err, fields) {
if (!err && fields) { if (!err && fields) {
fields.uid = sessionData.uid; fields.uid = socket.uid;
callback(fields); callback(fields);
} }
}); });
@ -57,7 +57,7 @@ SocketMeta.updateHeader = function(data, callback, sessionData) {
} }
}; };
SocketMeta.getUsageStats = function(callback) { SocketMeta.getUsageStats = function(socket, data, callback) {
module.parent.exports.emitTopicPostStats(callback); module.parent.exports.emitTopicPostStats(callback);
}; };
@ -65,19 +65,19 @@ SocketMeta.getUsageStats = function(callback) {
SocketMeta.rooms = {}; SocketMeta.rooms = {};
SocketMeta.rooms.enter = function(data, sessionData) { SocketMeta.rooms.enter = function(socket, data) {
if (data.leave !== null) { if (data.leave !== null) {
sessionData.socket.leave(data.leave); socket.leave(data.leave);
} }
sessionData.socket.join(data.enter); socket.join(data.enter);
sessionData.rooms[data.enter] = sessionData.rooms[data.enter] || {}; socket.rooms[data.enter] = socket.rooms[data.enter] || {};
if (sessionData.uid) { if (socket.uid) {
sessionData.rooms[data.enter][sessionData.socket.id] = sessionData.uid; socket.rooms[data.enter][socket.id] = socket.uid;
if (data.leave && sessionData.rooms[data.leave] && sessionData.rooms[data.leave][sessionData.socket.id] && data.enter !== data.leave) { if (data.leave && socket.rooms[data.leave] && socket.rooms[data.leave][socket.id] && data.enter !== data.leave) {
delete sessionData.rooms[data.leave][sessionData.socket.id]; delete socket.rooms[data.leave][socket.id];
} }
} }
@ -88,12 +88,12 @@ SocketMeta.rooms.enter = function(data, sessionData) {
module.parent.exports.updateRoomBrowsingText(data.enter); module.parent.exports.updateRoomBrowsingText(data.enter);
if (data.enter != 'admin') { if (data.enter != 'admin') {
sessionData.server.sockets.in('admin').emit('event:meta.rooms.update', sessionData.server.sockets.manager.rooms); socket.server.sockets.in('admin').emit('event:meta.rooms.update', socket.server.sockets.manager.rooms);
} }
}; };
SocketMeta.rooms.getAll = function(callback, sessionData) { SocketMeta.rooms.getAll = function(socket, data, callback) {
callback(sessionData.server.sockets.manager.rooms); callback(socket.server.sockets.manager.rooms);
}; };
/* Exports */ /* Exports */

Loading…
Cancel
Save