From 70e5c11c28bbf4e7a6a0ca80dba7f649760cb3cf Mon Sep 17 00:00:00 2001 From: Matteo Bertucci Date: Thu, 5 Mar 2020 10:24:08 +0100 Subject: [PATCH 1/2] Add one second padding to format_infraction_with_duration It caused the message to be rounded one second down, for example 59m and 59s instead of 1h --- bot/utils/time.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot/utils/time.py b/bot/utils/time.py index 77060143c8..ac2464110b 100644 --- a/bot/utils/time.py +++ b/bot/utils/time.py @@ -144,7 +144,7 @@ def format_infraction_with_duration( if absolute: delta = abs(delta) - duration = humanize_delta(delta, max_units=max_units) + duration = humanize_delta(delta, max_units=max_units) + datetime.timedelta(seconds=1) duration_formatted = f" ({duration})" if duration else "" return f"{date_to_formatted}{duration_formatted}" From 245c570ebf7e7d5fb57939eb6a824a014b355e71 Mon Sep 17 00:00:00 2001 From: Matteo Bertucci Date: Thu, 5 Mar 2020 10:31:16 +0100 Subject: [PATCH 2/2] Add padding to the delta, not the returned value --- bot/utils/time.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot/utils/time.py b/bot/utils/time.py index ac2464110b..5465968d0a 100644 --- a/bot/utils/time.py +++ b/bot/utils/time.py @@ -144,7 +144,7 @@ def format_infraction_with_duration( if absolute: delta = abs(delta) - duration = humanize_delta(delta, max_units=max_units) + datetime.timedelta(seconds=1) + duration = humanize_delta(delta + datetime.timedelta(seconds=1), max_units=max_units) duration_formatted = f" ({duration})" if duration else "" return f"{date_to_formatted}{duration_formatted}"