mirror of
https://github.com/Redume/Shirino.git
synced 2024-11-05 16:23:59 +03:00
feat: Add chart for rate currency
This commit is contained in:
parent
90c3646db7
commit
6d9dfac41a
2 changed files with 35 additions and 9 deletions
|
@ -4,3 +4,4 @@ coinapi_keys:
|
||||||
- key
|
- key
|
||||||
- key2 # coinapi keys list
|
- key2 # coinapi keys list
|
||||||
telegram_token: # telegram bot token
|
telegram_token: # telegram bot token
|
||||||
|
kekkai_instance: 'https://kekkai-api.redume.su/'
|
43
main.py
43
main.py
|
@ -2,10 +2,13 @@ from aiogram import Bot, Dispatcher, types
|
||||||
|
|
||||||
import asyncio
|
import asyncio
|
||||||
import yaml
|
import yaml
|
||||||
|
import requests
|
||||||
|
|
||||||
import hashlib
|
import hashlib
|
||||||
|
|
||||||
import json
|
import json
|
||||||
|
|
||||||
|
from http import HTTPStatus
|
||||||
|
|
||||||
from function.convert import Converter
|
from function.convert import Converter
|
||||||
from function.format_number import format_number
|
from function.format_number import format_number
|
||||||
|
|
||||||
|
@ -35,6 +38,7 @@ async def currency(query: types.Message | types.InlineQuery) -> None:
|
||||||
"2 or 3 arguments are required.",
|
"2 or 3 arguments are required.",
|
||||||
"@shirino_bot USD RUB "
|
"@shirino_bot USD RUB "
|
||||||
"\n@shirino_bot 12 USD RUB",
|
"\n@shirino_bot 12 USD RUB",
|
||||||
|
None,
|
||||||
query)
|
query)
|
||||||
if len(args) == 4:
|
if len(args) == 4:
|
||||||
conv.amount = float(args[0])
|
conv.amount = float(args[0])
|
||||||
|
@ -54,45 +58,66 @@ async def currency(query: types.Message | types.InlineQuery) -> None:
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
return await reply(result_id, 'The source and target currency could not be determined.', None, query)
|
return await reply(result_id, 'The source and target currency could not be determined.', None, None, query)
|
||||||
|
|
||||||
if not from_currency or not conv_currency:
|
if not from_currency or not conv_currency:
|
||||||
return await reply(result_id,
|
return await reply(result_id,
|
||||||
'The currency exchange rate could not be found.',
|
'The currency exchange rate could not be found.',
|
||||||
None,
|
None,
|
||||||
|
None,
|
||||||
query)
|
query)
|
||||||
|
|
||||||
conv.from_currency = from_currency.upper()
|
conv.from_currency = from_currency.upper()
|
||||||
conv.conv_currency = conv_currency.upper()
|
conv.conv_currency = conv_currency.upper()
|
||||||
conv.convert()
|
conv.convert()
|
||||||
|
|
||||||
result = f'{format_number(conv.amount)} {conv.from_currency} = {conv.conv_amount} {conv.conv_currency}'
|
res_chart = requests.get(f'{config['kekkai_instance']}/api/getChart/week/', {
|
||||||
return await reply(result_id, result, None, query)
|
'from_currency': from_currency,
|
||||||
|
'conv_currency': conv_currency
|
||||||
|
}, timeout=3)
|
||||||
|
|
||||||
|
if not HTTPStatus(res_chart.status_code).is_success:
|
||||||
|
res_chart = None
|
||||||
|
else:
|
||||||
|
res_chart = res_chart.json()['message']
|
||||||
|
|
||||||
|
result = f'{format_number(conv.amount)} {conv.from_currency} = {conv.conv_amount} {conv.conv_currency}' \
|
||||||
|
f'\n{f'[График]({res_chart})' if res_chart else ''}'
|
||||||
|
return await reply(result_id, result, None, res_chart, query)
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(e)
|
print(e)
|
||||||
|
|
||||||
|
|
||||||
async def reply(result_id: str | None, title: str | None, desc, query: types.InlineQuery | types.Message) -> None:
|
async def reply(
|
||||||
|
result_id: str | None,
|
||||||
|
title: str,
|
||||||
|
desc: str | None,
|
||||||
|
img: str | None,
|
||||||
|
query: types.InlineQuery | types.Message,
|
||||||
|
) -> None:
|
||||||
|
|
||||||
if isinstance(query, types.InlineQuery):
|
if isinstance(query, types.InlineQuery):
|
||||||
article = [None]
|
article = [None]
|
||||||
article[0] = types.InlineQueryResultArticle(
|
article[0] = types.InlineQueryResultArticle(
|
||||||
id=result_id,
|
id=result_id,
|
||||||
title=title,
|
title=title,
|
||||||
|
thumbnail_url=img,
|
||||||
description=desc,
|
description=desc,
|
||||||
input_message_content=types.InputTextMessageContent(
|
input_message_content=types.InputTextMessageContent(
|
||||||
message_text=title
|
message_text=title,
|
||||||
|
parse_mode='markdown'
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
await query.answer(
|
await query.answer(
|
||||||
article,
|
article,
|
||||||
cache_time=1,
|
parse_mode='markdown',
|
||||||
|
cache_time=0,
|
||||||
is_personal=True,
|
is_personal=True,
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
await query.answer(f'{title} \n{desc}')
|
await query.answer(f'{title} \n{'' if desc else ''}')
|
||||||
|
|
||||||
|
|
||||||
async def main() -> None:
|
async def main() -> None:
|
||||||
bot = Bot(config['telegram_token'])
|
bot = Bot(config['telegram_token'])
|
||||||
|
|
Loading…
Reference in a new issue