i broke it real bad so i fixed it
This commit is contained in:
404invalid-user
parent
425c617f23
commit
fcb10e8b9a
7 changed files with 177 additions and 147 deletions
|
|
@ -17,7 +17,7 @@ module.exports = {
|
|||
if (currentServer == null) return;
|
||||
|
||||
['caps', 'swearfilter'].forEach(addon => {
|
||||
require(`../addons/${addon}`)(message, server, messageUser, client);
|
||||
require(`../addons/${addon}`)(message, currentServer, messageUser, client);
|
||||
})
|
||||
|
||||
//eval command
|
||||
|
|
|
|||
|
|
@ -15,21 +15,25 @@ module.exports = {
|
|||
let currentUser = await Userdashboard.findOne({ userId: res.locals.cookie.id })
|
||||
let currentServer = await Server.findOne({ id: req.params.serverid })
|
||||
if (currentServer == null) return res.render('404.ejs')
|
||||
let guild = await currentUser.guilds[currentServer.id];
|
||||
if (guild.userPermission == 'owner' || guild.userPermission == 'MANAGE_GUILD' || currentServer.staff.includes(currentUser.userId)) {
|
||||
let hasAccess = false;
|
||||
await currentUser.accessCodes.forEach(async(userCode) => {
|
||||
if (res.locals.cookie.accesscode == userCode.code) {
|
||||
let gAccess = false;
|
||||
await currentUser.guilds.forEach(guild => {
|
||||
if (guild.id == currentServer.id) {
|
||||
gAccess = true;
|
||||
if (guild.userPermission == 'owner' || guild.userPermission == 'MANAGE_GUILD' || currentServer.staff.includes(currentUser.userId)) {
|
||||
let hasAccess = false;
|
||||
await currentUser.accessCodes.forEach(async(userCode) => {
|
||||
if (res.locals.cookie.accesscode == userCode.code) {
|
||||
|
||||
hasAccess = true;
|
||||
return res.cookie('id', currentUser.userId, { expires: new Date(253402300000000), httpOnly: true }).cookie('accesscode', res.locals.cookie.accesscode, { expires: new Date(253402300000000), httpOnly: true }).render('dashboard/filter.ejs', { domain: conf.domain, user: { id: currentUser.userId, accesscode: res.locals.cookie.accesscode }, currentUser: currentUser, currentServer: currentServer });
|
||||
hasAccess = true;
|
||||
return res.cookie('id', currentUser.userId, { expires: new Date(253402300000000), httpOnly: true }).cookie('accesscode', res.locals.cookie.accesscode, { expires: new Date(253402300000000), httpOnly: true }).render('dashboard/filter.ejs', { domain: conf.domain, user: { id: currentUser.userId, accesscode: res.locals.cookie.accesscode }, currentUser: currentUser, currentServer: currentServer });
|
||||
};
|
||||
});
|
||||
if (hasAccess == false) return res.redirect('/login?ninvalidcode');
|
||||
};
|
||||
});
|
||||
|
||||
if (hasAccess == false) return res.redirect('/login?ninvalidcode');
|
||||
|
||||
} else {
|
||||
await res.status(401).render('error.ejs', { errorMessage: null, error: "you do not have access to the admin dashboard if you are a member of staff tell the bot owner", userInfo: { id: req.query.userid, username: req.query.userame, avatar: req.query.userAvatar } })
|
||||
};
|
||||
});
|
||||
if (gAccess == false) {
|
||||
return res.status(401).render('error.ejs', { errorMessage: null, error: "you do not have access to the admin dashboard if you are a member of staff tell the bot owner" })
|
||||
}
|
||||
} catch (error) {
|
||||
console.log(error)
|
||||
|
|
|
|||
|
|
@ -16,28 +16,34 @@ module.exports = {
|
|||
if (currentUser == null) return res.render('404.ejs')
|
||||
let currentServer = await Server.findOne({ id: req.params.serverid })
|
||||
if (currentServer == null) return res.render('404.ejs')
|
||||
let guild = await currentUser.guilds[currentServer.id];
|
||||
if (guild.userPermission == 'owner' || guild.userPermission == 'MANAGE_GUILD' || currentServer.staff.includes(currentUser.userId)) {
|
||||
let hasAccess = false;
|
||||
let listedRoles = [];
|
||||
let listedChannels = [];
|
||||
let server = await client.guilds.cache.get(currentServer.id);
|
||||
let user = await server.members.fetch(currentUser.userId);
|
||||
//push server roles to array
|
||||
server.roles.cache.map((role) => listedRoles.push({ id: role.id, name: role.name }));
|
||||
//push only channels user can see to array
|
||||
server.channels.cache.filter(c => c.type == 'text').forEach(channel => {
|
||||
if (server.channels.cache.get(channel.id).permissionsFor(user).has(['SEND_MESSAGES', 'VIEW_CHANNEL'])) listedChannels.push({ name: channel.name, id: channel.id });
|
||||
});
|
||||
await currentUser.accessCodes.forEach(async(userCode) => {
|
||||
if (res.locals.cookie.accesscode == userCode.code) {
|
||||
hasAccess = true;
|
||||
return res.cookie('id', currentUser.userId, { expires: new Date(253402300000000), httpOnly: true }).cookie('accesscode', res.locals.cookie.accesscode, { expires: new Date(253402300000000), httpOnly: true }).render('dashboard/reactionroles.ejs', { domain: conf.domain, server: { channels: listedChannels, roles: listedRoles }, user: { id: currentUser.userId, accesscode: res.locals.cookie.accesscode }, currentUser: currentUser, currentServer: currentServer });
|
||||
let gAccess = false;
|
||||
await currentUser.guilds.forEach(guild => {
|
||||
if (guild.id == currentServer.id) {
|
||||
gAccess = true;
|
||||
if (guild.userPermission == 'owner' || guild.userPermission == 'MANAGE_GUILD' || currentServer.staff.includes(currentUser.userId)) {
|
||||
let hasAccess = false;
|
||||
let listedRoles = [];
|
||||
let listedChannels = [];
|
||||
let server = await client.guilds.cache.get(currentServer.id);
|
||||
let user = await server.members.fetch(currentUser.userId);
|
||||
//push server roles to array
|
||||
server.roles.cache.map((role) => listedRoles.push({ id: role.id, name: role.name }));
|
||||
//push only channels user can see to array
|
||||
server.channels.cache.filter(c => c.type == 'text').forEach(channel => {
|
||||
if (server.channels.cache.get(channel.id).permissionsFor(user).has(['SEND_MESSAGES', 'VIEW_CHANNEL'])) listedChannels.push({ name: channel.name, id: channel.id });
|
||||
});
|
||||
await currentUser.accessCodes.forEach(async(userCode) => {
|
||||
if (res.locals.cookie.accesscode == userCode.code) {
|
||||
hasAccess = true;
|
||||
return res.cookie('id', currentUser.userId, { expires: new Date(253402300000000), httpOnly: true }).cookie('accesscode', res.locals.cookie.accesscode, { expires: new Date(253402300000000), httpOnly: true }).render('dashboard/reactionroles.ejs', { domain: conf.domain, server: { channels: listedChannels, roles: listedRoles }, user: { id: currentUser.userId, accesscode: res.locals.cookie.accesscode }, currentUser: currentUser, currentServer: currentServer });
|
||||
};
|
||||
});
|
||||
if (hasAccess == false) return res.redirect('/login?ninvalidcode');
|
||||
};
|
||||
});
|
||||
if (hasAccess == false) return res.redirect('/login?ninvalidcode');
|
||||
} else {
|
||||
await res.status(401).render('error.ejs', { errorMessage: null, error: "you do not have access to the admin dashboard if you are a member of staff tell the bot owner", userInfo: { id: req.query.userid, username: req.query.userame, avatar: req.query.userAvatar } })
|
||||
};
|
||||
});
|
||||
if (gAccess == false) {
|
||||
return res.status(401).render('error.ejs', { errorMessage: null, error: "you do not have access to the admin dashboard if you are a member of staff tell the bot owner" })
|
||||
}
|
||||
} catch (error) {
|
||||
console.log(error)
|
||||
|
|
|
|||
|
|
@ -16,21 +16,28 @@ module.exports = {
|
|||
if (currentUser == null) return res.redirect('/login');
|
||||
let currentServer = await Server.findOne({ id: req.params.serverid })
|
||||
if (currentServer == null) return res.render('404.ejs');
|
||||
let guild = await currentUser.guilds[currentServer.id];
|
||||
if (guild.userPermission == 'owner' || guild.userPermission == 'MANAGE_GUILD' || currentServer.staff.includes(currentUser.userId)) {
|
||||
let hasAccess = false;
|
||||
await currentUser.accessCodes.forEach(async(userCode) => {
|
||||
if (res.locals.cookie.accesscode == userCode.code) {
|
||||
hasAccess = true;
|
||||
const memberCount = await client.guilds.cache.get(currentServer.id).memberCount;
|
||||
return res.cookie('id', currentUser.userId, { expires: new Date(253402300000000), httpOnly: true }).cookie('accesscode', res.locals.cookie.accesscode, { expires: new Date(253402300000000), httpOnly: true }).render('dashboard/server.ejs', { domain: conf.domain, user: { id: currentUser.userId, accesscode: res.locals.cookie.accesscode }, currentUser: currentUser, currentServer: currentServer, memberCount: memberCount });
|
||||
};
|
||||
});
|
||||
if (hasAccess == false) return res.redirect('/login?ninvalidcode');
|
||||
} else {
|
||||
await res.status(401).render('error.ejs', { errorMessage: null, error: "you do not have access to the admin dashboard if you are a member of staff tell the bot owner", userInfo: { id: req.query.userid, username: req.query.userame, avatar: req.query.userAvatar } })
|
||||
let gAccess = false;
|
||||
await currentUser.guilds.forEach(guild => {
|
||||
if (guild.id == currentServer.id) {
|
||||
gAccess = true;
|
||||
if (guild.userPermission == 'owner' || guild.userPermission == 'MANAGE_GUILD' || currentServer.staff.includes(currentUser.userId)) {
|
||||
let hasAccess = false;
|
||||
await currentUser.accessCodes.forEach(async(userCode) => {
|
||||
if (res.locals.cookie.accesscode == userCode.code) {
|
||||
hasAccess = true;
|
||||
const memberCount = await client.guilds.cache.get(currentServer.id).memberCount;
|
||||
return res.cookie('id', currentUser.userId, { expires: new Date(253402300000000), httpOnly: true }).cookie('accesscode', res.locals.cookie.accesscode, { expires: new Date(253402300000000), httpOnly: true }).render('dashboard/server.ejs', { domain: conf.domain, user: { id: currentUser.userId, accesscode: res.locals.cookie.accesscode }, currentUser: currentUser, currentServer: currentServer, memberCount: memberCount });
|
||||
};
|
||||
});
|
||||
if (hasAccess == false) return res.redirect('/login?ninvalidcode');
|
||||
}
|
||||
};
|
||||
});
|
||||
if (gAccess == false) {
|
||||
return res.status(401).render('error.ejs', { errorMessage: null, error: "you do not have access to the admin dashboard if you are a member of staff tell the bot owner" })
|
||||
}
|
||||
|
||||
|
||||
} catch (error) {
|
||||
console.log(error)
|
||||
res.status(500).render('error.ejs', { errorMessage: error, error: "there has been an issue with your request please try again, if this continuous report it at http://knightrider.rf.gd/er/admin.php" })
|
||||
|
|
|
|||
|
|
@ -13,25 +13,29 @@ module.exports = {
|
|||
if (currentUser == null) return res.status(404).json({ error: "404 - cant find you in the db" });
|
||||
let currentServer = await Server.findOne({ id: req.body.server.id });
|
||||
if (currentServer == null) return res.status(404).json({ error: "404 - cant find that server in the db" });
|
||||
let guild = await currentUser.guilds[currentServer.id];
|
||||
if (guild.userPermission == 'owner' || guild.userPermission == 'MANAGE_GUILD' || currentServer.staff.includes(currentUser.userId)) {
|
||||
|
||||
let hasAccess = false;
|
||||
await currentUser.accessCodes.forEach(async(userCode) => {
|
||||
if (req.body.user.accesscode == userCode.code) {
|
||||
hasAccess = true;
|
||||
currentServer.filter.normal = await req.body.normalFilter;
|
||||
currentServer.filter.safe = await req.body.safeFilter;
|
||||
currentServer.save();
|
||||
return res.status(200).json({ error: "no", message: "filters have been updates" });
|
||||
};
|
||||
});
|
||||
} else {
|
||||
return res.status(401).json({ error: "401 - unauthorised", info: "your user does not own the server or have a staff role or pi is listed as a staff member" });
|
||||
};
|
||||
|
||||
let gAccess = false;
|
||||
await currentUser.guilds.forEach(guild => {
|
||||
if (guild.id == currentServer.id) {
|
||||
gAccess = true;
|
||||
if (guild.userPermission == 'owner' || guild.userPermission == 'MANAGE_GUILD' || currentServer.staff.includes(currentUser.userId)) {
|
||||
|
||||
let hasAccess = false;
|
||||
await currentUser.accessCodes.forEach(async(userCode) => {
|
||||
if (req.body.user.accesscode == userCode.code) {
|
||||
hasAccess = true;
|
||||
currentServer.filter.normal = await req.body.normalFilter;
|
||||
currentServer.filter.safe = await req.body.safeFilter;
|
||||
currentServer.save();
|
||||
return res.status(200).json({ error: "no", message: "filters have been updates" });
|
||||
};
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
if (hasAccess == false) return res.status(401).json({ error: "401 - unauthorised", info: "please include your accesscode and user id to use this api more info in the docs " + conf.domain + '/docs' });
|
||||
if (gAccess == false) {
|
||||
return res.status(401).render('error.ejs', { errorMessage: null, error: "you do not have access to the admin dashboard if you are a member of staff tell the bot owner" })
|
||||
}
|
||||
} catch (error) {
|
||||
console.log(error);
|
||||
res.status(500).json({ error: "some error happened", info: "report this if it happenes again." + domain + '/er' });
|
||||
|
|
|
|||
|
|
@ -13,31 +13,35 @@ module.exports = {
|
|||
if (currentUser == null) return res.status(404).json({ error: "404 - cant find you in the db", message: "that user id cant be found" });
|
||||
let currentServer = await Server.findOne({ id: req.body.server.id });
|
||||
if (currentServer == null) return res.status(404).json({ error: "404 - cant find that server in the db", message: "that server id cant be found" });
|
||||
let guild = await currentUser.guilds[currentServer.id];
|
||||
if (guild.userPermission == 'owner' || guild.userPermission == 'MANAGE_GUILD' || currentServer.staff.includes(currentUser.userId)) {
|
||||
let gAccess = false;
|
||||
await currentUser.guilds.forEach(guild => {
|
||||
if (guild.id == currentServer.id) {
|
||||
gAccess = true;
|
||||
if (guild.userPermission == 'owner' || guild.userPermission == 'MANAGE_GUILD' || currentServer.staff.includes(currentUser.userId)) {
|
||||
|
||||
let hasAccess = false;
|
||||
await currentUser.accessCodes.forEach(async(userCode) => {
|
||||
if (req.body.user.accesscode == userCode.code) {
|
||||
hasAccess = true;
|
||||
//apply all data from the req to the db (probabbly a better way to do this)
|
||||
currentServer.prefix = req.body.prefix || prefix;
|
||||
currentServer.staff = req.body.staffids || [];
|
||||
currentServer.staffRoles = req.body.staffRoles || [];
|
||||
currentServer.channels.modLogs = req.body.channels.modlogs || ' ';
|
||||
currentServer.channels.announcments = req.body.channels.announcments || ' ';
|
||||
currentServer.channels.townhall = req.body.channels.townhall || ' ';
|
||||
currentServer.channels.townhallLogs = req.body.channels.townhallLogs || ' ';
|
||||
currentServer.save();
|
||||
return res.status(200);
|
||||
};
|
||||
});
|
||||
} else {
|
||||
return res.status(401).json({ error: "401 - unauthorised", info: "your user does not own the server or have a staff role or pi is listed as a staff member" });
|
||||
};
|
||||
|
||||
|
||||
if (hasAccess == false) return res.status(401).JSON({ error: "401 - unauthorised", info: "please include your accesscode and user id to use this api more info in the docs " + conf.domain + '/docs' });
|
||||
let hasAccess = false;
|
||||
await currentUser.accessCodes.forEach(async(userCode) => {
|
||||
if (req.body.user.accesscode == userCode.code) {
|
||||
hasAccess = true;
|
||||
//apply all data from the req to the db (probabbly a better way to do this)
|
||||
currentServer.prefix = req.body.prefix || prefix;
|
||||
currentServer.staff = req.body.staffids || [];
|
||||
currentServer.staffRoles = req.body.staffRoles || [];
|
||||
currentServer.channels.modLogs = req.body.channels.modlogs || ' ';
|
||||
currentServer.channels.announcments = req.body.channels.announcments || ' ';
|
||||
currentServer.channels.townhall = req.body.channels.townhall || ' ';
|
||||
currentServer.channels.townhallLogs = req.body.channels.townhallLogs || ' ';
|
||||
currentServer.save();
|
||||
return res.status(200);
|
||||
};
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
if (hasAccess == false) return res.status(401).json({ error: "401 - unauthorised", info: "please include your accesscode and user id to use this api more info in the docs " + conf.domain + '/docs' });
|
||||
if (gAccess == false) {
|
||||
return res.status(401).render('error.ejs', { errorMessage: null, error: "you do not have access to the admin dashboard if you are a member of staff tell the bot owner" })
|
||||
}
|
||||
} catch (error) {
|
||||
console.log(error);
|
||||
res.status(500).JSON({ error: "some error happened", info: "report this if it happenes again. " + domain + '/er' });
|
||||
|
|
|
|||
|
|
@ -12,68 +12,73 @@ module.exports = {
|
|||
if (currentUser == null) return res.status(404).json({ error: "404 - cant find you in the db" });
|
||||
let currentServer = await Server.findOne({ id: req.body.server.id });
|
||||
if (currentServer == null) return res.status(404).json({ error: "404 - cant find that server in the db" });
|
||||
let guild = await currentUser.guilds[currentServer.id];
|
||||
if (guild.userPermission == 'owner' || guild.userPermission == 'MANAGE_GUILD' || currentServer.staff.includes(currentUser.userId)) {
|
||||
let hasAccess = false;
|
||||
await currentUser.accessCodes.forEach(async(userCode) => {
|
||||
if (req.body.user.accesscode == userCode.code) {
|
||||
hasAccess = true;
|
||||
currentServer.reactionRoles = await req.body.reactionRoles;
|
||||
currentServer.save();
|
||||
let eachChannelRoles = {};
|
||||
await currentServer.reactionRoles.forEach(role => {
|
||||
if (!eachChannelRoles[role.channelID]) {
|
||||
eachChannelRoles[role.channelID] = [{
|
||||
roleID: role.roleID,
|
||||
emoji: role.emoji
|
||||
}];
|
||||
} else {
|
||||
eachChannelRoles[role.channelID].push({
|
||||
roleID: role.roleID,
|
||||
emoji: role.emoji
|
||||
let gAccess = false;
|
||||
await currentUser.guilds.forEach(guild => {
|
||||
if (guild.id == currentServer.id) {
|
||||
gAccess = true;
|
||||
if (guild.userPermission == 'owner' || guild.userPermission == 'MANAGE_GUILD' || currentServer.staff.includes(currentUser.userId)) {
|
||||
let hasAccess = false;
|
||||
await currentUser.accessCodes.forEach(async(userCode) => {
|
||||
if (req.body.user.accesscode == userCode.code) {
|
||||
hasAccess = true;
|
||||
currentServer.reactionRoles = await req.body.reactionRoles;
|
||||
currentServer.save();
|
||||
let eachChannelRoles = {};
|
||||
await currentServer.reactionRoles.forEach(role => {
|
||||
if (!eachChannelRoles[role.channelID]) {
|
||||
eachChannelRoles[role.channelID] = [{
|
||||
roleID: role.roleID,
|
||||
emoji: role.emoji
|
||||
}];
|
||||
} else {
|
||||
eachChannelRoles[role.channelID].push({
|
||||
roleID: role.roleID,
|
||||
emoji: role.emoji
|
||||
});
|
||||
};
|
||||
});
|
||||
for (let i in eachChannelRoles) {
|
||||
let rolesEmbed = {
|
||||
color: conf.colour.ok,
|
||||
title: 'ReactionRoles',
|
||||
url: conf.domain,
|
||||
author: {
|
||||
name: conf.bot.name,
|
||||
icon_url: conf.bot.logo,
|
||||
url: conf.bot.url,
|
||||
},
|
||||
description: 'react with the appropriate emoji to get your role',
|
||||
fields: [],
|
||||
timestamp: new Date(),
|
||||
footer: {
|
||||
text: currentServer.name,
|
||||
},
|
||||
};
|
||||
|
||||
await eachChannelRoles[i].forEach(role => {
|
||||
rolesEmbed.fields.push({
|
||||
name: '\u200B',
|
||||
value: '<@&' + role.roleID + '> - ' + role.emoji,
|
||||
});
|
||||
});
|
||||
const channel = client.guilds.cache.get(currentServer.id).channels.cache.get(i)
|
||||
if (channel !== undefined) {
|
||||
const msg = await channel.send({ embed: rolesEmbed });
|
||||
eachChannelRoles[i].forEach(role => {
|
||||
msg.react(role.emoji);
|
||||
});
|
||||
};
|
||||
};
|
||||
return res.status(200).json({ error: "no", message: "reactionroles have been updates" });
|
||||
};
|
||||
});
|
||||
for (let i in eachChannelRoles) {
|
||||
let rolesEmbed = {
|
||||
color: conf.colour.ok,
|
||||
title: 'ReactionRoles',
|
||||
url: conf.domain,
|
||||
author: {
|
||||
name: conf.bot.name,
|
||||
icon_url: conf.bot.logo,
|
||||
url: conf.bot.url,
|
||||
},
|
||||
description: 'react with the appropriate emoji to get your role',
|
||||
fields: [],
|
||||
timestamp: new Date(),
|
||||
footer: {
|
||||
text: currentServer.name,
|
||||
},
|
||||
};
|
||||
|
||||
|
||||
await eachChannelRoles[i].forEach(role => {
|
||||
rolesEmbed.fields.push({
|
||||
name: '\u200B',
|
||||
value: '<@&' + role.roleID + '> - ' + role.emoji,
|
||||
});
|
||||
});
|
||||
const channel = client.guilds.cache.get(currentServer.id).channels.cache.get(i)
|
||||
if (channel !== undefined) {
|
||||
const msg = await channel.send({ embed: rolesEmbed });
|
||||
eachChannelRoles[i].forEach(role => {
|
||||
msg.react(role.emoji);
|
||||
});
|
||||
};
|
||||
};
|
||||
return res.status(200).json({ error: "no", message: "reactionroles have been updates" });
|
||||
};
|
||||
});
|
||||
} else {
|
||||
return res.status(401).json({ error: "401 - unauthorised", info: "your user does not own the server or have a staff role or pi is listed as a staff member" });
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
if (hasAccess == false) return res.status(401).json({ error: "401 - unauthorised", info: "please include your accesscode and user id to use this api more info in the docs " + conf.domain + '/docs' });
|
||||
if (gAccess == false) {
|
||||
return res.status(401).render('error.ejs', { errorMessage: null, error: "you do not have access to the admin dashboard if you are a member of staff tell the bot owner" })
|
||||
}
|
||||
} catch (error) {
|
||||
console.log(error);
|
||||
res.status(500).json({ error: "some error happened", info: "report this if it happenes again." + conf.domain + '/er' });
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue