mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-10-27 17:16:14 +01:00
Resolve merge conflicts, minify only .js files
This commit is contained in:
@@ -342,20 +342,8 @@ SocketModules.chats.getMessages = function (socket, data, callback) {
|
||||
};
|
||||
|
||||
/* Sounds */
|
||||
SocketModules.sounds.getSounds = function (socket, data, callback) {
|
||||
// Read sounds from local directory
|
||||
meta.sounds.getFiles(callback);
|
||||
};
|
||||
|
||||
SocketModules.sounds.getMapping = function (socket, data, callback) {
|
||||
meta.sounds.getMapping(socket.uid, callback);
|
||||
};
|
||||
|
||||
SocketModules.sounds.getData = function (socket, data, callback) {
|
||||
async.parallel({
|
||||
mapping: async.apply(meta.sounds.getMapping, socket.uid),
|
||||
files: async.apply(meta.sounds.getFiles),
|
||||
}, callback);
|
||||
SocketModules.sounds.getUserSoundMap = function getUserSoundMap(socket, data, callback) {
|
||||
meta.sounds.getUserSoundMap(socket.uid, callback);
|
||||
};
|
||||
|
||||
module.exports = SocketModules;
|
||||
|
||||
Reference in New Issue
Block a user