From caac4f9a1fca206aadca2ff9ca705947e4a0f02d Mon Sep 17 00:00:00 2001 From: Redume Date: Thu, 9 Jan 2025 20:41:29 +0300 Subject: [PATCH 1/3] feat: Made a command to start --- main.py | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/main.py b/main.py index ff5a6d1..c383a44 100644 --- a/main.py +++ b/main.py @@ -11,6 +11,7 @@ from aiogram import Bot, Dispatcher, Router, types from aiogram.client.default import DefaultBotProperties from aiogram.enums import ParseMode from aiogram.webhook.aiohttp_server import SimpleRequestHandler, setup_application +from aiogram.filters import CommandStart import hashlib @@ -19,6 +20,19 @@ bot = Bot(token=config['telegram_token'], default=DefaultBotProperties(parse_mod router = Router() +@router.message(CommandStart()) +async def start(message: types.Message): + get_bot = await bot.get_me() + await message.reply( + 'Shirino is a telegram bot for converting fiat or cryptocurrency. ' + 'The example of use occurs via inline query:\n' + f'@{get_bot.username} USD RUB \n' + f'@{get_bot.username} 12 USD RUB \n\n' + '[Source Code](https://github.com/Redume/Shirino)', + parse_mode='markdown' + ) + + @router.inline_query() async def currency(query: types.InlineQuery) -> None: text = query.query.lower() @@ -28,8 +42,8 @@ async def currency(query: types.InlineQuery) -> None: get_bot = await bot.get_me() if len(args) < 2: - return await reply(result_id, - [("2 or 3 arguments are required.", + return await reply(result_id, + [("2 or 3 arguments are required.", f'@{get_bot.username} USD RUB \n' f'@{get_bot.username} 12 USD RUB', None, None)], @@ -50,7 +64,7 @@ async def currency(query: types.InlineQuery) -> None: f'@{get_bot.username} USD RUB \n' f'@{get_bot.username} 12 USD RUB', None, None)], query) - + from_currency = args[1] conv_currency = args[2] elif len(args) == 2: @@ -74,12 +88,12 @@ async def currency(query: types.InlineQuery) -> None: chart = await create_chart(from_currency, conv_currency) message = f'{format_number(conv.amount)} {conv.from_currency} = {conv.conv_amount} {conv.conv_currency}' - + results = [(message, None, None)] - + if chart: results.insert(0, (f'{message}\n[График]({chart})', None, chart)) - + await reply(result_id, results, query) @@ -87,7 +101,7 @@ async def on_startup(bot: Bot) -> None: await bot.set_webhook( f"{config['webhook']['base_url']}{config['webhook']['path']}", secret_token=config['webhook']['secret_token'], - allowed_updates=['inline_query'] + allowed_updates=['inline_query', 'message'] ) @@ -96,7 +110,7 @@ def main() -> None: dp.include_router(router) dp.startup.register(on_startup) - + app = web.Application() webhook_requests_handler = SimpleRequestHandler( dispatcher=dp, From 0eafaba090c9b2b2cf955b236bcbd40d372db255 Mon Sep 17 00:00:00 2001 From: Redume Date: Thu, 9 Jan 2025 20:47:35 +0300 Subject: [PATCH 2/3] feat: commands are now in mono-wide format --- main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.py b/main.py index c383a44..5b54d05 100644 --- a/main.py +++ b/main.py @@ -26,8 +26,8 @@ async def start(message: types.Message): await message.reply( 'Shirino is a telegram bot for converting fiat or cryptocurrency. ' 'The example of use occurs via inline query:\n' - f'@{get_bot.username} USD RUB \n' - f'@{get_bot.username} 12 USD RUB \n\n' + f'`@{get_bot.username} USD RUB` \n' + f'`@{get_bot.username} 12 USD RUB` \n\n' '[Source Code](https://github.com/Redume/Shirino)', parse_mode='markdown' ) From c9eb773f1040d45a40925f831240cd8fb5829bf0 Mon Sep 17 00:00:00 2001 From: Redume Date: Thu, 9 Jan 2025 23:03:38 +0300 Subject: [PATCH 3/3] fix: Error with Decimal if the number was too large --- functions/convert.py | 15 ++++++--------- utils/format_number.py | 6 +++--- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/functions/convert.py b/functions/convert.py index 1e898c4..c6ed7ea 100644 --- a/functions/convert.py +++ b/functions/convert.py @@ -1,14 +1,12 @@ -from utils.format_number import format_number - -import yaml - -import aiohttp import json import re - from datetime import datetime +from decimal import Decimal from http import HTTPStatus -from decimal import Decimal, ROUND_DOWN + +import aiohttp +import yaml + from utils.format_number import format_number config = yaml.safe_load(open('config.yaml')) @@ -24,8 +22,7 @@ class Converter: if not await self.kekkai(): await self.ddg() - number = Decimal(str(self.conv_amount)) - self.conv_amount = format_number(number.quantize(Decimal('1.0000'), rounding=ROUND_DOWN)) + self.conv_amount = format_number(Decimal(self.conv_amount)) async def kekkai(self) -> bool: diff --git a/utils/format_number.py b/utils/format_number.py index fe0de81..6012c7f 100644 --- a/utils/format_number.py +++ b/utils/format_number.py @@ -2,11 +2,11 @@ from decimal import Decimal def format_number(number): number = Decimal(str(number)) - + formatted_integer_part = '{:,.0f}'.format(number).replace(',', ' ') - + if '.' in str(number): - fractional_part = str(number).split('.')[1] + fractional_part = str(number).split('.')[1][:3] return formatted_integer_part + '.' + fractional_part else: return formatted_integer_part