Hri7566
/
mpp-server-dev2
1
0
Fork 1
Code Issues Pull Requests Packages Projects 1 Releases Wiki 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
SALT=๖ۣۜH͜r̬i͡7566
MONGO_URL=mongodb://7566:Phillies11@127.0.0.1/?authSource=admin&readPreference=primary&appname=MongoDB%20Compass&ssl=false
SSL=true
# MONGO_URL=mongodb://7566:Phillies11@127.0.0.1/?authSource=admin&readPreference=primary&appname=MongoDB%20Compass&ssl=false
MONGO_URL=mongodb://127.0.0.1
SSL=false
MPPCLONE_TOKEN=056921b5199a52cf926baaed.15646cde-7a71-40d5-880c-5b283265c6fd

4
config.js
View File

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

1
mpp.hri7566.info Submodule

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

7
src/Channel.js
View File

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

7
src/Message.js
View File

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