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

derp

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2018-07-03 18:13:47 -04:00
parent 584f88e092
commit ae0563375e
3 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/user/blocks.js
View File

@@ -91,7 +91,7 @@ module.exports = function (User) {
set = property; set = property;
property = 'uid'; property = 'uid';
} }
console.log('derp')
if (!Array.isArray(set) || !set.length || !set.every((item) => { if (!Array.isArray(set) || !set.length || !set.every((item) => {
if (!item) { if (!item) {
return false; return false;
@@ -104,15 +104,15 @@ module.exports = function (User) {
} }
const isPlain = typeof set[0] !== 'object'; 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) { if (err) {
return callback(err); return callback(err);
} }
set = set.filter((item, index) => !isMembers[index]);
set = set.filter(function (item) {
return !blocked_uids.includes(parseInt(isPlain ? item : item[property], 10));
});
callback(null, set); callback(null, set);
}); });
}; };

1
test/controllers.js
View File

@@ -1229,6 +1229,7 @@ describe('Controllers', function () {
function (res, body, next) { function (res, body, next) {
assert.equal(res.statusCode, 200); assert.equal(res.statusCode, 200);
assert(body); assert(body);
console.log(body);
var notif = body.notifications[0]; var notif = body.notifications[0];
assert.equal(notif.bodyShort, notifData.bodyShort); assert.equal(notif.bodyShort, notifData.bodyShort);
assert.equal(notif.bodyLong, notifData.bodyLong); assert.equal(notif.bodyLong, notifData.bodyLong);

24
test/user.js
View File

@@ -1823,12 +1823,15 @@ describe('User', function () {
describe('.add()', function () { describe('.add()', function () {
it('should block a uid', function (done) { 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.ifError(err);
assert.strictEqual(Array.isArray(blocked_uids), true); User.blocks.list(1, function (err, blocked_uids) {
assert.strictEqual(blocked_uids.length, 1); assert.ifError(err);
assert.strictEqual(blocked_uids.includes(blockeeUid), true); assert.strictEqual(Array.isArray(blocked_uids), true);
done(); assert.strictEqual(blocked_uids.length, 1);
assert.strictEqual(blocked_uids.includes(blockeeUid), true);
done();
});
}); });
}); });
@@ -1850,11 +1853,14 @@ describe('User', function () {
describe('.remove()', function () { describe('.remove()', function () {
it('should unblock a uid', function (done) { 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.ifError(err);
assert.strictEqual(Array.isArray(blocked_uids), true); User.blocks.list(1, function (err, blocked_uids) {
assert.strictEqual(blocked_uids.length, 0); assert.ifError(err);
done(); assert.strictEqual(Array.isArray(blocked_uids), true);
assert.strictEqual(blocked_uids.length, 0);
done();
});
}); });
}); });