NgTech-LTD/HFCNotificator
2
0
Fork 0
mirror of https://github.com/GaMeNu/HFCNotificator.git synced 2024-11-16 15:24:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

v2.1.0

Browse Source 
Latest command param fixes
This commit is contained in:
GaMeNu 2023-10-12 10:10:30 +03:00
parent 93e2f014e7
commit 42c52fa2e9
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cog_notificator.py
View File

@ -67,6 +67,7 @@ class Alert:
data.get('desc')) data.get('desc'))
# noinspection PyUnresolvedReferences
class Notificator(commands.Cog): class Notificator(commands.Cog):
districts: list[dict] = json.loads(requests.get('https://www.oref.org.il//Shared/Ajax/GetDistricts.aspx').text) districts: list[dict] = json.loads(requests.get('https://www.oref.org.il//Shared/Ajax/GetDistricts.aspx').text)
@ -337,6 +338,13 @@ class Notificator(commands.Cog):
@staticmethod @staticmethod
def get_alert_history_page(time_back_amount: int, page_number: int, alerts_in_page: int) -> str: def get_alert_history_page(time_back_amount: int, page_number: int, alerts_in_page: int) -> str:
"""
max_page is EXCLUSIVE!
:param time_back_amount: amount of time back
:param page_number: the page number (starting at 0)
:param alerts_in_page: The number of alerts in one page
:return: page as str
"""
alert_history = AlertReqs.request_history_json() alert_history = AlertReqs.request_history_json()
current_time = datetime.datetime.now() current_time = datetime.datetime.now()
@ -360,13 +368,18 @@ class Notificator(commands.Cog):
if alert_counter % alerts_in_page != 0: if alert_counter % alerts_in_page != 0:
max_page += 1 max_page += 1
print(max_page, page_number)
if time_back_amount <= 0: if time_back_amount <= 0:
raise ValueError("Time can't be lower than 1.") raise ValueError("Time can't be lower than 1.")
if page_number > (max_page-1): if max_page == 0:
raise ValueError("Page number overflow") raise ValueError("No results found.")
if page_number >= max_page:
raise ValueError("Page number is too high.")
if page_number < 0: if page_number < 0:
raise ValueError("Page number underflow") raise ValueError("Page number is too low.")
page_info = f'Page {page_number + 1}/{alert_counter//alerts_in_page + 1}\n\n' page_info = f'Page {page_number + 1}/{alert_counter//alerts_in_page + 1}\n\n'