SUDOZOVCHIK/bot_tg
1
0
Fork 0
forked from zovos/bot_tg
Code Pull requests Activity

Resolve merge conflict: combine size and creep handlers

Browse source
This commit is contained in:
q 2026-02-20 13:53:49 +03:00
parent 11ad1c43c9
commit aafb64ad4e
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
main.py
View file

@ -364,7 +364,6 @@ async def handle_gen_mem(message: Message, bot: Bot):
await message.reply_photo(BufferedInputFile(output.getvalue(), filename="meme.jpg")) await message.reply_photo(BufferedInputFile(output.getvalue(), filename="meme.jpg"))
<<<<<<< HEAD
async def handle_size(message: Message): async def handle_size(message: Message):
size = round(random.uniform(0.1, 35.0), 1) size = round(random.uniform(0.1, 35.0), 1)
@ -385,7 +384,7 @@ async def handle_size(message: Message):
f"📏 Твой хуек: {size} см\n" f"📏 Твой хуек: {size} см\n"
f"Ты: {status}" f"Ты: {status}"
) )
=======
KEYWORDS = {'крип', 'радиохэд', 'creep', 'radiohead'} KEYWORDS = {'крип', 'радиохэд', 'creep', 'radiohead'}
# I'M CREEP # I'M CREEP
async def handle_keywords(message: types.Message): async def handle_keywords(message: types.Message):
@ -405,7 +404,6 @@ async def handle_keywords(message: types.Message):
) )
else: else:
logger.warning(f"Файл не найден по пути: {audio_path}") logger.warning(f"Файл не найден по пути: {audio_path}")
>>>>>>> SUDOZOVCHIK-CREEP-FUNCTION
def main(): def main():