aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Chris Lovering <[email protected]>2021-10-22 21:57:47 +0100
committerGravatar Chris Lovering <[email protected]>2021-10-22 21:57:47 +0100
commit22f155e70cf0219d93e9dc17f6f352884ea4eb57 (patch)
tree33baadcea1ca8e314e7bfaebefca96980b4df392
parentMerge pull request #1906 from python-discord/fix-tzinfo-issue (diff)
Use datetime.fromtimestamp so we pass relativedelta a datetime object, not Arrow
Fixes #1907 Fixes BOT-1PA
-rw-r--r--bot/exts/moderation/infraction/management.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/bot/exts/moderation/infraction/management.py b/bot/exts/moderation/infraction/management.py
index eaaa1e00b..1cd259a4b 100644
--- a/bot/exts/moderation/infraction/management.py
+++ b/bot/exts/moderation/infraction/management.py
@@ -1,9 +1,9 @@
import textwrap
import typing as t
+from datetime import datetime, timezone
import dateutil.parser
import discord
-from arrow import Arrow
from dateutil.relativedelta import relativedelta
from discord.ext import commands
from discord.ext.commands import Context
@@ -314,7 +314,10 @@ class ModManagement(commands.Cog):
if expires_at is None:
duration = "*Permanent*"
else:
- date_from = Arrow.fromtimestamp(float(time.DISCORD_TIMESTAMP_REGEX.match(created).group(1)))
+ date_from = datetime.fromtimestamp(
+ float(time.DISCORD_TIMESTAMP_REGEX.match(created).group(1)),
+ timezone.utc
+ )
date_to = dateutil.parser.isoparse(expires_at)
duration = humanize_delta(relativedelta(date_to, date_from))