x=&QOlA$_Te?N$(3LVGeih;=OtHa5XGy4KEqu`7?kqoeTrI(JiC5RKuE
zK{HS~HX{rt^Ng+wj(1~lq*$8swluFge+8+F8Xx6-Rusx`)dbgtD18`q-`a=9JtyAVsGs(2J+_1unW*17ZD?
zNrw^~)ltXHabLi4gt{PJ=fp+GYj%{PeH12R*mGngzYgkZ9%yJ6tI!6!MlO9iTVlw+Ez{=}G>=
zPUUxZyW2it-Tlgr=Es!y^h;-@`~M&vDn)g~lQzR)3Lh%f(9kod?}U=!6Y>3bCi}iY
zPH$QrjR`X{}~f2jFv%cjp=)n~59c+pkQ3OMsBT+5prLTTTNZ4eSqqa)8wU
zra&sTO*1G&Afy36f!ILJvFQi63T)>9xIjF%a}7`qa3Qb`h-yG-lghFEhyT7k)A))T
zA@k{vFZQgtXopL$xknqRzd(SnRgTmL(W(R~spq-5-HPO{`3Kq>RpXnJDDT`p$
z%=C7VLLrp;89q@iG*>tGmg$g>cN7tERK4Zo#4_OgB6|le-!J%6dAMuTrAq`%=BJ#F
zfg5(Z(^;M&m*8wHCn(^O-!#ZU5CunN;V${#n&R#j6?jz@84wxmO8mzH%B3fYAWqLV
zWGs>uys90(?dXN-HBl69h()cfEpgZum!NalH+5s$?++oBTthUe`sY(}8%xUYIyG|4rvYR8!nE<8+Zo=58!C70RdW%0VOjNtx|e$Yam8VFvV^T5|A3!nx#!k5VNp*bRD4>#!wu@!idC
zQLFo_*j{xAyeuNAzfn?6ak=E<)IpkAOi2&mJJnV3AZO={qrWz@iob7VL%NIxM|P>%
z%WkW4ffgQXhY%*HP>PopGky1g*NY*?*v*deh!dJ+(DSM*=gJHDkwpW>bdODsRS`NY
z=2*Q)@8iqRLrePR;@SbNX`uW{RNgoia)L%6ZgryGM52!RmWS~;v%8R)g+mgNGgDoR
zeOVL7tXU={R3)JKFlauJO&}XWy;YhSp?>pNaKk|M5G;m2meq^CWaT5FpqKjx&2!J|
ztps@Mm@!LgdATG1(rAR-9+pn(hGVj8F|bR#R5R*Qf8#XFCAy}!0QQe#BXhXVt;VQ5
zKftA-0dl4Z%eQ_=3iibI-CA@38iG}3e66}kBoXvh7(!I=xVh?)=Y3$}S_05bp#s7AKS&ijpMvJL^*CT}``F+eYX&34(D
zTp~=Y!a;s~8}uf5126;90KfpbcbNV4bCExUrGV>^;tvz*ep(kckdOaCn2syO9J}hj
zj>Bp^*t&R{2UE(7L2XQ-#PFnq7;q$Y4;AQ2Rje2yF@_u$?UEG}`&wd78kiTZ9g%iEke$07koOCyh%Zg3B53*(oeDb_?2m8fp{4z#>F(8a5m77
zH_-V_0`qL6hx4PE6du```~2lkuYR6S2@iqc@?IMOe}*;pU+hBky1}cSzpIQ
zAc~>WJ6JWjk7SW7cyzjMR$p#O|x3&HhJvH$NTGN)#R*p^slLeL~G|&Rfy7tA7|u($qhZAuqU+W0@poVu5NA
zUJ2DV#G`s#a}+BMagW`T^bsQ<2bkWci@e*bRZJ?-tC|>J6poYPUj0Z?dsY}auOn#N
zU1IY2TSySpe}z<8pKC%<6Fx*EWVL!_;nZQh(muJ3xfO#t!fUWXE<_2mfu011W3uwZ
z22ucpQ$%C(nKw|_)I?|lGQ)Z~q@LEb*jI`q4cIx2e^}z5(l!p?;FJ?mnr
zduG;|#+kDy^#|WFZoK4(X7j_6lqt9jD2EH!iuRi@|DoiCH43YDSal2?8Ee
z-v|>kYjbDAI3#slI(<>war`%5P;s(+==_D$t~
z|5yun3%JKdACR1F6Jc9lgLVZx2Sf$Xv#AaM2*d_7Ht9Kl9`GFCZt|Quu^$Az?cE2J
zHtuZD*$fBJvt3jtmV;A8HqQa{fL|wXMSu6P)&zaLR}UJh=DmGZ_vGr?+ZrAtJa6~4
ztmb7EBXcV@gJ*TPXj*=1WVDmqDLS$!#W~tn?i=l_3h@byajA%dM|;XWqv1-gsO&6S
z&~7DWn@}p;j8QmcX3?|xhmXi0N>(H~D|ExBxGa_nWAiqT3o?f+qWrV0
zT|+V^((6k(cN_CWR?OH8LX#5e417M_P_Eb-?ekNDPnKvCQs~tDt)t84Oyo
zy>nc=S|%ddS*%V?Wu2mRf)IZdc};
z&lVpXN*#}Su!o59RJP_Dr=yOk?Hhf_oO8{4_Nff#zrUml3j^V=dCW26ds)wowj7ZOj%xU
zY)zl?>y=V;EPZJbEVp`J6)HLbT98
z9;^Z?R29DL35T*cdNVTGqE-;1X@=d)D(qlz<|ozaZC)>&VJ6p~5@BMTvA1;?hxzbH
zt`bLUu(JGRRU{X(pk7ks>^7z|5X9k+5yaDUH37m1e%j=aIK5lu$rKuS2gv*b
zOYkXje8L}O{$t{6=Re4Ncftig0&f90ZCC<~LAJG#2}qtK)3#X$WKN!=K=uUo1>o6s
zgh0lVZ~|4^;GARVc!$MWszP}_)QEdOdYQ8$RTyLw>O1wGX;qWj7fLpJHN
zBJxvlj1a913Sr=i<^*RsC>^qbHz#4UFiK1oS3Zy6LyQsz?2LuN8Lmn{Mz|#=n3sKu
ze5_UK%?QNH@kEBVj5#G6yuZsPpOsSr+a1CvLDWwvGM6m>+tSb@jDuID9@kHO>LI^O
zL@GkFP!DA8EBoE$k?UhGNBt=0xb-u&>5>*N=XL*DCcQ_f@LHL`ONU#{7{mt4prud4
z-iFPhr8-I*s!Gw|3+W+!pV*9X?e6H`{sN2I@mTbI>g?GWZ;<7qIYZyqA)zwoNQ?jU
zUv#}?MC49?7@0ZhO1|GhHR^d;_?mfT=U+73?KZ(&uL>=0JLD&5qRV?&)KjJ9VTg*_
zT)i)^fhzMW&;*<`U@)?O544p4oymCVj(8k`aN&_0sWP(FVF*|&c2H2jbD+C+oGptrZboJ=zi
zeN#1(^|Cxe35vki?7@f#UFDe9q{dQ=Db*+`&U&C`lDTFlsq)C4#2(+690)^;F^r1^
zKE25(C_0TPQ_2hV$^b>hPg)09gVunZGJ`)eZ;Wj0a-G6?VYH;YIbI=;O>L2qBav1k
zL`WOkALdA>&SiJ2)H}6|evNr8cIi#lT)`^?Y{se*lsE-F!tWtO3^h9C#%S9smiXtn
zQQ;rlnbp+<=GkntL&co0KCv!!{y*eafC0#@|3>uft_5&n)8=GuwVCs;+61HlECHXu
zpMYTyY5$a4fjNOcClR&D6NFX}UBO}>u=>6~L0p~W(^BxpRMB^*-!CT&)kMpOuozbVcRCZEhduY)-SGg-Mn!w+%P^5ELy6Z%n
z7LauuB~ll%E!j`URbq913bvD;bqClIQYD{ZScS=f#vW5jwmSa#$Sd
zpw&$|r|{4PBc;gxXb)LMwD7`ID98})luJ6Ri11!a8;qtz$Z*ka!}6f!YzZl8Wd_awu2FY13RrN*&UEqz@(EE1O@8f(Kc&9cx#T9oJDT9^H}(
zyB_5{3t7W)!)vNaM{6(MY}`L6BOssh=EmL~-0vsDn_UGu58S$6M@pPtR(&R%0bLFI
zryv{KqhB(#Y|6;|h*jmDQM-54zxXaQ%#u3fcGkf?{^Agpc`hG~%TG?tUx5(SLB5W)
zJJow|W;Znad_8+!Y1yHv>XzZeF1&^4oz@_R{V0JIv1nr{l?=yx792lrXb?k5=}dI7
z@;ra$`oyo2+JP+T;Dby1G`$3Yuw$8MzVyUJA11anz%rhUYmrF1v8~X?h~+vnvbi9!
z49?4IXdwMhWuuXy%QLuQ1&_rtW0at*5AJLks&n{+%Y?At@2W8A_bo*P#6!(qj7$Ql
zV8>Vx1u?s;0q)^33bibreza9qu1F#clc?X{?%OckgV~p+7|9d!omCC7)j6|n(s)WN
zv&0qK)&4MyW63Qd@2)#AimfI!wi3NWzRk3l6GKwLkNM5@2z_N2Ja?$NY5^17lI?*-
zlEx3M>GxSS|J~8;uQ}ItMX;?!0j;){2~zFkS`+{aE^a_|lUD>_Q{d6biU|m{^-EjM
z1+f>X5g_&_S^=lFv
z(iu&ok7xHIR?%>l4j6_m$$LBhS
zsj7
zh-moq1r%+(2uT<@6k^SlwnBY~wy*grM2Q6j;lHA&A%v#gN`bn^)sh`kM~CL5E>ZON
zz~zu%Hwjm`#)NQt$?uPJd3xguL_2J}c$1XVe$Wk5>$@YuLvXPNt*BD>q=*D#;(fZr
z<7s59e<~6l)mzo2*VWyU`pQx-6&W8l@<$NySH~5I#63H^Q#^+eO57`Za!=v6)|<;D
zxSk56C!H+_$F6`v`EE>Qq=u&CY9eJ&kZ}oRV@4ECOF1cbG2+0#hvaj2
z7a2^;aSU6V7G*>UK93Gpcxc#oDW0wIkojxQnVAko%E2V)bC07_G0_2ovf$g%VH7QH
zA;Aw;LLjT|9PS@VH0-U4&ap7F8CewA6t(vBknLkq+aGI(s5DG0
z=P@Z!QA9*3<~`Pj6dT`c#wj7nP)9Y+@)4$lm)f|vn?n5gg}vP&FDrFD+w+8G-imlQ
zKO~26eSBrnNMQJ?>eVz9bYZ>oI(`37hX(EN42JOQ7x#|tg3Lk7VO55rnKrM^!qT~jJ{
zZz}y6rWGruwtTsIu)gH@@0_iE|NQjY|6D3V1l9~8a2H=jBC(#?uM!IXWmI>q*NhJ@
z^3l*pMgq6}TK6}^XEg6^ZGXyNGM)8gP8#Jz>5UXNaapQKPCzO+9@b%Y
zL-orEBmpy@yM%c
zK-`+q=g@y%k-UDYj%ez?cZmR4M@V{w=^swj5t4p;m+3lHN7f~;W>j#z{`p7++6*uS
zN2<$y0hfSj0O;#<0xrQ{0RRf3BNv*$djXfPtFH@C*O>aJ-F!j0T>tipUwyZ6c24e&
zan*O;0rj0-yRKh~~z&NeOIjbc7UE;pko}+U#mB
zivfA_)Wlh-SGmME2#SkBVQDDZ0VVm9)qxkM#;94}dgLOfHq?2#UEen-a^9vg&}b(A
zIv=;$w`P4=NDnAhBZQanm$z3m;RE~+UobZ|c9XQSl9FO&z8>d`&qhKpyz?(B0?K6y
z3-Ul$&*4%tau;+GAUE#h$=eW|te)^mqjQncWUMaD$zM6MI8t|%-rFc5{GdBkNAaD}
zzB@W~_BwiE9cu@sL(+g_`IQ=XYtLcxRNvy7Fr7>LOGW$3l-ABpnEqlPq;#UWLhX|DMeL13(WMEHp6)xA_tifbDsh9h3<+oQv
zpcI7|OO{=hxX+CsKzVRSFIzyn)Qv2PC=BRc@rZUs0;d;VlLV79Pj8?Nn%b2x=mXWe
zqh+N;tWQ3qrD65j&MmSUNKU+6HC;2;3(1|!rv4~}Na$_HtyyfF724tctw>koRRrnW
z7n`9yswi_H787_vL`-*U)L2yh!ZdxUc%D^TwCav%p9-?`HY164MbJdib%a`av)*wr
zIKCmnM(i;`Ubx`)Oc|N;P^7^re5#~vfeY}p@0+Iv73?r-5nMsh9w;nuwjOQJsU5aYxSp~c7GV_}}$%&}k$
z7z;>l!`+kogFQ%)KFC5bP%J@}*ooYL*f_!-h`;~G2vLRLD?@*ZpaP0q&~uzuF-@N{
zCM*lNE@dDD&+;M71VX35-}74{$@;ZTKW4u$JCF9YL?Vfad}$qLytmOEY?Phj04j#i|`
z?%g5j`UxZD`^1HY5{|&FJho}AtS;u+Y071BeDez^iLPN;=H(Y70pD+Q?M&H6cVG9EE2J2h0^L!*Z!+wAAjFR>ED?heg6o+)J-
zOrB-9$w=}uJ22(JCrXT1%S@}06sffKuc^QAIIm{RdkXRR@3h0(g_XX&8}&7c!C@)U
zTen;VCWKGUh4&1v*sOVju~m`^`H#QH~lAk~Rl7}sIbV0E*tz$J%vQopt-F5~yMxH<`OmK^Jj*8W{#7^j7fE*4A4@x3V>XZjU^7j
z0(WhfTJp#`q~g*GQ-LB}3u;|9HzCPMn$&cJU3*cocUFCHnIq|8q&8
z2pqLt?b$o%-Ph$vTy(ukSf>dYx&^&CG3K1_+N0ov^qXqm-~&%)G*elPFn#
zNI2naC8m36Ka{%{64fauX`wYOkiyKL`s!d8x
z)U`m#9S*HkE@j_zP@j(1KV5n+@_vScq%Cw`{ZXV{xB1|P3<~Hs7$FETri*6
z_Stkz(a@ui`*pHtxSJ4Wo7T)gY`iRYuKDPF1Tk6-qL8d@G74&Q>~J@FH5cTlZDLU0
zFeJ7&$ZD?m(iT6e^VuFYWQ9ZDJeXj^$I|-l;v|!ashJljJza^>g9$P`N-%f0;aZ#U
z^(+&7S0G&CxLC(8G)pQo_Bq$>9IFY*CqYo1uHFy3xQP;VLTPGbT@p*H4*%Zp9qIGi
zr2Stk9;9L*#(v%60iOU)m%;;L0ivU0wksP0Yo^f|8;sTfS3nm~ct9-R6U^JMPui|*
zY}Ddi8Me#fUE5z*di}b>yO;!&f*Bi7Itr)jA)l}17XfyZ+N(ZJ&a7pvl^
zvr_qh&^RFSW7UTkzH^Sp2@||k@zMx#T+9I};VgMX4Sq(W8Kj&lWxQj
zV<9Lu@|DPU5BO8mj7w98D9qL4f=`cFyq%*|t*a8T*NX^@iuK0%1MBV9dJ7-R>bzQ1
z*gjvkfhwO^@;6D^Hc7xxIMc@hpVoR|*F%JRPUA~|TJ{4={Bj;eAM!;Q8`e+NL^Js<$8T^J{*E5Shf8%Wed
z>}BhKv?mu8Jg>gg71a;cnow4Y^R$eeGY0*>EXnzt>tWa8m8c6I-jOlwSm&Nl(%e-mTh@~NlV|L)MOluE1#&jC>)6eBO>@^XLCkf9oNu~bXQUDIa4*gC
z-~^e*?fWS_a=NgvTPJV72A6%`)ALE?`*F^NvRS|KJ9m2A-HCkYaWA3q?rN!6^u^k9
zvEBxX-*Wz3TrZK|nRb1^zI~}%T?GfSRrO((=Y^ziXB_Pd@-KW_-p45-+NTe&K3Xz3
zuvPg1zmvo>nR6N@$?WlR
z@1 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 @@
+
\ No newline at end of file
diff --git a/website/views/bot/analytics.ejs b/website/views/bot/analytics.ejs
index c7e1def..6e93a37 100644
--- a/website/views/bot/analytics.ejs
+++ b/website/views/bot/analytics.ejs
@@ -55,8 +55,8 @@
Referrers
The domain names of the sites that most redirect to your bot's page.
-
-
+
+
| Referring Url |
@@ -78,21 +78,20 @@
Countries
These are the countries that enter your bot's page.
-
-
-
+
+
+
| Country |
Total viewers |
-
<%
if(bot.country) {
Object.keys(bot.country).sort((a,b) => bot.country[b] - bot.country[a]).forEach(b => {
%>
- <%= b %> |
+ <%= b %> |
<%= bot.country[b] %> |
<%
diff --git a/website/views/server/add.ejs b/website/views/server/add.ejs
index 5c8f4d5..aaff1f6 100644
--- a/website/views/server/add.ejs
+++ b/website/views/server/add.ejs
@@ -51,6 +51,9 @@
}
});
+
\ No newline at end of file
diff --git a/website/views/server/edit.ejs b/website/views/server/edit.ejs
index 509911f..defcd98 100644
--- a/website/views/server/edit.ejs
+++ b/website/views/server/edit.ejs
@@ -1,6 +1,11 @@
<%- include("../includes/header.ejs", {title: "Edit " + server.name}) %>