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:e3f5396d1a2e8d4885a7165662b312aad167c938
Branches Tags
Redume:main
...
compare: Redume:c07fba01ad69a77ce0411973e0a2fd2b5f2d7102
Branches Tags
Redume:main

2 commits
e3f5396d1a ... c07fba01ad

Author SHA1 Message Date
Redume
c07fba01ad Обновил конфиг алиасов 2024-09-26 16:09:58 +03:00
Redume
5b79f6699b Пофиксил баг. Если написать текст не относящийся к валюте, то бот будет игнорировать 2024-09-26 16:09:47 +03:00
2 changed files with 15 additions and 9 deletions
Show stats Expand all files Collapse all files

8
currency.json
View file

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

16
main.py
View file

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