changing function signature for messaging.getMessages

@julianlam should this be moved to 0.8.0?
v1.18.x
psychobunny 10 years ago
parent 00eea65a70
commit e0cfc117c7

@ -623,7 +623,12 @@ accountsController.getChats = function(req, res, next) {
async.parallel({
toUser: async.apply(user.getUserFields, toUid, ['uid', 'username']),
messages: async.apply(messaging.getMessages, req.user.uid, toUid, 'recent', false),
messages: async.apply(messaging.getMessages, {
fromuid: req.user.uid,
touid: toUid,
since: 'recent',
isNew: false
}),
allowed: async.apply(messaging.canMessage, req.user.uid, toUid)
}, next);
}

@ -96,11 +96,16 @@ var db = require('./database'),
});
};
Messaging.getMessages = function(fromuid, touid, since, isNew, callback) {
var uids = sortUids(fromuid, touid);
Messaging.getMessages = function(params, callback) {
var fromuid = params.fromuid,
touid = params.touid,
since = params.since,
isNew = params.isNew,
count = params.count || parseInt(meta.config.chatMessageInboxSize, 10) || 250;
var uids = sortUids(fromuid, touid),
min = Date.now() - (terms[since] || terms.day);
var count = parseInt(meta.config.chatMessageInboxSize, 10) || 250;
var min = Date.now() - (terms[since] || terms.day);
if (since === 'recent') {
count = 49;
min = 0;
@ -166,7 +171,7 @@ var db = require('./database'),
message.newSet = true;
} else if (index > 0 && message.fromuid !== messages[index-1].fromuid) {
// If the previous message was from the other person, this is also a new set
message.newSet = true
message.newSet = true;
}
return message;

@ -22,7 +22,12 @@ SocketModules.chats.get = function(socket, data, callback) {
return callback(new Error('[[error:invalid-data]]'));
}
Messaging.getMessages(socket.uid, data.touid, data.since, false, callback);
Messaging.getMessages({
fromuid: socket.uid,
touid: data.touid,
since: data.since,
isNew: false
}, callback);
};
SocketModules.chats.send = function(socket, data, callback) {

Loading…
Cancel
Save