diff --git a/website/bot/index.js b/website/bot/index.js index 32d65c4..91e5c2e 100644 --- a/website/bot/index.js +++ b/website/bot/index.js @@ -83,12 +83,15 @@ client.on("guildMemberAdd", async (member) => { if (member.user.bot) { try { guild.member(member.id).roles.add(config.server.roles.botlist.bot); + client.channels.cache.get(config.server.channels.new).send(`${member.user.tag} has joined the server!`); + } catch (error) { } } else { try { guild.member(member.id).roles.add(config.server.roles.botlist.user); + client.channels.cache.get(config.server.channels.new).send(`${member.user.tag} has joined the server!`); } catch (error) { } @@ -96,25 +99,34 @@ client.on("guildMemberAdd", async (member) => { }); var cooldown = []; client.on("messageCreate", async (message) => { + console.log(cooldown + ) if (message.author.bot) return; if (message.channel.type === "dm") return; - // cooldown function - if (cooldown.includes(message.author.id)) return; - cooldown.push(message.author.id); - const coins = await users.findOne({ id: message.author.id }); - if (!coins) { - await users.create({ id: message.author.id, coins: 0 }); - } else { - if (coins.coins < 1) { - coins.coins = 1; - coins.save(); - } else { - coins.coins++; - coins.save(); + if (cooldown.some(code => code.id === message.author.id)){ + var userr = cooldown.findIndex((obj => obj.id == message.author.id)); + cooldown[userr].message += 1; + if (cooldown[userr].message >= 15) { + cooldown[userr].message = 0; + const coins = await users.findOne({ id: message.author.id }); + if (!coins) { + await users.create({ id: message.author.id, coins: 0 }); + } else { + if (coins.coins < 1) { + coins.coins = 1; + coins.save(); + } else { + coins.coins++; + coins.save(); + } + message.reply(`You earned 1 coin! You now have ${coins.coins} coins!`); + } } - message.reply(`You have ${coins.coins} coins!`); - setTimeout(() => { - cooldown.splice(cooldown.indexOf(message.author.id), 1); - }, 1200000); - } + return + }; + cooldown.push({ + id: message.author.id, + message: 0, + }); + }); \ No newline at end of file diff --git a/website/index.js b/website/index.js index 143f820..957a474 100644 --- a/website/index.js +++ b/website/index.js @@ -15,7 +15,9 @@ var admin = require('./routers/admin'); var auth = require('./routers/auth'); var servers = require('./routers/servers'); var api = require('./routers/api'); +var profile = require('./routers/user'); var client = require('../index'); + const port = client.config.server.port || 3000; app.set('view engine', 'ejs'); app.set('views', path.join(__dirname, '/views')); @@ -54,8 +56,8 @@ const server = require('../models/server'); var scopes = ['identify', 'guilds', 'guilds.join']; var prompt = 'consent' passport.use(new DiscordStrategy({ - clientID: '934087523649609768', - clientSecret: 'nPKjKvOCOyyhDaQM64qcJYbd6CdhCxLh', + clientID: '870001234583621713', + clientSecret: 'vnWBrTQwSPwjCz9bykN7QwxdliQSZYaC', callbackURL: client.config.server.host + '/auth/callback', scope: scopes, prompt: prompt @@ -94,6 +96,7 @@ app.use('/admin', admin); app.use('/auth', auth); app.use('/server', servers); app.use('/api', api); +app.use('/user', profile) // set up routes app.get('/', async (req, res) => { @@ -162,6 +165,11 @@ app.get('/tag/:id', async (req, res) => { }); }); +app.get('/tos' , (req, res) => { + res.render('tos', { + user: req.user, + }); +} ); app.get("/robots.txt", function (req, res) { res.set('Content-Type', 'text/plain'); res.send(`Sitemap: https://botscord.xyz/sitemap.xml`); @@ -183,11 +191,17 @@ app.get('/invite', function (req, res) { res.redirect(client.config.bot.bsl.invite); }); app.use((req, res, next) => { - res.status(404).send("Sorry can't find that!") + res.status(404).render('error', { + errorr: "Page not found", + user: req.user, + }) }) app.use((err, req, res, next) => { console.error(err.stack) - res.status(500).send('Something broke!') + res.status(500).render('error',{ + errorr: 500, + user: req.user, + }) }) app.listen(client.config.server.port, () => { console.log(colors.green("Website: "), 'Your app is listening on port ' + port); diff --git a/website/public/css/style.css b/website/public/css/style.css index 628b07f..c767a31 100644 --- a/website/public/css/style.css +++ b/website/public/css/style.css @@ -880,6 +880,15 @@ video { .w-0 { width: 0px; } +.w-64 { + width: 16rem; +} +.w-9 { + width: 2.25rem; +} +.w-4 { + width: 1rem; +} .w-3\/6 { width: 50%; } @@ -889,18 +898,6 @@ video { .w-1\/4 { width: 25%; } -.w-64 { - width: 16rem; -} -.w-9\/12 { - width: 75%; -} -.w-9 { - width: 2.25rem; -} -.w-4 { - width: 1rem; -} .min-w-fit { min-width: -webkit-fit-content; min-width: -moz-fit-content; @@ -1072,6 +1069,9 @@ video { .items-center { align-items: center; } +.items-stretch { + align-items: stretch; +} .justify-end { justify-content: flex-end; } @@ -1379,12 +1379,12 @@ video { .p-96 { padding: 24rem; } -.p-2\.5 { - padding: 0.625rem; -} .p-3 { padding: 0.75rem; } +.p-2\.5 { + padding: 0.625rem; +} .px-3 { padding-left: 0.75rem; padding-right: 0.75rem; @@ -1623,6 +1623,14 @@ video { --tw-text-opacity: 1; color: rgb(191 219 254 / var(--tw-text-opacity)); } +.text-blue-color { + --tw-text-opacity: 1; + color: rgb(24 25 28 / var(--tw-text-opacity)); +} +.text-button-primary { + --tw-text-opacity: 1; + color: rgb(88 101 242 / var(--tw-text-opacity)); +} .underline { -webkit-text-decoration-line: underline; text-decoration-line: underline; @@ -1958,11 +1966,6 @@ body { --tw-ring-color: rgb(147 197 253 / var(--tw-ring-opacity)); } -.group:hover .group-hover\:text-gray-900 { - --tw-text-opacity: 1; - color: rgb(17 24 39 / var(--tw-text-opacity)); -} - .peer:-moz-placeholder-shown ~ .peer-placeholder-shown\:translate-y-0 { --tw-translate-y: 0px; transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y)); @@ -2035,16 +2038,6 @@ body { background-color: rgb(37 99 235 / var(--tw-bg-opacity)); } - .dark\:bg-gray-800 { - --tw-bg-opacity: 1; - background-color: rgb(31 41 55 / var(--tw-bg-opacity)); - } - - .dark\:bg-blue-900 { - --tw-bg-opacity: 1; - background-color: rgb(30 58 138 / var(--tw-bg-opacity)); - } - .dark\:text-primary-color { color: #1E2023;; } @@ -2064,11 +2057,6 @@ body { color: rgb(209 213 219 / var(--tw-text-opacity)); } - .dark\:text-blue-200 { - --tw-text-opacity: 1; - color: rgb(191 219 254 / var(--tw-text-opacity)); - } - .dark\:placeholder-gray-400::-moz-placeholder { --tw-placeholder-opacity: 1; color: rgb(156 163 175 / var(--tw-placeholder-opacity)); @@ -2098,11 +2086,6 @@ body { background-color: rgb(29 78 216 / var(--tw-bg-opacity)); } - .dark\:hover\:bg-gray-700:hover { - --tw-bg-opacity: 1; - background-color: rgb(55 65 81 / var(--tw-bg-opacity)); - } - .dark\:hover\:text-white:hover { --tw-text-opacity: 1; color: rgb(255 255 255 / var(--tw-text-opacity)); @@ -2138,11 +2121,6 @@ body { --tw-ring-color: rgb(37 99 235 / var(--tw-ring-opacity)); } - .group:hover .dark\:group-hover\:text-white { - --tw-text-opacity: 1; - color: rgb(255 255 255 / var(--tw-text-opacity)); - } - .peer:focus ~ .peer-focus\:dark\:text-blue-500 { --tw-text-opacity: 1; color: rgb(59 130 246 / var(--tw-text-opacity)); diff --git a/website/routers/bot/index.js b/website/routers/bot/index.js index 1399eb2..5287144 100644 --- a/website/routers/bot/index.js +++ b/website/routers/bot/index.js @@ -32,7 +32,7 @@ router.post('/add', async function (req, res) { var checkbot = await bots.findOne({ id: req.body.id }); if (checkbot) { req.session.error = "Bot already exists"; - res.redirect('/'); + res.redirect('/bot/add'); return } var owners = new Array(); @@ -55,12 +55,13 @@ router.post('/add', async function (req, res) { if (err) { console.log(err); req.session.error = "Something went wrong"; - res.redirect('/'); + res.redirect('/bot/add'); } else { req.session.message = "Bot added"; - res.redirect('/'); + res.redirect('/bot/' + bot.id); } }); + client.client.client.channels.cache.get(client.client.config.bot.channels.admin).send(`<@${req.user.id}> has added a new bot: ${bot.name}, invite: https://discordapp.com/oauth2/authorize?client_id=${bot.id}&scope=bot&permissions=0 `); } else { req.session.backURL = req.originalUrl; res.redirect('/auth'); @@ -79,11 +80,11 @@ router.get('/:botID', async function (req, res) { } let coowner = new Array() await bot.owners.forEach(async function (a) { - try{ - var b = await global.bsl.users.fetch(a) - }catch(e){ + try { + var b = await global.bsl.users.fetch(a) + } catch (e) { } - if(!b) return; + if (!b) return; coowner.push(b) }) try { @@ -144,11 +145,11 @@ router.post('/:botID/settings', async function (req, res) { req.session.error = "No bot found"; return res.redirect('/'); } - if(!bot.owners.includes(req.user.id)){ - - - req.session.error = "You do not have permission to edit this bot"; - return res.redirect('/'); + if (!bot.owners.includes(req.user.id)) { + + + req.session.error = "You do not have permission to edit this bot"; + return res.redirect('/'); } bot.name = req.body.bot_name; bot.description = req.body.bot_short; diff --git a/website/routers/user/index.js b/website/routers/user/index.js new file mode 100644 index 0000000..07c9179 --- /dev/null +++ b/website/routers/user/index.js @@ -0,0 +1,23 @@ +var express = require('express'), + router = express.Router(); +var servers = require('../../../models/server'); +var votes = require('../../../models/votes'); +var bots = require('../../../models/bot'); + +router.get('/', function (req,res) { + res.redirect('/user/me') +}) +router.get('/me', async function (req, res) { + if (req.user) { + var bot = await bots.find({ owners: req.user.id }); + res.render('user/me', { + user: req.user, + bots: bot + }); + return + } else { + req.session.backURL = req.originalUrl; + res.redirect('/auth'); + } +}) +module.exports = router; \ No newline at end of file diff --git a/website/views/error.ejs b/website/views/error.ejs new file mode 100644 index 0000000..4e55447 --- /dev/null +++ b/website/views/error.ejs @@ -0,0 +1,9 @@ +<%- include('./includes/header.ejs', {title: 'Error ' + errorr}) %> +
Error: <%= errorr %>
+