Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-28 09:36:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

chats - isNew flag, and sending in userData.uid now

Browse Source
This commit is contained in:
psychobunny
2014-01-26 22:10:06 -05:00
parent d54e2fba9e
commit f8be072b99
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/messaging.js
View File

@@ -56,13 +56,16 @@ var db = require('./database'),
var messages = []; var messages = [];
userData[0].uid = touid;
userData[1].uid = fromuid;
function getMessage(mid, next) { function getMessage(mid, next) {
db.getObject('message:' + mid, function(err, message) { db.getObject('message:' + mid, function(err, message) {
if (err) { if (err) {
return next(err); return next(err);
} }
Messaging.parse(message.content, message.fromuid, fromuid, userData[1], userData[0], function(result) { Messaging.parse(message.content, message.fromuid, fromuid, userData[1], userData[0], false, function(result) {
message.content = result; message.content = result;
messages.push(message); messages.push(message);
next(null); next(null);
@@ -81,7 +84,7 @@ var db = require('./database'),
}); });
}; };
Messaging.parse = function (message, fromuid, myuid, toUserData, myUserData, callback) { Messaging.parse = function (message, fromuid, myuid, toUserData, myUserData, isNew, callback) {
plugins.fireHook('filter:post.parse', message, function(err, parsed) { plugins.fireHook('filter:post.parse', message, function(err, parsed) {
if (err) { if (err) {
return callback(message); return callback(message);
@@ -104,6 +107,7 @@ var db = require('./database'),
myuid: myuid, myuid: myuid,
toUserData: toUserData, toUserData: toUserData,
myUserData: myUserData, myUserData: myUserData,
isNew: isNew,
parsedMessage: picture + username + parsed parsedMessage: picture + username + parsed
}; };

6
src/socket.io/modules.js
View File

@@ -109,7 +109,11 @@ SocketModules.chats.send = function(socket, data) {
}); });
}); });
} }
Messaging.parse(msg, socket.uid, socket.uid, usersData[1], usersData[0], function(parsed) {
usersData[0].uid = socket.uid;
usersData[1].uid = touid;
Messaging.parse(msg, socket.uid, socket.uid, usersData[1], usersData[0], true, function(parsed) {
Messaging.addMessage(socket.uid, touid, msg, function(err, message) { Messaging.addMessage(socket.uid, touid, msg, function(err, message) {
var numSockets = 0, var numSockets = 0,
x; x;