Revert "updated rate limit to actually work..."

This reverts commit 8c1139d380.

commands/admin/checkip.js

@@ -14,7 +14,6 @@ const {Command} = require('../../lib.js')
         {
             //Check administration privilege
             if(message.author.id != '186540961650835456') return;
-            //Shiz running on a docker container... don't really get out to get to the host ip....
             message.author.send(JSON.stringify(require('os').networkInterfaces()));
         }
 

controller/test.js

@@ -1,6 +0,0 @@
-
-if (this.selectedGeneration === "all" && this.selectedType === "all" && this.searchTerm === "") return this.pokemons;
-if (this.selectedGeneration === "all" && this.selectedType === "all") return this.pokemons.filter((pokemon) => pokemon.Name.toLowerCase().includes(this.searchTerm));
-if (this.selectedGeneration === "all") return this.pokemons.filter((pokemon) =>pokemon.Tipoc.includes(this.selectedType) && pokemon.Name.toLowerCase().includes(this.searchTerm));
-if (this.selectedType === "all") return this.pokemons.filter((pokemon) => pokemon.Geracaoc === parseInt(this.selectedGeneration) && pokemon.Name.toLowerCase().includes(this.searchTerm));
-return this.pokemons.filter((pokemon) => pokemon.Geracaoc === parseInt(this.selectedGeneration) && pokemon.Tipoc.includes(this.selectedType) && pokemon.Name.toLowerCase().includes(this.searchTerm));

lib.js

@@ -109,7 +109,6 @@ class _Client extends Client
         setInterval(() => {
             this.YTFeed()
         }, 60*60*1000);
-
     }
     /**
      * Register a group of commands under the folder commands
@@ -253,7 +252,7 @@ class _Client extends Client
             channel.send({embeds:[embed]});
         }
     }
-   
+
 }module.exports.Client = _Client;
 const ErrorType = 
 {

public/css/dashboard.css

@@ -163,6 +163,7 @@ p
   filter:grayscale(0);
 
 }
+.card
 
 /* width */
 ::-webkit-scrollbar {

public/css/game.css

@@ -1,133 +0,0 @@
-body
-{
-    text-align: center;
-    background-color: #071c24;
-    position: absolute;
-    margin: 0;
-    width: 100%;
-    height: 100%;
-    align-content:center;
-    font-family: 'Eczar', serif;
-    font-weight: bold;
-    background-image:url(https://raw.communitydragon.org/latest/game/assets/ux/loadingscreen/firstbloodsplash.png);
-    background-size:100%;
-    background-position:0% 30%;
-    background-repeat:no-repeat;
-}
-.container
-{
-  width:70vw;
-  height:40vh;
-  position:relative;
-  top:50%;
-  left:50%;
-  transform:translate(-50%, -50%); 
-  display:flex;
-}
-.card
-{
-  background-color:ivory;
-  height:100%;
-  width: 24%;
-  background-size:100% 100%;
-  background-repeat:no-repeat;
-}
-.sumBox
-{
-  position:relative;
-  top:70%;
-}
-.sums
-{
-  height:11%;
-  aspect-ratio: 1;
-  background-color:ivory;
-  display:inline-block;
-  position:relative;
-  top:80%;
-  border: 2px solid #95792f;
-  background-size:100%;
-  background-repeat: no-repeat;
-}
-.name
-{
-  position:relative;
-  color:#95792f;
-  top:93%;
-}
-.stats
-{
-  position:relative;
-  top:25%;
-  width:50%;  
-  display:flex;
-}
-.stats h3
-{
-  color:#0F9C94;
-}
-.statA
-{
-  width:50%;
-  text-align:left;
-  margin-left:5%;
-}
-.statB
-{
-  width:50%;
-  text-align:right;
-  margin-right:5%; 
-}
-#cardA:after
-{
-  content:'';
-  display:inline-block;
-  height:105%;
-  width: 115%;
-  position:relative;
-  top:-20%;
-  left:-7.5%;
-  background-size:225% 135%; 
-  background-repeat:no-repeat; 
-}
-#cardB:after
-{
-    content:'';
-  display:inline-block;
-  height:105%;
-  width: 115%;
-  position:relative;
-  top:-20%;
-  left:-7.5%;
-  background-size:225% 135%; 
-  background-repeat:no-repeat;   
-}
-
-/* Going to js*/
- #cardA
-{
- background-image: url("http://ddragon.leagueoflegends.com/cdn/img/champion/loading/Caitlyn_29.jpg");
-}
-#cardA:after
-{
-    background-image:url("https://raw.communitydragon.org/latest/game/assets/ux/loadingscreen/loadingscreen_frames_atlas11.png");
-    background-position:-0.5vw 13%;
-} 
-#cardB
-{
-  background-image: url("http://ddragon.leagueoflegends.com/cdn/img/champion/loading/Ezreal_0.jpg");
-  
-}
-#cardB:after
-{  
-    background-image:url("https://raw.communitydragon.org/latest/game/assets/ux/loadingscreen/loadingscreen_frames_atlas8.png");
-    background-position:-19.5vw 13%;
-}  
-
-/* #sumsAD #sumsAF #sumsBD #sumsBF  For all of this*/
-
-.justToTest{
-  background-image:url("http://ddragon.leagueoflegends.com/cdn/13.7.1/img/spell/SummonerDot.png");
-}
-
-/* Gone to js ^*/

public/css/league.css

@@ -207,7 +207,7 @@ td
   left:2%;
   margin:0;
   font-weight:bolder;
-  cursor:pointer;
+
 }
 .matchPlayers
 {
@@ -224,5 +224,4 @@ td
 .matchResult
 {
   width:15%;
-  
 }

public/js/createleague.js

@@ -49,7 +49,6 @@ async function sendRequest(form)
     .then(response => 
     {
         if(response.Error) alert(response.Error)
-        console.log(response)
         location.replace(location.origin+'/leagues?league='+response.data._id);
     })
     .catch(console.error);

public/js/game.js

@@ -1,26 +0,0 @@
-var Positions = 
-    {
-      iron:'-0vw 14.5%',
-      bronze:'-19vw 14.5%',
-      silver:'-0vw 13%',
-      gold:'-19.5vw 13%',
-      platinium:'-0vw 13%',
-      diamond:'-19.5vw 13%',
-      master:'-0vw 13%;',
-      grandmaster:'-20vw 13%',
-      challenger:'-0.5vw 13%',
-      nothing:''
-    }
-var src_s =
-{
-    iron:'https://raw.communitydragon.org/latest/game/assets/ux/loadingscreen/loadingscreen_frames_atlas7.png',
-    bronze:'https://raw.communitydragon.org/latest/game/assets/ux/loadingscreen/loadingscreen_frames_atlas7.png',
-    silver:'https://raw.communitydragon.org/latest/game/assets/ux/loadingscreen/loadingscreen_frames_atlas8.png',
-    gold:'0https://raw.communitydragon.org/latest/game/assets/ux/loadingscreen/loadingscreen_frames_atlas8.png',
-    platinium:'https://raw.communitydragon.org/latest/game/assets/ux/loadingscreen/loadingscreen_frames_atlas4.png',
-    diamond:'https://raw.communitydragon.org/latest/game/assets/ux/loadingscreen/loadingscreen_frames_atlas4.png',
-    master:'https://raw.communitydragon.org/latest/game/assets/ux/loadingscreen/loadingscreen_frames_atlas10.png',
-    grandmaster:'https://raw.communitydragon.org/latest/game/assets/ux/loadingscreen/loadingscreen_frames_atlas10.png',
-    challenger:'https://raw.communitydragon.org/latest/game/assets/ux/loadingscreen/loadingscreen_frames_atlas11.png',
-    nothing:'',
-}

public/js/league.js

@@ -58,7 +58,7 @@ async function fillResults(Games)
         {
             console.log(game)
             matches.push(`
-                <div class="match" onclick="fullGameData('${game.gId}')">
+                <div class="match">
                 
                 <div class="matchPlayers">
                 <p>
@@ -145,10 +145,7 @@ async function fillPlayers(Players)
     `
 
 }
-function fullGameData(id)
+
-{
-    window.open(`${window.location.origin}/game?id=${id}`)
-}
 async function listener(id)
 {
     window.open(`${window.location.origin}/leagueListener?id=${id}&leagueid=${leagueID}`)

public/js/leaguelistener.js

@@ -46,19 +46,7 @@ async function start()
             mode:"cors",
             headers:
             {
-                "Accept": "*/*",
+                "Access-Control-Allow-Methods": "*"
-                "Accept-Encoding": "gzip, deflate, br",
-                "Access-Control-Allow-Methods": "*",
-                "Accept-Language": "pt-PT,pt;q=0.9,en-US;q=0.8,en;q=0.7",
-                "Access-Control-Request-Headers": "access-control-allow-methods",
-                "Access-Control-Request-Method": "GET",
-                "Connection": "keep-alive",
-                "Host": "127.0.0.1:2999",
-                "Origin": "http://localhost:5000",
-                "Referer": "http://localhost:5000/",
-                "Sec-Fetch-Dest": "empty",
-                "Sec-Fetch-Mode": "cors",
-                "Sec-Fetch-Site": "cross-site",
             }
         }).then(handleRes)
         .then(handleData)
@@ -86,11 +74,7 @@ async function checkStatus()
         },
         headers:
         {
-            "Accept": "*/*",
+            "Access-Control-Allow-Methods": "*"
-            "Host": "127.0.0.1:2999",
-            "Access-Control-Allow-Methods": "*",
-            "Origin": "http://localhost:5000",
-            "Referer": "http://localhost:5000/",
         }
     }).then(handleRes)
     .catch(handleError)

server.js

@@ -55,21 +55,17 @@ var retryCounter = 0;
     bot.login(process.env.discord_token).catch(()=>
     {
         if(retryCounter==900) return startLimitProtectionTimer();
-        retryCounter++;
         login();
+        retryCounter++;
     });
 })()
-bot.on('disconnect', (err)=>
-{
-    console.log('Disconnected', err)
-})
 function startLimitProtectionTimer()
 {
     console.log('Server: Rate Limit Protection - Waiting before trying again.')
     setTimeout(() => {
         login();
         retryCounter = 0;
-    }, 60*60*1000);
+    }, 30*60*1000);
 }
 function connectToDB()
 {

views/game.ejs

@@ -1,45 +0,0 @@
-<html>
-    <head>
-        <meta http-equiv="Content-type" content="text/html;charset=UTF-8"/>
-        <meta name="generator" content="2018.1.0.386"/>
-        <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-        <link rel="shortcut icon" href="../images/favicon.ico"/>
-        <title>Game</title>
-        <link rel="stylesheet" type="text/css" href="../css/game.css" id="pagesheet"/>
-        <script src='../js/game.js'></script>
-        <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@48,400,0,0" />
-      </head>
-<body>
-  <div class="container">
-    <div id="cardA" class="card">
-      <span class="name"> hc12</span><!-- JS -->
-      <div class="sumBox"> 
-        <div id="sumsAD" class="sums justToTest"> </div><!-- JS -->
-        <div id="sumsAF" class ="sums justToTest"></div><!-- JS -->
-      </div>
-    </div>
-    <div class="stats">
-      <div class="statA">
-        <h3>K/D</h3>
-        <span class="KDA">1/0</span> <!-- JS -->
-        <h3>CS</h3>
-        <span class="CSA">90</span> <!-- JS -->
-      </div>
-       <div class="statB">
-        <h3>K/D</h3>
-        <span class="KDB">1/0</span> <!-- JS -->
-        <h3>CS</h3>
-        <span class="CSB">90</span> <!-- JS -->
-      </div>
-    </div>
-    <div id="cardB" class="card">
-      <span class="name"> Ezreal Bot</span> <!-- JS -->
-      <div class="sumBox">
-        <div id="sumsBD" class="sums justToTest"> </div> <!-- JS-->
-        <div id="sumsBF"class ="sums justToTest"></div> <!-- JS -->
-      </div>
-    </div>
-  </div>
-    
-</body>
-</html>

views/leaguelistener.ejs

@@ -12,7 +12,7 @@
 <body>
     <h1>Attenttion!</h1>
     <h3>Don't change tabs: this page needs to stay open and in focus for the duration of the game.</h3>
-    <h3>Once a winner is declared an alert will be triggered and the page can be closed.</h3>
+    <h3>Once a winner is declared an alert will be triggered and the page can be close.</h3>
     <div class="spinner" id="spinner">
         <div class="leo-border-1">
           <div class="leo-core-1"></div>