Compare commits
No commits in common. "87424c8786d7cf931468a0a1943637f3cd1cb9c0" and "ba353a3609479dd15945be58bfbebd6452fd2cd4" have entirely different histories.
87424c8786
...
ba353a3609
17
main.py
17
main.py
|
@ -189,19 +189,10 @@ def queue_processor():
|
||||||
if mod.enabled:
|
if mod.enabled:
|
||||||
if mod.version == 1 or mod.version == 2:
|
if mod.version == 1 or mod.version == 2:
|
||||||
response = mod.process(msg)
|
response = mod.process(msg)
|
||||||
|
|
||||||
if response:
|
if response:
|
||||||
# protecting output
|
|
||||||
response = response.replace("(", "\\(")
|
|
||||||
response = response.replace(")", "\\)")
|
|
||||||
response = response.replace("!", "\\!")
|
|
||||||
response = response.replace(".", "\\.")
|
|
||||||
response = response.replace("=", "\\=")
|
|
||||||
|
|
||||||
updater.bot.send_message(chat_id=msg.chat.id, text=response,
|
updater.bot.send_message(chat_id=msg.chat.id, text=response,
|
||||||
disable_web_page_preview=True,
|
disable_web_page_preview=True)
|
||||||
parse_mode="MarkdownV2")
|
print(f"Responded using module {mod.path} ({mod.alias}) with text: {responce}")
|
||||||
print(f"Responded using module {mod.path} ({mod.alias}) with text: {response}")
|
|
||||||
break
|
break
|
||||||
|
|
||||||
del message_queue[0]
|
del message_queue[0]
|
||||||
|
@ -212,9 +203,9 @@ def queue_processor():
|
||||||
break
|
break
|
||||||
else:
|
else:
|
||||||
time.sleep(1)
|
time.sleep(1)
|
||||||
except Exception as e:
|
except Exception:
|
||||||
print(f"[ERROR] queue_processor: current message queue: {message_queue}")
|
print(f"[ERROR] queue_processor: current message queue: {message_queue}")
|
||||||
print(f"[ERROR] queue_processor: error while processing message ({e}), trying to delete it...")
|
print("[ERROR] queue_processor: error while processing message, trying to delete it...")
|
||||||
try:
|
try:
|
||||||
del message_queue[0]
|
del message_queue[0]
|
||||||
print("[INFO] queue_processor: deleted broken message from the queue")
|
print("[INFO] queue_processor: deleted broken message from the queue")
|
||||||
|
|
|
@ -55,13 +55,13 @@ def generate_lesson_description(lesson, start_datetime, end_datetime, current_da
|
||||||
if output_settings['date']:
|
if output_settings['date']:
|
||||||
human_readable_date = get_human_readable_date(start_datetime, end_datetime,
|
human_readable_date = get_human_readable_date(start_datetime, end_datetime,
|
||||||
current_day, current_week)
|
current_day, current_week)
|
||||||
result += f"*Дата*: {human_readable_date}\n"
|
result += f"Дата: {human_readable_date}\n"
|
||||||
|
|
||||||
if output_settings['teacher']:
|
if output_settings['teacher']:
|
||||||
result += f"*Викладач*: {lesson['teacher']}\n"
|
result += f"Викладач: {lesson['teacher']}\n"
|
||||||
|
|
||||||
if output_settings['link']:
|
if output_settings['link']:
|
||||||
result += f"*Посилання*: {lesson['link']}"
|
result += f"Посилання на пару: {lesson['link']}"
|
||||||
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
@ -161,7 +161,7 @@ def process(message, path):
|
||||||
else:
|
else:
|
||||||
closest_lesson_time = min(schedule)
|
closest_lesson_time = min(schedule)
|
||||||
|
|
||||||
return "*Актуальна пара*: " + get_lesson_description(schedule, reference_time, closest_lesson_time, current_day,
|
return "Актуальна пара: " + get_lesson_description(schedule, reference_time, closest_lesson_time, current_day,
|
||||||
current_week)
|
current_week)
|
||||||
|
|
||||||
elif base_command == "!пари":
|
elif base_command == "!пари":
|
||||||
|
@ -176,8 +176,8 @@ def process(message, path):
|
||||||
|
|
||||||
lesson_list = [i for i in schedule if selected_day * 86400 <= i < (selected_day + 1) * 86400]
|
lesson_list = [i for i in schedule if selected_day * 86400 <= i < (selected_day + 1) * 86400]
|
||||||
|
|
||||||
lesson_descriptions_list = ["*Назва*: " + get_lesson_description(schedule, reference_time, lesson_time,
|
lesson_descriptions_list = ["Назва: " + get_lesson_description(schedule, reference_time, lesson_time,
|
||||||
current_day, current_week, overrides=preferences)
|
current_day, current_week, overrides=preferences)
|
||||||
for lesson_time in lesson_list]
|
for lesson_time in lesson_list]
|
||||||
|
|
||||||
return f"__Пари у {WEEKDAYS_ACCUSATIVE[selected_day % 7]}__:\n" + "\n\n".join(lesson_descriptions_list)
|
return f"Пари у {WEEKDAYS_ACCUSATIVE[selected_day % 7]}:\n" + "\n\n".join(lesson_descriptions_list)
|
||||||
|
|
|
@ -25,7 +25,7 @@ if (command[0] in self.aliases) and (1 <= command_length <= 3):
|
||||||
decoded_text = decoded_text.replace(i[0].capitalize(), i[1].capitalize())
|
decoded_text = decoded_text.replace(i[0].capitalize(), i[1].capitalize())
|
||||||
decoded_text = decoded_text.replace(i[0].upper(), i[1].upper())
|
decoded_text = decoded_text.replace(i[0].upper(), i[1].upper())
|
||||||
|
|
||||||
self.RESPONSE = f"__Результат__\n{decoded_text}"
|
self.RESPONSE = f"Результат: {decoded_text}"
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"[translit-decoder] Got exception: {e}")
|
print(f"[translit-decoder] Got exception: {e}")
|
||||||
|
|
Loading…
Reference in New Issue