From c6929bc3224fa2756e4faa78d3c2110046243318 Mon Sep 17 00:00:00 2001
From: Sebastiaan Zeeff <33516116+SebastiaanZ@users.noreply.github.com>
Date: Tue, 8 Oct 2019 19:09:55 +0200
Subject: Set bot as actor of antispam infractions

As mentioned in #476, the bot currently sets the actor of infractions
applied due to an antispam rule trigger to the offending member. The
reason is that we get a `Context` object from the message that
triggered the antispam rule, which was sent by the offender.

I've changed it by patching both available author attributes,
`Context.author` and `Context.message.author` with the bot user.
---
 bot/cogs/antispam.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bot/cogs/antispam.py b/bot/cogs/antispam.py
index cd1940aaa..fd7e4edb0 100644
--- a/bot/cogs/antispam.py
+++ b/bot/cogs/antispam.py
@@ -207,8 +207,10 @@ class AntiSpam(Cog):
         if not any(role.id == self.muted_role.id for role in member.roles):
             remove_role_after = AntiSpamConfig.punishment['remove_after']
 
-            # We need context, let's get it
+            # Get context and make sure the bot becomes the actor of infraction by patching the `author` attributes
             context = await self.bot.get_context(msg)
+            context.author = self.bot.user
+            context.message.author = self.bot.user
 
             # Since we're going to invoke the tempmute command directly, we need to manually call the converter.
             dt_remove_role_after = await self.expiration_date_converter.convert(context, f"{remove_role_after}S")
-- 
cgit v1.2.3


From 5da0868a29b75be301ecfeca67901640581a21d6 Mon Sep 17 00:00:00 2001
From: Sebastiaan Zeeff <33516116+SebastiaanZ@users.noreply.github.com>
Date: Tue, 8 Oct 2019 19:37:59 +0200
Subject: Show infraction reason when the bot is the actor

https://github.com/python-discord/bot/issues/476

We recently decided to hide the reason in the confirmation message
the bot sends after applying an infraction. In most situations, this
makes sense, since the message containing the invocation command
already contains the reason.

However, if the infraction was triggered by the bot itself (e.g., an
antispam trigger), this means that we're missing information that
provides context to the infraction.

This commit adds the reason back to the confirmation message, but
only if the actor of the infraction was the bot itself.

Closes #476
---
 bot/cogs/moderation/infractions.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bot/cogs/moderation/infractions.py b/bot/cogs/moderation/infractions.py
index 34c439ffe..2c075f436 100644
--- a/bot/cogs/moderation/infractions.py
+++ b/bot/cogs/moderation/infractions.py
@@ -416,6 +416,7 @@ class Infractions(Scheduler, commands.Cog):
         expiry_log_text = f"Expires: {expiry}" if expiry else ""
         log_title = "applied"
         log_content = None
+        reason_msg = ""
 
         # DM the user about the infraction if it's not a shadow/hidden infraction.
         if not infraction["hidden"]:
@@ -430,6 +431,9 @@ class Infractions(Scheduler, commands.Cog):
                 dm_log_text = "\nDM: **Failed**"
                 log_content = ctx.author.mention
 
+        if infraction["actor"] == self.bot.user.id:
+            reason_msg = f" (reason: {infraction['reason']})"
+
         # Execute the necessary actions to apply the infraction on Discord.
         if action_coro:
             try:
@@ -445,7 +449,7 @@ class Infractions(Scheduler, commands.Cog):
                 log_title = "failed to apply"
 
         # Send a confirmation message to the invoking context.
-        await ctx.send(f"{dm_result}{confirm_msg} **{infr_type}** to {user.mention}{expiry_msg}.")
+        await ctx.send(f"{dm_result}{confirm_msg} **{infr_type}** to {user.mention}{expiry_msg}{reason_msg}.")
 
         # Send a log message to the mod log.
         await self.mod_log.send_log_message(
-- 
cgit v1.2.3