diff --git a/src/commands/codename.js b/src/commands/codename.js index 390760a..220f511 100644 --- a/src/commands/codename.js +++ b/src/commands/codename.js @@ -3,7 +3,6 @@ const { getStrings } = require('../plugins/checklang.js'); const { isOnSpamWatch } = require('../spamwatch/spamwatch.js'); const spamwatchMiddleware = require('../spamwatch/Middleware.js')(isOnSpamWatch); const axios = require('axios'); -const { verifyInput } = require('../plugins/verifyInput.js'); async function getDeviceList() { try { @@ -24,10 +23,12 @@ module.exports = (bot) => { bot.command(['codename', 'whatis'], spamwatchMiddleware, async (ctx) => { const userInput = ctx.message.text.split(" ").slice(1).join(" "); const Strings = getStrings(ctx.from.language_code); - const { noCodename } = Strings.codenameCheck - - if(verifyInput(ctx, userInput, noCodename)){ - return; + + if (!userInput) { + ctx.reply(Strings.codenameCheck.noCodename, { + parse_mode: "Markdown", + reply_to_message_id: ctx.message.message_id + }); } const jsonRes = await getDeviceList() diff --git a/src/commands/http.js b/src/commands/http.js index 1ee383c..672a7c0 100644 --- a/src/commands/http.js +++ b/src/commands/http.js @@ -3,18 +3,19 @@ const { getStrings } = require('../plugins/checklang.js'); const { isOnSpamWatch } = require('../spamwatch/spamwatch.js'); const spamwatchMiddleware = require('../spamwatch/Middleware.js')(isOnSpamWatch); const axios = require('axios'); -const { verifyInput } = require('../plugins/verifyInput.js'); module.exports = (bot) => { bot.command("http", spamwatchMiddleware, async (ctx) => { const Strings = getStrings(ctx.from.language_code); const userInput = ctx.message.text.split(' ')[1]; const apiUrl = Resources.httpApi; - const { invalidCode } = Strings.httpCodes - if (verifyInput(ctx, userInput, invalidCode, true)) { - return; - } + if (!userInput || isNaN(userInput)) { + return ctx.reply(Strings.httpCodes.invalidCode, { + parse_mode: 'Markdown', + reply_to_message_id: ctx.message.message_id + }); + }; try { const response = await axios.get(apiUrl); @@ -49,10 +50,12 @@ module.exports = (bot) => { bot.command("httpcat", spamwatchMiddleware, async (ctx) => { const Strings = getStrings(ctx.from.language_code); const userInput = ctx.message.text.split(' ').slice(1).join(' ').replace(/\s+/g, ''); - const { invalidCode } = Strings.httpCodes - - if (verifyInput(ctx, userInput, invalidCode, true)) { - return; + + if (!userInput || isNaN(userInput)) { + return ctx.reply(Strings.httpCodes.invalidCode, { + parse_mode: 'Markdown', + reply_to_message_id: ctx.message.message_id + }); } const apiUrl = `${Resources.httpCatApi}${userInput}`; diff --git a/src/commands/ponyapi.js b/src/commands/ponyapi.js index 4bdcd96..9a6d699 100644 --- a/src/commands/ponyapi.js +++ b/src/commands/ponyapi.js @@ -3,7 +3,6 @@ const { getStrings } = require('../plugins/checklang.js'); const { isOnSpamWatch } = require('../spamwatch/spamwatch.js'); const spamwatchMiddleware = require('../spamwatch/Middleware.js')(isOnSpamWatch); const axios = require("axios"); -const { verifyInput } = require('../plugins/verifyInput.js'); function capitalizeFirstLetter(string) { return string.charAt(0).toUpperCase() + string.slice(1); @@ -23,9 +22,12 @@ module.exports = (bot) => { bot.command("mlpchar", spamwatchMiddleware, async (ctx) => { const Strings = getStrings(ctx.from.language_code); const userInput = ctx.message.text.split(' ').slice(1).join(' ').replace(" ", "+"); - const { noCharName } = Strings.ponyApi - if (verifyInput(ctx, userInput, noCharName)) { + if (!userInput) { + ctx.reply(Strings.ponyApi.noCharName, { + parse_mode: 'Markdown', + reply_to_message_id: ctx.message.message_id + }); return; }; @@ -97,9 +99,11 @@ module.exports = (bot) => { const Strings = getStrings(ctx.from.language_code); const userInput = ctx.message.text.split(' ').slice(1).join(' ').replace(" ", "+"); - const { noEpisodeNum } = Strings.ponyApi - - if (verifyInput(ctx, userInput, noEpisodeNum, true)) { + if (!userInput) { + ctx.reply(Strings.ponyApi.noEpisodeNum, { + parse_mode: 'Markdown', + reply_to_message_id: ctx.message.message_id + }); return; }; @@ -165,9 +169,11 @@ module.exports = (bot) => { const Strings = getStrings(ctx.from.language_code); const userInput = ctx.message.text.split(' ').slice(1).join(' ').replace(" ", "+"); - const { noComicName } = Strings.ponyApi - - if (verifyInput(ctx, userInput, noComicName)) { + if (!userInput) { + ctx.reply(Strings.ponyApi.noComicName, { + parse_mode: 'Markdown', + reply_to_message_id: ctx.message.message_id + }); return; }; diff --git a/src/commands/weather.js b/src/commands/weather.js index caf420b..ad8a5f0 100644 --- a/src/commands/weather.js +++ b/src/commands/weather.js @@ -7,7 +7,6 @@ const axios = require('axios'); const { getStrings } = require('../plugins/checklang.js'); const { isOnSpamWatch } = require('../spamwatch/spamwatch.js'); const spamwatchMiddleware = require('../spamwatch/Middleware.js')(isOnSpamWatch); -const { verifyInput } = require('../plugins/verifyInput.js'); const statusEmojis = { 0: '⛈', 1: '⛈', 2: '⛈', 3: '⛈', 4: '⛈', 5: '🌨', 6: '🌨', 7: '🌨', @@ -36,10 +35,12 @@ module.exports = (bot) => { const userLang = ctx.from.language_code || "en-US"; const Strings = getStrings(userLang); const userInput = ctx.message.text.split(' ').slice(1).join(' '); - const { provideLocation } = Strings.weatherStatus - if (verifyInput(ctx, userInput, provideLocation)) { - return; + if (!userInput) { + return ctx.reply(Strings.weatherStatus.provideLocation, { + parse_mode: "Markdown", + reply_to_message_id: ctx.message.message_id + }); } const location = userInput; @@ -94,7 +95,7 @@ module.exports = (bot) => { .replace('{windSpeed}', windSpeed) .replace('{speedUnit}', speedUnit); - ctx.reply(weatherMessage, { + ctx.reply(weatherMessage, { parse_mode: "Markdown", reply_to_message_id: ctx.message.message_id });