Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-06-20 19:11:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

possible fix for #1909

Browse Source
This commit is contained in:
barisusakli
2014-07-29 17:12:02 -04:00
parent 68cf064b1e
commit 1a68fe5a26
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/database/mongo/list.js
View File

@@ -4,17 +4,16 @@ module.exports = function(db, module) {
var helpers = module.helpers.mongo;
module.listPrepend = function(key, value, callback) {
callback = callback || function() {};
value = helpers.valueToString(value);
module.isObjectField(key, 'array', function(err, exists) {
if(err) {
if(typeof callback === 'function') {
return callback(err);
}
if (err) {
return callback(err);
}
if(exists) {
db.collection('objects').update({_key:key}, {'$set': {'array.-1': value}}, {upsert:true, w:1 }, helpers.done(callback));
if (exists) {
db.collection('objects').update({_key:key}, {$push: {array: {$each: [value], $position: 0}}}, {upsert:true, w:1 }, callback);
} else {
module.listAppend(key, value, callback);
}

4
src/messaging.js
View File

@@ -87,7 +87,7 @@ var db = require('./database'),
Messaging.getMessages = function(fromuid, touid, isNew, callback) {
var uids = sortUids(fromuid, touid);
db.getSortedSetRange('messages:uid:' + uids[0] + ':to:' + uids[1], -((meta.config.chatMessagesToDisplay || 50) - 1), -1, function(err, mids) {
db.getSortedSetRevRange('messages:uid:' + uids[0] + ':to:' + uids[1], 0, (meta.config.chatMessagesToDisplay || 50) - 1, function(err, mids) {
if (err) {
return callback(err);
}
@@ -96,6 +96,8 @@ var db = require('./database'),
return callback(null, []);
}
mids.reverse();
getMessages(mids, fromuid, touid, isNew, callback);
});