From cee458cef113ab037c8c5a3afec674dbd76edc96 Mon Sep 17 00:00:00 2001
From: Essem <smswessem@gmail.com>
Date: Wed, 28 Sep 2022 23:11:05 -0500
Subject: [PATCH] Fix sqlite guild registration, fix starting status

---
 app.js                       | 4 ++--
 events/guildCreate.js        | 2 +-
 utils/database/dummy.js      | 2 +-
 utils/database/postgresql.js | 4 ++--
 utils/database/sqlite.js     | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app.js b/app.js
index 4f8df77..593db2b 100644
--- a/app.js
+++ b/app.js
@@ -154,9 +154,9 @@ const client = new Client({
     concurrency: "auto",
     maxShards: "auto",
     presence: {
-      status: "dnd",
+      status: "idle",
       activities: [{
-        type: "GAME",
+        type: 0,
         name: "Starting esmBot..."
       }]
     },
diff --git a/events/guildCreate.js b/events/guildCreate.js
index b0f0393..1fa5ebf 100644
--- a/events/guildCreate.js
+++ b/events/guildCreate.js
@@ -5,5 +5,5 @@ import { log } from "../utils/logger.js";
 export default async (client, guild) => {
   log(`[GUILD JOIN] ${guild.name} (${guild.id}) added the bot.`);
   const guildDB = await db.getGuild(guild.id);
-  if (!guildDB) await db.addGuild(guild);
+  if (!guildDB) await db.addGuild(guild.id);
 };
diff --git a/utils/database/dummy.js b/utils/database/dummy.js
index 15185c0..1ffcd24 100644
--- a/utils/database/dummy.js
+++ b/utils/database/dummy.js
@@ -23,7 +23,7 @@ export async function editTag() {}
 export async function setPrefix() {}
 export async function addGuild(guild) {
   return {
-    id: guild.id,
+    id: guild,
     tags: {},
     prefix: process.env.PREFIX,
     disabled: [],
diff --git a/utils/database/postgresql.js b/utils/database/postgresql.js
index c44e4c8..47aa918 100644
--- a/utils/database/postgresql.js
+++ b/utils/database/postgresql.js
@@ -155,9 +155,9 @@ export async function addGuild(guild) {
 }
 
 export async function fixGuild(guild) {
-  const guildDB = await sql`SELECT exists(SELECT 1 FROM guilds WHERE guild_id = ${guild.id})`;
+  const guildDB = await sql`SELECT exists(SELECT 1 FROM guilds WHERE guild_id = ${guild})`;
   if (!guildDB[0].exists) {
-    logger.log(`Registering guild database entry for guild ${guild.id}...`);
+    logger.log(`Registering guild database entry for guild ${guild}...`);
     return await this.addGuild(guild);
   }
 }
diff --git a/utils/database/sqlite.js b/utils/database/sqlite.js
index 7621455..e6a2d73 100644
--- a/utils/database/sqlite.js
+++ b/utils/database/sqlite.js
@@ -69,12 +69,12 @@ export async function upgrade(logger) {
 export async function fixGuild(guild) {
   let guildDB;
   try {
-    guildDB = connection.prepare("SELECT * FROM guilds WHERE guild_id = ?").get(guild.id);
+    guildDB = connection.prepare("SELECT * FROM guilds WHERE guild_id = ?").get(guild);
   } catch {
     connection.prepare("CREATE TABLE guilds ( guild_id VARCHAR(30) NOT NULL PRIMARY KEY, prefix VARCHAR(15) NOT NULL, disabled text NOT NULL, disabled_commands text NOT NULL )").run();
   }
   if (!guildDB) {
-    logger.log(`Registering guild database entry for guild ${guild.id}...`);
+    logger.log(`Registering guild database entry for guild ${guild}...`);
     return await this.addGuild(guild);
   }
 }
@@ -160,7 +160,7 @@ export async function addGuild(guild) {
   const query = await this.getGuild(guild);
   if (query) return query;
   const guildObject = {
-    id: guild.id,
+    id: guild,
     prefix: process.env.PREFIX,
     disabled: "[]",
     disabledCommands: "[]"