Refactor /remind list
to use a normal embed and fix calculate() function
This commit is contained in:
@ -1,14 +1,13 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import datetime
|
||||
from typing import TYPE_CHECKING
|
||||
|
||||
import sentry_sdk
|
||||
from apscheduler.triggers.cron import CronTrigger
|
||||
from apscheduler.triggers.date import DateTrigger
|
||||
from loguru import logger
|
||||
from apscheduler.triggers.interval import IntervalTrigger
|
||||
|
||||
if TYPE_CHECKING:
|
||||
import datetime
|
||||
|
||||
from apscheduler.job import Job
|
||||
|
||||
|
||||
@ -21,21 +20,14 @@ def calculate(job: Job) -> str | None:
|
||||
Returns:
|
||||
str: The time left for the job.
|
||||
"""
|
||||
trigger_time: datetime.datetime | None = job.trigger.run_date if isinstance(job.trigger, DateTrigger) else job.next_run_time
|
||||
trigger_time = None
|
||||
if isinstance(job.trigger, DateTrigger | IntervalTrigger):
|
||||
trigger_time = job.next_run_time if hasattr(job, "next_run_time") else None
|
||||
elif isinstance(job.trigger, CronTrigger):
|
||||
trigger_time = job.trigger.get_next_fire_time(None, datetime.datetime.now(tz=job._scheduler.timezone)) # noqa: SLF001
|
||||
|
||||
# Check if the job is paused
|
||||
if trigger_time is None:
|
||||
with sentry_sdk.push_scope() as scope:
|
||||
scope.set_tag("job_id", job.id)
|
||||
scope.set_extra("job_state", job.__getstate__() if hasattr(job, "__getstate__") else "No state")
|
||||
sentry_sdk.capture_exception(Exception("Couldn't calculate time for job"))
|
||||
|
||||
msg: str = f"Couldn't calculate time for job: {job.id}"
|
||||
if hasattr(job, "__getstate__"):
|
||||
msg += f"State: {job.__getstate__()}"
|
||||
|
||||
logger.error(msg)
|
||||
return None
|
||||
if not trigger_time:
|
||||
return "Paused"
|
||||
|
||||
return f"<t:{int(trigger_time.timestamp())}:R>"
|
||||
|
||||
|
Reference in New Issue
Block a user