From c346c2becd2967058a73bc900800afbfb8dbe6d5 Mon Sep 17 00:00:00 2001
From: Senjan21 <53477086+Senjan21@users.noreply.github.com>
Date: Fri, 5 Feb 2021 19:12:14 +0100
Subject: Fix #1371 error via adding errors.

---
 bot/errors.py                            | 17 ++++++++++++++++-
 bot/exts/backend/error_handler.py        |  4 +++-
 bot/exts/moderation/infraction/_utils.py |  5 +++++
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/bot/errors.py b/bot/errors.py
index 65d715203..016d9bd17 100644
--- a/bot/errors.py
+++ b/bot/errors.py
@@ -1,4 +1,5 @@
-from typing import Hashable
+from typing import Hashable, Union
+from discord import Member, User
 
 
 class LockedResourceError(RuntimeError):
@@ -18,3 +19,17 @@ class LockedResourceError(RuntimeError):
             f"Cannot operate on {self.type.lower()} `{self.id}`; "
             "it is currently locked and in use by another operation."
         )
+
+
+class InvalidInfractedUser(Exception):
+    """
+    Exception raised upon attempt of infracting an invalid user."
+
+    Attributes:
+        `user` -- User or Member which is invalid
+    """
+
+    def __init__(self, user: Union[Member, User], reason: str = "User infracted is a bot."):
+        self.user = user
+
+        super().__init__(reason)
diff --git a/bot/exts/backend/error_handler.py b/bot/exts/backend/error_handler.py
index ed7962b06..d2cce5558 100644
--- a/bot/exts/backend/error_handler.py
+++ b/bot/exts/backend/error_handler.py
@@ -12,7 +12,7 @@ from bot.api import ResponseCodeError
 from bot.bot import Bot
 from bot.constants import Colours, ERROR_REPLIES, Icons, MODERATION_ROLES
 from bot.converters import TagNameConverter
-from bot.errors import LockedResourceError
+from bot.errors import InvalidInfractedUser, LockedResourceError
 from bot.exts.backend.branding._errors import BrandingError
 from bot.utils.checks import InWhitelistCheckFailure
 
@@ -82,6 +82,8 @@ class ErrorHandler(Cog):
             elif isinstance(e.original, BrandingError):
                 await ctx.send(embed=self._get_error_embed(random.choice(ERROR_REPLIES), str(e.original)))
                 return
+            elif isinstance(e.original, InvalidInfractedUser):
+                await ctx.send(f"Cannot infract that user. {e.original.reason}")
             else:
                 await self.handle_unexpected_error(ctx, e.original)
             return  # Exit early to avoid logging.
diff --git a/bot/exts/moderation/infraction/_utils.py b/bot/exts/moderation/infraction/_utils.py
index d0dc3f0a1..e766c1e5c 100644
--- a/bot/exts/moderation/infraction/_utils.py
+++ b/bot/exts/moderation/infraction/_utils.py
@@ -7,6 +7,7 @@ from discord.ext.commands import Context
 
 from bot.api import ResponseCodeError
 from bot.constants import Colours, Icons
+from bot.errors import InvalidInfractedUser
 
 log = logging.getLogger(__name__)
 
@@ -79,6 +80,10 @@ async def post_infraction(
     active: bool = True
 ) -> t.Optional[dict]:
     """Posts an infraction to the API."""
+    if isinstance(user, (discord.Member, discord.User)) and user.bot:
+        log.trace(f"Posting of {infr_type} infraction for {user} to the API aborted. User is a bot.")
+        raise InvalidInfractedUser(user)
+
     log.trace(f"Posting {infr_type} infraction for {user} to the API.")
 
     payload = {
-- 
cgit v1.2.3


From 4f1f45652ab980502098b98e5534d64f810b4b53 Mon Sep 17 00:00:00 2001
From: Senjan21 <53477086+Senjan21@users.noreply.github.com>
Date: Fri, 5 Feb 2021 19:19:02 +0100
Subject: Linting fix.

---
 bot/errors.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bot/errors.py b/bot/errors.py
index 016d9bd17..a6fc33312 100644
--- a/bot/errors.py
+++ b/bot/errors.py
@@ -1,4 +1,5 @@
 from typing import Hashable, Union
+
 from discord import Member, User
 
 
@@ -23,7 +24,7 @@ class LockedResourceError(RuntimeError):
 
 class InvalidInfractedUser(Exception):
     """
-    Exception raised upon attempt of infracting an invalid user."
+    Exception raised upon attempt of infracting an invalid user.
 
     Attributes:
         `user` -- User or Member which is invalid
-- 
cgit v1.2.3


From 174f70e216e327e30a9df6902619944f47eea5ad Mon Sep 17 00:00:00 2001
From: Senjan21 <53477086+Senjan21@users.noreply.github.com>
Date: Sat, 6 Feb 2021 18:10:17 +0100
Subject: add reason attribute

---
 bot/errors.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bot/errors.py b/bot/errors.py
index a6fc33312..ab0adcd42 100644
--- a/bot/errors.py
+++ b/bot/errors.py
@@ -32,5 +32,6 @@ class InvalidInfractedUser(Exception):
 
     def __init__(self, user: Union[Member, User], reason: str = "User infracted is a bot."):
         self.user = user
+        self.reason = reason
 
         super().__init__(reason)
-- 
cgit v1.2.3