From 25d07411ce68053b4a136ade47faf2e8396f1b3d Mon Sep 17 00:00:00 2001 From: ks129 <45097959+ks129@users.noreply.github.com> Date: Tue, 7 Apr 2020 19:59:36 +0300 Subject: (Space): Moved APOD command min date to constant, made changes in error message when date is going out of range. --- bot/exts/evergreen/space.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'bot') diff --git a/bot/exts/evergreen/space.py b/bot/exts/evergreen/space.py index 6d93a980..3587fc00 100644 --- a/bot/exts/evergreen/space.py +++ b/bot/exts/evergreen/space.py @@ -1,6 +1,6 @@ import logging import random -from datetime import datetime +from datetime import date, datetime from typing import Any, Dict, Optional, Union from urllib.parse import urlencode @@ -17,6 +17,8 @@ NASA_BASE_URL = "https://api.nasa.gov" NASA_IMAGES_BASE_URL = "https://images-api.nasa.gov" NASA_EPIC_BASE_URL = "https://epic.gsfc.nasa.gov" +APOD_MIN_DATE = date(1995, 6, 16) + class DateConverter(Converter): """Parse SOL or earth date (in format YYYY-MM-DD) into `int` or `datetime`. When invalid input, raise error.""" @@ -80,8 +82,8 @@ class Space(Cog): return now = datetime.now().date() - if datetime(1995, 6, 16).date() > apod_date or now < apod_date: - await ctx.send(f"Date must be in range 16th June 1995 and {now.strftime('%dth %B %Y')}.") + if APOD_MIN_DATE > apod_date or now < apod_date: + await ctx.send(f"Date must be between {APOD_MIN_DATE.isoformat()} and {now.isoformat()} (today).") return params["date"] = apod_date.isoformat() -- cgit v1.2.3