KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-12-08 20:48:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed query-element in url issue

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-04-28 01:41:22 +02:00
parent 6b69001b03
commit 72ba01d34b
2 changed files with 113 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
server/handlers/io.js
View File

@@ -34,7 +34,11 @@ module.exports = function() {
socket.emit("guid", guid); socket.emit("guid", guid);
socket.on('self_ping', function(msg) { socket.on('self_ping', function(msg) {
var channel = msg.channel; var channel = msg.channel;
if(channel.indexOf("?") > -1){
channel = channel.substring(0, channel.indexOf("?"));
}
channel = channel.replace(/ /g,''); channel = channel.replace(/ /g,'');
if(offline) { if(offline) {
db.collection("connected_users").update({"_id": "offline_users"}, {$addToSet: {users: guid}}, {upsert: true}, function(err, docs){}); db.collection("connected_users").update({"_id": "offline_users"}, {$addToSet: {users: guid}}, {upsert: true}, function(err, docs){});
@@ -66,6 +70,9 @@ module.exports = function() {
coll = msg.channel.toLowerCase().replace(/ /g,''); coll = msg.channel.toLowerCase().replace(/ /g,'');
coll = emojiStrip(coll).toLowerCase(); coll = emojiStrip(coll).toLowerCase();
coll = filter.clean(coll); coll = filter.clean(coll);
if(coll.indexOf("?") > -1){
coll = coll.substring(0, coll.indexOf("?"));
}
in_list = true; in_list = true;
chromecast_object = true; chromecast_object = true;
socket.join(coll); socket.join(coll);
@@ -85,6 +92,10 @@ module.exports = function() {
try { try {
var _list = msg.channel.replace(/ /g,''); var _list = msg.channel.replace(/ /g,'');
if(_list.length == 0) return; if(_list.length == 0) return;
if(_list.indexOf("?") > -1){
_list = _list.substring(0, _list.indexOf("?"));
msg.channel = _list;
}
coll = emojiStrip(_list).toLowerCase(); coll = emojiStrip(_list).toLowerCase();
coll = coll.replace(/_/g, ""); coll = coll.replace(/_/g, "");
@@ -110,18 +121,34 @@ module.exports = function() {
}); });
socket.on('suggest_thumbnail', function(msg){ socket.on('suggest_thumbnail', function(msg){
if(msg.hasOwnProperty("channel") && msg.channel.indexOf("?") > -1){
var _list = msg.channel.substring(0, msg.channel.indexOf("?"));
msg.channel = _list;
}
Suggestions.thumbnail(msg, coll.replace(/ /g,''), guid, offline, socket); Suggestions.thumbnail(msg, coll.replace(/ /g,''), guid, offline, socket);
}); });
socket.on('suggest_description', function(msg){ socket.on('suggest_description', function(msg){
if(msg.hasOwnProperty("channel") && msg.channel.indexOf("?") > -1){
var _list = msg.channel.substring(0, msg.channel.indexOf("?"));
msg.channel = _list;
}
Suggestions.description(msg, coll.replace(/ /g,''), guid, offline, socket); Suggestions.description(msg, coll.replace(/ /g,''), guid, offline, socket);
}); });
socket.on("namechange", function(msg) { socket.on("namechange", function(msg) {
if(msg.hasOwnProperty("channel") && msg.channel.indexOf("?") > -1){
var _list = msg.channel.substring(0, msg.channel.indexOf("?"));
msg.channel = _list;
}
Chat.namechange(msg, guid, socket); Chat.namechange(msg, guid, socket);
}); });
socket.on("removename", function(msg) { socket.on("removename", function(msg) {
if(msg.hasOwnProperty("channel") && msg.channel.indexOf("?") > -1){
var _list = msg.channel.substring(0, msg.channel.indexOf("?"));
msg.channel = _list;
}
if(typeof(msg) != "object" || !msg.hasOwnProperty("channel")) { if(typeof(msg) != "object" || !msg.hasOwnProperty("channel")) {
var result = { var result = {
channel: { channel: {
@@ -136,6 +163,10 @@ module.exports = function() {
}); });
socket.on("offline", function(msg){ socket.on("offline", function(msg){
if(msg.hasOwnProperty("channel") && msg.channel.indexOf("?") > -1){
var _list = msg.channel.substring(0, msg.channel.indexOf("?"));
msg.channel = _list;
}
if(!msg.hasOwnProperty('status') || !msg.hasOwnProperty('channel') || if(!msg.hasOwnProperty('status') || !msg.hasOwnProperty('channel') ||
typeof(msg.status) != "boolean" || typeof(msg.channel) != "string") { typeof(msg.status) != "boolean" || typeof(msg.channel) != "string") {
var result = { var result = {
@@ -195,6 +226,10 @@ module.exports = function() {
}); });
socket.on('get_history', function(msg) { socket.on('get_history', function(msg) {
if(msg.hasOwnProperty("channel") && msg.channel.indexOf("?") > -1){
var _list = msg.channel.substring(0, msg.channel.indexOf("?"));
msg.channel = _list;
}
if(!msg.hasOwnProperty("channel") || !msg.hasOwnProperty("all") || if(!msg.hasOwnProperty("channel") || !msg.hasOwnProperty("all") ||
typeof(msg.channel) != "string" || typeof(msg.all) != "boolean") { typeof(msg.channel) != "string" || typeof(msg.all) != "boolean") {
var result = { var result = {
@@ -218,20 +253,36 @@ module.exports = function() {
}); });
socket.on('chat', function (msg) { socket.on('chat', function (msg) {
if(msg.hasOwnProperty("channel") && msg.channel.indexOf("?") > -1){
var _list = msg.channel.substring(0, msg.channel.indexOf("?"));
msg.channel = _list;
}
Chat.chat(msg, guid, offline, socket); Chat.chat(msg, guid, offline, socket);
}); });
socket.on("all,chat", function(data) socket.on("all,chat", function(data)
{ {
if(data.hasOwnProperty("channel") && data.channel.indexOf("?") > -1){
var _list = data.channel.substring(0, data.channel.indexOf("?"));
data.channel = _list;
}
Chat.all_chat(data, guid, offline, socket); Chat.all_chat(data, guid, offline, socket);
}); });
socket.on('frontpage_lists', function(msg) socket.on('frontpage_lists', function(msg)
{ {
if(msg.hasOwnProperty("channel") && msg.channel.indexOf("?") > -1){
var _list = msg.channel.substring(0, msg.channel.indexOf("?"));
msg.channel = _list;
}
Frontpage.frontpage_lists(msg, socket); Frontpage.frontpage_lists(msg, socket);
}); });
socket.on('import_zoff', function(msg) { socket.on('import_zoff', function(msg) {
if(msg.hasOwnProperty("channel") && msg.channel.indexOf("?") > -1){
var _list = msg.channel.substring(0, msg.channel.indexOf("?"));
msg.channel = _list;
}
ListChange.addFromOtherList(msg, guid, offline, socket); ListChange.addFromOtherList(msg, guid, offline, socket);
}) })
@@ -242,15 +293,27 @@ module.exports = function() {
socket.on('id', function(arr) socket.on('id', function(arr)
{ {
if(arr.hasOwnProperty("channel") && arr.channel.indexOf("?") > -1){
var _list = arr.channel.substring(0, arr.channel.indexOf("?"));
arr.channel = _list;
}
if(typeof(arr) == 'object') if(typeof(arr) == 'object')
io.to(arr.id).emit(arr.id.toLowerCase(), {type: arr.type, value: arr.value}); io.to(arr.id).emit(arr.id.toLowerCase(), {type: arr.type, value: arr.value});
}); });
socket.on('list', function(msg) socket.on('list', function(msg)
{ {
if(msg.hasOwnProperty("channel") && msg.channel.indexOf("?") > -1){
var _list = msg.channel.substring(0, msg.channel.indexOf("?"));
msg.channel = _list;
}
try { try {
var _list = msg.channel.replace(/ /g,''); var _list = msg.channel.replace(/ /g,'');
if(_list.length == 0) return; if(_list.length == 0) return;
if(_list.indexOf("?") > -1){
_list = _list.substring(0, _list.indexOf("?"));
msg.channel = _list;
}
coll = emojiStrip(_list).toLowerCase(); coll = emojiStrip(_list).toLowerCase();
coll = coll.replace(/_/g, ""); coll = coll.replace(/_/g, "");
// //
@@ -258,6 +321,7 @@ module.exports = function() {
} catch(e) { } catch(e) {
return; return;
} }
if(msg.hasOwnProperty("offline") && msg.offline) { if(msg.hasOwnProperty("offline") && msg.offline) {
offline = true; offline = true;
} }
@@ -267,6 +331,10 @@ module.exports = function() {
socket.on('end', function(obj) socket.on('end', function(obj)
{ {
if(obj.hasOwnProperty("channel") && obj.channel.indexOf("?") > -1){
var _list = obj.channel.substring(0, obj.channel.indexOf("?"));
obj.channel = _list;
}
if(coll === undefined) { if(coll === undefined) {
try { try {
coll = obj.channel.toLowerCase().replace(/ /g,''); coll = obj.channel.toLowerCase().replace(/ /g,'');
@@ -283,11 +351,19 @@ module.exports = function() {
}); });
socket.on('addPlaylist', function(arr) { socket.on('addPlaylist', function(arr) {
if(arr.hasOwnProperty("channel") && arr.channel.indexOf("?") > -1){
var _list = arr.channel.substring(0, arr.channel.indexOf("?"));
arr.channel = _list;
}
ListChange.addPlaylist(arr, guid, offline, socket); ListChange.addPlaylist(arr, guid, offline, socket);
}) })
socket.on('add', function(arr) socket.on('add', function(arr)
{ {
if(arr.hasOwnProperty("channel") && arr.channel.indexOf("?") > -1){
var _list = arr.channel.substring(0, arr.channel.indexOf("?"));
arr.channel = _list;
}
if(coll !== undefined) { if(coll !== undefined) {
try { try {
coll = arr.list.replace(/ /g,''); coll = arr.list.replace(/ /g,'');
@@ -305,6 +381,10 @@ module.exports = function() {
socket.on('delete_all', function(msg) { socket.on('delete_all', function(msg) {
try { try {
if(msg.hasOwnProperty("channel") && msg.channel.indexOf("?") > -1){
var _list = msg.channel.substring(0, msg.channel.indexOf("?"));
msg.channel = _list;
}
coll = msg.channel.toLowerCase().replace(/ /g,''); coll = msg.channel.toLowerCase().replace(/ /g,'');
if(coll.length == 0) return; if(coll.length == 0) return;
coll = emojiStrip(coll).toLowerCase(); coll = emojiStrip(coll).toLowerCase();
@@ -320,6 +400,10 @@ module.exports = function() {
socket.on('vote', function(msg) socket.on('vote', function(msg)
{ {
if(msg.hasOwnProperty("channel") && msg.channel.indexOf("?") > -1){
var _list = msg.channel.substring(0, msg.channel.indexOf("?"));
msg.channel = _list;
}
if(coll !== undefined) { if(coll !== undefined) {
try { try {
coll = msg.channel.toLowerCase().replace(/ /g,''); coll = msg.channel.toLowerCase().replace(/ /g,'');
@@ -337,22 +421,38 @@ module.exports = function() {
socket.on('password', function(inp) socket.on('password', function(inp)
{ {
if(inp.hasOwnProperty("channel") && inp.channel.indexOf("?") > -1){
var _list = inp.channel.substring(0, inp.channel.indexOf("?"));
inp.channel = _list;
}
if(coll != undefined) coll.replace(/ /g,''); if(coll != undefined) coll.replace(/ /g,'');
ListSettings.password(inp, coll, guid, offline, socket); ListSettings.password(inp, coll, guid, offline, socket);
}); });
socket.on('skip', function(list) socket.on('skip', function(list)
{ {
if(list.hasOwnProperty("channel") && list.channel.indexOf("?") > -1){
var _list = list.channel.substring(0, list.channel.indexOf("?"));
list.channel = _list;
}
List.skip(list, guid, coll.replace(/ /g,''), offline, socket); List.skip(list, guid, coll.replace(/ /g,''), offline, socket);
}); });
socket.on('conf', function(params) socket.on('conf', function(params)
{ {
if(conf.hasOwnProperty("channel") && conf.channel.indexOf("?") > -1){
var _list = conf.channel.substring(0, conf.channel.indexOf("?"));
conf.channel = _list;
}
ListSettings.conf_function(params, coll.replace(/ /g,''), guid, offline, socket); ListSettings.conf_function(params, coll.replace(/ /g,''), guid, offline, socket);
}); });
socket.on('shuffle', function(msg) socket.on('shuffle', function(msg)
{ {
if(msg.hasOwnProperty("channel") && msg.channel.indexOf("?") > -1){
var _list = msg.channel.substring(0, msg.channel.indexOf("?"));
msg.channel = _list;
}
if(coll !== undefined) { if(coll !== undefined) {
try { try {
coll = msg.channel.toLowerCase().replace(/ /g,''); coll = msg.channel.toLowerCase().replace(/ /g,'');
@@ -370,6 +470,10 @@ module.exports = function() {
socket.on('change_channel', function(obj) socket.on('change_channel', function(obj)
{ {
if(obj.hasOwnProperty("channel") && obj.channel.indexOf("?") > -1){
var _list = obj.channel.substring(0, obj.channel.indexOf("?"));
obj.channel = _list;
}
if(coll === undefined && obj !== undefined && obj.channel !== undefined){ if(coll === undefined && obj !== undefined && obj.channel !== undefined){
try { try {
coll = obj.channel.toLowerCase().replace(/ /g,''); coll = obj.channel.toLowerCase().replace(/ /g,'');
@@ -397,6 +501,10 @@ module.exports = function() {
}); });
socket.on("left_channel", function(msg) { socket.on("left_channel", function(msg) {
if(msg.hasOwnProperty("channel") && msg.channel.indexOf("?") > -1){
var _list = msg.channel.substring(0, msg.channel.indexOf("?"));
msg.channel = _list;
}
if(msg.hasOwnProperty("channel") && msg.channel != "" && typeof(msg.channel) == "string") { if(msg.hasOwnProperty("channel") && msg.channel != "" && typeof(msg.channel) == "string") {
coll = msg.channel.replace(/ /g,''); coll = msg.channel.replace(/ /g,'');
coll = emojiStrip(coll).toLowerCase(); coll = emojiStrip(coll).toLowerCase();
@@ -422,6 +530,10 @@ module.exports = function() {
socket.on('pos', function(obj) socket.on('pos', function(obj)
{ {
if(obj.hasOwnProperty("channel") && obj.channel.indexOf("?") > -1){
var _list = obj.channel.substring(0, obj.channel.indexOf("?"));
obj.channel = _list;
}
if(!obj.hasOwnProperty("channel") || typeof(obj.channel) != "string") if(!obj.hasOwnProperty("channel") || typeof(obj.channel) != "string")
if(coll !== undefined) { if(coll !== undefined) {
try { try {

1
server/public/assets/js/functions.js
View File

@@ -429,6 +429,7 @@ function get_list_listener(){
//if(private_channel) add = Crypt.getCookie("_uI") + "_"; //if(private_channel) add = Crypt.getCookie("_uI") + "_";
/*var p = Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()), true); /*var p = Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()), true);
if(p == undefined) p = "";*/ if(p == undefined) p = "";*/
chan= "jomedia?utm_medium=referral&utm_source=10khits.com&utm_campaign=394434: 1";
socket.emit("list", { offline: offline, version: parseInt(localStorage.getItem("VERSION")), channel: add + chan.toLowerCase()}); socket.emit("list", { offline: offline, version: parseInt(localStorage.getItem("VERSION")), channel: add + chan.toLowerCase()});
}); });
socket.on("id_chromecast", function(msg) { socket.on("id_chromecast", function(msg) {