CHANGES:

- Punishment: updated all messages to ASCII layout

Author: karel26

plugins/punishment/commands.py

@@ -49,9 +49,6 @@ async def punish(self, server: Server, ucid: str, punishment: dict, reason: str,
                     member=utils.escape_string(member.display_name),
                     banned_by=utils.escape_string(self.bot.member.name),
                     reason=reason)
-                if admin_channel:
-                    await admin_channel.send(message)
-                await self.bot.audit(message)
                 with suppress(Exception):
                     guild = self.bot.guilds[0]
                     channel = await member.create_dm()
@@ -62,38 +59,33 @@ async def punish(self, server: Server, ucid: str, punishment: dict, reason: str,
             elif player:
                 message = _("Player {player} (ucid={ucid}) banned by {banned_by} for {reason}.").format(
                     player=player.display_name, ucid=player.ucid, banned_by=self.bot.member.name, reason=reason)
-                if admin_channel:
-                    await admin_channel.send(message)
-                await self.bot.audit(message)
             else:
                 message = _("Player with ucid {ucid} banned by {banned_by} for {reason}.").format(
                     ucid=ucid, banned_by=self.bot.member.name, reason=reason)
-                if admin_channel:
-                    await admin_channel.send(message)
-                await self.bot.audit(message)
+            # audit
+            if admin_channel:
+                await admin_channel.send("```" + message + "```")
+            await self.bot.audit(message)
 
         # everything after that point can only be executed if players are active
         if not player:
             return
 
+        message = None
         if punishment['action'] == 'kick' and player.active:
             # we must not punish for reslots here
             self.eventlistener.pending_kill.pop(ucid, None)
             await server.kick(player, reason)
-            if admin_channel:
-                await admin_channel.send(
-                    _("Player {player} (ucid={ucid}) kicked by {kicked_by} for {reason}.").format(
-                        player=player.display_name, ucid=player.ucid, kicked_by=self.bot.member.name, reason=reason))
+            message = _("Player {player} (ucid={ucid}) kicked by {kicked_by} for {reason}.").format(
+                player=player.display_name, ucid=player.ucid, kicked_by=self.bot.member.name, reason=reason)
 
         elif punishment['action'] == 'move_to_spec':
             # we must not punish for reslots here
             self.eventlistener.pending_kill.pop(ucid, None)
             await server.move_to_spectators(player)
             await player.sendUserMessage(_("You've been kicked back to spectators because of: {}.").format(reason))
-            if admin_channel:
-                await admin_channel.send(
-                    _("Player {player} (ucid={ucid}) moved to spectators by {spec_by} for {reason}.").format(
-                        player=player.display_name, ucid=player.ucid, spec_by=self.bot.member.name, reason=reason))
+            message = _("Player {player} (ucid={ucid}) moved to spectators by {spec_by} for {reason}.").format(
+                player=player.display_name, ucid=player.ucid, spec_by=self.bot.member.name, reason=reason)
 
         elif punishment['action'] == 'credits' and type(player).__name__ == 'CreditPlayer':
             player: CreditPlayer = cast(CreditPlayer, player)
@@ -104,10 +96,8 @@ async def punish(self, server: Server, ucid: str, punishment: dict, reason: str,
                 _("{name}, you have been punished for: {reason}!\n"
                   "Your current credit points are: {points}").format(
                     name=player.name, reason=reason, points=player.points))
-            if admin_channel:
-                await admin_channel.send(
-                    _("Player {player} (ucid={ucid}) punished with credits by {punished_by} for {reason}.").format(
-                        player=player.display_name, ucid=player.ucid, punished_by=self.bot.member.name, reason=reason))
+            message = _("Player {player} (ucid={ucid}) punished with credits by {punished_by} for {reason}.").format(
+                player=player.display_name, ucid=player.ucid, punished_by=self.bot.member.name, reason=reason)
 
         elif punishment['action'] == 'warn':
             await player.sendUserMessage(_("{name}, you have been punished for: {reason}!").format(name=player.name,
@@ -119,6 +109,11 @@ async def punish(self, server: Server, ucid: str, punishment: dict, reason: str,
         if points:
             await player.sendUserMessage(_("{name}, you have {points} punishment points.").format(name=player.name,
                                                                                                   points=points))
+        if message:
+            # audit
+            if admin_channel:
+                await admin_channel.send("```" + message + "```")
+            await self.bot.audit(message)
 
     # TODO: change to pubsub
     @tasks.loop(minutes=1.0)