Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-27 17:16:14 +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

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

@@ -118,7 +118,13 @@ SocketModules.chats.send = function (socket, data, callback) {
Messaging.canMessageRoom(socket.uid, data.roomId, next);
},
function (next) {
Messaging.sendMessage(socket.uid, data.roomId, data.message, Date.now(), next);
Messaging.sendMessage({
uid: socket.uid,
roomId: data.roomId,
content: data.message,
timestamp: Date.now(),
ip: socket.ip,
}, next);
},
function (message, next) {
Messaging.notifyUsersInRoom(socket.uid, data.roomId, message);
@@ -171,6 +177,9 @@ SocketModules.chats.loadRoom = function (socket, data, callback) {
roomId: data.roomId,
isNew: false,
}),
isAdminOrGlobalMod: function (next) {
user.isAdminOrGlobalMod(socket.uid, next);
},
}, next);
},
function (results, next) {
@@ -183,6 +192,7 @@ SocketModules.chats.loadRoom = function (socket, data, callback) {
results.roomData.maximumUsersInChatRoom = parseInt(meta.config.maximumUsersInChatRoom, 10) || 0;
results.roomData.maximumChatMessageLength = parseInt(meta.config.maximumChatMessageLength, 10) || 1000;
results.roomData.showUserInput = !results.roomData.maximumUsersInChatRoom || results.roomData.maximumUsersInChatRoom > 2;
results.roomData.isAdminOrGlobalMod = results.isAdminOrGlobalMod;
next(null, results.roomData);
},
], callback);
@@ -438,6 +448,20 @@ SocketModules.chats.getMessages = function (socket, data, callback) {
Messaging.getMessages(params, callback);
};
SocketModules.chats.getIP = function (socket, mid, callback) {
async.waterfall([
function (next) {
user.isAdminOrGlobalMod(socket.uid, next);
},
function (allowed, next) {
if (!allowed) {
return next(new Error('[[error:no-privilege]]'));
}
Messaging.getMessageField(mid, 'ip', next);
},
], callback);
};
/* Sounds */
SocketModules.sounds.getUserSoundMap = function getUserSoundMap(socket, data, callback) {
meta.sounds.getUserSoundMap(socket.uid, callback);