From a1f3de63bd76d5359e81fe461ea3b2e2ec4afc36 Mon Sep 17 00:00:00 2001 From: Lucas Polo Date: Sat, 27 Aug 2022 18:32:57 -0300 Subject: [PATCH] fix: fix bot message to improve readbility feat: add stickers --- redditbot/ui/bot.py | 23 +++++++++++++++++++++-- tests/ui/test_bot.py | 8 ++++++-- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/redditbot/ui/bot.py b/redditbot/ui/bot.py index 1586b1f..ef7af26 100644 --- a/redditbot/ui/bot.py +++ b/redditbot/ui/bot.py @@ -9,12 +9,21 @@ from redditbot.config import settings DEFAULT_MESSAGE = """r/{subreddit} \\- [{upvotes} votos] -**{title}** -[Link]({link}) +**[{title}]({link})**\n [Comentários]({comments})""" +STICKERS = { + 'crying_piglet': 'CAACAgIAAxkBAAEXhYNjCojvibG9_v_VIAABGaq0YhoIrYQAAo8BAAIWQmsKO2O0DZs84FkpBA', + 'alpaca_hi': 'CAACAgIAAxkBAAEXhaRjComgByhjRuOjuFsM_0pZa9I8sQAClwADO2AkFLPjVSHrbN7ZKQQ', + 'duck_finding': 'CAACAgIAAxkBAAEXhapjCoqLx-ApexksbOfFtQeiTXJ8RAACSQIAAladvQoqlwydCFMhDikE', + 'ok_piglet': 'CAACAgIAAxkBAAEXhaxjCovR30n5XwH5JmDUGrUNZToNyQACegEAAhZCawqYRZuYnxC0lykE', +} + async def start(update: Update, context: CallbackContext): + await update.message.reply_sticker( + sticker=STICKERS['alpaca_hi'] + ) await update.message.reply_text( text='Está sem o que fazer? Dá um confere no Reddit!' ) @@ -30,6 +39,9 @@ async def nada_para_fazer(update: Update, context: CallbackContext): await update.message.reply_text( text='Digite o termo da procura, ex: /nadaparafazer dogs;python' ) + await update.message.reply_sticker( + sticker=STICKERS['duck_finding'] + ) return await send_subreddit(update, subreddits) @@ -42,6 +54,10 @@ async def send_subreddit(update, subreddits): await update.message.reply_text( text=f'Procurando o que está bombando em {canais_message}...' ) + await update.message.reply_sticker( + sticker=STICKERS['ok_piglet'] + ) + threads = await rc.get_subreddits(subreddits) filtered_threads = rc.filter_by_votes(threads, min_votes=settings.MIN_VOTES) for thread in filtered_threads: @@ -59,6 +75,9 @@ async def send_subreddit(update, subreddits): await update.message.reply_text( text=f'Não encontrei nada bombando em {canais_message}' ) + await update.message.reply_sticker( + sticker=STICKERS['crying_piglet'] + ) async def get_version(update: Update, context: CallbackContext): diff --git a/tests/ui/test_bot.py b/tests/ui/test_bot.py index fc29e00..601a88a 100644 --- a/tests/ui/test_bot.py +++ b/tests/ui/test_bot.py @@ -31,6 +31,7 @@ class TestNadaParaFazerBot: async def test_get_version_should_return_version(self): update = MagicMock() update.message.reply_text = CoroutineMock() + update.message.reply_sticker = CoroutineMock() context = MagicMock() await start(update, context) @@ -40,6 +41,7 @@ async def test_get_version_should_return_version(self): async def test_start(self): update = MagicMock() update.message.reply_text = CoroutineMock() + update.message.reply_sticker = CoroutineMock() context = MagicMock() await start(update, context) @@ -51,6 +53,7 @@ async def test_start(self): async def test_nada_para_fazer_should_send_help(self): update = MagicMock() update.message.reply_text = CoroutineMock() + update.message.reply_sticker = CoroutineMock() context = MagicMock() context.args = '' @@ -67,6 +70,7 @@ async def test_nada_para_fazer_should_send_messages( update = MagicMock() update.message.reply_text = CoroutineMock() update.message.reply_markdown_v2 = CoroutineMock() + update.message.reply_sticker = CoroutineMock() context = MagicMock() context.args = ['dogs'] calls_text = [ @@ -77,8 +81,7 @@ async def test_nada_para_fazer_should_send_messages( calls_markdown = [ call( text='r/dogs \\- [9999 votos]' - '\n**Cute Dogs**' - '\n[Link](https://www\\.reddit\\.com/r/cutedogs)' + '\n**[Cute Dogs](https://www\\.reddit\\.com/r/cutedogs)**\n' '\n[Comentários](https://www\\.reddit\\.com/r/cute\\_dogs)' ) ] @@ -96,6 +99,7 @@ async def test_nada_para_fazer_should_send_not_found( ): update = MagicMock() update.message.reply_text = CoroutineMock() + update.message.reply_sticker = CoroutineMock() context = MagicMock() context.args = ['dogs'] calls = [