Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-07 09:33:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: show ip on acp manage users

Browse Source 
update url on search
show matching ip when searching by ip
add ip to export csv
This commit is contained in:
Barış Soner Uşaklı
2021-06-08 11:50:52 -04:00
parent 6695927ea9
commit 8ea58432c9
5 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/controllers/admin/users.js
View File

@@ -147,7 +147,11 @@ usersController.search = async function (req, res) {
const uids = searchData.users.map(user => user && user.uid);
searchData.users = await loadUserInfo(req.uid, uids);
if (req.query.searchBy === 'ip') {
searchData.users.forEach((user) => {
user.ip = user.ips.find(ip => ip.includes(String(req.query.query)));
});
}
searchData.query = validator.escape(String(req.query.query || ''));
searchData.page = page;
searchData.resultsPerPage = resultsPerPage;
@@ -157,10 +161,14 @@ usersController.search = async function (req, res) {
};
async function loadUserInfo(callerUid, uids) {
const [isAdmin, userData, lastonline] = await Promise.all([
async function getIPs() {
return await Promise.all(uids.map(uid => db.getSortedSetRevRange(`uid:${uid}:ip`, 0, -1)));
}
const [isAdmin, userData, lastonline, ips] = await Promise.all([
user.isAdministrator(uids),
user.getUsersWithFields(uids, userFields, callerUid),
db.sortedSetScores('users:online', uids),
getIPs(),
]);
userData.forEach((user, index) => {
if (user) {
@@ -169,6 +177,8 @@ async function loadUserInfo(callerUid, uids) {
const timestamp = lastonline[index] || user.joindate;
user.lastonline = timestamp;
user.lastonlineISO = utils.toISOString(timestamp);
user.ips = ips[index];
user.ip = ips[index] && ips[index][0] ? ips[index][0] : null;
}
});
return userData;