diff --git a/commands/remove.js b/commands/remove.js index d240b98..ea09324 100644 --- a/commands/remove.js +++ b/commands/remove.js @@ -1,23 +1,23 @@ var libFlayer = require("../libFlayer.js"); module.exports = { - name: 'add', - description: 'Add RSS Source', + name: 'remove', + description: 'Remove RSS Source', execute(message, args) { try { if (args.length < 1) { - message.reply(`Please use in !add [title] format`); + message.reply(`Please use in '${process.env.prefix}remove [title]' format`); return; } var title = args[0]; - libFlayer.deleteSource(title, link, category, (err, result) => { - console.log("Result from adding entry", result); + libFlayer.deleteSource(title, (err, result) => { + console.log("Result from removing entry", result); if (result) { - message.reply(`Adding ${title} to the list of RSS sources`); + message.reply(`Removing ${title} from the list of RSS sources`); } else { - message.reply(`${title} already exists in the list of RSS sources`); + message.reply(`${title} does not exist in the list of RSS sources`); } var sources = libFlayer.getSources(); diff --git a/libFlayer.js b/libFlayer.js index 3879c72..54601cd 100644 --- a/libFlayer.js +++ b/libFlayer.js @@ -94,7 +94,7 @@ exports.addSource = function (title, link, category, callback) { * @constructor * @param {string} title - Title/Name of the RSS feed. */ -exports.deleteSource = function (title) { +exports.deleteSource = function (title, callback) { var deleteRecord = ""; for (i = 0; i < feeds.length; i++) { if (feeds[i].title == title) { @@ -104,9 +104,10 @@ exports.deleteSource = function (title) { base.destroy(deleteRecord, function (err, deletedRecord) { if (err) { console.error(err); - return; + callback(err, undefined); } console.log(deletedRecord.id); + callback(undefined, deletedRecord); }); } diff --git a/libStorage.js b/libStorage.js index c85267b..0cdfb18 100644 --- a/libStorage.js +++ b/libStorage.js @@ -212,11 +212,11 @@ exports.Storage = class Storage { callback(new Error("No entry title given before deleting"), undefined) } - const sqlQuery = `DELETE FROM ${this.dbTable} WHERE title = '${title}'`; + const sqlQuery = `DELETE FROM ${this.dbTable} WHERE title = '${title}';`; runSQL(sqlQuery, this.connection, (err, rows) => { if (err) callback(err, undefined); - callback(undefined, rows); + callback(undefined, rows[0]); }) }