daniel176
/
mpp-server-dev2
forked from Hri7566/mpp-server-dev2
1
0
Fork 0
Code Pull Requests Activity

implement remove crown, fix crown bugs

This commit is contained in:
Hri7566 2022-07-09 00:38:32 -04:00
parent 69deba6558
commit 75002ec47d
5 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.env
View File

@ -1,6 +1,7 @@
ADMINPASS=burgerass ADMINPASS=burgerass
SALT=๖ۣۜH͜r̬i͡7566 SALT=๖ۣۜH͜r̬i͡7566
MONGO_URL=mongodb://7566:Phillies11@127.0.0.1/?authSource=admin&readPreference=primary&appname=MongoDB%20Compass&ssl=false # MONGO_URL=mongodb://7566:Phillies11@127.0.0.1/?authSource=admin&readPreference=primary&appname=MongoDB%20Compass&ssl=false
SSL=true MONGO_URL=mongodb://127.0.0.1
SSL=false
MPPCLONE_TOKEN=056921b5199a52cf926baaed.15646cde-7a71-40d5-880c-5b283265c6fd MPPCLONE_TOKEN=056921b5199a52cf926baaed.15646cde-7a71-40d5-880c-5b283265c6fd

4
config.js
View File

@ -22,6 +22,6 @@ module.exports = Object.seal({
visible: true visible: true
}, },
hostDevFiles: false, hostDevFiles: true,
enableMPPCloneBot: true enableMPPCloneBot: false
}); });

1
mpp.hri7566.info Submodule

@ -0,0 +1 @@
Subproject commit 91ff8343d35176eb8bcfb4c51396871a7ddac5b6

3
src/Channel.js
View File

@ -364,9 +364,11 @@ class Channel extends EventEmitter {
this.crown = new Crown(id, prsn.user._id); this.crown = new Crown(id, prsn.user._id);
this.crowndropped = false; this.crowndropped = false;
} else { } else {
if (this.crown) {
this.crown = new Crown(id, this.crown.userId); this.crown = new Crown(id, this.crown.userId);
this.crowndropped = true; this.crowndropped = true;
} }
}
this.updateCh(); this.updateCh();
} }
@ -449,6 +451,7 @@ class Channel extends EventEmitter {
this.adminChat("pong"); this.adminChat("pong");
break; break;
case "!setcolor": case "!setcolor":
case "!color":
if (!isAdmin) { if (!isAdmin) {
this.adminChat("You do not have permission to use this command."); this.adminChat("You do not have permission to use this command.");
return; return;

5
src/Message.js
View File

@ -97,7 +97,9 @@ module.exports = (cl) => {
//console.log((Date.now() - cl.channel.crown.time)) //console.log((Date.now() - cl.channel.crown.time))
//console.log(!(cl.channel.crown.userId != cl.user._id), !((Date.now() - cl.channel.crown.time) > 15000)); //console.log(!(cl.channel.crown.userId != cl.user._id), !((Date.now() - cl.channel.crown.time) > 15000));
if (!cl.channel.crown && !admin) {
if (!(cl.channel.crown.userId == cl.user._id) && !((Date.now() - cl.channel.crown.time) > 15000)) return; if (!(cl.channel.crown.userId == cl.user._id) && !((Date.now() - cl.channel.crown.time) > 15000)) return;
}
if (msg.hasOwnProperty("id")) { if (msg.hasOwnProperty("id")) {
// console.log(cl.channel.crown) // console.log(cl.channel.crown)
@ -369,13 +371,14 @@ module.exports = (cl) => {
if (!msg.hasOwnProperty('msg')) return; if (!msg.hasOwnProperty('msg')) return;
if (typeof msg.msg != 'object') return; if (typeof msg.msg != 'object') return;
if (typeof msg.msg.m != 'string') return;
if (!cl.channel) return; if (!cl.channel) return;
if (!msg.hasOwnProperty('_id')) msg._id = cl.channel._id; if (!msg.hasOwnProperty('_id')) msg._id = cl.channel._id;
let ch = cl.server.rooms.get(msg._id); let ch = cl.server.rooms.get(msg._id);
if (!ch) return; if (!ch) return;
ch.emit(msg.m, msg); ch.emit(msg.msg.m, msg.msg);
}); });
cl.on('name', (msg, admin) => { cl.on('name', (msg, admin) => {