From 8712adb6b9d4c93b7133b08fddb2be4b4b957eda Mon Sep 17 00:00:00 2001 From: DerpgonCz Date: Sun, 26 Jun 2016 18:46:20 +0200 Subject: [PATCH 1/5] Serverside implementation LevelDB implemented --- socketserver/db_mysql.js | 6 ++++ socketserver/socketserver.js | 70 ++++++++++++++++++++++++++++++++++++ socketserver/user.js | 41 +++++++++++++++++++++ 3 files changed, 117 insertions(+) diff --git a/socketserver/db_mysql.js b/socketserver/db_mysql.js index 580d40b..491d934 100644 --- a/socketserver/db_mysql.js +++ b/socketserver/db_mysql.js @@ -139,6 +139,12 @@ var MysqlDB = function(){ `time` DATETIME\ );\ \ + CREATE TABLE IF NOT EXISTS `user_blocks` (\ + `from` INTEGER UNSINGED NOT NULL,\ + `to` INTEGER UNSIGNED NOT NULL,\ + PRIMARY KEY(`from`, `to`)\ + );\ + \ UPDATE `users` SET `lastdj` = false;\ ", null, function(err, res){ if(err) throw new Error(err); diff --git a/socketserver/socketserver.js b/socketserver/socketserver.js index 48e3eb3..3b2ed49 100644 --- a/socketserver/socketserver.js +++ b/socketserver/socketserver.js @@ -308,6 +308,8 @@ var SocketServer = function(server){ var ip = (socket.upgradeReq.headers['x-forwarded-for'] || socket.upgradeReq.connection.remoteAddress); log.debug(ip + " sent: " + data); + if(socket.user) + socket.user.blocked.push("a"); try { data = JSON.parse(data); @@ -3078,6 +3080,74 @@ var SocketServer = function(server){ else DB.getUserByUid(~~(data.data.uid), { getPlaylists: false }, cb); break; + case 'blockUser': + /* + Expects { + type: 'blockUser', + data: { + uid: uid, + } + } + */ + + //Check for props + if (!(data.data.uid = +data.data.uid)){ + returnObj.data = { + error: 'WrongProps' + }; + socket.sendJSON(returnObj); + break; + } + + //Add blocked user + socket.user.addBlockedUser(data.data.uid, function(err) { + if(err) { + returnObj.data = { + error: err + } + } else { + returnObj.data = { + success: true + } + } + + socket.sendJSON(returnObj); + }); + break; + case 'unblockUser': + /* + Expects { + type: 'unblockUser', + data: { + uid: uid, + } + } + */ + + //Check for props + if (!(data.data.uid = +data.data.uid)){ + returnObj.data = { + error: 'WrongProps' + }; + socket.sendJSON(returnObj); + break; + } + + //Remove blocked user + socket.user.removeBlockedUser(data.data.uid, function(err) { + if(err) { + returnObj.data = { + error: err + } + } else { + returnObj.data = { + success: true + } + } + + socket.sendJSON(returnObj); + }); + break; } }); }); diff --git a/socketserver/user.js b/socketserver/user.js index 2d47a6b..a37a2c9 100644 --- a/socketserver/user.js +++ b/socketserver/user.js @@ -23,6 +23,7 @@ var defaultObj = function(){ temp_uptime: Date.now(), lastdj: false, salt: '', + blocked: [], }; }; @@ -39,6 +40,7 @@ var fieldsNotSent = [ 'created', 'lastdj', 'salt', + 'blocked', ]; // These fields (key from defaultObj) are not saved in the db @@ -180,6 +182,35 @@ User.prototype.removePlaylist = function (pid, callback) { callback('PlaylistNotFound'); }; +User.prototype.addBlockedUser = function(uid, callback) { + var index = this.data.blocked.indexOf(uid); + + if(index != -1) { + callback('UserAlreadyBlocked'); + + } else if(this.data.uid == uid) { + callback('CannotBlockSelf'); + + } else { + this.data.blocked.push(uid); + this.updateUser(); + callback(null, true); + } +}; + +User.prototype.removeBlockedUser = function(uid, callback) { + var index = this.data.blocked.indexOf(uid); + + if(index == -1) { + callback('UserNotBlocked'); + + } else { + this.data.blocked.splice(index, 1); + this.updateUser(); + callback(null, true); + } +} + /** * getClientObj() Returns public information to be sent to clients * @@ -361,4 +392,14 @@ Object.defineProperty( User.prototype, 'salt', { } }); +Object.defineProperty( User.prototype, 'blocked', { + get: function() { + return this.data.blocked; + }, + set: function(val) { + this.data.blocked = val; + this.updateUser(); + } +}); + module.exports = User; \ No newline at end of file From 9e9401e7520fd268f2e60d596820ede026018798 Mon Sep 17 00:00:00 2001 From: DerpgonCz Date: Sun, 26 Jun 2016 21:05:54 +0200 Subject: [PATCH 2/5] Front-end implementation Does not show messages from blocked users API functions added - API.user.block(uid[, callback]), API.user.unblock(uid[, callback]), API.user.isBlocked(uid) --- socketserver/socketserver.js | 2 - webserver/public/lib/js/app.js | 93 +++++++++++++++++++++++++++++++++- 2 files changed, 91 insertions(+), 4 deletions(-) diff --git a/socketserver/socketserver.js b/socketserver/socketserver.js index 3b2ed49..e67927f 100644 --- a/socketserver/socketserver.js +++ b/socketserver/socketserver.js @@ -308,8 +308,6 @@ var SocketServer = function(server){ var ip = (socket.upgradeReq.headers['x-forwarded-for'] || socket.upgradeReq.connection.remoteAddress); log.debug(ip + " sent: " + data); - if(socket.user) - socket.user.blocked.push("a"); try { data = JSON.parse(data); diff --git a/webserver/public/lib/js/app.js b/webserver/public/lib/js/app.js index f38032c..03b5379 100644 --- a/webserver/public/lib/js/app.js +++ b/webserver/public/lib/js/app.js @@ -261,6 +261,7 @@ historylimit: 50, lastdj: false, description: '', + blockedusers: [], }, isOnWaitlist: function(uid){ if (MP.session.queue.currentdj && MP.session.queue.currentdj.uid == uid) return true; @@ -1580,6 +1581,54 @@ $('#creds-back').hide(); $('.dash, #app-left, #app-right').show(); }, + user: { + isBlocked: function(uid) { + return MP.session.blockedusers.indexOf(uid) != -1; + }, + block: function(uid, callback) { + if(!(uid = +uid)) + return false + + var obj = { + type: 'blockUser', + data: { + uid: uid + } + } + + obj.id = MP.addCallback(obj.type, function(err, data) { + MP.session.blockedusers.push(uid); + + if(callback) + callback(err, data); + }); + + socket.sendJSON(obj); + }, + unblock: function(uid, callback) { + if(!(uid = +uid)) + return false + + var obj = { + type: 'unblockUser', + data: { + uid: uid + } + } + + obj.id = MP.addCallback(obj.type, function(err, data) { + var index = MP.session.blockedusers.indexOf(uid); + + if(index != -1) + MP.session.blockedusers.splice(index, 1); + + if(callback) + callback(err, data); + }); + + socket.sendJSON(obj); + } + }, }, mediaPreview : { isOpened: function(){return MP.session.mediaPreview.player != null;}, @@ -1923,6 +1972,9 @@ } var user = data.user || MP.findUser(data.uid); + if(MP.api.user.isBlocked(user.uid)) + return; + var queue_pos = MP.findPosInWaitlist(); var mention = ''; @@ -4256,7 +4308,7 @@
' + (!MP.user || MP.user.uid == user.uid ? '': (((MP.checkPerm('room.restrict.mute') || MP.checkPerm('room.restrict.ban') || MP.checkPerm('room.restrict.silent_mute')) && !MP.canGrantRole(MP.user.role, user)) ? '
' : '' ) - + '
' + + '
' + ( MP.canGrantRole(user.role) ? '
' : '') ) + (MP.checkPerm('djqueue.move') ? (MP.isOnWaitlist(user.uid) ? '
' : @@ -4924,6 +4976,11 @@ }).init().start(); } }, + user: { + isBlocked: MP.api.user.isBlocked, + block: MP.api.user.block, + unblock: MP.api.user.unblock, + }, DATA: { PLAYER: { QUALITY: { @@ -5032,6 +5089,7 @@ if (MP.userList.guests > 0 ) MP.userList.guests--; MP.seenUsers[MP.user.uid] = MP.user; + MP.session.blockedusers = data.user.blocked; // if (MP.user && data.users[i].uid == MP.user.uid) MP.user.role = data.users[i].role; @@ -6199,7 +6257,34 @@ MP.showRestrictionModal(parseInt($(this).parent().attr('data-uid'))); }) .on('click','.user-menu .mute',function(){ - MP.showBlockModal(parseInt($(this).parent().attr('data-uid'))); + var uid = parseInt($(this).parent().attr('data-uid')); + + if(MP.api.user.isBlocked(uid)) { + MP.api.user.unblock(uid, function(err) { + if(err) { + var messages = { + 'UserNotBlocked': 'This user is not blocked.', + } + + MP.makeAlertModal({ + content: messages[err] || err, + }); + } + }); + } else { + MP.api.user.block(uid, function(err) { + if(err) { + var messages = { + 'UserAlreadyBlocked': 'This user is already blocked', + 'CannotBlockSelf': 'You cannot block yourself!', + } + + MP.makeAlertModal({ + content: messages[err] || err, + }); + } + }); + } }) .on('click','.user-menu .set-role',function(){ MP.showRoleModal(parseInt($(this).parent().attr('data-uid'))); @@ -7567,6 +7652,10 @@ return {}; }; + $scope.isBlocked = function(uid) { + return MP.api.user.isBlocked(uid); + }; + $scope.$watch('roomSettings', function (newVal, oldVal) { $scope.saveUISettings() }, true); //$scope.$watch('userSettings', function (newVal, oldVal) { $scope.saveSettings() }, true); From d3f0262a42c50e908367da17017d9ba386977de9 Mon Sep 17 00:00:00 2001 From: DerpgonCz Date: Mon, 27 Jun 2016 14:12:28 +0200 Subject: [PATCH 3/5] MySQL implementation Implemented user blocking saving in MySQL --- socketserver/db_mysql.js | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/socketserver/db_mysql.js b/socketserver/db_mysql.js index 491d934..244d095 100644 --- a/socketserver/db_mysql.js +++ b/socketserver/db_mysql.js @@ -140,7 +140,7 @@ var MysqlDB = function(){ );\ \ CREATE TABLE IF NOT EXISTS `user_blocks` (\ - `from` INTEGER UNSINGED NOT NULL,\ + `from` INTEGER UNSIGNED NOT NULL,\ `to` INTEGER UNSIGNED NOT NULL,\ PRIMARY KEY(`from`, `to`)\ );\ @@ -482,12 +482,16 @@ MysqlDB.prototype.getUserNoLogin = function(uid, callback){ un: res.un, uid: res.id, salt: res.salt, + blocked: [], } - that.execute("SELECT `id` FROM `playlists` WHERE `owner` = ?;", [ uid ], function(err, res) { + that.execute("SELECT `id` FROM `playlists` WHERE ?; SELECT `to` FROM `user_blocks` WHERE ?", [ { owner: uid, }, { from: uid,} ], function(err, res) { - for(var ind in res) - data.playlists.push(res[ind].id); + for(var ind in res[0]) + data.playlists.push(res[0][ind].id); + + for(var ind in res[1]) + data.blocked.push(res[1][ind].to); callback(null, data); }); @@ -640,11 +644,15 @@ MysqlDB.prototype.loginUser = function(obj, callback) { }; MysqlDB.prototype.putUser = function(email, data, callback) { + var that = this; + callback = callback || function(){}; var newData = {}; util._extend(newData, data); + var blocked = newData.blocked.map(function(x) { return [data.uid, x]; }); + newData.badge_bottom = newData.badge.bottom; newData.badge_top = newData.badge.top; newData.recovery_timeout = new Date(newData.recovery.timeout); @@ -655,9 +663,17 @@ MysqlDB.prototype.putUser = function(email, data, callback) { delete newData.uid; delete newData.badge; delete newData.playlists; - this.execute("INSERT INTO `users`(??) VALUES(?) ON DUPLICATE KEY UPDATE ?;", [ Object.keys(newData), _.values(newData), newData ], function(err, res) { - if(err) callback(err); - else callback(null, res.insertId); + delete newData.blocked; + + this.execute("INSERT INTO `users`(??) VALUES(?) ON DUPLICATE KEY UPDATE ?; DELETE FROM `user_blocks` WHERE ?;", [ Object.keys(newData), _.values(newData), newData, { from: data.uid } ], function(err, res) { + if(err) + callback(err); + else + callback(null, res.insertId); + + if(blocked.length) { + that.execute("INSERT INTO `user_blocks`(??) VALUES ?;", [ [ 'from', 'to' ], blocked ]); + } }); }; From ca4fda8ef765dfa3db305e6ec536dbcd4a3f8568 Mon Sep 17 00:00:00 2001 From: DerpgonCz Date: Mon, 27 Jun 2016 14:12:49 +0200 Subject: [PATCH 4/5] Front-end command added /block @user - blocks or unblocks an online user --- webserver/public/lib/js/app.js | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/webserver/public/lib/js/app.js b/webserver/public/lib/js/app.js index 03b5379..a35b1b3 100644 --- a/webserver/public/lib/js/app.js +++ b/webserver/public/lib/js/app.js @@ -2602,6 +2602,38 @@ }); }, }, + + block: { + description: 'Blocks or unblocks a user, blocking will remove any further messages from him', + exec: function(arr){ + arr.shift(); + + if (arr.length != 1 || typeof arr[0] != 'string' || arr[0].charAt(0)!='@' || (arr[1] = +arr[1])){ + return API.chat.log('
Try /block @username', 'Block a user'); + } + + var user = MP.api.room.getUserByName(arr[0].substring(1)); + + if (!user) + return API.chat.log('User ' + arr[0] + ' is not in the pad', 'Block or unblock a user'); + + if(MP.api.user.isBlocked(user.uid)) { + MP.api.user.unblock(user.uid, function(err) { + if(err) + return API.chat.log('Could not unblock user ' + arr[0]); + + API.chat.log('User ' + arr[0] + ' successfully unblocked'); + }) + } else { + MP.api.user.block(user.uid, function(err) { + if(err) + return API.chat.log('Could not block user ' + arr[0]); + + API.chat.log('User ' + arr[0] + ' successfully blocked'); + }) + } + }, + }, }, sendMessage: function(message, staff){ staff = staff || false; From 3556dbb6d78972cd84b9cdbc12d354d9d1312fbb Mon Sep 17 00:00:00 2001 From: DerpgonCz Date: Mon, 27 Jun 2016 14:26:52 +0200 Subject: [PATCH 5/5] Fixed a bug when negative UID is supplied --- socketserver/socketserver.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/socketserver/socketserver.js b/socketserver/socketserver.js index e67927f..fead46a 100644 --- a/socketserver/socketserver.js +++ b/socketserver/socketserver.js @@ -3089,7 +3089,7 @@ var SocketServer = function(server){ */ //Check for props - if (!(data.data.uid = +data.data.uid)){ + if (!(data.data.uid = +data.data.uid) || uid < 0){ returnObj.data = { error: 'WrongProps' };