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

More clever way of detecting if a name should be removed when user leaves

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-08-28 13:18:22 +02:00
parent 46996881cb
commit b135c1390c
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/handlers/chat.js
View File

@@ -261,8 +261,9 @@ function removename(guid, coll, socket) {
}); });
} }
function generate_name(guid, announce_payload, second) { function generate_name(guid, announce_payload, second, round) {
var tmp_name = Functions.rndName(second ? second : guid, 8); if(round == undefined) round = 0;
var tmp_name = Functions.rndName(second ? second : guid, Math.floor(8 + round));
db.collection("registered_users").find({"_id": tmp_name}, function(err, docs) { db.collection("registered_users").find({"_id": tmp_name}, function(err, docs) {
if(docs.length == 0) { if(docs.length == 0) {
db.collection("user_names").update({"_id": "all_names"}, {$addToSet: {names: tmp_name}}, {upsert: true}, function(err, updated) { db.collection("user_names").update({"_id": "all_names"}, {$addToSet: {names: tmp_name}}, {upsert: true}, function(err, updated) {
@@ -279,11 +280,11 @@ function generate_name(guid, announce_payload, second) {
} }
}); });
} else { } else {
generate_name(guid, announce_payload, tmp_name); generate_name(guid, announce_payload, tmp_name, round + 0.25);
} }
}) })
} else { } else {
generate_name(guid, announce_payload, tmp_name); generate_name(guid, announce_payload, tmp_name, round + 0.25);
} }
}) })
} }

8
server/handlers/functions.js
View File

@@ -37,10 +37,18 @@ function remove_unique_id(short_id) {
} }
function remove_name_from_db(guid, name) { function remove_name_from_db(guid, name) {
// Use temporary, with caution. Can bottleneck in large quantity of users.
//
// Find a way of indexing users in lists in a clever way, to avoid the search here
db.collection("connected_users").find({"_id": "total_users"}, function(err, all_users) {
var hasOne = all_users[0].total_users.some(function(v){ return v.indexOf(guid)>=0 });
if(!hasOne) {
db.collection("user_names").update({"_id": "all_names"}, {$pull: {names: name}}, function(err, updated) { db.collection("user_names").update({"_id": "all_names"}, {$pull: {names: name}}, function(err, updated) {
db.collection("user_names").remove({"guid": guid}, function(err, removed) { }); db.collection("user_names").remove({"guid": guid}, function(err, removed) { });
}); });
} }
});
}
function isUrl(str) { function isUrl(str) {
var pattern = new RegExp("\\b(((ht|f)tp(s?)\\:\\/\\/|~\\/|\\/)|www.)" + var pattern = new RegExp("\\b(((ht|f)tp(s?)\\:\\/\\/|~\\/|\\/)|www.)" +