diff --git a/models/server.js b/models/server.js index 9c65aca..43f17f2 100644 --- a/models/server.js +++ b/models/server.js @@ -10,10 +10,14 @@ let hm = new mongoose.Schema({ tags: [String], premium: Boolean, invite: String, - votes: Number, + votes: { type: Number, default: 0 }, bump: Date, webhook: String, - bumps: Number, + bumps: { type: Number, default: 0 }, + analytics: Object, + analytics_visitors: Number, + analytics_joins: Number, + country: Object, }); module.exports = mongoose.model("servers", hm); \ No newline at end of file diff --git a/models/user.js b/models/user.js index db2297f..ea25d14 100644 --- a/models/user.js +++ b/models/user.js @@ -3,10 +3,10 @@ let model = new mongoose.Schema({ id: String, biography: { type: String, default: null }, coins: String, - website: { type: String, default: null }, - github: { type: String, default: null }, - twitter: { type: String, default: null }, - instagram: { type: String, default: null } + website: String, + github: String, + twitter:String , + instagram: String }); module.exports = mongoose.model("profiles", model); \ No newline at end of file diff --git a/website/index.js b/website/index.js index 957a474..f653e15 100644 --- a/website/index.js +++ b/website/index.js @@ -164,7 +164,22 @@ app.get('/tag/:id', async (req, res) => { tag: id, }); }); +app.get('/i/:id', async (req, res) => { + var id = req.params.id.toLowerCase(); + var bott = await bots.findOne({ name: { $regex: req.params.id }}); + if(!bott){ + var serverr = await server.findOne({ name: { $regex: req.params.id }}); + if(!serverr){ + res.redirect('/'); + return + } + res.redirect('/server/' + serverr.id + '/join'); + return + } + res.redirect('/bot/' + bott.id + '/join'); + return +}); app.get('/tos' , (req, res) => { res.render('tos', { user: req.user, diff --git a/website/public/css/style.css b/website/public/css/style.css index df03d43..6b43b62 100644 --- a/website/public/css/style.css +++ b/website/public/css/style.css @@ -825,6 +825,9 @@ video { .h-3 { height: 0.75rem; } +.h-96 { + height: 24rem; +} .max-h-fit { max-height: -webkit-fit-content; max-height: -moz-fit-content; @@ -909,6 +912,9 @@ video { .w-1\/4 { width: 25%; } +.w-96 { + width: 24rem; +} .min-w-fit { min-width: -webkit-fit-content; min-width: -moz-fit-content; @@ -931,6 +937,9 @@ video { max-width: -moz-fit-content; max-width: fit-content; } +.max-w-md { + max-width: 28rem; +} .flex-initial { flex: 0 1 auto; } @@ -1209,6 +1218,9 @@ video { .border-b-2 { border-bottom-width: 2px; } +.border-l-8 { + border-left-width: 8px; +} .border-solid { border-style: solid; } @@ -1504,6 +1516,9 @@ video { .text-center { text-align: center; } +.text-justify { + text-align: justify; +} .text-end { text-align: end; } @@ -1934,6 +1949,11 @@ body { color: rgb(24 25 28 / var(--tw-text-opacity)); } +.hover\:text-blue-300:hover { + --tw-text-opacity: 1; + color: rgb(147 197 253 / var(--tw-text-opacity)); +} + .hover\:no-underline:hover { -webkit-text-decoration-line: none; text-decoration-line: none; @@ -2223,14 +2243,14 @@ body { width: auto; } - .lg\:w-1\/4 { - width: 25%; - } - .lg\:w-2\/3 { width: 66.666667%; } + .lg\:w-1\/4 { + width: 25%; + } + .lg\:flex-grow { flex-grow: 1; } @@ -2242,10 +2262,6 @@ body { .lg\:items-center { align-items: center; } - - .lg\:p-10 { - padding: 2.5rem; - } } @media (min-width: 1280px) { diff --git a/website/public/gif/loading.gif b/website/public/gif/loading.gif new file mode 100644 index 0000000..a9345db Binary files /dev/null and b/website/public/gif/loading.gif differ diff --git a/website/routers/servers/index.js b/website/routers/servers/index.js index b6a7dff..8dadab1 100644 --- a/website/routers/servers/index.js +++ b/website/routers/servers/index.js @@ -47,6 +47,7 @@ router.post('/add', async function (req, res) { req.session.error = "You do not have admin permissions"; return res.redirect('/'); } + var invite = null; if (req.body.create) { var channel = await checkServer.channels.cache.filter(channel => channel.type === Discord.ChannelType.GuildText) .first(); @@ -54,15 +55,13 @@ router.post('/add', async function (req, res) { req.session.error = "Could not create invite"; return res.redirect('/'); } else { - channel.createInvite({ + var invite = await 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 }) } } @@ -75,7 +74,7 @@ router.post('/add', async function (req, res) { icon: checkServer.iconURL({ format: 'png', dynamic: true }), memberCount: checkServer.memberCount, tags: req.body.tags, - invite: req.body.server_invite, + invite: req.body.server_invite || invite.url, token: makeid(64), }) var tagss = Array.from(new Set(req.body.tags)); @@ -118,8 +117,8 @@ router.post('/add', async function (req, res) { } }); -router.get('/:server', function (req, res) { - servers.findOne({ id: req.params.server }, function (err, server) { +router.get('/:server', async function (req, res) { + servers.findOne({ id: req.params.server }, async function (err, server) { if (err) { console.log(err); return res.redirect('/'); @@ -128,6 +127,38 @@ router.get('/:server', function (req, res) { req.session.error = "No server found"; return res.redirect('/'); } + + let referresURL = String(req.headers.referer).replace("undefined", "Unkown").split('.').join(','); + await servers.updateOne({ + id: req.params.server + }, { + $inc: { + analytics_visitors: 1 + } + }) + var getIP = require('ipware')().get_ip; + var ipInfo = getIP(req); + var geoip = require('geoip-lite'); + var ip = ipInfo.clientIp; + var geo = geoip.lookup(ip); + + if (geo) { + let CountryCode = geo.country || "TR" + await servers.updateOne({ + id: req.params.server + }, { + $inc: { + [`country.${CountryCode}`]: 1 + } + }) + } + await servers.updateOne({ + id: req.params.server + }, { + $inc: { + [`analytics.${referresURL}`]: 1 + } + }) res.render('server/index', { user: req.user, server: server, @@ -267,7 +298,7 @@ router.get('/:server/vote', function (req, res) { console.log(e); } } - const embed = new Discord.EmbedBuilder() + const embed = new Discord.Embeserversuilder() .setColor('#0099ff') .setTitle(`${req.user.username} has voted for ${bot.name}`) .setDescription(`[${bot.name}](${bot.url})`) @@ -314,7 +345,7 @@ router.get('/:server/vote', function (req, res) { console.log(e); } } - const embed = new Discord.EmbedBuilder() + const embed = new Discord.Embeserversuilder() .setColor('#0099ff') .setTitle(`${req.user.username} has voted for ${bot.name}`) .setDescription(`[${bot.name}](${bot.url})`) @@ -334,4 +365,45 @@ router.get('/:server/vote', function (req, res) { } }) +router.get('/:server/join', async function (req, res) { + servers.findOne({ id: req.params.server }, async function (err, server) { + await servers.updateOne({ + id: req.params.guildID + }, { + $inc: { + analytics_joins: 1 + } + } + ) + let urlInvite = server.invite; + res.render('server/join', { + url: urlInvite, + server: server + }); + }); +}) + +router.get('/:botID/analytics', async function (req, res) { + if (!req.user) { + req.session.backURL = req.originalUrl; + return res.redirect('/auth'); + } else { + bots.findOne({ id: req.params.botID }, async function (err, bot) { + if (err) { + console.log(err); + return res.redirect('/'); + } + if (!bot) { + req.session.error = "No bot found"; + return res.redirect('/'); + } + res.render('bot/analytics', { + bot: bot, + user: req.user, + bota: await global.bsl.users.fetch(bot.id) + }); + + }); + } +}); module.exports = router; \ No newline at end of file diff --git a/website/routers/user/index.js b/website/routers/user/index.js index b517b1a..5630b19 100644 --- a/website/routers/user/index.js +++ b/website/routers/user/index.js @@ -14,12 +14,12 @@ router.get('/me', async function (req, res) { return res.redirect('/auth'); } var bot = await bots.find({ owners: req.user.id }); - var user = await users.find({ id: req.user.id }); - res.render('user/me', { + var user = await users.findOne({ id: req.user.id }); + res.render('user/index', { user: req.user, bots: bot, users: user, - dcuser: global.bsl.users.fetch(req.user.id) + dcuser: await global.bsl.users.fetch(req.user.id) }); }) diff --git a/website/views/bot/add.ejs b/website/views/bot/add.ejs index 1cf8178..2e0a031 100644 --- a/website/views/bot/add.ejs +++ b/website/views/bot/add.ejs @@ -48,6 +48,9 @@ +
The domain names of the sites that most redirect to your bot's page.
-| Referring Url | @@ -78,21 +78,20 @@
|---|
| Country | Total viewers | |
|---|---|---|
<%= b %> |
+ <%= bot.country[b] %> |