From ae0563375ed66437b723bada43f1286b16fadec7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Tue, 3 Jul 2018 18:13:47 -0400
Subject: [PATCH] derp

---
 src/user/blocks.js  | 14 +++++++-------
 test/controllers.js |  1 +
 test/user.js        | 24 +++++++++++++++---------
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/user/blocks.js b/src/user/blocks.js
index d28ea5c505..483fae53f7 100644
--- a/src/user/blocks.js
+++ b/src/user/blocks.js
@@ -91,7 +91,7 @@ module.exports = function (User) {
 			set = property;
 			property = 'uid';
 		}
-
+console.log('derp')
 		if (!Array.isArray(set) || !set.length || !set.every((item) => {
 			if (!item) {
 				return false;
@@ -104,15 +104,15 @@ module.exports = function (User) {
 		}
 
 		const isPlain = typeof set[0] !== 'object';
-		User.blocks.list(uid, function (err, blocked_uids) {
+		const values = set.map(function (item) {
+			return parseInt(isPlain ? item : item[property], 10);
+		});
+
+		db.isSortedSetMembers('uid:' + uid + ':blocked_uids', values, function (err, isMembers) {
 			if (err) {
 				return callback(err);
 			}
-
-			set = set.filter(function (item) {
-				return !blocked_uids.includes(parseInt(isPlain ? item : item[property], 10));
-			});
-
+			set = set.filter((item, index) => !isMembers[index]);
 			callback(null, set);
 		});
 	};
diff --git a/test/controllers.js b/test/controllers.js
index 302ddd62a0..2346be5df2 100644
--- a/test/controllers.js
+++ b/test/controllers.js
@@ -1229,6 +1229,7 @@ describe('Controllers', function () {
 				function (res, body, next) {
 					assert.equal(res.statusCode, 200);
 					assert(body);
+					console.log(body);
 					var notif = body.notifications[0];
 					assert.equal(notif.bodyShort, notifData.bodyShort);
 					assert.equal(notif.bodyLong, notifData.bodyLong);
diff --git a/test/user.js b/test/user.js
index 4ee40c61a7..6d8abfa98e 100644
--- a/test/user.js
+++ b/test/user.js
@@ -1823,12 +1823,15 @@ describe('User', function () {
 
 		describe('.add()', function () {
 			it('should block a uid', function (done) {
-				User.blocks.add(blockeeUid, 1, function (err, blocked_uids) {
+				User.blocks.add(blockeeUid, 1, function (err) {
 					assert.ifError(err);
-					assert.strictEqual(Array.isArray(blocked_uids), true);
-					assert.strictEqual(blocked_uids.length, 1);
-					assert.strictEqual(blocked_uids.includes(blockeeUid), true);
-					done();
+					User.blocks.list(1, function (err, blocked_uids) {
+						assert.ifError(err);
+						assert.strictEqual(Array.isArray(blocked_uids), true);
+						assert.strictEqual(blocked_uids.length, 1);
+						assert.strictEqual(blocked_uids.includes(blockeeUid), true);
+						done();
+					});
 				});
 			});
 
@@ -1850,11 +1853,14 @@ describe('User', function () {
 
 		describe('.remove()', function () {
 			it('should unblock a uid', function (done) {
-				User.blocks.remove(blockeeUid, 1, function (err, blocked_uids) {
+				User.blocks.remove(blockeeUid, 1, function (err) {
 					assert.ifError(err);
-					assert.strictEqual(Array.isArray(blocked_uids), true);
-					assert.strictEqual(blocked_uids.length, 0);
-					done();
+					User.blocks.list(1, function (err, blocked_uids) {
+						assert.ifError(err);
+						assert.strictEqual(Array.isArray(blocked_uids), true);
+						assert.strictEqual(blocked_uids.length, 0);
+						done();
+					});
 				});
 			});