From 123df7396a13f0418d6694b157017afd0da294cf Mon Sep 17 00:00:00 2001 From: Wolfy Date: Tue, 7 Apr 2020 17:09:00 -0400 Subject: [PATCH] something --- src/Client.js | 3 +-- src/Message.js | 4 ++-- src/Room.js | 8 ++------ src/User.js | 4 +--- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/Client.js b/src/Client.js index e02a7c3..ba10f85 100644 --- a/src/Client.js +++ b/src/Client.js @@ -82,7 +82,6 @@ class Client extends EventEmitter { chown: new RateLimitChain(quotas.chown.amount, quotas.chown.time), userset: new RateLimitChain(quotas.userset.amount, quotas.userset.time), kickban: new RateLimitChain(quotas.kickban.amount, quotas.kickban.time), - note: new Quota(Quota.PARAMS_LOBBY), chset: new Quota(Quota.PARAMS_USED_A_LOT), "+ls": new Quota(Quota.PARAMS_USED_A_LOT), @@ -129,4 +128,4 @@ class Client extends EventEmitter { }); } } -module.exports = Client; \ No newline at end of file +module.exports = Client; diff --git a/src/Message.js b/src/Message.js index 157a858..36d9fb9 100644 --- a/src/Message.js +++ b/src/Message.js @@ -192,7 +192,7 @@ module.exports = (cl) => { let dbentry = user.userdb.get(uSr._id); if (!dbentry) return; dbentry.color = msg.color; - //user.updatedb(); + user.updatedb(); cl.server.rooms.forEach((room) => { room.updateParticipant(usr.participantId, { color: msg.color @@ -204,4 +204,4 @@ module.exports = (cl) => { }) -} \ No newline at end of file +} diff --git a/src/Room.js b/src/Room.js index a314a8e..6d2a2b8 100644 --- a/src/Room.js +++ b/src/Room.js @@ -48,7 +48,7 @@ class Room extends EventEmitter { //cl.quotas.a.setParams(Quota.PARAMS_A_NORMAL); } this.ppl.set(participantId, cl); - + this.connections.push(cl); this.sendArray([{ color: this.ppl.get(cl.participantId).user.color, @@ -110,17 +110,13 @@ class Room extends EventEmitter { options.name ? this.ppl.get(pid).user.name = options.name : {}; options._id ? this.ppl.get(pid).user._id = options._id : {}; options.color ? this.ppl.get(pid).user.color = options.color : {}; - options.noteColor ? this.ppl.get(pid).user.noteColor = options.noteColor : {}; this.connections.filter((ofo) => ofo.participantId == p.participantId).forEach((usr) => { options.name ? usr.user.name = options.name : {}; options._id ? usr.user._id = options._id : {}; options.color ? usr.user.color = options.color : {}; - options.noteColor ? usr.user.noteColor = options.noteColor : {}; }) this.sendArray([{ color: p.user.color, - noteColor: p.user.noteColor, - //noteColor: "#000", id: p.participantId, m: "p", name: p.user.name, @@ -429,4 +425,4 @@ class Room extends EventEmitter { } } -module.exports = Room; \ No newline at end of file +module.exports = Room; diff --git a/src/User.js b/src/User.js index f8301dd..3dae730 100644 --- a/src/User.js +++ b/src/User.js @@ -18,7 +18,6 @@ class User { if (typeof usertofind == 'object' && (usertofind.hasOwnProperty('name') && usertofind.name != this.server.defaultUsername)) return; userdb.set(_id, { "color": `#${ColorEncoder.intToRGB(ColorEncoder.hashCode(_id)).toLowerCase()}`, - "noteColor": `#${ColorEncoder.intToRGB(ColorEncoder.hashCode(_id)).toLowerCase()}`, "name": this.server.defaultUsername, "_id": _id, "ip": this.cl.ip @@ -28,7 +27,6 @@ class User { let user = userdb.get(_id); return { "color": user.color, - "noteColor": user.noteColor, "name": user.name, "_id": user._id, } @@ -52,4 +50,4 @@ class User { return [...strMap.entries()].reduce((obj, [key, value]) => (obj[key] = value, obj), {}); } } -module.exports = User; \ No newline at end of file +module.exports = User;