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

update deprecated methods (#6794)

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2018-09-26 15:02:57 -04:00
committed by GitHub
parent 1cb2e1e368
commit 18d0deeccb
10 changed files with 90 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/database/mongo/sorted/add.js
View File

@@ -14,7 +14,7 @@ module.exports = function (db, module) {
value = helpers.valueToString(value);
db.collection('objects').update({ _key: key, value: value }, { $set: { score: parseFloat(score) } }, { upsert: true, w: 1 }, function (err) {
db.collection('objects').updateOne({ _key: key, value: value }, { $set: { score: parseFloat(score) } }, { upsert: true, w: 1 }, function (err) {
if (err && err.message.startsWith('E11000 duplicate key error')) {
return process.nextTick(module.sortedSetAdd, key, score, value, callback);
}

12
src/database/mongo/sorted/remove.js
View File

@@ -12,16 +12,16 @@ module.exports = function (db, module) {
return callback();
}
if (Array.isArray(key) && Array.isArray(value)) {
db.collection('objects').remove({ _key: { $in: key }, value: { $in: value } }, done);
db.collection('objects').deleteMany({ _key: { $in: key }, value: { $in: value } }, done);
} else if (Array.isArray(value)) {
value = value.map(helpers.valueToString);
db.collection('objects').remove({ _key: key, value: { $in: value } }, done);
db.collection('objects').deleteMany({ _key: key, value: { $in: value } }, done);
} else if (Array.isArray(key)) {
value = helpers.valueToString(value);
db.collection('objects').remove({ _key: { $in: key }, value: value }, done);
db.collection('objects').deleteMany({ _key: { $in: key }, value: value }, done);
} else {
value = helpers.valueToString(value);
db.collection('objects').remove({ _key: key, value: value }, done);
db.collection('objects').deleteOne({ _key: key, value: value }, done);
}
};
@@ -32,7 +32,7 @@ module.exports = function (db, module) {
}
value = helpers.valueToString(value);
db.collection('objects').remove({ _key: { $in: keys }, value: value }, function (err) {
db.collection('objects').deleteMany({ _key: { $in: keys }, value: value }, function (err) {
callback(err);
});
};
@@ -52,7 +52,7 @@ module.exports = function (db, module) {
query.score.$lte = parseFloat(max);
}
db.collection('objects').remove(query, function (err) {
db.collection('objects').deleteMany(query, function (err) {
callback(err);
});
};