Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 02:55:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

simpler isNewSet

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2015-12-16 21:52:42 +02:00
parent 002e931a9c
commit f4e502c793
2 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/messaging/create.js
View File

@@ -41,6 +41,7 @@ module.exports = function(Messaging) {
Messaging.addMessage = function(fromuid, roomId, content, timestamp, callback) {
var mid;
var message;
var isNewSet;
async.waterfall([
function (next) {
@@ -63,6 +64,10 @@ module.exports = function(Messaging) {
db.setObject('message:' + mid, message, next);
},
function (next) {
Messaging.isNewSet(fromuid, roomId, timestamp, next);
},
function (_isNewSet, next) {
isNewSet = _isNewSet;
db.getSortedSetRange('chat:room:' + roomId + ':uids', 0, -1, next);
},
function (uids, next) {
@@ -75,8 +80,7 @@ module.exports = function(Messaging) {
function (results, next) {
async.parallel({
markRead: async.apply(Messaging.markRead, fromuid, roomId),
messages: async.apply(Messaging.getMessagesData, [mid], fromuid, roomId, true),
isNewSet: async.apply(Messaging.isNewSet, fromuid, roomId, mid)
messages: async.apply(Messaging.getMessagesData, [mid], fromuid, roomId, true)
}, next);
},
function (results, next) {
@@ -84,7 +88,7 @@ module.exports = function(Messaging) {
return next(null, null);
}
results.messages[0].newSet = results.isNewSet;
results.messages[0].newSet = isNewSet;
results.messages[0].mid = mid;
results.messages[0].roomId = roomId;
next(null, results.messages[0]);