HEAPS of bug fixes and QA updates

discordextremelist · Jun 30, 2020 · 3258ecf · 3258ecf
1 parent 9adde6e
commit 3258ecf
Show file tree

Hide file tree

Showing 46 changed files with 914 additions and 229 deletions.
diff --git a/@types/del.d.ts b/@types/del.d.ts
@@ -113,6 +113,7 @@ interface delUser {
 
 interface delBot {
     _id: string;
+    _cacheID?: string;
     name: string;
     prefix: string;
     library: string;

diff --git a/assets/Public/css/theme/dark/all.css b/assets/Public/css/theme/dark/all.css
diff --git a/assets/Public/css/theme/dark/standard.css b/assets/Public/css/theme/dark/standard.css
diff --git a/assets/Public/robots.txt b/assets/Public/robots.txt
@@ -2,4 +2,5 @@ User-agent: *
 Disallow: 
 Disallow: /staff/
 Disallow: /users/account/
+
 Sitemap: https://discordextremelist.xyz/sitemap.xml
diff --git a/assets/Sass/dark/variables.scss b/assets/Sass/dark/variables.scss
@@ -26,7 +26,7 @@ $family-sans-serif: "Lexend Deca", sans-serif;
 // Navbar
 
 $navbar-background-color: $primary;
-$navbar-item-hover-background-color: $black;
+$navbar-item-hover-background-color: #131313;
 $navbar-dropdown-background-color: $black;
 $navbar-dropdown-item-hover-color: $white;
 $navbar-item-hover-color: $white;

diff --git a/assets/Views/partials/cards/botCard.ejs b/assets/Views/partials/cards/botCard.ejs
@@ -34,66 +34,66 @@
                 <div class="content-footer">
                     <div class="buttons">
                     <% if (bot.status.archived === true) { %>
-                        <a href="<%= linkPrefix %>/bots/<%= bot._id %>/resubmit" class="button is-default is-outlined">
+                        <a href="<%= linkPrefix %>/bots/<%= bot._id || bot.id %>/resubmit" class="button is-default is-outlined">
                             <span class="icon">
                               <i class="fas fa-redo-alt"></i>
                             </span>
                             <span><%= __("common.resubmit") %></span>
                         </a>
                     <% } else if (verificationApp === true) { %>
-                        <a href="<%= linkPrefix %>/staff/apps/verification/<%= bot._id %>" class="button is-default is-outlined">
+                        <a href="<%= linkPrefix %>/staff/apps/verification/<%= bot._id || bot.id %>" class="button is-default is-outlined">
                             <span class="icon">
                               <i class="fas fa-eye"></i>
                             </span>
                             <span><%= __("common.application.view") %></span>
                         </a>
                     <% } else if (search === true) { %>
-                        <a href="<%= linkPrefix %>/bots/<%= bot._id %>" class="button is-default is-outlined">
+                        <a href="<%= linkPrefix %>/bots/<%= bot.vanityUrl ? bot.vanityUrl : (bot._id || bot.id) %>" class="button is-default is-outlined">
                             <span class="icon">
                                 <i class="fas fa-robot"></i>
                             </span>
                             <span><%= __("common.view.bot") %></span>
                         </a>
                     <% } else if (queue === true) { %>
-                        <a href="<%= linkPrefix %>/bots/<%= bot._id %>" class="button is-default is-outlined">
+                        <a href="<%= linkPrefix %>/bots/<%= bot.vanityUrl ? bot.vanityUrl : (bot._id || bot.id) %>" class="button is-default is-outlined">
                             <span class="icon">
                                 <i class="fas fa-eye"></i>
                             </span>
                             <span><%= __("common.view") %></span>
                         </a>
-                        <a href="https://discord.com/oauth2/authorize?client_id=<%= bot._id %>&scope=bot&guild_id=<%= staffServer %>" target="_blank" rel="noopener" class="button is-success is-outlined">
+                        <a href="https://discord.com/oauth2/authorize?client_id=<%= bot._id || bot.id %>&scope=bot&guild_id=<%= staffServer %>" target="_blank" rel="noopener" class="button is-success is-outlined">
                             <span class="icon">
                                 <i class="fas fa-vial"></i>
                             </span>
                             <span><%= __("page.bots.invite.staff") %></span>
                         </a>
-                        <a href="https://discord.com/oauth2/authorize?client_id=<%= bot._id %>&scope=bot&guild_id=<%= mainServer %>" target="_blank" rel="noopener" class="button is-blurple is-outlined">
+                        <a href="https://discord.com/oauth2/authorize?client_id=<%= bot._id || bot.id %>&scope=bot&guild_id=<%= mainServer %>" target="_blank" rel="noopener" class="button is-blurple is-outlined">
                             <span class="icon">
                                 <i class="fas fa-shield-alt"></i>
                             </span>
                             <span><%= __("page.bots.invite.main") %></span>
                         </a>
-                        <a href="<%= linkPrefix %>/bots/<%= bot._id %>/approve" class="button is-success is-outlined">
+                        <a href="<%= linkPrefix %>/bots/<%= bot._id || bot.id %>/approve" class="button is-success is-outlined">
                             <span class="icon">
                                 <i class="fas fa-check"></i>
                             </span>
                             <span><%= __("common.staff.approve") %></span>
                         </a>
-                        <a href="<%= linkPrefix %>/bots/<%= bot._id %>/decline" class="button is-danger is-outlined">
+                        <a href="<%= linkPrefix %>/bots/<%= bot._id || bot.id %>/decline" class="button is-danger is-outlined">
                             <span class="icon">
                                 <i class="fas fa-minus"></i>
                             </span>
                             <span><%= __("common.staff.decline") %></span>
                         </a>
                     <% } else { %>
-                        <a href="<%= linkPrefix %>/bots/<%= bot._id %>" class="button is-default is-outlined">
+                        <a href="<%= linkPrefix %>/bots/<%= bot.vanityUrl ? bot.vanityUrl : (bot._id || bot.id) %>" class="button is-default is-outlined">
                             <span class="icon">
                               <i class="fas fa-eye"></i>
                             </span>
                             <span><%= __("common.view") %></span>
                         </a>
-                        <% if (profile === true && bot.owner.id === req.user.id || profile === true && bot.editors.includes("req.user.id")) { %>
-                            <a href="<%= linkPrefix %>/bots/<%= bot._id %>/edit" class="button is-warning is-outlined">
+                        <% if (req.user && profile === true && (bot.owner.id === req.user.id || bot.editors.includes(req.user.id))) { %>
+                            <a href="<%= linkPrefix %>/bots/<%= bot._id || bot.id %>/edit" class="button is-warning is-outlined">
                                 <span class="icon">
                                   <i class="fas fa-pencil"></i>
                                 </span>

diff --git a/assets/Views/partials/footer.ejs b/assets/Views/partials/footer.ejs
@@ -66,6 +66,7 @@
 <script type="text/javascript">console.log(`%cSTOP! DELLYTIME%c\n\nDEBUG INFORMATION:\n%cVersion: <%= req.del.version %>\nRelease Channel: <%= req.del.channel %>\nNode: <%= req.del.node %>\nResponse time: <%= Date.now() - requestedAt %>ms\n\nUser-Agent: ${navigator.userAgent}`,"color: red; font-size: xx-large; background-color: #000; padding: 10px; border-radius: 5px;","color: yellow; font-size: medium;","font-size: x-small;");</script>
 <script src="https://twemoji.maxcdn.com/v/13.0.0/twemoji.min.js" integrity="sha384-avLpk7eChiSgpDvwa4N7hvg9vj6V9sfFmGHurVkPOlWUalASzcO3d2x3qcbQqhsH" crossorigin="anonymous"></script>
 <script type="text/javascript" defer>twemoji.parse(document.body, {folder: 'svg', ext: '.svg'})</script>
+<script src="https://4ptzyp93lnp4.statuspage.io/embed/script.js"></script>
 <% if (subtitle === "") { %><script type="text/javascript" async defer>let seizure=0;function invokeSeizureMode(){seizure+=1;if(seizure===3){seizureMode()}}function seizureMode(){const body=document.getElementById("siteContent");const hero=document.getElementsByClassName("hero")[0];let audio;if(Math.floor(Math.random()*10)+1>=10){audio=new Audio("/audio/nyan.mp3")}else{audio=new Audio("/audio/rick.mp3")}body.style.fontFamily="Comic Sans MS";document.getElementsByClassName("title")[0].innerText="Discord Seizure List:tm:!";document.getElementsByClassName("subtitle")[0].innerText="Discord's unbiased list, giving people seizures all across the world!";document.getElementById("delLogo").src = "/img/logo-seizuremode.png";audio.play();setInterval(()=>{setTimeout(()=>{body.style.backgroundColor="#ff1493";hero.style.backgroundColor="#ffffff"},0);setTimeout(()=>{body.style.backgroundColor="#ffffff";hero.style.backgroundColor="#ff1493"},20)},100)}</script><% } %>
 <% if (mobile) { %>
     <script type="text/javascript">function display(s,i){s.classList.contains("is-hidden-mobile")?s.classList.remove("is-hidden-mobile"):s.classList.add("is-hidden-mobile"),i.classList.contains("fa-chevron-left")?(i.classList.remove("fa-chevron-left"),i.classList.add("fa-chevron-down"),i.style.right="16px"):(i.classList.add("fa-chevron-left"),i.classList.remove("fa-chevron-down"),i.style.right="18.4px")}</script>

diff --git a/assets/Views/partials/header.ejs b/assets/Views/partials/header.ejs
@@ -12,7 +12,7 @@
         .has-text-default { color: <% if (req.user) { %><%= req.user.db.preferences.defaultColour || "#b114ff" %><% } else { %>#b114ff<% } %> !important; }
         .has-text-default:hover { color: <% if (req.user) { %><%= colour(`${req.user.db.preferences.defaultColour}`).darken(0.1) || colour("#b114ff").darken(0.1) %><% } else { %><%= colour("#b114ff").darken(0.1) %><% } %>; }
         .has-background-default { background-color: <% if (req.user) { %><%= req.user.db.preferences.defaultColour || "#b114ff" %><% } else { %>#b114ff<% } %>; color: <% if (req.user) { %><%= req.user.db.preferences.defaultForegroundColour || "#ffffff" %><% } else { %>#ffffff<% } %>; }
-        ::-webkit-scrollbar{width:10px}::-webkit-scrollbar-track{background:#0e0e0e}::-webkit-scrollbar-thumb{background:<% if (req.user) { %><%= req.user.db.preferences.defaultColour || "#b114ff" %><% } else { %>#b114ff<% } %>}::-webkit-scrollbar-thumb:hover{background:<% if (req.user) { %><%= req.user.db.preferences.defaultColour || "#b114ff" %><% } else { %>#b114ff<% } %>}
+        ::-webkit-scrollbar{width:10px}::-webkit-scrollbar-track{background:<%= siteThemeColour %>}::-webkit-scrollbar-thumb{background:<% if (req.user) { %><%= req.user.db.preferences.defaultColour || "#b114ff" %><% } else { %>#b114ff<% } %>}::-webkit-scrollbar-thumb:hover{background:<% if (req.user) { %><%= req.user.db.preferences.defaultColour || "#b114ff" %><% } else { %>#b114ff<% } %>}
     </style>
     <% if (req.user) { %><style type="text/css"><%= req.user.db.preferences.customGlobalCss %></style><% } %>
 
@@ -25,7 +25,7 @@
     <% } %>
 
     <link rel="manifest" href="/manifest.json">
-    <link rel="search" title="Search" href="/<%= req.locale %>/search" />
+    <link rel="search" title="Search" href="<%= linkPrefix %>/search" />
     <link rel="preconnect" href="https://cdn.discordapp.com">
     <link rel="preconnect" href="https://cdn.jsdelivr.net">
     <link rel="preconnect" href="https://twemoji.maxcdn.com">
@@ -36,13 +36,15 @@
     <meta name="keywords" content="Discord Extreme List, Discord Bots, Discord Bot List, Discord Servers, Discord Templates, Discord Template List, Discord Server List">
     <meta name="robots" content="index,follow">
     <meta name="distribution" content="global">
-    <meta name="rating" content="safe for kids">
     <meta name="revisit-after" content="1 day">
 
+    <meta name="theme-color" content="<%= req.user ? req.user.db.preferences.defaultColour || "#b114ff" : "#b114ff" %>">
+
     <% if (pageType.bot === true) { %>
-        <meta name="theme-color" content="#2C2F33">
         <meta name="description" content="<%= bot.shortDesc %>">
 
+        <link rel="canonical" href="<%= baseURL %><%= linkPrefix %>/bots/<%= bot.vanityUrl || bot._id %>">
+
         <meta name="twitter:card" content="summary">
         <meta name="twitter:site" content="@ExtremeList">
         <meta name="twitter:creator" content="@ExtremeList">
@@ -54,7 +56,7 @@
         <meta property="og:type" content="website">
         <meta property="og:site_name" content="Discord Extreme List">
         <meta property="og:title" content="<%= title || "Page" %> | Discord Extreme List">
-        <meta property="og:url" content="https://discordextremelist.xyz">
+        <meta property="og:url" content="<%= baseURL %><%= linkPrefix %>/bots/<%= bot.vanityUrl || bot._id %>">
         <meta property="og:description" content="<%= bot.shortDesc %>">
         <meta property="og:image" content="<%= bot.avatar.url %>.png">
         <meta property="og:image:alt" content="DEL's Logo">
@@ -69,18 +71,24 @@
         <%
             let listing;
             let listingOwner;
+            let folder;
 
             if (pageType.server === true) {
                 listing = server;
                 listingOwner = serverOwner;
+                folder = 'servers';
             } else if (pageType.template === true) {
                 listing = template;
                 listingOwner = templateOwner;
+                folder = 'templates';
             }
+            
+            
         %>
-        <meta name="theme-color" content="#2C2F33">
         <meta name="description" content="<%= listing.shortDesc %>">
 
+        <link rel="canonical" href="<%= baseURL %><%= linkPrefix %>/<%= folder %>/<%= listing._id %>">
+
         <meta name="twitter:card" content="summary">
         <meta name="twitter:site" content="@ExtremeList">
         <meta name="twitter:creator" content="@ExtremeList">
@@ -92,7 +100,7 @@
         <meta property="og:type" content="website">
         <meta property="og:site_name" content="Discord Extreme List">
         <meta property="og:title" content="<%= title || "Page" %> | Discord Extreme List">
-        <meta property="og:url" content="https://discordextremelist.xyz">
+        <meta property="og:url" content="<%= baseURL %><%= linkPrefix %>/<%= folder %>/<%= listing._id %>">
         <meta property="og:description" content="<%= listing.shortDesc %>">
         <meta property="og:image" content="<%= listing.icon.url %>.png">
         <meta property="og:image:alt" content="DEL's Logo">
@@ -104,7 +112,6 @@
         <meta name="author" content="<%= listingOwner ? listingOwner.fullUsername : 'Unknown' %>" />
         <meta name="copyright" content="Cairo Mitchell-Acason, John Burke, Advaith Jagathesan" />
     <% } else { %>
-        <meta name="theme-color" content="#2C2F33">
         <meta name="description" content="<%= subtitle || "Discord Extreme List, Discord's unbiased list, giving Discord bots and Discord servers of all sizes an extreme chance!" %>">
 
         <meta name="twitter:card" content="summary">
@@ -141,4 +148,28 @@
     <meta name="msapplication-config" content="/browserconfig.xml">
 
     <% if (htmlDir === "rtl") { %><%- include("./rtl.ejs") %><% } %>
+
+    <script type="application/ld+json">
+        {
+            "@context": "http://schema.org",
+            "@type": "WebSite",
+            "url": "https://discordextremelist.xyz/",
+            "potentialAction": {
+                "@type": "SearchAction",
+                "target": "https://discordextremelist.xyz/search?q={query}",
+                "query-input": "required name=query"
+            }
+        }
+    </script>
+
+    <!-- Global site tag (gtag.js) - Google Analytics -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id=<%= gaID %>"></script>
+    <script>
+        window.dataLayer = window.dataLayer || [];
+        function gtag(){dataLayer.push(arguments);}
+        gtag('js', new Date());
+
+        gtag('config', '<%= gaID %>');
+    </script>
+
 </head>
diff --git a/assets/Views/partials/nav.ejs b/assets/Views/partials/nav.ejs
@@ -1,3 +1,4 @@
+<body>
 <noscript>
     <div style="padding: 25px; background-color: yellow; color: black;" class="has-text-centered">
         <span class="icon">
@@ -97,17 +98,29 @@
                         </span>
                         <span><%= __("common.discord") %></span>
                     </a>
-                    <a class="navbar-item" href="<%= linkPrefix %>/docs" tabindex="0">
+                    <a class="navbar-item" id="navAbout" href="<%= linkPrefix %>/about" tabindex="0">
                         <span class="icon iconalign">
-                            <i class="fad fa-books" aria-hidden="true"></i>
+                            <i class="fad fa-info-circle" aria-hidden="true"></i>
                         </span>
-                        <span><%= __("common.nav.more.docs") %></span>
+                        <span><%= __("common.nav.more.about") %></span>
                     </a>
-                    <a class="navbar-item" id="navAbout" href="<%= linkPrefix %>/about" tabindex="0">
+                    <a class="navbar-item" href="/blog" target="_blank" rel="noopener" tabindex="0">
                         <span class="icon iconalign">
-                            <i class="fad fa-question" aria-hidden="true"></i>
+                            <i class="fad fa-pen" aria-hidden="true"></i>
                         </span>
-                        <span><%= __("common.nav.more.about") %></span>
+                        <span><%= __("common.nav.more.blog") %></span>
+                    </a>
+                    <a class="navbar-item" href="https://status.discordextremelist.xyz" target="_blank" rel="noopener" tabindex="0">
+                        <span class="icon iconalign">
+                            <i class="fad fa-thermometer-three-quarters" aria-hidden="true"></i>
+                        </span>
+                        <span><%= __("common.nav.more.status") %></span>
+                    </a>
+                    <a class="navbar-item" href="<%= linkPrefix %>/docs" tabindex="0">
+                        <span class="icon iconalign">
+                            <i class="fad fa-books" aria-hidden="true"></i>
+                        </span>
+                        <span><%= __("common.nav.more.docs") %></span>
                     </a>
                     <hr class="navbar-divider">
                     <a class="navbar-item" href="<%= linkPrefix %>/terms" tabindex="0">