diff --git a/config.js b/config.js index f3aedcc..f5db639 100644 --- a/config.js +++ b/config.js @@ -49,6 +49,6 @@ module.exports = { }, users: { owner: ["755297485328482356"], - verificator: ["755297485328482356"], + verificator: ["755297485328482356", "759037138929975297"], } } \ No newline at end of file diff --git a/models/bot.js b/models/bot.js index b083b37..5e6de12 100644 --- a/models/bot.js +++ b/models/bot.js @@ -12,7 +12,7 @@ let hm = new mongoose.Schema({ premium: Boolean, servers: String, users: String, - votes: Number, + votes: { type: Number, default: 0 }, token: String, }); diff --git a/website/bot/index.js b/website/bot/index.js index 89667e8..32d65c4 100644 --- a/website/bot/index.js +++ b/website/bot/index.js @@ -1,20 +1,23 @@ const client = require('../../index.js').client; const servers = require('../../models/server'); +const bots = require('../../models/bot'); +const users = require('../../models/user'); var config = client.config -const { SlashCommandBuilder, Routes } = require('discord.js'); +const { SlashCommandBuilder, Routes, EmbedBuilder } = require('discord.js'); const { REST } = require('@discordjs/rest'); const colors = require('colors'); const commands = [ new SlashCommandBuilder().setName('ping').setDescription('Replies with pong!'), - new SlashCommandBuilder().setName('topserver').setDescription('Replies with highest server!'), + new SlashCommandBuilder().setName('topvoted').setDescription('Replies with highest server/bots!'), new SlashCommandBuilder().setName('user').setDescription('Replies with user info and connected bots/servers!'), + new SlashCommandBuilder().setName('queue').setDescription('Replies with queue'), ] .map(command => command.toJSON()); const rest = new REST({ version: '10' }).setToken(config.bot.token); rest.put(Routes.applicationGuildCommands(config.bot.id, config.discord.id), { body: commands }) - .then(() => console.log(colors.green("Website: "),'Successfully registered application commands.')) + .then(() => console.log(colors.green("Website: "), 'Successfully registered application commands.')) .catch(console.error); client.on('interactionCreate', async interaction => { @@ -24,13 +27,55 @@ client.on('interactionCreate', async interaction => { if (commandName === 'ping') { await interaction.reply('Pong!'); - } else if (commandName === 'topserver') { - const topServer = await servers.find({}, { sort: { memberCount: -1 } }); - await interaction.reply(`The top server is ${topServer.name} with ${topServer.memberCount} members!`); + } else if (commandName === 'topvoted') { + const serversdata = await servers.find(); + const botsdata = await bots.find({ verified: true }); + var botsdata1 = botsdata + .sort((a, b) => b.votes - a.votes) + .slice(0, 6) + .map( + a => `${a.name} **[ \`${a.votes}\` Votes ]**` + ) + .join('\n'); + + var serversdata1 = serversdata + .sort((a, b) => b.votes - a.votes) + .slice(0, 6) + .map( + a => `${a.name} | ${a.id} **[ \`${a.votes}\` Votes ]**` + ) + .join('\n'); + + if (!serversdata1) { + var serversdata1 = 'no servers'; + } + if (!botsdata1) { + var botsdata1 = 'no bots'; + } + + const embed = new EmbedBuilder() + .setAuthor({ name: interaction.user.tag, iconURL: interaction.user.avatarURL({ dynamic: true }) }) + .setColor("#7289da") + .setDescription(`**Top 6 voted bots of the week!**\n${botsdata1}\n\n**Top 6 voted servers of the week!**\n${serversdata1}`) + interaction.reply({ embeds: [embed] }); } else if (commandName === 'user') { const { user } = interaction; await interaction.reply(`${user.username}#${user.discriminator} has ${user.bot ? 'a bot' : 'no bot'} and is connected to ${user.guilds.size} servers!`); + } else if (commandName === 'queue') { + if (!global.config.users.owner.includes(interaction.user.id) && !global.config.users.verificator.includes(interaction.user.id)) return interaction.reply('You are not allowed to use this command!'); + const unVerified = await bots.find({ verified: false }); + var desc = ""; + for (let i = 0; i < unVerified.length; i++) { + desc += `${i + 1}. ${unVerified[i].name} - ${unVerified[i].id} Invite: https://discord.com/api/oauth2/authorize?client_id=${unVerified[i].id}&scope=applications.commands%20bot\n`; + } + const embed = new EmbedBuilder() + .setTitle('Unverified Bots') + .setDescription(desc) + .setColor("#5865F2") + .setFooter({ text: 'BotsCord', iconURL: 'https://botscord.xyz/img/logo.png' }) + .setTimestamp() + interaction.reply({ embeds: [embed] }); } }); client.on("guildMemberAdd", async (member) => { @@ -41,11 +86,35 @@ client.on("guildMemberAdd", async (member) => { } catch (error) { } - }else{ + } else { try { guild.member(member.id).roles.add(config.server.roles.botlist.user); } catch (error) { } } +}); +var cooldown = []; +client.on("messageCreate", async (message) => { + 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(); + } + message.reply(`You have ${coins.coins} coins!`); + setTimeout(() => { + cooldown.splice(cooldown.indexOf(message.author.id), 1); + }, 1200000); + } }); \ No newline at end of file diff --git a/website/public/css/style.css b/website/public/css/style.css index dc2f074..628b07f 100644 --- a/website/public/css/style.css +++ b/website/public/css/style.css @@ -816,6 +816,9 @@ video { .h-16 { height: 4rem; } +.h-3 { + height: 0.75rem; +} .min-h-screen { min-height: 100vh; } @@ -886,6 +889,18 @@ 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; @@ -1095,6 +1110,11 @@ video { margin-right: calc(1rem * var(--tw-space-x-reverse)); margin-left: calc(1rem * calc(1 - var(--tw-space-x-reverse))); } +.space-y-2 > :not([hidden]) ~ :not([hidden]) { + --tw-space-y-reverse: 0; + margin-top: calc(0.5rem * calc(1 - var(--tw-space-y-reverse))); + margin-bottom: calc(0.5rem * var(--tw-space-y-reverse)); +} .divide-y > :not([hidden]) ~ :not([hidden]) { --tw-divide-y-reverse: 0; border-top-width: calc(1px * calc(1 - var(--tw-divide-y-reverse))); @@ -1113,12 +1133,18 @@ video { .overflow-x-auto { overflow-x: auto; } +.overflow-y-auto { + overflow-y: auto; +} .text-ellipsis { text-overflow: ellipsis; } .text-clip { text-overflow: clip; } +.whitespace-nowrap { + white-space: nowrap; +} .break-words { overflow-wrap: break-word; } @@ -1301,6 +1327,14 @@ video { --tw-bg-opacity: 1; background-color: rgb(249 115 22 / var(--tw-bg-opacity)); } +.bg-blue-200 { + --tw-bg-opacity: 1; + background-color: rgb(191 219 254 / var(--tw-bg-opacity)); +} +.bg-blue-900 { + --tw-bg-opacity: 1; + background-color: rgb(30 58 138 / var(--tw-bg-opacity)); +} .bg-fixed { background-attachment: fixed; } @@ -1348,6 +1382,9 @@ video { .p-2\.5 { padding: 0.625rem; } +.p-3 { + padding: 0.75rem; +} .px-3 { padding-left: 0.75rem; padding-right: 0.75rem; @@ -1486,6 +1523,9 @@ video { .font-medium { font-weight: 500; } +.font-normal { + font-weight: 400; +} .uppercase { text-transform: uppercase; } @@ -1575,6 +1615,14 @@ video { --tw-text-opacity: 1; color: rgb(249 115 22 / var(--tw-text-opacity)); } +.text-gray-300 { + --tw-text-opacity: 1; + color: rgb(209 213 219 / var(--tw-text-opacity)); +} +.text-blue-200 { + --tw-text-opacity: 1; + color: rgb(191 219 254 / var(--tw-text-opacity)); +} .underline { -webkit-text-decoration-line: underline; text-decoration-line: underline; @@ -1663,6 +1711,9 @@ video { .ring-opacity-5 { --tw-ring-opacity: 0.05; } +.ring-offset-gray-800 { + --tw-ring-offset-color: #1f2937; +} .drop-shadow { --tw-drop-shadow: drop-shadow(0 1px 2px rgb(0 0 0 / 0.1)) drop-shadow(0 1px 1px rgb(0 0 0 / 0.06)); filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow); @@ -1819,6 +1870,11 @@ body { background-color: rgb(88 101 242 / var(--tw-bg-opacity)); } +.hover\:bg-gray-100:hover { + --tw-bg-opacity: 1; + background-color: rgb(243 244 246 / var(--tw-bg-opacity)); +} + .hover\:bg-blue-800:hover { --tw-bg-opacity: 1; background-color: rgb(30 64 175 / var(--tw-bg-opacity)); @@ -1829,11 +1885,6 @@ body { background-color: rgb(255 255 255 / var(--tw-bg-opacity)); } -.hover\:bg-gray-100:hover { - --tw-bg-opacity: 1; - background-color: rgb(243 244 246 / var(--tw-bg-opacity)); -} - .hover\:text-white:hover { --tw-text-opacity: 1; color: rgb(255 255 255 / var(--tw-text-opacity)); @@ -1907,6 +1958,11 @@ 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)); @@ -1979,6 +2035,16 @@ 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;; } @@ -1993,6 +2059,16 @@ body { color: rgb(156 163 175 / var(--tw-text-opacity)); } + .dark\:text-gray-300 { + --tw-text-opacity: 1; + 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)); @@ -2003,19 +2079,28 @@ body { color: rgb(156 163 175 / var(--tw-placeholder-opacity)); } + .dark\:ring-offset-gray-800 { + --tw-ring-offset-color: #1f2937; + } + .dark\:hover\:bg-button-primary:hover { --tw-bg-opacity: 1; background-color: rgb(88 101 242 / var(--tw-bg-opacity)); } + .dark\:hover\:bg-gray-800:hover { + --tw-bg-opacity: 1; + background-color: rgb(31 41 55 / var(--tw-bg-opacity)); + } + .dark\:hover\:bg-blue-700:hover { --tw-bg-opacity: 1; background-color: rgb(29 78 216 / var(--tw-bg-opacity)); } - .dark\:hover\:bg-gray-800:hover { + .dark\:hover\:bg-gray-700:hover { --tw-bg-opacity: 1; - background-color: rgb(31 41 55 / var(--tw-bg-opacity)); + background-color: rgb(55 65 81 / var(--tw-bg-opacity)); } .dark\:hover\:text-white:hover { @@ -2048,6 +2133,16 @@ body { --tw-ring-color: rgb(107 114 128 / var(--tw-ring-opacity)); } + .dark\:focus\:ring-blue-600:focus { + --tw-ring-opacity: 1; + --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 e36d357..1399eb2 100644 --- a/website/routers/bot/index.js +++ b/website/routers/bot/index.js @@ -79,7 +79,10 @@ 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){ + } if(!b) return; coowner.push(b) }) diff --git a/website/routers/servers/index.js b/website/routers/servers/index.js index b895004..9caf90b 100644 --- a/website/routers/servers/index.js +++ b/website/routers/servers/index.js @@ -6,6 +6,16 @@ const client = require('../../../index'); const Discord = require('discord.js'); var showdown = require('showdown'), converter = new showdown.Converter(); +function makeid(length) { + var result = ''; + var characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; + var charactersLength = characters.length; + for (var i = 0; i < length; i++) { + result += characters.charAt(Math.floor(Math.random() * + charactersLength)); + } + return result; +} router.get('/', function () { }) @@ -33,7 +43,32 @@ router.post('/add', async function (req, res) { req.session.error = "Server already exists"; return res.redirect('/'); } + //check if member has admin permissions + if (!checkServer.members.cache.get(req.user.id).permissions.has("ADMINISTRATOR")) { + req.session.error = "You do not have admin permissions"; + return res.redirect('/'); + } + if (req.body.create) { + var channel = await checkServer.channels.cache.filter(channel => channel.type === Discord.ChannelType.GuildText) + .first(); + if (!channel) { + req.session.error = "Could not create invite"; + return res.redirect('/'); + } else { + + channel.createInvite({ + maxAge: 0, + maxUses: 0, + }).catch(err => { + console.log(err); + req.session.error = "Could not create invite"; + return res.redirect('/'); + }).then(invite => { + req.body.server_invite = invite.url + }) + } + } var server = new servers({ id: req.body.serverid, name: checkServer.name, @@ -42,7 +77,9 @@ router.post('/add', async function (req, res) { description: req.body.server_short, icon: checkServer.iconURL({ format: 'png', dynamic: true }), memberCount: checkServer.memberCount, - tags: req.body.tags + tags: req.body.tags, + invite: req.body.server_invite, + token: makeid(64), }) var tagss = Array.from(new Set(req.body.tags)); var tags; @@ -59,7 +96,6 @@ router.post('/add', async function (req, res) { } } - console.log(tags) const embed = new client.embed() .setTitle('New server') .setDescription(`${req.user.username}#${req.user.discriminator} added **${checkServer.name}** with members: **${checkServer.memberCount}**\nDescription: **${req.body.server_short}**\nWith tags: **${tags}**`) @@ -67,7 +103,7 @@ router.post('/add', async function (req, res) { .setTimestamp() .setThumbnail(checkServer.iconURL({ format: 'png', dynamic: true })) .setFooter({ text: 'New Server', iconURL: "https://cdn.discordapp.com/avatars/" + req.user.id + "/" + req.user.avatar + ".png" }); - client.client.channels.cache.get(client.client.config.server.channels.info).send({ embeds: [embed] }); + client.client.channels.cache.get(client.client.config.bot.channels.info).send({ embeds: [embed] }); server.save(function (err) { if (err) { console.log(err); @@ -239,7 +275,7 @@ router.get('/:server/vote', function (req, res) { .setTitle(`${req.user.username} has voted for ${bot.name}`) .setDescription(`[${bot.name}](${bot.url})`) .setThumbnail(global.bsl.guilds.cache.get(bot.id).iconURL({ format: 'png' })) - .setFooter({ text: "BotsCord", iconURL: "https://botscord.xyz/img/logo.png"}) + .setFooter({ text: "BotsCord", iconURL: "https://botscord.xyz/img/logo.png" }) .setTimestamp(); global.client.channels.cache.get(global.config.bot.channels.vote).send({ embeds: [embed] }); req.session.message = "Vote added"; @@ -276,7 +312,7 @@ router.get('/:server/vote', function (req, res) { content: `${req.user.username} has voted for ${bot.name}`, username: "BotsCord", avatarURL: "https://botscord.xyz/img/logo.png" - }); + }); } catch (e) { console.log(e); } diff --git a/website/views/server/add.ejs b/website/views/server/add.ejs index 1da946e..5c8f4d5 100644 --- a/website/views/server/add.ejs +++ b/website/views/server/add.ejs @@ -3,22 +3,14 @@