From de8169af32d5dd3f3842a60004309428c5afb417 Mon Sep 17 00:00:00 2001
From: Snazzah <suggesttosnazzy@gmail.com>
Date: Thu, 10 Jun 2021 17:47:00 -0500
Subject: [PATCH] Throw when failed to back up wallet

Co-authored-by: Coolguy3289 <Coolguy3289@users.noreply.github.com>
---
 src/commands/admin/deleteaccount.js | 11 +++++++++--
 src/util.js                         |  7 ++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/commands/admin/deleteaccount.js b/src/commands/admin/deleteaccount.js
index 4adfb59..98eadf6 100644
--- a/src/commands/admin/deleteaccount.js
+++ b/src/commands/admin/deleteaccount.js
@@ -21,8 +21,15 @@ module.exports = class DeleteAccount extends Command {
         header:
           `Are you sure you want to delete that account? *(${supportsCount.toLocaleString()} support[s])*`
       })) return;
-      await Util.LBRY.deleteAccount(this.client, discordID, account.accountID);
-      return message.channel.createMessage('Deleted account.');
+      try {
+        await Util.LBRY.deleteAccount(this.client, discordID, account.accountID);
+        return message.channel.createMessage('Deleted account.');
+      } catch (e) {
+        return message.channel.createMessage(
+          'Failed to delete the account. An error most likely occured while backing up the wallet.' +
+          `\n\`\`\`\n${e.toString()}\`\`\``
+        );
+      }
     } else
       return message.channel.createMessage('That user does not have an account.');
   }
diff --git a/src/util.js b/src/util.js
index 0b66f79..7fcc161 100644
--- a/src/util.js
+++ b/src/util.js
@@ -279,7 +279,8 @@ Util.LBRY = {
       Util.LBRY.backupWallet();
     } catch (err) {
       console.error('Error occurred while backing up wallet file!');
-      console.error(err);      
+      console.error(err);
+      throw err;
     }
 
     // Abandon supports
@@ -315,7 +316,7 @@ Util.LBRY = {
     return { count: supports.length };
   },
   backupWallet() {
-    const wallet = fs.readFileSync(path.join(__dirname, config.walletPath));
+    const wallet = fs.readFileSync(config.walletPath);
     const d = new Date();
     const date = [
       d.getUTCFullYear(),
@@ -329,7 +330,7 @@ Util.LBRY = {
       d.getUTCMilliseconds().toString()
     ].join('-');
     const backupName = 'default_wallet.' + date + '_' + time + '.bak';
-    const backupPath = path.join(__dirname, config.walletBackupFolder, backupName);
+    const backupPath = path.join(config.walletBackupFolder, backupName);
     fs.writeFileSync(backupPath, wallet);
     console.log(`Backed up wallet file: ${backupPath}`); 
   }