Skip to content

Infraction Search Dates #438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MarkKoz merged 6 commits into from
Sep 18, 2019
Merged

Infraction Search Dates #438

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
17d6d80
Infraction Date Humanization
MrHemlock Sep 18, 2019
f846416
Infraction Date Humanization
MrHemlock Sep 18, 2019
31f5015
Merge branches 'hemlock-infraction-date-humanization' and 'master' of…
MrHemlock Sep 18, 2019
cb2d892
Infraction Date Humanization
MrHemlock Sep 18, 2019
d6aab94
Merge branch 'master' into hemlock-infraction-date-humanization
MrHemlock Sep 18, 2019
5640a23
Infraction Date Humanization
MrHemlock Sep 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions bot/cogs/moderation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1260,6 +1260,11 @@ def _infraction_to_string(self, infraction_object: Dict[str, Union[str, int, boo
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")
if infraction_object["expires_at"] is None:
expires = "*Permanent*"
else:
expires = datetime.fromisoformat(infraction_object["expires_at"]).strftime("%Y-%m-%d %H:%M")

lines = textwrap.dedent(f"""
{"**===============**" if active else "==============="}
Expand All @@ -1268,8 +1273,8 @@ def _infraction_to_string(self, infraction_object: Dict[str, Union[str, int, boo
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 "==============="}
Expand Down