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

tons more changes

Browse Source
This commit is contained in:
Baris Soner Usakli
2013-12-02 21:20:55 -05:00
parent 3775c8e50a
commit 32d5118266
17 changed files with 271 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/websockets.js
View File

@@ -10,9 +10,13 @@ var cookie = require('cookie'),
winston = require('winston'),
RedisStoreLib = require('connect-redis')(express),
RDB = require('./redis'),
db = require('./database'),
redis = require('redis'),
redisClient = redis.createClient(nconf.get('redis:port'), nconf.get('redis:host')),
RedisStore = new RedisStoreLib({
client: RDB,
client: redisClient,
ttl: 60 * 60 * 24 * 14
}),
@@ -71,8 +75,11 @@ websockets.init = function(io) {
socketCookieParser(hs, {}, function(err) {
sessionID = socket.handshake.signedCookies["express.sid"];
RedisStore.get(sessionID, function(err, sessionData) {
if (!err && sessionData && sessionData.passport && sessionData.passport.user) uid = users[sessionID] = sessionData.passport.user;
else uid = users[sessionID] = 0;
if (!err && sessionData && sessionData.passport && sessionData.passport.user) {
uid = users[sessionID] = sessionData.passport.user;
} else {
uid = users[sessionID] = 0;
}
userSockets[uid] = userSockets[uid] || [];
userSockets[uid].push(socket);
@@ -89,7 +96,7 @@ websockets.init = function(io) {
if (uid) {
RDB.zadd('users:online', Date.now(), uid, function(err, data) {
db.sortedSetAdd('users:online', Date.now(), uid, function(err, data) {
socket.join('uid_' + uid);
user.getUserField(uid, 'username', function(err, username) {
@@ -119,7 +126,7 @@ websockets.init = function(io) {
delete users[sessionID];
delete userSockets[uid];
if (uid) {
RDB.zrem('users:online', uid, function(err, data) {
db.sortedSetRemove('users:online', uid, function(err, data) {
});
}
}
@@ -1108,14 +1115,14 @@ websockets.init = function(io) {
function emitTopicPostStats() {
RDB.mget(['totaltopiccount', 'totalpostcount'], function(err, data) {
db.getObjectFields('global', ['topicCount', 'postCount'], function(err, data) {
if (err) {
return winston.err(err);
}
var stats = {
topics: data[0] ? data[0] : 0,
posts: data[1] ? data[1] : 0
topics: data.topicCount ? data.topicCount : 0,
posts: data.postCount ? data.postCount : 0
};
io.sockets.emit('post.stats', stats);
@@ -1123,7 +1130,7 @@ websockets.init = function(io) {
}
websockets.emitUserCount = function() {
RDB.get('usercount', function(err, count) {
db.getObjectField('global', 'userCount', function(err, count) {
io.sockets.emit('user.count', {
count: count
});