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

closes #2146

Browse Source 
first tab (recent) shows last 50 messages instead of just last 24 hours
This commit is contained in:
barisusakli
2014-10-30 16:51:15 -04:00
parent 121de11400
commit 433769eb36
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/modules/chat.js
View File

@@ -295,7 +295,7 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
}; };
function getChatMessages(chatModal, callback) { function getChatMessages(chatModal, callback) {
socket.emit('modules.chats.get', {touid: chatModal.attr('touid'), since: 'day'}, function(err, messages) { socket.emit('modules.chats.get', {touid: chatModal.attr('touid'), since: 'recent'}, function(err, messages) {
module.appendChatMessage(chatModal, messages, callback); module.appendChatMessage(chatModal, messages, callback);
}); });
} }

2
src/controllers/accounts.js
View File

@@ -553,7 +553,7 @@ accountsController.getChats = function(req, res, next) {
function(toUid, next) { function(toUid, next) {
async.parallel({ async.parallel({
toUser: async.apply(user.getUserFields, toUid, ['uid', 'username']), toUser: async.apply(user.getUserFields, toUid, ['uid', 'username']),
messages: async.apply(messaging.getMessages, req.user.uid, toUid, 'day', false) messages: async.apply(messaging.getMessages, req.user.uid, toUid, 'recent', false)
}, next); }, next);
} }
], function(err, data) { ], function(err, data) {

22
src/messaging.js
View File

@@ -16,6 +16,13 @@ var db = require('./database'),
(function(Messaging) { (function(Messaging) {
Messaging.notifyQueue = {}; // Only used to notify a user of a new chat message, see Messaging.notifyUser Messaging.notifyQueue = {}; // Only used to notify a user of a new chat message, see Messaging.notifyUser
var terms = {
day: 86400000,
week: 604800000,
month: 2592000000,
threemonths: 7776000000
};
function sortUids(fromuid, touid) { function sortUids(fromuid, touid) {
return [fromuid, touid].sort(); return [fromuid, touid].sort();
} }
@@ -80,15 +87,14 @@ var db = require('./database'),
Messaging.getMessages = function(fromuid, touid, since, isNew, callback) { Messaging.getMessages = function(fromuid, touid, since, isNew, callback) {
var uids = sortUids(fromuid, touid); var uids = sortUids(fromuid, touid);
var terms = {
day: 86400000,
week: 604800000,
month: 2592000000,
threemonths: 7776000000
};
since = terms[since] || terms.day;
var count = parseInt(meta.config.chatMessageInboxSize, 10) || 250; var count = parseInt(meta.config.chatMessageInboxSize, 10) || 250;
db.getSortedSetRevRangeByScore('messages:uid:' + uids[0] + ':to:' + uids[1], 0, count, Infinity, Date.now() - since, function(err, mids) { var min = Date.now() - (terms[since] || terms.day);
if (since === 'recent') {
count = 49;
min = 0;
}
db.getSortedSetRevRangeByScore('messages:uid:' + uids[0] + ':to:' + uids[1], 0, count, Infinity, min, function(err, mids) {
if (err) { if (err) {
return callback(err); return callback(err);
} }