From fd858afcfd05dda34f04d10cf34ea8c7d27383c9 Mon Sep 17 00:00:00 2001 From: Profitroll <47523801+profitrollgame@users.noreply.github.com> Date: Sun, 4 Dec 2022 11:27:59 +0100 Subject: [PATCH] Fixed questions source for inline --- modules/inline.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/inline.py b/modules/inline.py index 395fa1b..2c74510 100644 --- a/modules/inline.py +++ b/modules/inline.py @@ -33,19 +33,22 @@ async def inline_answer(client, inline_query): results = [] + applications = jsonLoad(f"{configGet('data', 'locations')}{sep}applications.json") + for match in list_of_users: try: - user_data = jsonLoad(f"{configGet('data', 'locations')}{sep}users{sep}{match.user.id}.json") application_content = [] i = 1 - for question in configGet("application", file=str(match.user.id)): + for question in applications[str(match.user.id)]["application"]: if i == 2: - age = relativedelta(datetime.now(), datetime.strptime(configGet('application', file=str(match.user.id))['2'], '%d.%m.%Y')) - application_content.append(f"{locale('question'+str(i), 'message', 'question_titles')} {configGet('application', file=str(match.user.id))['2']} ({age.years} р.)") + age = relativedelta(datetime.now(), datetime.strptime(applications[str(match.user.id)]['application']['2'], '%d.%m.%Y')) + application_content.append(f"{locale('question'+str(i), 'message', 'question_titles')} {applications[str(match.user.id)]['application']['2']} ({age.years} р.)") else: - application_content.append(f"{locale('question'+str(i), 'message', 'question_titles')} {configGet('application', file=str(match.user.id))[question]}") + application_content.append(f"{locale('question'+str(i), 'message', 'question_titles')} {applications[str(match.user.id)]['application'][question]}") i += 1 + except KeyError: + continue except FileNotFoundError: continue except TypeError: