diff --git a/config.js b/config.js index fe14b28..f3aedcc 100644 --- a/config.js +++ b/config.js @@ -39,8 +39,6 @@ module.exports = { "company", "game", "emoji", - "botlist", - "serverlist", "turkish", "support", "sound", @@ -50,7 +48,7 @@ module.exports = { ] }, users: { - owner: [""], - verificator: [""], + owner: ["755297485328482356"], + verificator: ["755297485328482356"], } } \ No newline at end of file diff --git a/models/server.js b/models/server.js index 47499c0..9c65aca 100644 --- a/models/server.js +++ b/models/server.js @@ -3,14 +3,13 @@ let hm = new mongoose.Schema({ id: String, name: String, description: { - type: String, maxLength: 20 + type: String, maxLength: 100 }, owner: String, long_description: String, tags: [String], premium: Boolean, - icon: String, - members: Number, + invite: String, votes: Number, bump: Date, webhook: String, diff --git a/website/index.js b/website/index.js index 1617294..254c5b8 100644 --- a/website/index.js +++ b/website/index.js @@ -120,16 +120,40 @@ app.get('/bots', async (req, res) => { botscord: client }); }); + +app.get('/servers', async (req, res) => { + var servers = await server.find({}); + res.render('servers', { + servers: servers, + user: req.user, + botscord: client + }); +}); + +app.get('/tag/:id', async (req, res) => { + var id = req.params.id; + var bot = await bots.find({ tags: id }); + res.render('tags/index', { + bot: bot, + user: req.user, + tag: id, + }); +}); + app.get("/robots.txt", function (req, res) { res.set('Content-Type', 'text/plain'); res.send(`Sitemap: https://botscord.xyz/sitemap.xml`); }); app.get("/sitemap.xml", async function (req, res) { let link = "https://botscord.xyz/"; - let botdataforxml = await bots.find() + let botdataforxml = await bots.find({verified:true}) + let serverdataforxml = await server.find() botdataforxml.forEach(bot => { link += "\nhttps://botscord.xyz/bot/" + bot.id + ""; }) + serverdataforxml.forEach(server => { + link += "\nhttps://botscord.xyz/server/" + server.id + ""; + }); res.set('Content-Type', 'text/xml'); res.send(`${link}`); }); diff --git a/website/public/css/style.css b/website/public/css/style.css index b591174..dc2f074 100644 --- a/website/public/css/style.css +++ b/website/public/css/style.css @@ -874,6 +874,9 @@ video { .w-16 { width: 4rem; } +.w-0 { + width: 0px; +} .w-3\/6 { width: 50%; } @@ -883,8 +886,10 @@ video { .w-1\/4 { width: 25%; } -.w-0 { - width: 0px; +.min-w-fit { + min-width: -webkit-fit-content; + min-width: -moz-fit-content; + min-width: fit-content; } .max-w-7xl { max-width: 80rem; @@ -898,6 +903,11 @@ video { .max-w-full { max-width: 100%; } +.max-w-fit { + max-width: -webkit-fit-content; + max-width: -moz-fit-content; + max-width: fit-content; +} .flex-initial { flex: 0 1 auto; } @@ -925,6 +935,9 @@ video { .basis-1 { flex-basis: 0.25rem; } +.table-auto { + table-layout: auto; +} .border-collapse { border-collapse: collapse; } @@ -1097,6 +1110,9 @@ video { .overflow-hidden { overflow: hidden; } +.overflow-x-auto { + overflow-x: auto; +} .text-ellipsis { text-overflow: ellipsis; } @@ -1203,6 +1219,10 @@ video { --tw-border-opacity: 1; border-color: rgb(229 231 235 / var(--tw-border-opacity)); } +.border-slate-500 { + --tw-border-opacity: 1; + border-color: rgb(100 116 139 / var(--tw-border-opacity)); +} .bg-transparent { background-color: transparent; } @@ -1322,12 +1342,12 @@ video { .p-8 { padding: 2rem; } -.p-2\.5 { - padding: 0.625rem; -} .p-96 { padding: 24rem; } +.p-2\.5 { + padding: 0.625rem; +} .px-3 { padding-left: 0.75rem; padding-right: 0.75rem; @@ -1790,6 +1810,10 @@ body { border-color: transparent; } +.hover\:bg-primary-color:hover { + background-color: #1E2023;; +} + .hover\:bg-button-primary:hover { --tw-bg-opacity: 1; background-color: rgb(88 101 242 / var(--tw-bg-opacity)); @@ -1805,6 +1829,16 @@ 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)); +} + .hover\:text-blue-600:hover { --tw-text-opacity: 1; color: rgb(37 99 235 / var(--tw-text-opacity)); @@ -1815,11 +1849,6 @@ body { color: rgb(17 24 39 / var(--tw-text-opacity)); } -.hover\:text-white:hover { - --tw-text-opacity: 1; - color: rgb(255 255 255 / var(--tw-text-opacity)); -} - .hover\:text-blue-color:hover { --tw-text-opacity: 1; color: rgb(24 25 28 / var(--tw-text-opacity)); @@ -1984,6 +2013,11 @@ body { background-color: rgb(29 78 216 / 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\:text-white:hover { --tw-text-opacity: 1; color: rgb(255 255 255 / var(--tw-text-opacity)); @@ -1999,16 +2033,16 @@ body { --tw-ring-color: rgb(59 130 246 / var(--tw-ring-opacity)); } - .dark\:focus\:ring-blue-800:focus { - --tw-ring-opacity: 1; - --tw-ring-color: rgb(30 64 175 / var(--tw-ring-opacity)); - } - .dark\:focus\:ring-button-primary:focus { --tw-ring-opacity: 1; --tw-ring-color: rgb(88 101 242 / var(--tw-ring-opacity)); } + .dark\:focus\:ring-blue-800:focus { + --tw-ring-opacity: 1; + --tw-ring-color: rgb(30 64 175 / var(--tw-ring-opacity)); + } + .dark\:focus\:ring-gray-500:focus { --tw-ring-opacity: 1; --tw-ring-color: rgb(107 114 128 / var(--tw-ring-opacity)); diff --git a/website/routers/admin/index.js b/website/routers/admin/index.js index 8fb96af..3f7b8fc 100644 --- a/website/routers/admin/index.js +++ b/website/routers/admin/index.js @@ -6,7 +6,7 @@ var servers = require('../../../models/server'); var bans = require('../../../models/site-ban'); router.get('/', async function (req, res) { if (req.user) { - if (config.users.verificator.includes(req.user.userid) || config.users.owner.includes(req.user.userid)) { + if (global.config.users.verificator.includes(req.user.id) || global.config.users.owner.includes(req.user.id)) { const bot = await bots.find({}); const server = await servers.find({}); const ban = await bans.find({}); @@ -25,4 +25,21 @@ router.get('/', async function (req, res) { } }) +router.get('/bot/:d', async function (req, res) { + if (req.user) { + if (global.config.users.verificator.includes(req.user.id) || global.config.users.owner.includes(req.user.id)) { + const bot = await bots.find({ id: req.params.d }); + res.render('admin/bot', { + user: req.user, + bots: bot + }); + } else { + res.redirect('/'); + } + } else { + req.session.backURL = req.originalUrl; + res.redirect('/auth'); + } +}) + module.exports = router; \ No newline at end of file diff --git a/website/routers/api/v1/index.js b/website/routers/api/v1/index.js index 6fc2522..e23468b 100644 --- a/website/routers/api/v1/index.js +++ b/website/routers/api/v1/index.js @@ -10,17 +10,30 @@ router.get('/', function (req, res) { }) }); router.get('/search/:id', function (req, res) { - bots.findOne({ id: req.params.id }, function (err, bot) { + bots.find({ $or: [{ id: { $regex: req.params.id } }, { name: { $regex: req.params.id } }] },async function (err, bot) { if (err) throw err; if (!bot) { - servers.find() - return res.json({ - message: "Bot not found" + return + } else { + var serverArray = []; + const serverr = await servers.find({ $or: [{ id: { $regex: req.params.id } }, { name: { $regex: req.params.id } }] }) + if (!serverr) { + return + } else { + serverr.forEach(function (server1) { + serverArray.push({ "name": server1.name, "id": server1.id, "description": server1.description, type: "server", "avatar": global.bsl.guilds.cache.get(server1.id).iconURL() }) + }); + } + + + bot.forEach(function (server) { + serverArray.push({ "name": server.name, "id": server.id, "description": server.description, type: "bot" }); }); + res.json({ + serverArray + }) + } - res.json({ - bot: bot, - }) }) }) router.use(function (req, res, next) { diff --git a/website/routers/bot/index.js b/website/routers/bot/index.js index 69b2084..e36d357 100644 --- a/website/routers/bot/index.js +++ b/website/routers/bot/index.js @@ -80,6 +80,7 @@ router.get('/:botID', async function (req, res) { let coowner = new Array() await bot.owners.forEach(async function (a) { var b = await global.bsl.users.fetch(a) + if(!b) return; coowner.push(b) }) try { diff --git a/website/routers/servers/index.js b/website/routers/servers/index.js index 75961d1..b895004 100644 --- a/website/routers/servers/index.js +++ b/website/routers/servers/index.js @@ -211,9 +211,9 @@ router.get('/:server/vote', function (req, res) { return res.redirect('/'); } if (bot.votes) { - bot.votes = 1; - } else { bot.votes++; + } else { + bot.votes = 1; } bot.save(function (err) { if (err) { @@ -234,6 +234,14 @@ router.get('/:server/vote', function (req, res) { console.log(e); } } + const embed = new Discord.EmbedBuilder() + .setColor('#0099ff') + .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"}) + .setTimestamp(); + global.client.channels.cache.get(global.config.bot.channels.vote).send({ embeds: [embed] }); req.session.message = "Vote added"; return res.redirect('/'); }) @@ -251,9 +259,9 @@ router.get('/:server/vote', function (req, res) { return res.redirect('/'); } else { if (bot.votes) { - bot.votes = 1; - } else { bot.votes++; + } else { + bot.votes = 1; } bot.save(function (err) { if (err) { @@ -273,6 +281,14 @@ router.get('/:server/vote', function (req, res) { console.log(e); } } + const embed = new Discord.EmbedBuilder() + .setColor('#0099ff') + .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" }) + .setTimestamp(); + global.client.channels.cache.get(global.config.bot.channels.vote).send({ embeds: [embed] }); req.session.message = "Vote added"; return res.redirect('/'); } diff --git a/website/views/admin/bot.ejs b/website/views/admin/bot.ejs new file mode 100644 index 0000000..e1f6903 --- /dev/null +++ b/website/views/admin/bot.ejs @@ -0,0 +1,39 @@ +<%- include("../includes/header.ejs", { title: "Bot" + bots.name}) %> +
+ + + + + + + + + + + <% var nbots = bots.filter(bot => bot.verified == false); %> + <% nbots.forEach(function(bot) { %> + + + + + + + <% }) %> + +
+ Bot Name + + BotID + + Bot Description + + Owner +
+ <%= bot.name %> + + <%= bot.id %> + + <%= bot.description %> + + <%= bot.owner %> +
\ No newline at end of file diff --git a/website/views/admin/index.ejs b/website/views/admin/index.ejs new file mode 100644 index 0000000..b26d159 --- /dev/null +++ b/website/views/admin/index.ejs @@ -0,0 +1,41 @@ +<%- include("../includes/header.ejs", {title: "Admin"}) %> +
+ + + + + + + + + + + <% var nbots = bots.filter(bot => bot.verified == false); %> + <% nbots.forEach(function(bot) { %> + + + + + + + <% }) %> + + +
+ Bot Name + + BotID + + Bot Description + + Owner +
+ <%= bot.name %> + + <%= bot.id %> + + <%= bot.description %> + + <%= bot.owner %> +
+
\ No newline at end of file diff --git a/website/views/bot/vote.ejs b/website/views/bot/vote.ejs deleted file mode 100644 index e69de29..0000000 diff --git a/website/views/bots.ejs b/website/views/bots.ejs index b710ec4..9508643 100644 --- a/website/views/bots.ejs +++ b/website/views/bots.ejs @@ -1,12 +1,12 @@ <%- include("./includes/header.ejs") %>
<% var nbots=bots.filter(a=> a.promoted == true) - nbots.forEach((val, key) => { - randomIndex = Math.ceil(Math.random()*(key + 1)); - nbots[key] = nbots[randomIndex]; - nbots[randomIndex] = val; - }); - if(nbots.length > 0) { %> + nbots.forEach((val, key) => { + randomIndex = Math.ceil(Math.random()*(key + 1)); + nbots[key] = nbots[randomIndex]; + nbots[randomIndex] = val; + }); + if(nbots.length > 0) { %>

Promoted Bots @@ -16,12 +16,10 @@
<% } %> <% for(let i=0; i < nbots.length; i++) { if (i===3) break; var bot=nbots[i]; if(bot) { %> -
- <%= bot.name %> -
-

: <%= bot.votes || 0 %> - <%if(bot.servers) { %>: <%= bot.servers %> - <% } %> +

+ <%= bot.name %> +
+

: <%= bot.votes || 0 %> <%if(bot.servers) { %>: <%= bot.servers %><% } %>

@@ -32,19 +30,10 @@ <%= bot.description %>

- <% if(bot.tags) {%> @@ -56,12 +45,12 @@
<% var nbots=bots.filter(a=> a.verified == true) - nbots.forEach((val, key) => { - randomIndex = Math.ceil(Math.random()*(key + 1)); - nbots[key] = nbots[randomIndex]; - nbots[randomIndex] = val; - }); - if(nbots.length > 0) { %> + nbots.forEach((val, key) => { + randomIndex = Math.ceil(Math.random()*(key + 1)); + nbots[key] = nbots[randomIndex]; + nbots[randomIndex] = val; + }); + if(nbots.length > 0) { %>

Random Bots @@ -71,86 +60,25 @@
<% } %> <% for(let i=0; i < nbots.length; i++) { if (i===3) break; var bot=nbots[i]; if(bot) { %> -
- <%= bot.name %> -
-

: <%= bot.votes || 0 %> <%if(bot.servers) { %>: <%= bot.servers %><% } %>

+ <% getBot = global.bsl.users.cache.get(bot.id); %> +
+ " onerror="this.src='/img/logo.webp'" alt="<%= bot.name %>"> +
+

: <%= bot.votes || 0 %> <%if(bot.servers) { %>: <%= bot.servers %><% } %> +

- <%= bot.name %> + <%= getBot.username %>

<%= bot.description %>

- <% if(bot.tags) {%>
- <% bot.tags.forEach(tag=>{ %> - # - <%= tag %> - - <% }) %> -
- <% } %> -
- <% } } %> -
-
-
- <% var nbots=bots.filter(a=> a.verified == true) - nbots.forEach((val, key) => { - randomIndex = Math.ceil(Math.random()*(key + 1)); - nbots[key] = nbots[randomIndex]; - nbots[randomIndex] = val; - }); - if(nbots.length > 0) { %> -
-
-

Best bots -

-

Bots with highest votes!

-
-
- <% } %> - <% for(let i=0; i < nbots.length; i++) { if (i===3) break; var bot=nbots[i]; if(bot) { %> -
- <%= bot.name %> -
-

: <%= bot.votes || 0 %> - <%if(bot.servers) { %>: <%= bot.servers %> - <% } %> -

-
-
-
- <%= bot.name %> -
-

- <%= bot.description %> -

-
- - <% if(bot.tags) {%> - diff --git a/website/views/includes/header.ejs b/website/views/includes/header.ejs index 37532c2..8d94f62 100644 --- a/website/views/includes/header.ejs +++ b/website/views/includes/header.ejs @@ -28,7 +28,7 @@ + 🟢 <%= global.bsl.guilds.cache.get(server.id).members.cache.filter(a => a.presence?.status).size %> onlineᅠᅠᅠᅠ⚫ <%= global.bsl.guilds.cache.get(server.id).memberCount %> members"> <% } %> diff --git a/website/views/index.ejs b/website/views/index.ejs index e319135..8f0c3e9 100644 --- a/website/views/index.ejs +++ b/website/views/index.ejs @@ -18,14 +18,44 @@
+ +
- - +
+  Moderation  Fun  Logging @@ -140,7 +170,7 @@ <% } %> <% for(let i=0; i < nbots.length; i++) { if (i===3) break; var bot=nbots[i]; if(bot) { %>
- <%= bot.name %> + <%= bot.name %>

: <%= bot.votes || 0 %> : <%= global.bsl.guilds.cache.get(bot.id).memberCount.toLocaleString().replace(',', '.' ) %>

@@ -185,13 +215,11 @@ <% servers.sort((a, b) => b.bump - a.bump).slice(0, 5).map(bot => { if(!bot) return; %>
- <%= bot.name %> - <% if (bot.votes){ %> + <%= bot.name %>

: <%= bot.votes || 0 %> : <%= global.bsl.guilds.cache.get(bot.id).memberCount.toLocaleString().replace(',', '.' ) %>: <%=bot.bumps %>

- <% } %>
<%= bot.name %> @@ -230,12 +258,10 @@ <% } %> <% for(let i=0; i < nbots.length; i++) { if (i===3) break; var bot=nbots[i]; if(bot) { %>
- <%= bot.name %> - <% if (bot.votes){ %> + <%= bot.name %>

: <%= bot.votes || 0 %> : <%= global.bsl.guilds.cache.get(bot.id).memberCount.toLocaleString().replace(',', '.' ) %>: <%=bot.bumps %>

- <% } %>
<%= bot.name %> diff --git a/website/views/server/add.ejs b/website/views/server/add.ejs index b90e37d..1da946e 100644 --- a/website/views/server/add.ejs +++ b/website/views/server/add.ejs @@ -23,10 +23,10 @@
+ description
- +
diff --git a/website/views/server/index.ejs b/website/views/server/index.ejs index 1f54ff4..4dccd74 100644 --- a/website/views/server/index.ejs +++ b/website/views/server/index.ejs @@ -37,7 +37,7 @@
-

Members: <%= serverr.memberCount.toLocaleString().replace(',', '.' ) %>/ <%= global.bsl.guilds.cache.get(server.id).members.cache.filter(a => a.presence?.status != 'dnd').size %> online +

Members: <%= serverr.memberCount.toLocaleString().replace(',', '.' ) %>/ <%= global.bsl.guilds.cache.get(server.id).members.cache.filter(a => a.presence?.status).size %> online

@@ -81,10 +81,4 @@



-<%- include('../includes/footer.ejs') %> - \ No newline at end of file +<%- include('../includes/footer.ejs') %> \ No newline at end of file diff --git a/website/views/tags/index.ejs b/website/views/tags/index.ejs index e69de29..2571d5b 100644 --- a/website/views/tags/index.ejs +++ b/website/views/tags/index.ejs @@ -0,0 +1 @@ +<%- include("../includes/header.ejs", { title: "Tag: " + tag}) %>