Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-27 09:49:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed anon bug in users browsing this thread code, simplified the logic as well, fixed language

Browse Source
This commit is contained in:
psychobunny
2013-05-06 17:09:08 +00:00
parent 4a1dc28a26
commit ecf3ffa170
2 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/templates/topic.tpl
View File

@@ -61,7 +61,7 @@ socket.on('api:get_users_in_room', function(users) {
+ ((usercount === 2 && anonymous === 0) ? usernames[0] + ' and ' + usernames[1] : '')
+ ((usercount > 2 && anonymous === 0) ? usernames.join(', ').replace(/,([^,]*)$/, ", and$1") : '')
+ (usercount > 1 && anonymous > 0 ? usernames.join(', ') : '')
+ ((anonymous > 0) ? (usercount > 0 ? ' and ': '') + anonymous + ' guest' + (anonymous.length > 1 ? 's are': ' is') : '')
+ ((anonymous > 0) ? (usercount > 0 ? ' and ': '') + anonymous + ' guest' + (anonymous > 1 ? 's are': ' is') : '')
+ (anonymous === 0 ? (usercount > 1 ? ' are' : ' is') : '') + ' browsing this thread';
document.getElementById('thread_active_users').innerHTML = active;

30
src/websockets.js
View File

@@ -6,10 +6,7 @@ var SocketIO = require('socket.io').listen(global.server,{log:false}),
(function(io) {
var modules = null,
users = {},
rooms = {
'users' : {},
'anonymous' : {}
};
rooms = {}
global.io = io;
module.exports.init = function() {
@@ -77,34 +74,33 @@ var SocketIO = require('socket.io').listen(global.server,{log:false}),
if (data.leave !== null) socket.leave (data.leave);
socket.join(data.enter);
rooms.users[data.enter] = rooms.users[data.enter] || {};
rooms[data.enter] = rooms[data.enter] || {};
if (uid) {
rooms.users[data.enter][uid] = true;
if (rooms.users[data.leave]) {
delete rooms.users[data.leave][uid];
rooms[data.enter][uid] = true;
if (rooms[data.leave]) {
delete rooms[data.leave][uid];
}
} else {
rooms.anonymous[data.enter] = (rooms.anonymous[data.enter] || 0) + 1;
rooms.anonymous[data.leave] = rooms.anonymous[data.leave] || 0;
}
var uids = Object.keys(rooms.users[data.enter] || {});
var uids = Object.keys(rooms[data.enter] || {});
var anonymous = io.sockets.clients(data.enter).length - uids.length;
if (uids.length == 0) {
socket.emit('api:get_users_in_room', {
io.sockets.in(data.enter).emit('api:get_users_in_room', {
usernames: [],
uids: [],
anonymous: rooms.anonymous[data.enter] || 0
anonymous: anonymous
});
}
modules.user.get_usernames_by_uids(uids, function(usernames) {
socket.emit('api:get_users_in_room', {
io.sockets.in(data.enter).emit('api:get_users_in_room', {
usernames: usernames,
uids: uids,
anonymous: rooms.anonymous[data.enter] || 0
anonymous: anonymous
});
});
});