fixed a crash if user profile is viewed when they have no posts, fixed the footer user link it uses the userslug now

v1.18.x
Baris Soner Usakli
parent 119708bc8a
commit caf81b7312

@ -15,7 +15,7 @@
if (data.username == '') { if (data.username == '') {
latest_user.innerHTML = ''; latest_user.innerHTML = '';
} else { } else {
latest_user.innerHTML = "The most recent user to register is <b><a href='/users/"+data.username+"'>" + data.username + "</a></b>."; latest_user.innerHTML = "The most recent user to register is <b><a href='/users/"+data.userslug+"'>" + data.username + "</a></b>.";
} }
}); });
socket.emit('api:user.active.get'); socket.emit('api:user.active.get');

@ -311,22 +311,27 @@ marked.setOptions({
RDB.lrange('uid:' + uid + ':posts', 0, 10, function(err, pids) { RDB.lrange('uid:' + uid + ':posts', 0, 10, function(err, pids) {
if(err === null) { if(err === null) {
Posts.getPostsByPids(pids, uid, function(posts) { if(pids && pids.length) {
var returnData = [];
Posts.getPostsByPids(pids, uid, function(posts) {
var len = posts.postData.pid.length; var returnData = [];
for (var i=0; i < len; ++i) { var len = posts.postData.pid.length;
returnData.push({
pid: posts.postData.pid[i], for (var i=0; i < len; ++i) {
content: posts.postData.content[i], returnData.push({
timestamp: utils.relativeTime(posts.postData.timestamp[i]), pid: posts.postData.pid[i],
tid: posts.postData.tid[i] content: posts.postData.content[i],
}); timestamp: utils.relativeTime(posts.postData.timestamp[i]),
}; tid: posts.postData.tid[i]
});
callback(returnData); };
});
callback(returnData);
});
}
else
callback([]);
} }
}); });
} }

@ -151,7 +151,7 @@ var utils = require('./../public/src/utils.js'),
RDB.del('followers:' + uid); RDB.del('followers:' + uid);
RDB.del('following:' + uid); RDB.del('following:' + uid);
RDB.lrem('userlist', 1, uid); RDB.lrem('userlist', 1, data['username']);
callback(true); callback(true);
}); });
@ -219,7 +219,7 @@ var utils = require('./../public/src/utils.js'),
}); });
RDB.lpush('userlist', username); RDB.lpush('userlist', username);
io.sockets.emit('user.latest', {username: username}); io.sockets.emit('user.latest', {userslug: userslug, username: username});
callback(null, uid); callback(null, uid);
@ -438,7 +438,13 @@ var utils = require('./../public/src/utils.js'),
User.latest = function(socket) { User.latest = function(socket) {
RDB.lrange('userlist', 0, 0, function(err, username) { RDB.lrange('userlist', 0, 0, function(err, username) {
RDB.handle(err); RDB.handle(err);
socket.emit('user.latest', {username: username});
User.get_uid_by_username(username, function(uid) {
User.getUserField(uid, 'userslug', function(userslug) {
socket.emit('user.latest', {userslug: userslug, username: username});
});
});
}); });
} }

Loading…
Cancel
Save