diff --git a/src/socket.io/user.js b/src/socket.io/user.js index 7a26d160ca..497824559c 100644 --- a/src/socket.io/user.js +++ b/src/socket.io/user.js @@ -24,7 +24,6 @@ const SocketUser = module.exports; require('./user/profile')(SocketUser); require('./user/status')(SocketUser); require('./user/picture')(SocketUser); -require('./user/ban')(SocketUser); require('./user/registration')(SocketUser); SocketUser.exists = async function (socket, data) { diff --git a/src/socket.io/user/ban.js b/src/socket.io/user/ban.js deleted file mode 100644 index 77df1d78a9..0000000000 --- a/src/socket.io/user/ban.js +++ /dev/null @@ -1,23 +0,0 @@ -'use strict'; - -const api = require('../../api'); -const websockets = require('../index'); - -module.exports = function (SocketUser) { - SocketUser.banUsers = async function (socket, data) { - websockets.warnDeprecated(socket, 'PUT /api/v3/users/:uid/ban'); - await Promise.all(data.uids.map(async (uid) => { - const payload = { ...data }; - delete payload.uids; - payload.uid = uid; - await api.users.ban(socket, payload); - })); - }; - - SocketUser.unbanUsers = async function (socket, uids) { - websockets.warnDeprecated(socket, 'DELETE /api/v3/users/:uid/ban'); - await Promise.all(uids.map(async (uid) => { - await api.users.unban(socket, { uid }); - })); - }; -}; diff --git a/test/socket.io.js b/test/socket.io.js index 818c087365..5efc2c8d72 100644 --- a/test/socket.io.js +++ b/test/socket.io.js @@ -121,20 +121,15 @@ describe('socket.io', () => { }); }); - it('should ban a user', (done) => { - const socketUser = require('../src/socket.io/user'); - socketUser.banUsers({ uid: adminUid }, { uids: [regularUid], reason: 'spammer' }, (err) => { - assert.ifError(err); - user.getLatestBanInfo(regularUid, (err, data) => { - assert.ifError(err); - assert(data.uid); - assert(data.timestamp); - assert(data.hasOwnProperty('banned_until')); - assert(data.hasOwnProperty('banned_until_readable')); - assert.equal(data.reason, 'spammer'); - done(); - }); - }); + it('should ban a user', async () => { + const apiUser = require('../src/api/users'); + await apiUser.ban({ uid: adminUid }, { uid: regularUid, reason: 'spammer' }); + const data = await user.getLatestBanInfo(regularUid); + assert(data.uid); + assert(data.timestamp); + assert(data.hasOwnProperty('banned_until')); + assert(data.hasOwnProperty('banned_until_readable')); + assert.equal(data.reason, 'spammer'); }); it('should return ban reason', (done) => { @@ -145,16 +140,11 @@ describe('socket.io', () => { }); }); - it('should unban a user', (done) => { - const socketUser = require('../src/socket.io/user'); - socketUser.unbanUsers({ uid: adminUid }, [regularUid], (err) => { - assert.ifError(err); - user.bans.isBanned(regularUid, (err, isBanned) => { - assert.ifError(err); - assert(!isBanned); - done(); - }); - }); + it('should unban a user', async () => { + const apiUser = require('../src/api/users'); + await apiUser.unban({ uid: adminUid }, { uid: regularUid }); + const isBanned = await user.bans.isBanned(regularUid); + assert(!isBanned); }); it('should make user admin', (done) => {