added add server
This commit is contained in:
1 parent
b2cd1691af
commit
a3e6692d7b
8 files changed
+69
-45
No files matched your search
@@ -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": {
|
||||
|
||||
@@ -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;
|
||||
@@ -122,6 +122,9 @@ app.get("/sitemap.xml", async function (req, res) {
|
||||
res.set('Content-Type', 'text/xml');
|
||||
res.send(`<?xml version="1.0" encoding="UTF-8"?><urlset xmlns="https://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="https://www.google.com/schemas/sitemap-image/1.1">${link}</urlset>`);
|
||||
});
|
||||
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";
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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');
|
||||
}
|
||||
});
|
||||
|
||||
@@ -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');
|
||||
}
|
||||
});
|
||||
|
||||
@@ -53,34 +53,23 @@
|
||||
<div>
|
||||
<button type="button" class="block lg:inline-block lg:mt-0 text-white hover:text-white mr-4 text-lg"
|
||||
id="menu-button" aria-expanded="true" aria-haspopup="true">
|
||||
More
|
||||
<li class="fa more"></li> More
|
||||
</button>
|
||||
</div>
|
||||
<div
|
||||
class="hidden origin-top-right absolute right-0 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">
|
||||
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;">
|
||||
<div class="py-1" role="none">
|
||||
<!-- Active: "bg-gray-100 text-gray-900", Not Active: "text-gray-700" -->
|
||||
<a href="#" class="text-gray-700 block px-4 py-2 text-sm" role="menuitem" tabindex="-1"
|
||||
id="menu-item-0">Edit</a>
|
||||
<a href="#" class="text-gray-700 block px-4 py-2 text-sm" role="menuitem" tabindex="-1"
|
||||
id="menu-item-1">Duplicate</a>
|
||||
<a href="/invite" class="text-gray-700 block px-4 py-2 text-sm" role="menuitem" tabindex="-1"
|
||||
id="menu-item-0"><i class="fas fa-user-plus"></i>Invite</a>
|
||||
<a href="/discord" class="text-gray-700 block px-4 py-2 text-sm" role="menuitem" tabindex="-1"
|
||||
id="menu-item-1"><i class="fa-brands fa-discord"></i>Discord Server</a>
|
||||
</div>
|
||||
<div class="py-1" role="none">
|
||||
<a href="#" class="text-gray-700 block px-4 py-2 text-sm" role="menuitem" tabindex="-1"
|
||||
id="menu-item-2">Archive</a>
|
||||
<a href="#" class="text-gray-700 block px-4 py-2 text-sm" role="menuitem" tabindex="-1"
|
||||
id="menu-item-3">Move</a>
|
||||
</div>
|
||||
<div class="py-1" role="none">
|
||||
<a href="#" class="text-gray-700 block px-4 py-2 text-sm" role="menuitem" tabindex="-1"
|
||||
id="menu-item-4">Share</a>
|
||||
<a href="#" class="text-gray-700 block px-4 py-2 text-sm" role="menuitem" tabindex="-1"
|
||||
id="menu-item-5">Add to favorites</a>
|
||||
</div>
|
||||
<div class="py-1" role="none">
|
||||
<a href="#" class="text-gray-700 block px-4 py-2 text-sm" role="menuitem" tabindex="-1"
|
||||
id="menu-item-6">Delete</a>
|
||||
<a href="/server/add" class="text-gray-700 block px-4 py-2 text-sm" role="menuitem" tabindex="-1"
|
||||
id="menu-item-2"><i class="fa fa-solid fa-plus"></i>Add server</a>
|
||||
<a href="/me/servers" class="text-gray-700 block px-4 py-2 text-sm" role="menuitem" tabindex="-1"
|
||||
id="menu-item-3"><li class="fa fa-server mr-1"></li>Edit server</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -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");
|
||||
}
|
||||
});
|
||||
</script>
|
||||
@@ -5,11 +5,10 @@
|
||||
<form method="post" action="">
|
||||
<div class="grid md:grid-cols-2 md:gap-6">
|
||||
<div class="relative z-0 mb-6 w-full group">
|
||||
<select name="server"
|
||||
<select name="serverid"
|
||||
class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
|
||||
required>
|
||||
<% for (var i=0; i < user.guilds.length; i++) { %>
|
||||
<% console.log(user.guilds[i].name) %>
|
||||
<option value="<%= user.guilds[i].id %>">
|
||||
<%= user.guilds[i].name %>
|
||||
</option>
|
||||
@@ -17,12 +16,12 @@
|
||||
</select>
|
||||
</div>
|
||||
<div class="relative z-0 mb-6 w-full group">
|
||||
<input type="text" name="server_id" id="floating_last_name"
|
||||
<input type="text" name="server_invite" id="floating_last_name"
|
||||
class="block py-2.5 px-0 w-full text-sm text-gray-900 bg-transparent border-0 border-b-2 border-gray-300 appearance-none dark:text-white dark:border-gray-600 dark:focus:border-blue-500 focus:outline-none focus:ring-0 focus:border-blue-600 peer"
|
||||
placeholder=" " required />
|
||||
<label for="floating_last_name"
|
||||
class="peer-focus:font-medium absolute text-sm text-white dark:text-white duration-300 transform -translate-y-6 scale-75 top-3 -z-10 origin-[0] peer-focus:left-0 peer-focus:text-blue-600 peer-focus:dark:text-blue-500 peer-placeholder-shown:scale-100 peer-placeholder-shown:translate-y-0 peer-focus:scale-75 peer-focus:-translate-y-6">server
|
||||
ID</label>
|
||||
class="peer-focus:font-medium absolute text-sm text-white dark:text-white duration-300 transform -translate-y-6 scale-75 top-3 -z-10 origin-[0] peer-focus:left-0 peer-focus:text-blue-600 peer-focus:dark:text-blue-500 peer-placeholder-shown:scale-100 peer-placeholder-shown:translate-y-0 peer-focus:scale-75 peer-focus:-translate-y-6">Server ID</label>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="relative z-0 mb-6 w-full group">
|
||||
@@ -30,8 +29,8 @@
|
||||
class="block py-2.5 px-0 w-full text-sm text-gray-900 bg-transparent border-0 border-b-2 border-gray-300 appearance-none dark:text-white dark:border-gray-600 dark:focus:border-blue-500 focus:outline-none focus:ring-0 focus:border-blue-600 peer"
|
||||
placeholder=" " required rows="5"></textarea>
|
||||
<label for="server_name"
|
||||
class="peer-focus:font-medium absolute text-sm text-white dark:text-white duration-300 transform -translate-y-6 scale-75 top-3 -z-10 origin-[0] peer-focus:left-0 peer-focus:text-blue-600 peer-focus:dark:text-blue-500 peer-placeholder-shown:scale-100 peer-placeholder-shown:translate-y-0 peer-focus:scale-75 peer-focus:-translate-y-6">server
|
||||
Description</label>
|
||||
class="peer-focus:font-medium absolute text-sm text-white dark:text-white duration-300 transform -translate-y-6 scale-75 top-3 -z-10 origin-[0] peer-focus:left-0 peer-focus:text-blue-600 peer-focus:dark:text-blue-500 peer-placeholder-shown:scale-100 peer-placeholder-shown:translate-y-0 peer-focus:scale-75 peer-focus:-translate-y-6">Server
|
||||
description</label>
|
||||
</div>
|
||||
<div class="relative z-0 mb-6 w-full group">
|
||||
<input type="text" name="server_short" id="floating_last_name"
|
||||
|
||||
Reference in new issue
Block a user