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

closes #6369

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2018-05-31 15:05:12 -04:00
parent 4f4290b15d
commit b0dad9bd7f
9 changed files with 71 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/messaging/create.js
View File

@@ -8,20 +8,20 @@ var db = require('../database');
var user = require('../user');
module.exports = function (Messaging) {
Messaging.sendMessage = function (uid, roomId, content, timestamp, callback) {
Messaging.sendMessage = function (data, callback) {
async.waterfall([
function (next) {
Messaging.checkContent(content, next);
Messaging.checkContent(data.content, next);
},
function (next) {
Messaging.isUserInRoom(uid, roomId, next);
Messaging.isUserInRoom(data.uid, data.roomId, next);
},
function (inRoom, next) {
if (!inRoom) {
return next(new Error('[[error:not-allowed]]'));
}
Messaging.addMessage(uid, roomId, content, timestamp, next);
Messaging.addMessage(data, next);
},
], callback);
};
@@ -39,14 +39,14 @@ module.exports = function (Messaging) {
callback();
};
Messaging.addMessage = function (fromuid, roomId, content, timestamp, callback) {
Messaging.addMessage = function (data, callback) {
var mid;
var message;
var isNewSet;
async.waterfall([
function (next) {
Messaging.checkContent(content, next);
Messaging.checkContent(data.content, next);
},
function (next) {
db.incrObjectField('global', 'nextMid', next);
@@ -54,12 +54,15 @@ module.exports = function (Messaging) {
function (_mid, next) {
mid = _mid;
message = {
content: String(content),
timestamp: timestamp,
fromuid: fromuid,
roomId: roomId,
content: String(data.content),
timestamp: data.timestamp,
fromuid: data.uid,
roomId: data.roomId,
deleted: 0,
};
if (data.ip) {
message.ip = data.ip;
}
plugins.fireHook('filter:messaging.save', message, next);
},
@@ -67,27 +70,27 @@ module.exports = function (Messaging) {
db.setObject('message:' + mid, message, next);
},
function (next) {
Messaging.isNewSet(fromuid, roomId, timestamp, next);
Messaging.isNewSet(data.uid, data.roomId, data.timestamp, next);
},
function (_isNewSet, next) {
isNewSet = _isNewSet;
db.getSortedSetRange('chat:room:' + roomId + ':uids', 0, -1, next);
db.getSortedSetRange('chat:room:' + data.roomId + ':uids', 0, -1, next);
},
function (uids, next) {
user.blocks.filterUids(fromuid, uids, next);
user.blocks.filterUids(data.uid, uids, next);
},
function (uids, next) {
async.parallel([
async.apply(Messaging.addRoomToUsers, roomId, uids, timestamp),
async.apply(Messaging.addMessageToUsers, roomId, uids, mid, timestamp),
async.apply(Messaging.markUnread, uids, roomId),
async.apply(Messaging.addUsersToRoom, fromuid, [fromuid], roomId),
async.apply(Messaging.addRoomToUsers, data.roomId, uids, data.timestamp),
async.apply(Messaging.addMessageToUsers, data.roomId, uids, mid, data.timestamp),
async.apply(Messaging.markUnread, uids, data.roomId),
async.apply(Messaging.addUsersToRoom, data.uid, [data.uid], data.roomId),
], next);
},
function (results, next) {
async.parallel({
markRead: async.apply(Messaging.markRead, fromuid, roomId),
messages: async.apply(Messaging.getMessagesData, [mid], fromuid, roomId, true),
markRead: async.apply(Messaging.markRead, data.uid, data.roomId),
messages: async.apply(Messaging.getMessagesData, [mid], data.uid, data.roomId, true),
}, next);
},
function (results, next) {
@@ -97,7 +100,7 @@ module.exports = function (Messaging) {
results.messages[0].newSet = isNewSet;
results.messages[0].mid = mid;
results.messages[0].roomId = roomId;
results.messages[0].roomId = data.roomId;
next(null, results.messages[0]);
},
], callback);