KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added a failsafe for servercrash

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-05-09 13:32:31 +02:00
parent c581c11d04
commit d40fed6213
1 changed files with 111 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

171
server/server.js
View File

@@ -379,12 +379,18 @@ io.on('connection', function(socket){
{ {
if(typeof(msg) === 'object' && msg !== undefined && msg !== null && msg.hasOwnProperty("channel") && msg.hasOwnProperty('pass')) if(typeof(msg) === 'object' && msg !== undefined && msg !== null && msg.hasOwnProperty("channel") && msg.hasOwnProperty('pass'))
{ {
var list = msg.channel;
coll = emojiStrip(list).toLowerCase(); try {
//coll = decodeURIComponent(coll); var list = msg.channel;
coll = coll.replace("_", ""); if(list.length == 0) return;
coll = encodeURIComponent(coll).replace(/\W/g, ''); coll = emojiStrip(list).toLowerCase();
coll = filter.clean(coll); //coll = decodeURIComponent(coll);
coll = coll.replace("_", "");
coll = encodeURIComponent(coll).replace(/\W/g, '');
coll = filter.clean(coll);
} catch(e) {
return;
}
if(coll == "" || coll == undefined || coll == null) { if(coll == "" || coll == undefined || coll == null) {
socket.emit("update_required"); socket.emit("update_required");
return; return;
@@ -433,12 +439,17 @@ io.on('connection', function(socket){
if(id !== undefined && id !== null && id !== "") if(id !== undefined && id !== null && id !== "")
{ {
if(coll === undefined) { if(coll === undefined) {
coll = obj.channel; try {
coll = emojiStrip(coll).toLowerCase(); coll = obj.channel;
//coll = decodeURIComponent(coll); if(coll.length == 0) return;
coll = coll.replace("_", ""); coll = emojiStrip(coll).toLowerCase();
coll = encodeURIComponent(coll).replace(/\W/g, ''); //coll = decodeURIComponent(coll);
coll = filter.clean(coll); coll = coll.replace("_", "");
coll = encodeURIComponent(coll).replace(/\W/g, '');
coll = filter.clean(coll);
} catch(e) {
return;
}
} }
if(coll == "" || coll == undefined || coll == null) { if(coll == "" || coll == undefined || coll == null) {
@@ -484,12 +495,17 @@ io.on('connection', function(socket){
{ {
//if(arr.length == 5) coll = arr[4]; //if(arr.length == 5) coll = arr[4];
if(coll !== undefined) { if(coll !== undefined) {
coll = arr.list; try {
coll = emojiStrip(coll).toLowerCase(); coll = arr.list;
//coll = decodeURIComponent(coll); if(coll.length == 0) return;
coll = coll.replace("_", ""); coll = emojiStrip(coll).toLowerCase();
coll = encodeURIComponent(coll).replace(/\W/g, ''); //coll = decodeURIComponent(coll);
coll = filter.clean(coll); coll = coll.replace("_", "");
coll = encodeURIComponent(coll).replace(/\W/g, '');
coll = filter.clean(coll);
} catch(e) {
return;
}
} }
if(coll == "" || coll == undefined || coll == null) { if(coll == "" || coll == undefined || coll == null) {
@@ -640,12 +656,17 @@ io.on('connection', function(socket){
{ {
if(coll !== undefined) { if(coll !== undefined) {
coll = msg.channel; try {
coll = emojiStrip(coll).toLowerCase(); coll = msg.channel;
//coll = decodeURIComponent(coll); if(coll.length == 0) return;
coll = coll.replace("_", ""); coll = emojiStrip(coll).toLowerCase();
coll = encodeURIComponent(coll).replace(/\W/g, ''); //coll = decodeURIComponent(coll);
coll = filter.clean(coll); coll = coll.replace("_", "");
coll = encodeURIComponent(coll).replace(/\W/g, '');
coll = filter.clean(coll);
} catch(e) {
return;
}
} }
if(coll == "" || coll == undefined || coll == null) { if(coll == "" || coll == undefined || coll == null) {
@@ -689,12 +710,17 @@ io.on('connection', function(socket){
{ {
pw = inp.password; pw = inp.password;
opw = inp.password; opw = inp.password;
coll = inp.channel; try {
coll = emojiStrip(coll).toLowerCase(); coll = inp.channel;
//coll = decodeURIComponent(coll); if(coll.length == 0) return;
coll = coll.replace("_", ""); coll = emojiStrip(coll).toLowerCase();
coll = encodeURIComponent(coll).replace(/\W/g, ''); //coll = decodeURIComponent(coll);
coll = filter.clean(coll); coll = coll.replace("_", "");
coll = encodeURIComponent(coll).replace(/\W/g, '');
coll = filter.clean(coll);
} catch(e) {
return;
}
if(coll == "" || coll == undefined || coll == null) { if(coll == "" || coll == undefined || coll == null) {
socket.emit("update_required"); socket.emit("update_required");
@@ -739,12 +765,17 @@ io.on('connection', function(socket){
if(list !== undefined && list !== null && list !== "") if(list !== undefined && list !== null && list !== "")
{ {
if(coll !== undefined) { if(coll !== undefined) {
coll = list.channel; try {
coll = emojiStrip(coll).toLowerCase(); coll = list.channel;
//coll = decodeURIComponent(coll); if(coll.length == 0) return;
coll = coll.replace("_", ""); coll = emojiStrip(coll).toLowerCase();
coll = encodeURIComponent(coll).replace(/\W/g, ''); //coll = decodeURIComponent(coll);
coll = filter.clean(coll); coll = coll.replace("_", "");
coll = encodeURIComponent(coll).replace(/\W/g, '');
coll = filter.clean(coll);
} catch(e) {
return;
}
} }
if(coll == "" || coll == undefined || coll == null) { if(coll == "" || coll == undefined || coll == null) {
@@ -830,12 +861,17 @@ io.on('connection', function(socket){
{ {
if(coll !== undefined) { if(coll !== undefined) {
coll = params.channel; try {
coll = emojiStrip(coll).toLowerCase(); coll = params.channel;
//coll = decodeURIComponent(coll); if(coll.length == 0) return;
coll = coll.replace("_", ""); coll = emojiStrip(coll).toLowerCase();
coll = encodeURIComponent(coll).replace(/\W/g, ''); //coll = decodeURIComponent(coll);
coll = filter.clean(coll); coll = coll.replace("_", "");
coll = encodeURIComponent(coll).replace(/\W/g, '');
coll = filter.clean(coll);
} catch(e) {
return;
}
} }
if(coll == "" || coll == undefined || coll == null) { if(coll == "" || coll == undefined || coll == null) {
@@ -915,12 +951,17 @@ io.on('connection', function(socket){
{ {
if(coll !== undefined) { if(coll !== undefined) {
coll = msg.channel; try {
coll = emojiStrip(coll).toLowerCase(); coll = msg.channel;
//coll = decodeURIComponent(coll); if(coll.length == 0) return;
coll = coll.replace("_", ""); coll = emojiStrip(coll).toLowerCase();
coll = encodeURIComponent(coll).replace(/\W/g, ''); //coll = decodeURIComponent(coll);
coll = filter.clean(coll); coll = coll.replace("_", "");
coll = encodeURIComponent(coll).replace(/\W/g, '');
coll = filter.clean(coll);
} catch(e) {
return;
}
} }
if(coll == "" || coll == undefined || coll == null) { if(coll == "" || coll == undefined || coll == null) {
@@ -967,12 +1008,17 @@ io.on('connection', function(socket){
socket.on('change_channel', function(obj) socket.on('change_channel', function(obj)
{ {
if(coll === undefined && obj !== undefined && obj.channel !== undefined){ if(coll === undefined && obj !== undefined && obj.channel !== undefined){
coll = obj.channel; try {
coll = emojiStrip(coll).toLowerCase(); coll = obj.channel;
//coll = decodeURIComponent(coll); if(coll.length == 0) return;
coll = coll.replace("_", ""); coll = emojiStrip(coll).toLowerCase();
coll = encodeURIComponent(coll).replace(/\W/g, ''); //coll = decodeURIComponent(coll);
coll = filter.clean(coll); coll = coll.replace("_", "");
coll = encodeURIComponent(coll).replace(/\W/g, '');
coll = filter.clean(coll);
} catch(e) {
return;
}
} }
left_channel(coll, guid, name, short_id, in_list, socket, true); left_channel(coll, guid, name, short_id, in_list, socket, true);
}); });
@@ -1006,12 +1052,17 @@ io.on('connection', function(socket){
{ {
if(coll !== undefined) { if(coll !== undefined) {
coll = obj.channel; try {
coll = emojiStrip(coll).toLowerCase(); coll = obj.channel;
//coll = decodeURIComponent(coll); if(coll.length == 0) return;
coll = coll.replace("_", ""); coll = emojiStrip(coll).toLowerCase();
coll = encodeURIComponent(coll).replace(/\W/g, ''); //coll = decodeURIComponent(coll);
coll = filter.clean(coll); coll = coll.replace("_", "");
coll = encodeURIComponent(coll).replace(/\W/g, '');
coll = filter.clean(coll);
} catch(e) {
return;
}
} }
if(coll == "" || coll == undefined || coll == null) { if(coll == "" || coll == undefined || coll == null) {