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

Improved how naming works on join

Browse Source 
- XXXX changed name to YYYY doesn't happen if the user already is signed in
- Signs automatically in on frontpage join
This commit is contained in:
Kasper Rynning-Tønnesen
2018-09-01 13:04:40 +02:00
parent 6d361db3ad
commit 47e45c5b19
4 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
server/handlers/chat.js
View File

@@ -301,13 +301,41 @@ function generate_name(guid, announce_payload, second, round) {
}
function get_name(guid, announce_payload, first) {
if(!announce_payload.announce && announce_payload.hasOwnProperty("socket")) {
Functions.getSessionChatPass(Functions.getSession(announce_payload.socket), function(name, pass) {
if(name == "" || pass == "") {
get_name_generate(guid, announce_payload, first);
return;
}
db.collection("registered_users").find({"_id": name.toLowerCase()}, function(err, docs) {
if(docs[0].password == Functions.hash_pass(Functions.decrypt_string(pass))) {
var icon = false;
if(docs[0].icon) {
icon = docs[0].icon;
}
Functions.setSessionChatPass(Functions.getSession(announce_payload.socket), name.toLowerCase(), pass, function() {
});
db.collection("user_names").update({"guid": guid}, {$set: {name: name, icon: icon}}, {upsert: true}, function(err, docs) {
db.collection("user_names").update({"_id": "all_names"}, {$addToSet: {names: name}}, function(err, docs) {
name = name;
});
});
}
});
});
} else {
get_name_generate(guid, announce_payload, first);
}
}
function get_name_generate(guid, announce_payload, first) {
db.collection("user_names").find({"guid": guid}, function(err, docs) {
if(docs.length == 0) {
generate_name(guid, announce_payload);
} else {
name = docs[0].name;
}
})
});
}
module.exports.get_history = get_history;