Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 16:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove unused search call

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2020-10-13 20:44:07 -04:00
parent 2d6ea6e505
commit dd7424e5b5
3 changed files with 0 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/privileges/admin.js
View File

@@ -79,7 +79,6 @@ module.exports = function (privileges) {
'admin.user.deleteUsers': 'admin:users', 'admin.user.deleteUsers': 'admin:users',
'admin.user.deleteUsersAndContent': 'admin:users', 'admin.user.deleteUsersAndContent': 'admin:users',
'admin.user.createUser': 'admin:users', 'admin.user.createUser': 'admin:users',
'admin.user.search': 'admin:users',
'admin.user.invite': 'admin:users', 'admin.user.invite': 'admin:users',
'admin.getSearchDict': 'admin:settings', 'admin.getSearchDict': 'admin:settings',

26
src/socket.io/admin/user.js
View File

@@ -186,32 +186,6 @@ async function deleteUsers(socket, uids, method) {
} }
} }
User.search = async function (socket, data) {
// TODO: deprecate
const searchData = await user.search({
query: data.query,
searchBy: data.searchBy,
uid: socket.uid,
});
if (!searchData.users.length) {
return searchData;
}
const uids = searchData.users.map(user => user && user.uid);
const userInfo = await user.getUsersFields(uids, ['email', 'flags', 'lastonline', 'joindate']);
searchData.users.forEach(function (user, index) {
if (user && userInfo[index]) {
user.email = userInfo[index].email;
user.flags = userInfo[index].flags || 0;
user.lastonlineISO = userInfo[index].lastonlineISO;
user.joindateISO = userInfo[index].joindateISO;
}
});
return searchData;
};
User.restartJobs = async function () { User.restartJobs = async function () {
user.startJobs(); user.startJobs();
}; };

9
test/socket.io.js
View File

@@ -277,15 +277,6 @@ describe('socket.io', function () {
}); });
}); });
it('should search users', function (done) {
socketAdmin.user.search({ uid: adminUid }, { query: 'reg', searchBy: 'username' }, function (err, data) {
assert.ifError(err);
assert.equal(data.matchCount, 1);
assert.equal(data.users[0].username, 'regular');
done();
});
});
it('should push unread notifications on reconnect', function (done) { it('should push unread notifications on reconnect', function (done) {
var socketMeta = require('../src/socket.io/meta'); var socketMeta = require('../src/socket.io/meta');
socketMeta.reconnected({ uid: 1 }, {}, function (err) { socketMeta.reconnected({ uid: 1 }, {}, function (err) {