mirror of
https://github.com/Redume/Shirino.git
synced 2024-11-06 00:33:59 +03:00
feat: Deleted the conversion via aliases
This commit is contained in:
parent
69bd887878
commit
cf0da8f220
2 changed files with 7 additions and 27 deletions
|
@ -1,8 +0,0 @@
|
||||||
{
|
|
||||||
"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"]
|
|
||||||
}
|
|
26
main.py
26
main.py
|
@ -16,10 +16,9 @@ dp = Dispatcher()
|
||||||
@dp.message()
|
@dp.message()
|
||||||
@dp.inline_query()
|
@dp.inline_query()
|
||||||
async def currency(query: types.Message | types.InlineQuery) -> None:
|
async def currency(query: types.Message | types.InlineQuery) -> None:
|
||||||
global result, from_currency_alias, conv_currency_alias
|
global result, from_currency, conv_currency
|
||||||
|
|
||||||
try:
|
try:
|
||||||
currency_json = json.load(open('currency.json', 'r', encoding='utf-8'))
|
|
||||||
text = query.query if isinstance(query, types.InlineQuery) else query.text
|
text = query.query if isinstance(query, types.InlineQuery) else query.text
|
||||||
args = text.split()
|
args = text.split()
|
||||||
result_id = hashlib.md5(text.encode()).hexdigest()
|
result_id = hashlib.md5(text.encode()).hexdigest()
|
||||||
|
@ -39,15 +38,15 @@ async def currency(query: types.Message | types.InlineQuery) -> None:
|
||||||
query)
|
query)
|
||||||
if len(args) == 4:
|
if len(args) == 4:
|
||||||
conv.amount = float(args[0])
|
conv.amount = float(args[0])
|
||||||
from_currency_alias = args[1].lower()
|
from_currency = args[1].lower()
|
||||||
conv_currency_alias = args[3].lower()
|
conv_currency = args[3].lower()
|
||||||
elif len(args) == 3:
|
elif len(args) == 3:
|
||||||
conv.amount = float(args[0])
|
conv.amount = float(args[0])
|
||||||
from_currency_alias = args[1].lower()
|
from_currency = args[1].lower()
|
||||||
conv_currency_alias = args[2].lower()
|
conv_currency = args[2].lower()
|
||||||
elif len(args) == 2:
|
elif len(args) == 2:
|
||||||
from_currency_alias = args[0].lower()
|
from_currency = args[0].lower()
|
||||||
conv_currency_alias = args[1].lower()
|
conv_currency = args[1].lower()
|
||||||
else:
|
else:
|
||||||
try:
|
try:
|
||||||
if query.chat.type in ['supergroup', 'group']:
|
if query.chat.type in ['supergroup', 'group']:
|
||||||
|
@ -57,17 +56,6 @@ async def currency(query: types.Message | types.InlineQuery) -> None:
|
||||||
|
|
||||||
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
|
|
||||||
|
|
||||||
for currency_code, aliases in currency_json.items():
|
|
||||||
if from_currency_alias in aliases:
|
|
||||||
from_currency = currency_code
|
|
||||||
if conv_currency_alias in aliases:
|
|
||||||
conv_currency = currency_code
|
|
||||||
|
|
||||||
if from_currency and conv_currency:
|
|
||||||
break
|
|
||||||
|
|
||||||
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.',
|
||||||
|
|
Loading…
Reference in a new issue