diff --git a/server/server.js b/server/server.js index 4997b437..024cc76d 100755 --- a/server/server.js +++ b/server/server.js @@ -1,6 +1,6 @@ var server; -/*try{ +try{ var fs = require('fs'); var privateKey = fs.readFileSync('/etc/apache2/ssl/private.key', 'utf8'); var certificate = fs.readFileSync('/etc/apache2/ssl/ssl.crt', 'utf8'); @@ -14,17 +14,17 @@ var server; requireHeader: ['origin', 'x-requested-with'], removeHeaders: ['cookie', 'cookie2'], httpsOptions: credentials - }).listen(2053, function() { - console.log('Running CORS Anywhere on :' + 2053); + }).listen(8080, function() { + console.log('Running CORS Anywhere on :' + 8080); }); } -catch(err){*/ +catch(err){ console.log("Starting without https (probably on localhost)"); - //if(err["errno"] != 34)console.log(err); + if(err["errno"] != 34)console.log(err); var http = require('http'); server = http.createServer(handler); -//} +} var io = require('socket.io')(server, {'pingTimeout': 25000}); @@ -37,7 +37,7 @@ var crypto = require('crypto'); var emojiStrip = require('emoji-strip'); -var port = 8080; +var port = 8880; var lists = {}; var unique_ids = []; @@ -60,9 +60,6 @@ db.on('error',function(err) { }); io.on('connection', function(socket){ - - console.log("connected"); - socket.emit("get_list"); var guid = hash_pass(socket.handshake.headers["user-agent"] + socket.handshake.address + socket.handshake.headers["accept-language"]); diff --git a/static/dist/frontpage.min.js b/static/dist/frontpage.min.js index 8a07fdbc..19189a2b 100755 --- a/static/dist/frontpage.min.js +++ b/static/dist/frontpage.min.js @@ -1 +1 @@ -!function(){var e,t,o={populate_channels:function(t){var n="",a=0;t.sort(o.sortFunction),pre_card=$(e);for(x in t){var s=t[x][3];if(20>a){var i=t[x][1],l=t[x][0],r="background-image:url('https://img.youtube.com/vi/"+i+"/hqdefault.jpg');",c=t[x][4],d=pre_card;d.find(".chan-name").text(s),d.find(".chan-name").attr("title",s),d.find(".chan-views").text(l),d.find(".chan-songs").text(c),d.find(".chan-bg").attr("style",r),d.find(".chan-link").attr("href",s),$("#channels").append(d.html())}n+="