From 17d6d80a78b8ab66d2f82060cb8334ccd8c62bca Mon Sep 17 00:00:00 2001 From: Daniel Brown Date: Wed, 18 Sep 2019 10:54:49 -0500 Subject: Infraction Date Humanization - Changed the date returned on infraction searches to use the `"%c"` strftime format instead of the standard ISO format. Signed-off-by: Daniel Brown --- bot/cogs/moderation.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bot/cogs/moderation.py b/bot/cogs/moderation.py index c631dd69d..898f053f5 100644 --- a/bot/cogs/moderation.py +++ b/bot/cogs/moderation.py @@ -1260,6 +1260,11 @@ class Moderation(Scheduler, Cog): active = infraction_object["active"] user_id = infraction_object["user"] hidden = infraction_object["hidden"] + created = datetime.fromisoformat(infraction_object["inserted_at"].strftime("%c")) + if not infraction_object["expires_at"]: + expires = "*Permanent*" + else: + expires = datetime.fromisoformat(infraction_object["expires_at"].strftime("%c")) lines = textwrap.dedent(f""" {"**===============**" if active else "==============="} @@ -1268,8 +1273,8 @@ class Moderation(Scheduler, Cog): Type: **{infraction_object["type"]}** Shadow: {hidden} Reason: {infraction_object["reason"] or "*None*"} - Created: {infraction_object["inserted_at"]} - Expires: {infraction_object["expires_at"] or "*Permanent*"} + Created: {created} + Expires: {expires} Actor: {actor.mention if actor else actor_id} ID: `{infraction_object["id"]}` {"**===============**" if active else "==============="} -- cgit v1.2.3 From f846416be2cd2fe05d0689f11bb30d3a67b4a571 Mon Sep 17 00:00:00 2001 From: Daniel Brown Date: Wed, 18 Sep 2019 15:02:51 -0500 Subject: Infraction Date Humanization - Changed to use the format `"%Y-%m-%d %H:%M"`, which will turn out looking like `2019-09-18 13:59` Signed-off-by: Daniel Brown --- bot/cogs/moderation.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bot/cogs/moderation.py b/bot/cogs/moderation.py index 898f053f5..f16a13a3e 100644 --- a/bot/cogs/moderation.py +++ b/bot/cogs/moderation.py @@ -1260,11 +1260,11 @@ class Moderation(Scheduler, Cog): active = infraction_object["active"] user_id = infraction_object["user"] hidden = infraction_object["hidden"] - created = datetime.fromisoformat(infraction_object["inserted_at"].strftime("%c")) + created = datetime.fromisoformat(infraction_object["inserted_at"].strftime("%Y-%m-%d %H:%M")) if not infraction_object["expires_at"]: expires = "*Permanent*" else: - expires = datetime.fromisoformat(infraction_object["expires_at"].strftime("%c")) + expires = datetime.fromisoformat(infraction_object["expires_at"].strftime("%Y-%m-%d %H:%M")) lines = textwrap.dedent(f""" {"**===============**" if active else "==============="} -- cgit v1.2.3 From cb2d892c37f68aa72b3078905d26030ea50368f2 Mon Sep 17 00:00:00 2001 From: Daniel Brown Date: Wed, 18 Sep 2019 15:30:46 -0500 Subject: Infraction Date Humanization - Changed the if statement to use `is None` for code clarity. Signed-off-by: Daniel Brown --- bot/cogs/moderation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot/cogs/moderation.py b/bot/cogs/moderation.py index f16a13a3e..2c7253c7b 100644 --- a/bot/cogs/moderation.py +++ b/bot/cogs/moderation.py @@ -1261,7 +1261,7 @@ class Moderation(Scheduler, Cog): user_id = infraction_object["user"] hidden = infraction_object["hidden"] created = datetime.fromisoformat(infraction_object["inserted_at"].strftime("%Y-%m-%d %H:%M")) - if not infraction_object["expires_at"]: + if infraction_object["expires_at"] is None: expires = "*Permanent*" else: expires = datetime.fromisoformat(infraction_object["expires_at"].strftime("%Y-%m-%d %H:%M")) -- cgit v1.2.3 From 5640a23b4b2af23a4a767d506105730ca06f5d0b Mon Sep 17 00:00:00 2001 From: Daniel Brown Date: Wed, 18 Sep 2019 16:01:03 -0500 Subject: Infraction Date Humanization - Corrected an error that would have made the code bug out. Moved a closing parentheses to the correct spot. Signed-off-by: Daniel Brown --- bot/cogs/moderation.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bot/cogs/moderation.py b/bot/cogs/moderation.py index 2c7253c7b..2d6c40a46 100644 --- a/bot/cogs/moderation.py +++ b/bot/cogs/moderation.py @@ -1260,11 +1260,11 @@ class Moderation(Scheduler, Cog): active = infraction_object["active"] user_id = infraction_object["user"] hidden = infraction_object["hidden"] - created = datetime.fromisoformat(infraction_object["inserted_at"].strftime("%Y-%m-%d %H:%M")) + created = datetime.fromisoformat(infraction_object["inserted_at"]).strftime("%Y-%m-%d %H:%M") if infraction_object["expires_at"] is None: expires = "*Permanent*" else: - expires = datetime.fromisoformat(infraction_object["expires_at"].strftime("%Y-%m-%d %H:%M")) + expires = datetime.fromisoformat(infraction_object["expires_at"]).strftime("%Y-%m-%d %H:%M") lines = textwrap.dedent(f""" {"**===============**" if active else "==============="} -- cgit v1.2.3