Make dateparser timezone aware

This commit is contained in:
Zeva Rose 2022-03-27 00:47:38 -06:00
parent 3b9a3f721b
commit 46693f2443

View file

@ -102,7 +102,7 @@ class RemindmeCog(Scale):
base_settings = { base_settings = {
"PREFER_DATES_FROM": "future", "PREFER_DATES_FROM": "future",
"TIMEZONE": "UTC", "TIMEZONE": "UTC",
"RETURN_AS_TIMEZONE_AWARE": False, "RETURN_AS_TIMEZONE_AWARE": True,
} }
rt_settings = base_settings.copy() rt_settings = base_settings.copy()
rt_settings["PARSERS"] = [ rt_settings["PARSERS"] = [
@ -115,12 +115,11 @@ class RemindmeCog(Scale):
at_settings["PARSERS"] = [x for x in default_parsers if x != "relative-time"] at_settings["PARSERS"] = [x for x in default_parsers if x != "relative-time"]
at_remind_at = parse(delay, settings=at_settings) at_remind_at = parse(delay, settings=at_settings)
if rt_remind_at and at_remind_at: if rt_remind_at:
remind_at = max(rt_remind_at, at_remind_at) remind_at = rt_remind_at
elif at_remind_at:
remind_at = at_remind_at
else: else:
remind_at = rt_remind_at or at_remind_at
if not remind_at:
self.logger.debug(f"Failed to parse delay: {delay}") self.logger.debug(f"Failed to parse delay: {delay}")
await response.send( await response.send(
f"`{delay}` is not a parsable date, please try again", ephemeral=True f"`{delay}` is not a parsable date, please try again", ephemeral=True