Compare commits

...

2 commits

2 changed files with 15 additions and 9 deletions

View file

@ -1,4 +1,8 @@
{
"RUB": ["руб", "рубли", "рубля", "рублей", "рубль", "rub", "rouble", "roubles"],
"USD": ["доллары", "доллар", "доллара", "зеленых", "usd", "dollar", "dollars"]
"RUB": ["руб", "рубли", "рубля", "рублей", "рубль", "российский рубль", "rub", "rouble", "roubles", "russian rouble"],
"USD": ["доллары", "доллар", "доллара", "долларах", "долларов", "зеленых", "бакса", "баксов", "usd", "dollar", "dollars"],
"UAH": ["гривны", "гривен", "гривен", "hryvnia"],
"EUR": ["евро", "eur", "euro", "euros"],
"KZT": ["тенге", "казахстанский тенге", "kazakhstani tenge", "tenge"],
"TRY": ["турецкая лира", "турецких лир", "try", "tl", "Turkish lira", "lira"]
}

View file

@ -16,7 +16,7 @@ dp = Dispatcher()
@dp.message()
@dp.inline_query()
async def currency(query: types.Message | types.InlineQuery) -> None:
global result
global result, from_currency_alias, conv_currency_alias
try:
currency_json = json.load(open('currency.json', 'r', encoding='utf-8'))
@ -26,6 +26,7 @@ async def currency(query: types.Message | types.InlineQuery) -> None:
conv = Converter()
if len(args) <= 1:
if query.chat.type not in ['supergroup', 'group']:
return await reply(result_id,
"2 or 3 arguments are required.",
"@shirino_bot USD RUB "
@ -43,6 +44,7 @@ async def currency(query: types.Message | types.InlineQuery) -> None:
from_currency_alias = args[0].lower()
conv_currency_alias = args[1].lower()
else:
if query.chat.type not in ['supergroup', 'group']:
return await reply(result_id, 'The source and target currency could not be determined.', None, query)
from_currency, conv_currency = None, None