diff --git a/commands/category.js b/commands/category.js index 88e3c01..e2ca68d 100644 --- a/commands/category.js +++ b/commands/category.js @@ -10,10 +10,18 @@ module.exports = { example: "categories", isPrivileged: false, async execute(interaction) { - var categories = libCore.getCategories(); + await libCore.getCategories(async (err, categoryResults) => { + if (err) throw err; + + log.DEBUG("Returned Categories: ", categoryResults); + var categories = []; + for (const record of categoryResults) { + categories.push(record.category); + } - await interaction.reply( - `Categories: [${categories.join(', ')}]` - ); + await interaction.reply( + `Categories: [${categories}]` + ); + }); } }; \ No newline at end of file diff --git a/libCore.js b/libCore.js index 677efc8..108b5d8 100644 --- a/libCore.js +++ b/libCore.js @@ -287,10 +287,10 @@ exports.getQuotes = async function (quote_url) { * getCategories - Returns feed categories * @constructor */ -exports.getCategories = function () { +exports.getCategories = async (callback) => { feedStorage.getUniqueByKey("category", (err, results) => { - if (err) throw err; + if (err) return callback(err, undefined); - return results + return callback(undefined, results); }); } \ No newline at end of file diff --git a/libStorage.js b/libStorage.js index 88bcaba..af4792e 100644 --- a/libStorage.js +++ b/libStorage.js @@ -118,7 +118,7 @@ class Storage { if (this.dbTable == rssFeedsTable){ records.push(new RSSSourceRecord(row.id, row.title, row.link, row.category, row.guild_id, row.channel_id)); } - if (this.dbTable == rssPostsTable){ + else { records.push(rows); } } @@ -144,7 +144,7 @@ class Storage { if (this.dbTable == rssFeedsTable){ records.push(new RSSSourceRecord(row.id, row.title, row.link, row.category, row.guild_id, row.channel_id)); } - if (this.dbTable == rssPostsTable){ + else { records.push(rows); } }