diff --git a/config.js b/config.js
index 091c545..f59198d 100644
--- a/config.js
+++ b/config.js
@@ -10,11 +10,12 @@ module.exports = {
},
"bsl" : {
"id": "870001234583621713",
- "token": "OTM0MDg3NTIzNjQ5NjA5NzY4.GV-g1-.Eggw57JNtsrLPbakg-_yr8fn8oBAbh0nKfK-lk",
+ "token": "ODcwMDAxMjM0NTgzNjIxNzEz.GfMe5Y.USVO8IBvKkPIX0PFbYFRgfpctT-wW8sBVmFLQc",
"channels":{
"vote":"937643610541793300",
"error":"1003947531543269507",
- }
+ },
+ "invite":"https://discord.com/api/oauth2/authorize?client_id=870001234583621713&permissions=314433&redirect_uri=http%3A%2F%2Flocalhost%3A3000%2Fauth%2Fcallback&response_type=code&scope=applications.commands%20bot"
}
},
"server": {
diff --git a/index.js b/index.js
index ff398fb..9abe886 100644
--- a/index.js
+++ b/index.js
@@ -23,14 +23,24 @@ const client = new Client({
]
});
+const bsl = new Client({
+ intents: [
+ GatewayIntentBits.Guilds,
+ ]
+})
client.config = config;
+bsl.config = config
// Set intents
client.on('ready', () => {
- console.log('Bot is ready!');
+ console.log('Website bot is ready!');
require('./website')
});
+bsl.on('ready', () => {
+ console.log('BSL Started!');
+});
// Login
client.login(client.config.bot.token);
+bsl.login(bsl.config.bot.bsl.token);
// Node Error Handler
process.on('uncaughtException', function (err) {
console.log(err);
@@ -71,4 +81,5 @@ process.on('disconnect', function (err) {
module.exports.config = config;
module.exports.mongoose = mongoose;
module.exports.client = client;
+module.exports.bsl = bsl;
module.exports.embed = EmbedBuilder;
\ No newline at end of file
diff --git a/website/index.js b/website/index.js
index c971df4..4be7eac 100644
--- a/website/index.js
+++ b/website/index.js
@@ -122,6 +122,9 @@ app.get("/sitemap.xml", async function (req, res) {
res.set('Content-Type', 'text/xml');
res.send(`${link}`);
});
+app.get('/invite', function (req, res) {
+ res.redirect(client.config.bot.bsl.invite);
+});
app.use((req, res, next) => {
if (res.statusCode === 404) {
req.session.error = "Page not found";
diff --git a/website/routers/auth/index.js b/website/routers/auth/index.js
index a0678e7..0503cb4 100644
--- a/website/routers/auth/index.js
+++ b/website/routers/auth/index.js
@@ -15,13 +15,12 @@ router.get("/", (req, res, next) => {
} else {
req.session.backURL = "/";
}
- console.log(req.session)
next();
}, passport.authenticate('discord'))
router.get('/callback', passport.authenticate('discord', {
- failureRedirect: '/'
+ failureRedirect: '/',
+ keepSessionInfo: true
}), function (req, res) {
- console.log(req.session)
try {
request({
url: `https://discordapp.com/api/v8/guilds/${config.server.id}/members/${req.user.id}`,
@@ -42,7 +41,6 @@ router.get('/callback', passport.authenticate('discord', {
.setThumbnail("https://cdn.discordapp.com/avatars/" + req.user.id + "/" + req.user.avatar + ".png")
.setFooter({ text: 'Logged in', iconURL: "https://cdn.discordapp.com/avatars/" + req.user.id + "/" + req.user.avatar + ".png" });
client.client.channels.cache.get(client.client.config.bot.channels.login).send({ embeds: [embed] });
- console.log(req.session)
res.redirect(req.session.backURL || '/')
});
router.get('/logout', function (req, res) {
diff --git a/website/routers/bot/index.js b/website/routers/bot/index.js
index 5dca249..4554d57 100644
--- a/website/routers/bot/index.js
+++ b/website/routers/bot/index.js
@@ -9,7 +9,7 @@ router.get('/add', function (req, res) {
res.render('bot/add', {user: req.user});
return
} else {
- req.session.backURL = req.url;
+ req.session.backURL = req.originalUrl;
res.redirect('/auth');
}
});
@@ -39,7 +39,7 @@ router.post('/add', function (req, res) {
}
});
}else {
- req.session.backURL = req.url;
+ req.session.backURL = req.originalUrl;
res.redirect('/auth');
}
});
diff --git a/website/routers/servers/index.js b/website/routers/servers/index.js
index 890a9a0..7a54638 100644
--- a/website/routers/servers/index.js
+++ b/website/routers/servers/index.js
@@ -1,25 +1,39 @@
var express = require('express'),
router = express.Router();
var servers = require('../../../models/server');
-const client = require('../../index');
+const client = require('../../../index');
+const Discord = require('discord.js');
router.get('/', function () {
})
+
router.get('/add', function (req, res) {
- console.log(req.headers.referer)
if (req.user) {
res.render('server/add', {
user: req.user,
- botscord: client,
- });
+ botscord: client
+ });
return
} else {
- req.session.backURL = req.url;
+ req.session.backURL = req.originalUrl;
res.redirect('/auth');
}
});
-router.post('/add', function (req, res) {
+router.post('/add', async function (req, res) {
if (req.user) {
+ var checkServer = await client.bsl.guilds.cache.get(req.body.serverid);
+ if (!checkServer) {
+ return res.redirect(client.config.bot.bsl.invite + "&guild_id=" + req.body.serverid);
+ }else{
+ let checkGuild = await servers.findOne({ id: guildID });
+ if (checkGuild) {
+ req.session.error = "Server already exists";
+ return res.redirect('/');
+ }
+ var server = new servers({
+ id: req.body.serverid,
+ })
+ }
var bot = new servers({
id: req.body.bot_id,
name: req.body.bot_name,
@@ -42,7 +56,7 @@ router.post('/add', function (req, res) {
}
});
} else {
- req.session.backURL = req.url;
+ req.session.backURL = req.originalUrl;
res.redirect('/auth');
}
});
diff --git a/website/views/includes/header.ejs b/website/views/includes/header.ejs
index fbac828..e2aca8e 100644
--- a/website/views/includes/header.ejs
+++ b/website/views/includes/header.ejs
@@ -53,34 +53,23 @@
+ class="hidden origin-top-right absolute mt-2 w-56 rounded-md shadow-lg bg-white ring-1 ring-black ring-opacity-5 divide-y divide-gray-100 focus:outline-none"
+ role="menu" aria-orientation="vertical" aria-labelledby="menu-button" tabindex="-1" id="dropdown" style="z-index: 99 !important;">
-
-
-
+
+
-
-
-
-
-
-
-
-
-
+
+
@@ -125,4 +114,13 @@
targetEl.classList.add("hidden");
}
});
+ const dropdown = document.getElementById("menu-button");
+ const dropdownMenu = document.getElementById("dropdown");
+ dropdown.addEventListener("click", function () {
+ if (dropdownMenu.classList.contains("hidden")) {
+ dropdownMenu.classList.remove("hidden");
+ } else {
+ dropdownMenu.classList.add("hidden");
+ }
+ });
\ No newline at end of file
diff --git a/website/views/server/add.ejs b/website/views/server/add.ejs
index c81f51a..dd5c3b1 100644
--- a/website/views/server/add.ejs
+++ b/website/views/server/add.ejs
@@ -5,11 +5,10 @@