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

Better icon-handling

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-10-12 17:23:49 +02:00
parent 520558166b
commit 3b50d84af8
1 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
server/handlers/chat.js
View File

@@ -13,11 +13,13 @@ function chat(msg, guid, offline, socket) {
data.length < 151 && data.replace(/\s/g, '').length){ data.length < 151 && data.replace(/\s/g, '').length){
db.collection("user_names").find({"guid": guid}, function(err, docs) { db.collection("user_names").find({"guid": guid}, function(err, docs) {
if(docs.length == 1) { if(docs.length == 1) {
var icon = false; db.collection("registered_users").find({"_id": docs[0].name}, function(err, n) {
if(docs[0].icon) { var icon = false;
icon = docs[0].icon; if(n.length > 0 && n[0].icon) {
} icon = n[0].icon;
io.to(coll).emit('chat', {from: docs[0].name, msg: ": " + data, icon: icon}); }
io.to(coll).emit('chat', {from: docs[0].name, msg: ": " + data, icon: icon});
});
} else if(docs.length == 0){ } else if(docs.length == 0){
get_name(guid, {announce: false, channel: coll, message: data, all: false}); get_name(guid, {announce: false, channel: coll, message: data, all: false});
} }
@@ -42,11 +44,13 @@ function all_chat(msg, guid, offline, socket) {
data.length < 151 && data.replace(/\s/g, '').length){ data.length < 151 && data.replace(/\s/g, '').length){
db.collection("user_names").find({"guid": guid}, function(err, docs) { db.collection("user_names").find({"guid": guid}, function(err, docs) {
if(docs.length == 1) { if(docs.length == 1) {
var icon = false; db.collection("registered_users").find({"_id": docs[0].name}, function(err, n) {
if(docs[0].icon) { var icon = false;
icon = docs[0].icon; if(n.length > 0 && n[0].icon) {
} icon = n[0].icon;
io.sockets.emit('chat.all', {from: docs[0].name, msg: ": " + data, channel: coll, icon: icon}); }
io.sockets.emit('chat.all', {from: docs[0].name, msg: ": " + data, channel: coll, icon: icon});
});
} else if(docs.length == 0) { } else if(docs.length == 0) {
get_name(guid, {announce: false, channel: coll, message: data, all: true}); get_name(guid, {announce: false, channel: coll, message: data, all: true});
} }
@@ -124,19 +128,25 @@ function removename(guid, coll) {
function generate_name(guid, announce_payload) { function generate_name(guid, announce_payload) {
var tmp_name = Functions.rndName(guid, 8); var tmp_name = Functions.rndName(guid, 8);
db.collection("user_names").update({"_id": "all_names"}, {$addToSet: {names: tmp_name}}, {upsert: true}, function(err, updated) { db.collection("registered_users").find({"_id": tmp_name}, function(err, docs) {
if(updated.nModified == 1 || (updated.hasOwnProperty("upserted") && n == 1)) { if(docs.length == 0) {
db.collection("user_names").update({"guid": guid}, {$set: {name: tmp_name, icon: false}}, {upsert: true}, function(err, update){ db.collection("user_names").update({"_id": "all_names"}, {$addToSet: {names: tmp_name}}, {upsert: true}, function(err, updated) {
name = tmp_name; if(updated.nModified == 1 || (updated.hasOwnProperty("upserted") && n == 1)) {
if(announce_payload.announce) { db.collection("user_names").update({"guid": guid}, {$set: {name: tmp_name, icon: false}}, {upsert: true}, function(err, update){
io.to(announce_payload.channel).emit('chat', {from: announce_payload.old_name, msg: " changed name to " + name}); name = tmp_name;
io.sockets.emit('chat.all', {from: announce_payload.old_name , msg: " changed name to " + name, channel: announce_payload.channel}); if(announce_payload.announce) {
} else if(announce_payload.message && !announce_payload.all) { io.to(announce_payload.channel).emit('chat', {from: announce_payload.old_name, msg: " changed name to " + name});
io.to(announce_payload.channel).emit('chat', {from: name, msg: ": " + announce_payload.message}); io.sockets.emit('chat.all', {from: announce_payload.old_name , msg: " changed name to " + name, channel: announce_payload.channel});
} else if(announce_payload.message && announce_payload.all) { } else if(announce_payload.message && !announce_payload.all) {
io.sockets.emit('chat.all', {from: name, msg: ": " + announce_payload.message, channel: announce_payload.channel}); io.to(announce_payload.channel).emit('chat', {from: name, msg: ": " + announce_payload.message});
} else if(announce_payload.message && announce_payload.all) {
io.sockets.emit('chat.all', {from: name, msg: ": " + announce_payload.message, channel: announce_payload.channel});
}
});
} else {
Chat.generate_name(tmp_name, announce_payload);
} }
}); })
} else { } else {
Chat.generate_name(tmp_name, announce_payload); Chat.generate_name(tmp_name, announce_payload);
} }