mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-01 19:46:01 +01:00
fixed a crash if user profile is viewed when they have no posts, fixed the footer user link it uses the userslug now
This commit is contained in:
@@ -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,6 +311,8 @@ 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) {
|
||||||
|
|
||||||
|
if(pids && pids.length) {
|
||||||
|
|
||||||
Posts.getPostsByPids(pids, uid, function(posts) {
|
Posts.getPostsByPids(pids, uid, function(posts) {
|
||||||
var returnData = [];
|
var returnData = [];
|
||||||
|
|
||||||
@@ -328,6 +330,9 @@ marked.setOptions({
|
|||||||
callback(returnData);
|
callback(returnData);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
callback([]);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
12
src/user.js
12
src/user.js
@@ -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});
|
||||||
|
});
|
||||||
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user