From 6bc82d4b263faaa58627afc80c5f0ae23402b853 Mon Sep 17 00:00:00 2001 From: synzen Date: Sat, 1 Feb 2020 12:03:35 -0500 Subject: [PATCH] Fix backups not restoring for databaseless --- util/dbOps.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/util/dbOps.js b/util/dbOps.js index fbf35943f..0dce61078 100644 --- a/util/dbOps.js +++ b/util/dbOps.js @@ -142,13 +142,13 @@ exports.guildRss = { restore: async guildId => { // Memory version let guildRss + const backupPath = path.join(config.database.uri, 'backup', `${guildId}.json`) if (!config.database.uri.startsWith('mongo')) { - const backupPath = path.join(config.database.uri, 'backup', `${guildId}.json`) if (!fs.existsSync(backupPath)) return try { const json = await readFilePromise(backupPath) const parsed = JSON.parse(json) - if (exports.guildRss.empty(parsed, true)) guildRss = parsed + guildRss = parsed } catch (err) { throw err } @@ -171,7 +171,11 @@ exports.guildRss = { } } } - await models.GuildRssBackup().deleteOne({ id: guildId }) + if (config.database.uri.startsWith('mongo')) { + await models.GuildRssBackup().deleteOne({ id: guildId }) + } else { + fs.unlinkSync(backupPath) + } return guildRss }, empty: (guildRss, skipRemoval) => { // Used on the beginning of each cycle to check for empty sources per guild