Redume/Shirino
1
0
Fork 0
mirror of https://github.com/Redume/Shirino.git synced 2024-11-23 16:56:23 +03:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: Redume:c07fba01ad69a77ce0411973e0a2fd2b5f2d7102
Branches Tags
Redume:main
..
compare: Redume:e3f5396d1a2e8d4885a7165662b312aad167c938
Branches Tags
Redume:main

No commits in common. "c07fba01ad69a77ce0411973e0a2fd2b5f2d7102" and "e3f5396d1a2e8d4885a7165662b312aad167c938" have entirely different histories.
c07fba01ad ... e3f5396d1a

2 changed files with 9 additions and 15 deletions
Show stats Expand all files Collapse all files

8
currency.json
View file

@ -1,8 +1,4 @@
{
"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"]
"RUB": ["руб", "рубли", "рубля", "рублей", "рубль", "rub", "rouble", "roubles"],
"USD": ["доллары", "доллар", "доллара", "зеленых", "usd", "dollar", "dollars"]
}

16
main.py
View file

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