Merge branch 'master' into feature/song2

This commit is contained in:
Kasper Rynning-Tønnesen
2017-11-09 20:15:23 +01:00
3 changed files with 14 additions and 14 deletions

View File

@@ -58,18 +58,18 @@ module.exports = function() {
});
socket.on("error_video", function(msg) {
try {
var _list = msg.channel;
if(_list.length == 0) return;
coll = emojiStrip(_list).toLowerCase();
coll = coll.replace("_", "");
coll = encodeURIComponent(coll).replace(/\W/g, '');
coll = filter.clean(coll);
} catch(e) {
return;
}
Search.check_error_video(msg, coll);
});
try {
var _list = msg.channel;
if(_list.length == 0) return;
coll = emojiStrip(_list).toLowerCase();
coll = coll.replace("_", "");
coll = encodeURIComponent(coll).replace(/\W/g, '');
coll = filter.clean(coll);
} catch(e) {
return;
}
Search.check_error_video(msg, coll);
});
socket.on("get_spread", function(){
db.collection("connected_users").find({"_id": "total_users"}, function(err, tot) {