Merge branch 'master' into mod-dm-status

1 files changed, 26 insertions, 0 deletions

diff --git a/bot/cogs/moderation.py b/bot/cogs/moderation.py
index 24b60332f..ac08d3dd4 100644
--- a/bot/cogs/moderation.py
+++ b/bot/cogs/moderation.py
@@ -103,6 +103,19 @@ class Moderation(Scheduler):
         if not notified:
             await self.log_notify_failure(user, ctx.author, "warning")
 
+        # Send a message to the mod log
+        await self.mod_log.send_log_message(
+            icon_url=Icons.user_warn,
+            colour=Colour(Colours.soft_red),
+            title="Member warned",
+            thumbnail=user.avatar_url_as(static_format="png"),
+            text=textwrap.dedent(f"""
+                Member: {user.mention} (`{user.id}`)
+                Actor: {ctx.message.author}
+                Reason: {reason}
+            """)
+        )
+
     @with_role(*MODERATION_ROLES)
     @command(name="kick")
     async def kick(self, ctx: Context, user: Member, *, reason: str = None):
@@ -385,6 +398,19 @@ class Moderation(Scheduler):
 
         await ctx.send(result_message)
 
+        # Send a message to the mod log
+        await self.mod_log.send_log_message(
+            icon_url=Icons.user_warn,
+            colour=Colour(Colours.soft_red),
+            title="Member shadow warned",
+            thumbnail=user.avatar_url_as(static_format="png"),
+            text=textwrap.dedent(f"""
+                Member: {user.mention} (`{user.id}`)
+                Actor: {ctx.message.author}
+                Reason: {reason}
+            """)
+        )
+
     @with_role(*MODERATION_ROLES)
     @command(name="shadow_kick", hidden=True, aliases=['shadowkick', 'skick'])
     async def shadow_kick(self, ctx: Context, user: Member, *, reason: str = None):