From 6c61ec59a633b27d8ccf1421ff9aa22bf3051ffd Mon Sep 17 00:00:00 2001
From: Emily J <me@emily.im>
Date: Wed, 19 Aug 2020 18:21:23 +1000
Subject: [PATCH] init function

---
 bot/index.js      |  8 +++++---
 bot/util/redis.js | 44 ++++++++++++++++++++++++--------------------
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/bot/index.js b/bot/index.js
index c83a9d3..e278b7f 100644
--- a/bot/index.js
+++ b/bot/index.js
@@ -44,12 +44,14 @@ const init = async () => {
   // Initialize client
   const client = new Custom();
 
-  // Initialize Redis database
-  await client.db.init();
-
+  // Load all commands/events
   await client.commandHandler.loadAll();
   await client.eventHandler.loadAll();
 
+  // Connect to Redis database
+  await client.db.init();
+  client.logger.info("Connected to Redis.")
+
   if (client.dev === true) {
     client.logger.warn("Development mode is on. Some features (such as Sentry) are disabled.");
     client.login(client.config.devtoken);
diff --git a/bot/util/redis.js b/bot/util/redis.js
index c741381..3f1beef 100644
--- a/bot/util/redis.js
+++ b/bot/util/redis.js
@@ -3,36 +3,40 @@ const generators = require('redis-async-gen')
 
 class Redis {
   constructor(client) {
+    this.client = client;
+  }
+
+  init () {
     // Create redis client
     this.global = redis.createClient(this.client.config.redis)
     this.server = this.global.duplicate({ db: 1 })
     this.member = this.global.duplicate({ db: 2 })
     this.user = this.global.duplicate({ db: 3 })
+  }
 
-    // Deletes specified guild entry
-    this.deleteGuild = async function (id) {
-        this.server.del(id)
-        var { keysMatching } = await generators.using(this.member)
-        // eslint-disable-next-line no-unused-vars
-        for await (const key of keysMatching(id + '-*')) {
-            this.member.del(key)
-        }
+  // Deletes specified guild entry
+  async deleteGuild (id) {
+    this.server.del(id)
+    var { keysMatching } = await generators.using(this.member)
+    // eslint-disable-next-line no-unused-vars
+    for await (const key of keysMatching(id + '-*')) {
+      this.member.del(key)
     }
+  }
 
-    // Deletes specified user and their member entries in guilds
-    this.deleteUser = async function (id) {
-        this.user.del(id)
-        var { keysMatching } = await generators.using(this.member)
-        // eslint-disable-next-line no-unused-vars
-        for await (const key of keysMatching('*-' + id)) {
-            this.member.del(key)
-        }
+  // Deletes specified user and their member entries in guilds
+  async deleteUser (id) {
+    this.user.del(id)
+    var { keysMatching } = await generators.using(this.member)
+    // eslint-disable-next-line no-unused-vars
+    for await (const key of keysMatching('*-' + id)) {
+      this.member.del(key)
     }
+  }
 
-    // Deletes member of user in specified guild
-    this.deleteMember = async function (guildId, id) {
-        this.member.del(guildId + '-' + id)
-    }
+  // Deletes member of user in specified guild
+  async deleteMember (guildId, id) {
+    this.member.del(guildId + '-' + id)
   }
 }