From ddaa178c75f1fab3c44f57ee736fc0867f59a551 Mon Sep 17 00:00:00 2001
From: Neko-Life <nekolife123579@gmail.com>
Date: Sat, 24 Jul 2021 15:47:31 +0700
Subject: [PATCH] Testing: Refactor DB complete (maybe)

---
 cmds/profile/avatar.js                      | 2 +-
 cmds/profile/servav.js                      | 2 +-
 resources/eventsLogger/guildMemberAdd.js    | 2 +-
 resources/eventsLogger/guildMemberRemove.js | 4 ++--
 resources/functions.js                      | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cmds/profile/avatar.js b/cmds/profile/avatar.js
index d62dd4e..7461960 100644
--- a/cmds/profile/avatar.js
+++ b/cmds/profile/avatar.js
@@ -16,7 +16,7 @@ module.exports = class avatar extends commando.Command {
     });
   }
   async run(msg, arg) {
-    const doc = msg.guild.DB.settings || msg.author.DB;
+    const doc = msg.guild?.DB || msg.author.DB;
     const footerQuote = doc.defaultEmbed?.footerQuote || "";
     const option = "";// || arg.match(/(?<!\\)--s +\d+/)?.[0];
     let user, avatar, member, show, notFound = "";
diff --git a/cmds/profile/servav.js b/cmds/profile/servav.js
index 95de0f4..8ce66c4 100644
--- a/cmds/profile/servav.js
+++ b/cmds/profile/servav.js
@@ -20,7 +20,7 @@ module.exports = class servav extends commando.Command {
         if (!msg.author.DB) await msg.author.dbLoad();
         if (msg.guild && !msg.guild.DB) await msg.guild.dbLoad();
         const server_ID = arg.split(/ +/)[0];
-        const footerQuote = (msg.guild?.DB.settings || msg.author.DB).defaultEmbed?.footerQuote || "";
+        const footerQuote = (msg.guild?.DB || msg.author.DB).defaultEmbed?.footerQuote || "";
         let icon, target;
         if (server_ID && this.client.owners.includes(msg.author)) {
             if (!/\D/.test(server_ID)) {
diff --git a/resources/eventsLogger/guildMemberAdd.js b/resources/eventsLogger/guildMemberAdd.js
index 869670a..3b70481 100644
--- a/resources/eventsLogger/guildMemberAdd.js
+++ b/resources/eventsLogger/guildMemberAdd.js
@@ -20,7 +20,7 @@ module.exports = (member) => {
             .setTitle("`" + member.user.tag + "` joined")
             .setThumbnail(member.user.displayAvatarURL({ format: "png", size: 4096, dynamic: true }))
             .setColor(getColor("cyan"))
-            .addField("Registered", defaultDateFormat(member.user.createdAt), true)
+            .addField("Registered", defaultDateFormat(member.user.createdAt))
             .setDescription(`<@!${member.id}> (${member.id}) just joined.\nWe have ${member.guild.memberCount} total members now.`);
         return trySend(member.client, log, emb);
     }
diff --git a/resources/eventsLogger/guildMemberRemove.js b/resources/eventsLogger/guildMemberRemove.js
index be4e557..de2939c 100644
--- a/resources/eventsLogger/guildMemberRemove.js
+++ b/resources/eventsLogger/guildMemberRemove.js
@@ -24,8 +24,8 @@ module.exports = (member) => {
             .setTitle("`" + member.user.tag + "` left")
             .setThumbnail(member.user.displayAvatarURL({ format: "png", size: 4096, dynamic: true }))
             .setColor(getColor("yellow"))
-            .addField("Registered", defaultDateFormat(member.user.createdAt), true)
-            .addField("Joined", defaultDateFormat(member.joinedAt) + `\n(${intervalToDuration(INT).strings.join(" ")} ago)`, true)
+            .addField("Registered", defaultDateFormat(member.user.createdAt))
+            .addField("Joined", defaultDateFormat(member.joinedAt) + `\n(${intervalToDuration(INT).strings.join(" ")} ago)`)
             .addField("Nick", "`" + member.displayName + "`")
             .setDescription(`<@!${member.id}> (${member.id}) just left.\nWe have ${member.guild.memberCount} total members now.`);
         for (const U of RU) {
diff --git a/resources/functions.js b/resources/functions.js
index 2f7501b..4d33804 100644
--- a/resources/functions.js
+++ b/resources/functions.js
@@ -261,7 +261,7 @@ function adCheck(content) {
  * @returns {MessageEmbed}
  */
 function defaultImageEmbed(msg, image, title, footerQuote) {
-  if (!footerQuote) footerQuote = (msg.guild?.DB.settings || msg.author.DB).defaultEmbed?.footerQuote || "";
+  if (!footerQuote) footerQuote = (msg.guild?.DB || msg.author.DB).defaultEmbed?.footerQuote || "";
   const emb = new MessageEmbed()
     .setImage(image)
     .setColor(msg.guild ? getColor((msg.member || msg).displayColor) : randomColors[Math.floor(Math.random() * randomColors.length)])
@@ -438,7 +438,7 @@ function defaultEventLogEmbed(guild) {
   return new MessageEmbed()
     .setColor(getColor(C.displayColor))
     .setAuthor(guild.name)
-    .setFooter((guild.DB?.settings?.defaultEmbed?.footerQuote ?
+    .setFooter((guild.DB?.defaultEmbed?.footerQuote ?
       guild.DB.defaultEmbed.footerQuote : ""), guild.iconURL({ format: "png", size: 128, dynamic: true }))
     .setTimestamp(new Date());
 }