diff options
| author |  sco1 <[email protected]> | 2019-09-22 19:12:27 -0400 |
|---|---|---|
| committer | sco1 <[email protected]> | 2019-09-22 19:13:21 -0400 |
| commit | 22947e928788a565541f4e09976fd7c8d575e267 (patch) | |
| tree | 955f573ed5b81ebb7a51a3a20e65c569f8654ead | |
| parent | Apply suggestions from code review (diff) | |
| parent | Fix date formatting bug in infraction search (diff) | |
Merge branch 'master' into flake8-plugins
| -rw-r--r-- | bot/cogs/moderation.py | 4 | ||||
| -rw-r--r-- | bot/cogs/superstarify/__init__.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bot/cogs/moderation.py b/bot/cogs/moderation.py index d407a90fe..81b3864a7 100644 --- a/bot/cogs/moderation.py +++ b/bot/cogs/moderation.py @@ -1171,11 +1171,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"][:-1]).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"][:-1]).strftime("%Y-%m-%d %H:%M") lines = textwrap.dedent(f""" {"**===============**" if active else "==============="} diff --git a/bot/cogs/superstarify/__init__.py b/bot/cogs/superstarify/__init__.py index 71dad0036..c42b94d28 100644 --- a/bot/cogs/superstarify/__init__.py +++ b/bot/cogs/superstarify/__init__.py @@ -226,7 +226,7 @@ class Superstarify(Cog): @command(name='unsuperstarify', aliases=('release_nick', 'unstar')) @with_role(*MODERATION_ROLES) async def unsuperstarify(self, ctx: Context, member: Member) -> Optional[Message]: - """This command will remove the superstarify entry from our database, allowing the user to change their nickname.""" + """Remove the superstarify entry from our database, allowing the user to change their nickname.""" log.debug(f"Attempting to unsuperstarify the following user: {member.display_name}") embed = Embed() |