mirror of
https://github.com/Expand-sys/mcbot
synced 2025-12-17 07:12:13 +11:00
bug fixes
This commit is contained in:
parent
a0ffbef3a0
commit
aaa300d752
3 changed files with 25 additions and 29 deletions
|
|
@ -23,15 +23,18 @@ module.exports = {
|
||||||
*/
|
*/
|
||||||
async execute(interaction) {
|
async execute(interaction) {
|
||||||
let mcusr = interaction.options.getString("mcusername")
|
let mcusr = interaction.options.getString("mcusername")
|
||||||
|
let collection = await dbclient.db("ntcmcbot").collection("users");
|
||||||
|
let userdb = await collection.findOne({DISCORDID: interaction.member.id})
|
||||||
|
|
||||||
interaction.deferReply()
|
interaction.deferReply()
|
||||||
let highest = "default";
|
let highest = "default";
|
||||||
switch(true) {
|
switch(true) {
|
||||||
case interaction.member.roles.cache.has(process.env.DISCORDSTAFF_ROLE):
|
|
||||||
highest = "discordstaff";
|
|
||||||
break;
|
|
||||||
case interaction.member.roles.cache.has(process.env.MCSTAFF_ROLE):
|
case interaction.member.roles.cache.has(process.env.MCSTAFF_ROLE):
|
||||||
highest = "mcstaff";
|
highest = "mcstaff";
|
||||||
break;
|
break;
|
||||||
|
case interaction.member.roles.cache.has(process.env.DISCORDSTAFF_ROLE):
|
||||||
|
highest = "discordstaff";
|
||||||
|
break;
|
||||||
case interaction.member.roles.cache.has(process.env.PATREON_ROLE):
|
case interaction.member.roles.cache.has(process.env.PATREON_ROLE):
|
||||||
highest = "patreon";
|
highest = "patreon";
|
||||||
break;
|
break;
|
||||||
|
|
@ -40,7 +43,7 @@ module.exports = {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
let collection = await dbclient.db("ntcmcbot").collection("users");
|
collection = await dbclient.db("ntcmcbot").collection("users");
|
||||||
// perform actions on the collection object
|
// perform actions on the collection object
|
||||||
collection.updateOne(
|
collection.updateOne(
|
||||||
{ DISCORDID: `${interaction.member.id}` }, // Query parameter
|
{ DISCORDID: `${interaction.member.id}` }, // Query parameter
|
||||||
|
|
@ -51,11 +54,6 @@ module.exports = {
|
||||||
}},
|
}},
|
||||||
{ upsert: true } // Options
|
{ upsert: true } // Options
|
||||||
)
|
)
|
||||||
collection = await dbclient.db("ntcmcbot").collection("users");
|
|
||||||
if(interaction.member.id === await collection.findOne({MCUSR: mcusr}).DISCORDID){
|
|
||||||
console.log("beans")
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
const rcon = new Rcon({
|
const rcon = new Rcon({
|
||||||
host: `${process.env.MCHOST}`,
|
host: `${process.env.MCHOST}`,
|
||||||
|
|
@ -71,10 +69,11 @@ module.exports = {
|
||||||
connected = false
|
connected = false
|
||||||
error = e
|
error = e
|
||||||
}
|
}
|
||||||
|
console.log(userdb)
|
||||||
|
if(userdb.USRROLE != undefined){
|
||||||
let clear = await rcon.send(`lp user ${mcusr} parent clear`)
|
let clear = await rcon.send(`lp user ${mcusr} group remove ${userdb.USRROLE}`)
|
||||||
let res = await rcon.send(`lp user ${mcusr} parent add ${highest}`);
|
}
|
||||||
|
let res = await rcon.send(`lp user ${mcusr} group add ${highest}`);
|
||||||
console.log(res)
|
console.log(res)
|
||||||
await sendResponse(interaction, `added ${mcusr} to the role ${highest}`);
|
await sendResponse(interaction, `added ${mcusr} to the role ${highest}`);
|
||||||
await rcon.end();
|
await rcon.end();
|
||||||
|
|
|
||||||
|
|
@ -21,18 +21,18 @@ module.exports = {
|
||||||
await interaction.deferReply()
|
await interaction.deferReply()
|
||||||
const collection = dbclient.db("ntcmcbot").collection("users");
|
const collection = dbclient.db("ntcmcbot").collection("users");
|
||||||
const cursor = await collection.find().forEach(async function(user){
|
const cursor = await collection.find().forEach(async function(user){
|
||||||
console.log(user.DISCORDID)
|
|
||||||
let member = await interaction.guild.members.cache.get(user.DISCORDID)
|
let member = await interaction.guild.members.cache.get(user.DISCORDID)
|
||||||
console.log(`checking ${member.user.username}`)
|
console.log(`checking ${member.user.username}`)
|
||||||
|
|
||||||
let highest = "stdusr";
|
let highest = "stdusr";
|
||||||
switch(true) {
|
switch(true) {
|
||||||
case interaction.member.roles.cache.has(process.env.DISCORDSTAFF_ROLE):
|
|
||||||
highest = "discordstaff";
|
|
||||||
break;
|
|
||||||
case interaction.member.roles.cache.has(process.env.MCSTAFF_ROLE):
|
case interaction.member.roles.cache.has(process.env.MCSTAFF_ROLE):
|
||||||
highest = "mcstaff";
|
highest = "mcstaff";
|
||||||
break;
|
break;
|
||||||
|
case interaction.member.roles.cache.has(process.env.DISCORDSTAFF_ROLE):
|
||||||
|
highest = "discordstaff";
|
||||||
|
break;
|
||||||
case interaction.member.roles.cache.has(process.env.PATREON_ROLE):
|
case interaction.member.roles.cache.has(process.env.PATREON_ROLE):
|
||||||
highest = "patreon";
|
highest = "patreon";
|
||||||
break;
|
break;
|
||||||
|
|
@ -41,7 +41,6 @@ module.exports = {
|
||||||
break;
|
break;
|
||||||
|
|
||||||
}
|
}
|
||||||
console.log(user.USRROLE)
|
|
||||||
if(highest != user.USRROLE){
|
if(highest != user.USRROLE){
|
||||||
collection.updateOne(
|
collection.updateOne(
|
||||||
{ DISCORDID: `${user.DISCORDID}` }, // Query parameter
|
{ DISCORDID: `${user.DISCORDID}` }, // Query parameter
|
||||||
|
|
@ -67,8 +66,8 @@ module.exports = {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
let clear = await rcon.send(`lp user ${user.MCUSR} parent clear`)
|
let clear = await rcon.send(`lp user ${user.MCUSR} group remove ${user.USRROLE}`)
|
||||||
let res = await rcon.send(`lp user ${user.MCUSR} parent add ${highest}`);
|
let res = await rcon.send(`lp user ${user.MCUSR} group add ${highest}`);
|
||||||
changed.push(`${member.user.username}(${user.MCUSER}) -> ${highest}`)
|
changed.push(`${member.user.username}(${user.MCUSER}) -> ${highest}`)
|
||||||
}
|
}
|
||||||
if (changed.length <= 0){
|
if (changed.length <= 0){
|
||||||
|
|
|
||||||
|
|
@ -21,17 +21,19 @@ module.exports = {
|
||||||
let guild = client.guilds.cache.get(`${process.env.GUILD_ID}`)
|
let guild = client.guilds.cache.get(`${process.env.GUILD_ID}`)
|
||||||
const collection = dbclient.db("ntcmcbot").collection("users");
|
const collection = dbclient.db("ntcmcbot").collection("users");
|
||||||
const cursor = collection.find().forEach(async function(user){
|
const cursor = collection.find().forEach(async function(user){
|
||||||
|
|
||||||
let member = guild.members.cache.get(`${user.DISCORDID}`)
|
let member = guild.members.cache.get(`${user.DISCORDID}`)
|
||||||
console.log(`updating ${member.name}`)
|
console.log(`updating ${member.name}`)
|
||||||
|
|
||||||
let highest = "default";
|
let highest = "default";
|
||||||
switch(true) {
|
switch(true) {
|
||||||
case interaction.member.roles.cache.has(process.env.DISCORDSTAFF_ROLE):
|
|
||||||
highest = "discordstaff";
|
|
||||||
break;
|
|
||||||
case interaction.member.roles.cache.has(process.env.MCSTAFF_ROLE):
|
case interaction.member.roles.cache.has(process.env.MCSTAFF_ROLE):
|
||||||
highest = "mcstaff";
|
highest = "mcstaff";
|
||||||
break;
|
break;
|
||||||
|
case interaction.member.roles.cache.has(process.env.DISCORDSTAFF_ROLE):
|
||||||
|
highest = "discordstaff";
|
||||||
|
break;
|
||||||
case interaction.member.roles.cache.has(process.env.PATREON_ROLE):
|
case interaction.member.roles.cache.has(process.env.PATREON_ROLE):
|
||||||
highest = "patreon";
|
highest = "patreon";
|
||||||
break;
|
break;
|
||||||
|
|
@ -40,7 +42,6 @@ module.exports = {
|
||||||
break;
|
break;
|
||||||
|
|
||||||
}
|
}
|
||||||
console.log(user.USRROLE)
|
|
||||||
if(highest != user.USRROLE){
|
if(highest != user.USRROLE){
|
||||||
interaction.deferReply()
|
interaction.deferReply()
|
||||||
collection.updateOne(
|
collection.updateOne(
|
||||||
|
|
@ -67,11 +68,8 @@ module.exports = {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
let clear = await rcon.send(`lp user ${mcusr} parent clear`)
|
let clear = await rcon.send(`lp user ${mcusr} group remove ${user.USRROLE}`)
|
||||||
let res = await rcon.send(`lp user ${user.MCUSR} parent add ${highest}`);
|
let res = await rcon.send(`lp user ${user.MCUSR} group add ${highest}`);
|
||||||
sendResponse(interaction, `did it boss`)
|
|
||||||
}else {
|
|
||||||
sendReply(interaction, `nothing to do here boss`)
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue