diff --git a/commands/fun.js b/commands/fun.js index 3852f18..902422d 100644 --- a/commands/fun.js +++ b/commands/fun.js @@ -14,7 +14,7 @@ function sendRandomReply(ctx, gifUrl, textKey, notTextKey) { reply_to_message_id: ctx.message.message_id }).catch(err => { gifErr = gifErr.replace('{err}', err); - + ctx.reply(Strings.gifErr, { parse_mode: 'Markdown', reply_to_message_id: ctx.message.message_id @@ -31,7 +31,7 @@ function sendRandomReply(ctx, gifUrl, textKey, notTextKey) { async function handleDiceCommand(ctx, emoji, delay) { const Strings = getStrings(ctx.from.language_code); - + const result = await ctx.sendDice({ emoji, reply_to_message_id: ctx.message.message_id }); const botResponse = Strings.funEmojiResult .replace('{emoji}', result.dice.emoji) @@ -57,10 +57,9 @@ module.exports = (bot) => { ctx.reply( randomVStr, { - parse_mode: 'Markdown', - reply_to_message_id: ctx.message.message_id - } - ); + parse_mode: 'Markdown', + reply_to_message_id: ctx.message.message_id + }); }); bot.command('dice', spamwatchMiddleware, async (ctx) => { @@ -97,4 +96,34 @@ module.exports = (bot) => { bot.command('gay', spamwatchMiddleware, async (ctx) => { sendRandomReply(ctx, resources.gayFlag, 'isGay', 'isNtGay'); }); -}; + + bot.command('soggy', spamwatchMiddleware, async (ctx) => { + const userInput = ctx.message.text.split(' ')[1]; + switch (true) { + case (userInput === "2" || userInput === "thumb"): + ctx.replyWithPhoto( + resources.soggyCat2, { + caption: resources.soggyCat2, + parse_mode: 'Markdown', + reply_to_message_id: ctx.message.message_id + }); + break; + + case (userInput === "3" || userInput === "sticker"): + const stickerId = "CAACAgEAAxkBAAJ9SWb0vY0Xgg4RtNQeU5iLOx3iTVRAAAKgAwACN-NRRFf8v9p0Nz1INgQ" + ctx.replyWithSticker(stickerId, { + reply_to_message_id: ctx.message.message_id + }); + break; + + default: + ctx.replyWithPhoto( + resources.soggyCat, { + caption: resources.soggyCat, + parse_mode: 'Markdown', + reply_to_message_id: ctx.message.message_id + }); + break; + }; + }); +}; \ No newline at end of file diff --git a/commands/help.js b/commands/help.js index 26620cb..2055611 100644 --- a/commands/help.js +++ b/commands/help.js @@ -32,6 +32,7 @@ module.exports = (bot) => { const Strings = getStrings(ctx.from.language_code); const options = { parse_mode: 'Markdown', + disable_web_page_preview: true, reply_markup: JSON.stringify({ inline_keyboard: [ [{ text: Strings.goBack, callback_data: '6' }], diff --git a/locales/english.json b/locales/english.json index e6035eb..9b524cd 100644 --- a/locales/english.json +++ b/locales/english.json @@ -52,7 +52,7 @@ "usefulCommands": "Useful commands", "usefulCommandsDesc": "*Useful commands*\n\n- /chatinfo: Send information about the group\n- /userinfo: Send information about yourself\n- /d | /device ``: Search for a device on GSMArena and show its specs.\n- /weather | /clima ``: See weather status for a specific location.\n- /modarchive | /tma ``: Download a module from The Mod Archive", "funnyCommands": "Funny commands", - "funnyCommandsDesc": "*Funny commands*\n\n- /gay: Check if you are gay\n- /furry: Check if you are a furry\n- /random: Pick a random number between 0-10", + "funnyCommandsDesc": "*Funny commands*\n\n- /gay: Check if you are gay\n- /furry: Check if you are a furry\n- /random: Pick a random number between 0-10\n- /soggy `<1 | 2 | 3 | orig | thumb | sticker>`: Sends the [Soggy cat meme](https://knowyourmeme.com/memes/soggy-cat)", "interactiveEmojis": "Interactive emojis", "interactiveEmojisDesc": "*Interactive emojis*\n\n- /dice: Roll a dice\n- /idice: Infinitely roll a colored dice\n- /slot: Try to combine the figures!\n- /ball: Try to kick the ball into the goal!\n- /bowling: Try to hit the pins!\n- /dart: Try to hit the target!", "goBack": "Back", diff --git a/locales/portuguese.json b/locales/portuguese.json index 13c9574..26becbb 100644 --- a/locales/portuguese.json +++ b/locales/portuguese.json @@ -52,7 +52,7 @@ "usefulCommands": "Comandos úteis", "usefulCommandsDesc": "*Comandos úteis*\n\n- /chatinfo: Envia informações sobre o grupo\n- /userinfo: Envia informações sobre você\n- /d | /device ``: Pesquisa um dispositivo no GSMArena e mostra suas especificações.\n- /weather | /clima ``: Veja o status do clima para uma localização específica\n- /modarchive | /tma ``: Baixa um módulo do The Mod Archive", "funnyCommands": "Comandos engraçados", - "funnyCommandsDesc": "*Comandos engraçados*\n\n- /gay: Verifique se você é gay\n- /furry: Verifique se você é furry\n- /random: Escolhe um número aleatório entre 0-10", + "funnyCommandsDesc": "*Comandos engraçados*\n\n- /gay: Verifique se você é gay\n- /furry: Verifique se você é furry\n- /random: Escolhe um número aleatório entre 0-10\n- /soggy `<1 | 2 | 3 | orig | thumb | sticker>`: Envia o meme [Soggy cat](https://knowyourmeme.com/memes/soggy-cat)", "interactiveEmojis": "Emojis interativos", "interactiveEmojisDesc": "*Emojis interativos*\n\n- /dice: Jogue um dado\n- /idice: Role infinitamente um dado colorido\n- /slot: Tente combinar as figuras!\n- /ball: Tente chutar a bola no gol!\n- /bowling: Tente derrubar os pinos!\n- /dart: Tente acertar o alvo!", "goBack": "Voltar", diff --git a/props/resources.json b/props/resources.json index 02122e3..fb1a120 100644 --- a/props/resources.json +++ b/props/resources.json @@ -1,6 +1,7 @@ { "lunaCat": "https://telegra.ph/file/0472e60d38376960de1a8.jpg", - "lunaCat2": "https://telegra.ph/file/a1ca455c9cf1fcdef9786.jpg", + "soggyCat": "https://soggy.cat/img/soggycat.webp", + "soggyCat2": "https://i.kym-cdn.com/photos/images/original/002/705/653/079.jpg", "gayFlag": "https://c.tenor.com/VTBe5BFc73sAAAAC/tenor.gif", "furryGif": "https://c.tenor.com/_V_k0BVj48IAAAAd/tenor.gif" } \ No newline at end of file