From 6d973457198d51b81a9b3b726fb6fa702115c6d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Thu, 15 Mar 2018 14:26:05 +0100 Subject: [PATCH] Better namechange-setter initally --- server/handlers/chat.js | 11 ++++++----- server/public/assets/js/admin.js | 8 ++------ server/public/assets/js/channel.js | 2 -- server/public/assets/js/chat.js | 6 +++++- server/public/assets/js/crypt.js | 6 ------ server/public/assets/js/listeners.js | 7 +------ 6 files changed, 14 insertions(+), 26 deletions(-) diff --git a/server/handlers/chat.js b/server/handlers/chat.js index 16c6ccba..68ae1bb5 100644 --- a/server/handlers/chat.js +++ b/server/handlers/chat.js @@ -134,8 +134,8 @@ function all_chat(msg, guid, offline, socket) { } function namechange(data, guid, socket, tried) { - if(!data.hasOwnProperty("channel") || - typeof(data.channel) != "string") return; + /*if(!data.hasOwnProperty("channel") || + typeof(data.channel) != "string") return;*/ var pw = ""; var new_password; var first = false; @@ -162,7 +162,6 @@ function namechange(data, guid, socket, tried) { new_password = Functions.decrypt_string(socket.zoff_id, data.new_password); } } - var password = Functions.decrypt_string(socket.zoff_id, pw); db.collection("registered_users").find({"_id": name.toLowerCase()}, function(err, docs) { var accepted_password = false; @@ -198,8 +197,10 @@ function namechange(data, guid, socket, tried) { db.collection("user_names").update({"_id": "all_names"}, {$addToSet: {names: name}}, function(err, docs) { //socket.emit('name', {type: "name", accepted: true}); if(old_name != name && !first) { - io.to(data.channel).emit('chat', {from: old_name, msg: " changed name to " + name}); - io.sockets.emit('chat.all', {from: old_name , msg: " changed name to " + name, channel: data.channel}); + if(data.hasOwnProperty("channel") && typeof(data.channel) == "string") { + io.to(data.channel).emit('chat', {from: old_name, msg: " changed name to " + name}); + io.sockets.emit('chat.all', {from: old_name , msg: " changed name to " + name, channel: data.channel}); + } } }); }); diff --git a/server/public/assets/js/admin.js b/server/public/assets/js/admin.js index 0cf40b36..3622e4b2 100755 --- a/server/public/assets/js/admin.js +++ b/server/public/assets/js/admin.js @@ -7,9 +7,7 @@ var Admin = { Admin.logged_in = msg; if(!msg) return; w_p = false; - if(adminpass == undefined || adminpass == "") { - //adminpass = Crypt.get_pass(chan.toLowerCase()); - } + if(Admin.logged_in) { $("#thumbnail_form").css("display", "inline-block"); $("#description_form").css("display", "inline-block"); @@ -224,9 +222,7 @@ var Admin = { userpass: Crypt.crypt_pass(pass_send), userpass_changed: userpass_changed }; - if(userpass_changed){ - //Crypt.set_userpass(chan.toLowerCase(), userpass); - } + emit("conf", configs); }, diff --git a/server/public/assets/js/channel.js b/server/public/assets/js/channel.js index 2f513368..d5d8f1b9 100644 --- a/server/public/assets/js/channel.js +++ b/server/public/assets/js/channel.js @@ -131,8 +131,6 @@ var Channel = { Crypt.init(); - Chat.namechange("", true, true); - setup_auth_listener(); if(Crypt.get_offline()){ diff --git a/server/public/assets/js/chat.js b/server/public/assets/js/chat.js index 7cb19fb7..5ac2ff36 100755 --- a/server/public/assets/js/chat.js +++ b/server/public/assets/js/chat.js @@ -24,7 +24,11 @@ var Chat = { socket.emit("namechange", {name: name, channel: chan.toLowerCase(), new_password: new_password, old_password: old_password}); } else if(first) { - socket.emit("namechange", {channel: chan.toLowerCase(), initial: initial, first: true}); + var to_send = {initial: initial, first: true}; + if(chan != undefined && chan != "") { + to_send.channel = chan.toLowerCase(); + } + socket.emit("namechange", to_send); } }, diff --git a/server/public/assets/js/crypt.js b/server/public/assets/js/crypt.js index bb561df8..0e4f4a04 100755 --- a/server/public/assets/js/crypt.js +++ b/server/public/assets/js/crypt.js @@ -22,12 +22,6 @@ var Crypt = { } if(window.location.pathname != "/") { - try { - //Crypt.conf_pass = Crypt.decrypt(Crypt.getCookie(chan.toLowerCase()), chan.toLowerCase()); - } catch(err) { - //Crypt.conf_pass = Crypt.decrypt(Crypt.create_cookie(chan.toLowerCase()), chan.toLowerCase()); - } - Hostcontroller.change_enabled(conf_arr.remote); if(conf_arr.width != 100) Player.set_width(conf_arr.width); } diff --git a/server/public/assets/js/listeners.js b/server/public/assets/js/listeners.js index eeea9b6c..a6455313 100755 --- a/server/public/assets/js/listeners.js +++ b/server/public/assets/js/listeners.js @@ -26,8 +26,6 @@ var frontpage = 1; var empty_clear = false; var adminpass = ""; var showDiscovery = false; -var temp_name = ""; -var temp_pass = ""; var player_ready = false; var viewers = 1; var temp_user_pass = ""; @@ -199,15 +197,12 @@ $().ready(function(){ /*if(chan != undefined && (Crypt.get_pass(chan.toLowerCase()) !== undefined && Crypt.get_pass(chan.toLowerCase()) !== "")){ emit("password", {password: Crypt.crypt_pass(Crypt.get_pass(chan.toLowerCase())), channel: chan.toLowerCase()}); }*/ - if(chan != undefined) { - Chat.namechange("", true, true); - } $(".connect_error").fadeOut(function(){ $(".connect_error").remove(); Materialize.toast("Connected!", 2000, "green lighten"); }); } - + Chat.namechange("", true, true); }); /*socket.on("name", function(data) {