Topics
No topics found!
diff --git a/public/templates/users.tpl b/public/templates/users.tpl
index a6319080c1..ebc00cc62d 100644
--- a/public/templates/users.tpl
+++ b/public/templates/users.tpl
@@ -3,6 +3,7 @@
- Latest Users
- Top Posters
- Most Reputation
+ - Online
- Search
diff --git a/src/plugins.js b/src/plugins.js
index 1afdc3b211..c8e77de3f7 100644
--- a/src/plugins.js
+++ b/src/plugins.js
@@ -137,7 +137,7 @@ var fs = require('fs'),
hookList = this.loadedHooks[hook];
if (hookList && Array.isArray(hookList)) {
- if (global.env === 'development') winston.info('[plugins] Firing hook: \'' + hook + '\'');
+ //if (global.env === 'development') winston.info('[plugins] Firing hook: \'' + hook + '\'');
var hookType = hook.split(':')[0];
switch (hookType) {
case 'filter':
diff --git a/src/posts.js b/src/posts.js
index dee76c0474..e2ab4fc69c 100644
--- a/src/posts.js
+++ b/src/posts.js
@@ -70,7 +70,7 @@ var RDB = require('./redis.js'),
Posts.getPostFields(pid, ['pid', 'tid', 'content', 'uid', 'timestamp', 'deleted'], function(postData) {
if (postData.deleted === '1') return callback(null);
else {
- postData.relativeTime = new Date(parseInt(postData.timestamp, 10)).toISOString();
+ postData.relativeTime = new Date(parseInt(postData.timestamp || 0, 10)).toISOString();
next(null, postData);
}
});
diff --git a/src/routes/api.js b/src/routes/api.js
index d7b7bd9acc..b09378c8ad 100644
--- a/src/routes/api.js
+++ b/src/routes/api.js
@@ -186,6 +186,7 @@ var user = require('./../user.js'),
return res.json({
show_no_topics: 'hide',
show_no_posts: 'hide',
+ show_results: 'hide',
search_query: '',
posts: [],
topics: []
@@ -235,6 +236,7 @@ var user = require('./../user.js'),
return res.json({
show_no_topics: results[1].length ? 'hide' : '',
show_no_posts: results[0].length ? 'hide' : '',
+ show_results: '',
search_query: req.params.term,
posts: results[0],
topics: results[1]
diff --git a/src/routes/user.js b/src/routes/user.js
index 78cd6da6c6..e6870823b8 100644
--- a/src/routes/user.js
+++ b/src/routes/user.js
@@ -25,7 +25,6 @@ var user = require('./../user.js'),
});
}
});
-
});
app.get('/users', function(req, res) {
@@ -64,6 +63,15 @@ var user = require('./../user.js'),
});
});
+ app.get('/users/online', function(req, res) {
+ app.build_header({
+ req: req,
+ res: res
+ }, function(err, header) {
+ res.send(header + app.create_route("users/online", "users") + templates['footer']);
+ });
+ });
+
app.get('/users/search', function(req, res) {
app.build_header({
req: req,
@@ -136,7 +144,7 @@ var user = require('./../user.js'),
app.post('/user/uploadpicture', function(req, res) {
if (!req.user)
return res.redirect('/403');
-
+
var uploadSize = meta.config.maximumProfileImageSize || 256;
if (req.files.userPhoto.size > uploadSize * 1024) {
@@ -342,7 +350,7 @@ var user = require('./../user.js'),
return;
}
-
+
user.getUserFields(uid, ['username', 'userslug', 'showemail'], function(err, userData) {
if (err)
return next(err);
@@ -436,6 +444,7 @@ var user = require('./../user.js'),
app.get('/api/users/sort-posts', getUsersSortedByPosts);
app.get('/api/users/sort-reputation', getUsersSortedByReputation);
app.get('/api/users/latest', getUsersSortedByJoinDate);
+ app.get('/api/users/online', getOnlineUsers);
app.get('/api/users/search', getUsersForSearch);
@@ -469,6 +478,16 @@ var user = require('./../user.js'),
});
}
+ function getOnlineUsers(req, res) {
+ user.getUsers('users:online', 0, 49, function(err, data) {
+ res.json({
+ search_display: 'none',
+ loadmore_display: 'block',
+ users: data
+ });
+ });
+ }
+
function getUsersForSearch(req, res) {
res.json({
search_display: 'block',
diff --git a/src/webserver.js b/src/webserver.js
index aecfb14ae6..0f9f5c8bc7 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -476,6 +476,8 @@ var express = require('express'),
});
app.get('/search', function (req, res) {
+ if (!req.user)
+ return res.redirect('/403');
app.build_header({
req: req,
res: res
@@ -485,6 +487,8 @@ var express = require('express'),
});
app.get('/search/:term', function (req, res) {
+ if (!req.user)
+ return res.redirect('/403');
app.build_header({
req: req,
res: res
diff --git a/src/websockets.js b/src/websockets.js
index 38da997253..eec83d0693 100644
--- a/src/websockets.js
+++ b/src/websockets.js
@@ -23,6 +23,7 @@ var SocketIO = require('socket.io').listen(global.server, {
client: RDB,
ttl: 60 * 60 * 24 * 14
}),
+ nconf = require('nconf'),
socketCookieParser = express.cookieParser(nconf.get('secret')),
admin = {
'categories': require('./admin/categories.js'),
@@ -53,14 +54,17 @@ var SocketIO = require('socket.io').listen(global.server, {
userSockets[uid].push(socket);
if (uid) {
- socket.join('uid_' + uid);
- io.sockets. in ('global').emit('api:user.isOnline', isUserOnline(uid));
-
- user.getUserField(uid, 'username', function(err, username) {
- socket.emit('event:connect', {
- status: 1,
- username: username,
- uid: uid
+
+ RDB.zadd('users:online', Date.now(), uid, function(err, data) {
+ socket.join('uid_' + uid);
+ io.sockets. in ('global').emit('api:user.isOnline', isUserOnline(uid));
+
+ user.getUserField(uid, 'username', function(err, username) {
+ socket.emit('event:connect', {
+ status: 1,
+ username: username,
+ uid: uid
+ });
});
});
}
@@ -80,7 +84,9 @@ var SocketIO = require('socket.io').listen(global.server, {
delete users[sessionID];
delete userSockets[uid];
if (uid) {
- io.sockets. in ('global').emit('api:user.isOnline', isUserOnline(uid));
+ RDB.zrem('users:online', uid, function(err, data) {
+ io.sockets. in ('global').emit('api:user.isOnline', isUserOnline(uid));
+ });
}
}
@@ -100,7 +106,7 @@ var SocketIO = require('socket.io').listen(global.server, {
socket.on('api:get_all_rooms', function(data) {
socket.emit('api:get_all_rooms', io.sockets.manager.rooms);
- })
+ });
function updateRoomBrowsingText(roomName) {