Merge pull request #8 from plane000/dev

Merge stable branch dev to master

src/events.js

@@ -4,7 +4,7 @@ import {RateLimits} from './ratelimits'
 
 export class Events extends RateLimits { // extends rate limits
     constructor() {
-        super()
+        super();
     }
 
     async init(client) {
@@ -22,6 +22,13 @@ export class Events extends RateLimits { // extends rate limits
             );
         });
 
+        this.client.on('error', async (err) => {
+            this.handle(err,
+                [this.handleError],
+                this.client
+            );
+        });
+
         this.client.on('message', async (message) => {
             this.handle(message, 
                 [super.request, this.handleMessage],
@@ -30,6 +37,9 @@ export class Events extends RateLimits { // extends rate limits
         });
     }
 
+
+
+
     async handle(obj = [null], callbacks = [undefined], client) {
         let doNext = false;
         if (callbacks.length == 0) {
@@ -56,9 +66,14 @@ export class Events extends RateLimits { // extends rate limits
         next();
     }
 
-    async handleMessage(obj, client, next) {
+    async handleError(err, client, next) {
-        if (client.user.id == obj.author.id) return;
+        Logger.error(`An error occured with the Discord API: ${err}`);
-        if (obj.limiting) obj.channel.send(`${obj.author} You are being rate limited`);
+        next();
+    }
+
+    async handleMessage(message, client, next) {
+        if (client.user.id == message.author.id) return;
+        if (message.limiting) message.channel.send(`${message.author} You are being rate limited`);
         next();
     }
 }

src/guildmanager.js

@@ -0,0 +1,9 @@
+import {Logger} from './logger';
+
+export class GuildManager {
+    constructor() {
+
+    }
+
+    
+}

src/messagemanager.js

@@ -0,0 +1,5 @@
+import {Logger} from './logger';
+
+export class MessageManager {
+    
+}

src/ratelimits.js

@@ -1,22 +1,23 @@
 import {Logger} from './logger';
 
 let buckets = { };
+let requestsPerSecond = 0.2;
 
 export class RateLimits {
     constructor() {
         Logger.info('Initialized ratelimiting middleware');
-        this.requestsPerSecond = 1;
+        setInterval(this.tick, 1000 / requestsPerSecond);
-        setInterval(this.tick, 1000 / this.requestsPerSecond);
     }
 
     async request(obj, client, next) {
         let id = obj.author.id;
+        if (id == client.user.id) return;
         
         if (!buckets[id]) {
-            Logger.debug(`New rate limiting bucket`);
+            Logger.debug(`New rate limiting bucket for ${id}`);
 
             buckets[id] = {id: id, tokens: [], lastUsed: new Date().getTime()};
-            for (let i = 0; i < this.requestsPerSecond; i++) {
+            for (let i = 0; i < requestsPerSecond; i++) {
                 buckets[id].tokens.push(1);
             }
 
@@ -25,25 +26,23 @@ export class RateLimits {
         }
 
         buckets[id].lastUsed = new Date().getTime();
-
+        
         if (buckets[id].tokens.length <= 0) {
             Logger.middleware(`${id} is being rate limited`);
             obj.limiting = true;
             next();
             return;
         }
-
+        
         buckets[id].tokens.pop();
         next();
     }   
 
     tick() {
         for (let bucket in buckets) {
-            // if (buckets[bucket].lastUsed += disposeTime >= new Date().getTime()) {
+            if (buckets[bucket].tokens.length > requestsPerSecond) {
-            //     delete buckets[bucket]; // remove element here, don't redefine
+                continue;
-            //     continue;
+            } 
-            // }
-            if (buckets[bucket].tokens.length > this.requestsPerSecond) continue;
             buckets[bucket].tokens.push(1);
         }
     }