From 716699dedf6ec7afc76eb61d5402184d5a808dc7 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Tue, 19 May 2020 20:14:06 +0300
Subject: Source: Created initial cog layout + setup function

---
 bot/cogs/source.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 bot/cogs/source.py

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
new file mode 100644
index 000000000..4897a16e3
--- /dev/null
+++ b/bot/cogs/source.py
@@ -0,0 +1,15 @@
+from discord.ext.commands import Cog
+
+from bot.bot import Bot
+
+
+class Source(Cog):
+    """Cog of Python Discord project source information."""
+
+    def __init__(self, bot: Bot):
+        self.bot = bot
+
+
+def setup(bot: Bot) -> None:
+    """Load `Source` cog."""
+    bot.add_cog(Source(bot))
-- 
cgit v1.2.3


From c71895c99366f5096442420edde10c70e562a4dd Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Tue, 19 May 2020 20:21:58 +0300
Subject: Source: Create converter for source object converting

---
 bot/cogs/source.py | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index 4897a16e3..76f75f83b 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -1,10 +1,39 @@
-from discord.ext.commands import Cog
+from typing import Union
+
+from discord.ext.commands import BadArgument, Cog, Context, Converter, Command, HelpCommand
 
 from bot.bot import Bot
 
 
+class SourceConverted(Converter):
+    """Convert argument to help command, command or Cog."""
+
+    async def convert(self, ctx: Context, argument: str) -> Union[HelpCommand, Command, Cog]:
+        """
+        Convert argument into source object.
+
+        Order how arguments is checked:
+        1. When argument is `help`, return bot help command
+        2. When argument is valid command, return this command
+        3. When argument is valid Cog, return this Cog
+        4. Otherwise raise `BadArgument` error
+        """
+        if argument.lower() == "help":
+            return ctx.bot.help_command
+
+        command = ctx.bot.get_command(argument)
+        if command:
+            return command
+
+        cog = ctx.bot.get_cog(argument)
+        if cog:
+            return cog
+
+        raise BadArgument(f"Unable to convert `{argument}` to help command, command or cog.")
+
+
 class Source(Cog):
-    """Cog of Python Discord project source information."""
+    """Cog of Python Discord projects source information."""
 
     def __init__(self, bot: Bot):
         self.bot = bot
-- 
cgit v1.2.3


From a4ad94904638c94b44006d546861d399eba77ed5 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Wed, 20 May 2020 08:46:27 +0300
Subject: Source: Create `get_source_link` function that build item's GitHub
 link

---
 bot/cogs/source.py | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index 76f75f83b..1f9e0e84d 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -1,11 +1,14 @@
+import inspect
+import os
 from typing import Union
 
-from discord.ext.commands import BadArgument, Cog, Context, Converter, Command, HelpCommand
+from discord.ext.commands import BadArgument, Cog, Command, Context, Converter, HelpCommand
 
 from bot.bot import Bot
+from bot.constants import URLs
 
 
-class SourceConverted(Converter):
+class SourceConverter(Converter):
     """Convert argument to help command, command or Cog."""
 
     async def convert(self, ctx: Context, argument: str) -> Union[HelpCommand, Command, Cog]:
@@ -38,6 +41,24 @@ class Source(Cog):
     def __init__(self, bot: Bot):
         self.bot = bot
 
+    @staticmethod
+    def get_source_link(source_item: Union[HelpCommand, Command, Cog]) -> str:
+        """Build GitHub link of source item."""
+        if isinstance(source_item, HelpCommand):
+            src = type(source_item)
+            filename = inspect.getsourcefile(src)
+        elif isinstance(source_item, Command):
+            src = source_item.callback.__code__
+            filename = src.co_filename
+        else:
+            src = type(source_item)
+            filename = inspect.getsourcefile(src)
+
+        lines, first_line_no = inspect.getsourcelines(src)
+        file_location = os.path.relpath(filename)
+
+        return f"{URLs.github_bot_repo}/blob/master/{file_location}#L{first_line_no}-L{first_line_no+len(lines)-1}"
+
 
 def setup(bot: Bot) -> None:
     """Load `Source` cog."""
-- 
cgit v1.2.3


From 6e923cb6386e95b7ad56c9fc8d2374a0feffd49e Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Wed, 20 May 2020 08:46:48 +0300
Subject: Source: Add cog loading to __main__.py

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

diff --git a/bot/__main__.py b/bot/__main__.py
index aa1d1aee8..d82adc802 100644
--- a/bot/__main__.py
+++ b/bot/__main__.py
@@ -57,6 +57,7 @@ bot.load_extension("bot.cogs.reddit")
 bot.load_extension("bot.cogs.reminders")
 bot.load_extension("bot.cogs.site")
 bot.load_extension("bot.cogs.snekbox")
+bot.load_extension("bot.cogs.source")
 bot.load_extension("bot.cogs.stats")
 bot.load_extension("bot.cogs.sync")
 bot.load_extension("bot.cogs.tags")
-- 
cgit v1.2.3


From dfda0abf922d49688774aae8e6f9c0ba8e44b96d Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Wed, 20 May 2020 09:10:05 +0300
Subject: Source: Create `build_embed` function that build embed of source item

---
 bot/cogs/source.py | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index 1f9e0e84d..bce51aa80 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -2,11 +2,18 @@ import inspect
 import os
 from typing import Union
 
+from discord import Embed
 from discord.ext.commands import BadArgument, Cog, Command, Context, Converter, HelpCommand
 
 from bot.bot import Bot
 from bot.constants import URLs
 
+CANT_RUN_MESSAGE = "You can't run this command here."
+CAN_RUN_MESSAGE = "You are able to run this command."
+
+COG_CHECK_FAIL = "You can't use commands what is in this Cog here."
+COG_CHECK_PASS = "You can use commands from this Cog."
+
 
 class SourceConverter(Converter):
     """Convert argument to help command, command or Cog."""
@@ -59,6 +66,26 @@ class Source(Cog):
 
         return f"{URLs.github_bot_repo}/blob/master/{file_location}#L{first_line_no}-L{first_line_no+len(lines)-1}"
 
+    @staticmethod
+    async def build_embed(link: str, source_object: Union[HelpCommand, Command, Cog], ctx: Context) -> Embed:
+        """Build embed based on source object."""
+        if isinstance(source_object, HelpCommand):
+            title = "Help"
+            description = source_object.__doc__
+        else:
+            title = source_object.qualified_name
+            description = source_object.help
+
+        embed = Embed(title=title, description=description, url=link)
+        embed.add_field(name="Source Code", value=f"[Go to GitHub]({link})")
+
+        if isinstance(source_object, Command):
+            embed.set_footer(text=CAN_RUN_MESSAGE if await source_object.can_run(ctx) else CANT_RUN_MESSAGE)
+        elif isinstance(source_object, Cog):
+            embed.set_footer(text=COG_CHECK_PASS if source_object.cog_check(ctx) else COG_CHECK_FAIL)
+
+        return embed
+
 
 def setup(bot: Bot) -> None:
     """Load `Source` cog."""
-- 
cgit v1.2.3


From b3742b8050aff7edbaccfa9d1d95843f5bf201a0 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Wed, 20 May 2020 09:11:50 +0300
Subject: Source: Create `source` command with alias `src`

---
 bot/cogs/source.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index bce51aa80..af29caaaa 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -3,7 +3,7 @@ import os
 from typing import Union
 
 from discord import Embed
-from discord.ext.commands import BadArgument, Cog, Command, Context, Converter, HelpCommand
+from discord.ext.commands import BadArgument, Cog, Command, Context, Converter, HelpCommand, group
 
 from bot.bot import Bot
 from bot.constants import URLs
@@ -48,6 +48,12 @@ class Source(Cog):
     def __init__(self, bot: Bot):
         self.bot = bot
 
+    @group(name='source', aliases=('src',), invoke_without_command=True)
+    async def source_command(self, ctx: Context, *, source_item: SourceConverter) -> None:
+        """Get GitHub link and information about help command, command or Cog."""
+        url = self.get_source_link(source_item)
+        await ctx.send(embed=await self.build_embed(url, source_item, ctx))
+
     @staticmethod
     def get_source_link(source_item: Union[HelpCommand, Command, Cog]) -> str:
         """Build GitHub link of source item."""
-- 
cgit v1.2.3


From ce34adbc64bacd15eeb1a2bfee7b0d022ec969eb Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Wed, 20 May 2020 09:17:26 +0300
Subject: Source: Make `source` command to `command` instead `group`

---
 bot/cogs/source.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index af29caaaa..1774d0085 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -3,7 +3,7 @@ import os
 from typing import Union
 
 from discord import Embed
-from discord.ext.commands import BadArgument, Cog, Command, Context, Converter, HelpCommand, group
+from discord.ext.commands import BadArgument, Cog, Command, Context, Converter, HelpCommand, command
 
 from bot.bot import Bot
 from bot.constants import URLs
@@ -48,7 +48,7 @@ class Source(Cog):
     def __init__(self, bot: Bot):
         self.bot = bot
 
-    @group(name='source', aliases=('src',), invoke_without_command=True)
+    @command(name="source", aliases=("src",))
     async def source_command(self, ctx: Context, *, source_item: SourceConverter) -> None:
         """Get GitHub link and information about help command, command or Cog."""
         url = self.get_source_link(source_item)
-- 
cgit v1.2.3


From 1bb52f815e93c2e3d3fa565c150bbc5effff94f2 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Wed, 20 May 2020 09:18:04 +0300
Subject: Source: Remove `command` shadowing on converter

---
 bot/cogs/source.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index 1774d0085..c628c6b29 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -31,9 +31,9 @@ class SourceConverter(Converter):
         if argument.lower() == "help":
             return ctx.bot.help_command
 
-        command = ctx.bot.get_command(argument)
-        if command:
-            return command
+        cmd = ctx.bot.get_command(argument)
+        if cmd:
+            return cmd
 
         cog = ctx.bot.get_cog(argument)
         if cog:
-- 
cgit v1.2.3


From e5239c4b20d2496cf5a96192981f050c87150acd Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Wed, 20 May 2020 09:37:26 +0300
Subject: Source: Implement no argument GitHub repo response

---
 bot/cogs/source.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index c628c6b29..22b75e2ee 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -1,9 +1,9 @@
 import inspect
 import os
-from typing import Union
+from typing import Optional, Union
 
 from discord import Embed
-from discord.ext.commands import BadArgument, Cog, Command, Context, Converter, HelpCommand, command
+from discord.ext.commands import Cog, Command, Context, Converter, HelpCommand, command
 
 from bot.bot import Bot
 from bot.constants import URLs
@@ -18,7 +18,7 @@ COG_CHECK_PASS = "You can use commands from this Cog."
 class SourceConverter(Converter):
     """Convert argument to help command, command or Cog."""
 
-    async def convert(self, ctx: Context, argument: str) -> Union[HelpCommand, Command, Cog]:
+    async def convert(self, ctx: Context, argument: str) -> Union[HelpCommand, Command, Cog, None]:
         """
         Convert argument into source object.
 
@@ -39,7 +39,7 @@ class SourceConverter(Converter):
         if cog:
             return cog
 
-        raise BadArgument(f"Unable to convert `{argument}` to help command, command or cog.")
+        return None
 
 
 class Source(Cog):
@@ -49,8 +49,14 @@ class Source(Cog):
         self.bot = bot
 
     @command(name="source", aliases=("src",))
-    async def source_command(self, ctx: Context, *, source_item: SourceConverter) -> None:
+    async def source_command(self, ctx: Context, *, source_item: Optional[SourceConverter] = None) -> None:
         """Get GitHub link and information about help command, command or Cog."""
+        if not source_item:
+            embed = Embed(title="Bot GitHub Repository", url=URLs.github_bot_repo)
+            embed.add_field(name="Repository", value=f"[Go to GitHub]({URLs.github_bot_repo})")
+            await ctx.send(embed=embed)
+            return
+
         url = self.get_source_link(source_item)
         await ctx.send(embed=await self.build_embed(url, source_item, ctx))
 
-- 
cgit v1.2.3


From 6d0a1b0c9e3f278f2b660659efd89db3c4a3595a Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Wed, 20 May 2020 09:40:26 +0300
Subject: Source: Fix `Cog` instance of source no `help` attribute

---
 bot/cogs/source.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index 22b75e2ee..1820392f3 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -84,9 +84,12 @@ class Source(Cog):
         if isinstance(source_object, HelpCommand):
             title = "Help"
             description = source_object.__doc__
-        else:
+        elif isinstance(source_object, Command):
             title = source_object.qualified_name
             description = source_object.help
+        else:
+            title = source_object.qualified_name
+            description = source_object.description
 
         embed = Embed(title=title, description=description, url=link)
         embed.add_field(name="Source Code", value=f"[Go to GitHub]({link})")
-- 
cgit v1.2.3


From 00445f54a8593ff14d2f9c9595be86f15ab78072 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Wed, 20 May 2020 16:23:05 +0300
Subject: Source: Make converter raising `BadArgument` again

---
 bot/cogs/source.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index 1820392f3..633cb8ccf 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -1,9 +1,9 @@
 import inspect
 import os
-from typing import Optional, Union
+from typing import Union
 
 from discord import Embed
-from discord.ext.commands import Cog, Command, Context, Converter, HelpCommand, command
+from discord.ext.commands import BadArgument, Cog, Command, Context, Converter, HelpCommand, command
 
 from bot.bot import Bot
 from bot.constants import URLs
@@ -18,7 +18,7 @@ COG_CHECK_PASS = "You can use commands from this Cog."
 class SourceConverter(Converter):
     """Convert argument to help command, command or Cog."""
 
-    async def convert(self, ctx: Context, argument: str) -> Union[HelpCommand, Command, Cog, None]:
+    async def convert(self, ctx: Context, argument: str) -> Union[HelpCommand, Command, Cog]:
         """
         Convert argument into source object.
 
@@ -39,7 +39,7 @@ class SourceConverter(Converter):
         if cog:
             return cog
 
-        return None
+        raise BadArgument(f"Unable to convert `{argument}` to valid command or Cog.")
 
 
 class Source(Cog):
@@ -49,7 +49,7 @@ class Source(Cog):
         self.bot = bot
 
     @command(name="source", aliases=("src",))
-    async def source_command(self, ctx: Context, *, source_item: Optional[SourceConverter] = None) -> None:
+    async def source_command(self, ctx: Context, *, source_item: SourceConverter = None) -> None:
         """Get GitHub link and information about help command, command or Cog."""
         if not source_item:
             embed = Embed(title="Bot GitHub Repository", url=URLs.github_bot_repo)
-- 
cgit v1.2.3


From dd05246e29fa46ff53456a499244373c23a24d06 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Wed, 20 May 2020 16:23:58 +0300
Subject: Source: Remove links from title of embeds

---
 bot/cogs/source.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index 633cb8ccf..b285b4089 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -52,7 +52,7 @@ class Source(Cog):
     async def source_command(self, ctx: Context, *, source_item: SourceConverter = None) -> None:
         """Get GitHub link and information about help command, command or Cog."""
         if not source_item:
-            embed = Embed(title="Bot GitHub Repository", url=URLs.github_bot_repo)
+            embed = Embed(title="Bot GitHub Repository")
             embed.add_field(name="Repository", value=f"[Go to GitHub]({URLs.github_bot_repo})")
             await ctx.send(embed=embed)
             return
@@ -91,7 +91,7 @@ class Source(Cog):
             title = source_object.qualified_name
             description = source_object.description
 
-        embed = Embed(title=title, description=description, url=link)
+        embed = Embed(title=title, description=description)
         embed.add_field(name="Source Code", value=f"[Go to GitHub]({link})")
 
         if isinstance(source_object, Command):
-- 
cgit v1.2.3


From 36ef3514674812afab6c94b12b3f9d3768b324f5 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Wed, 20 May 2020 16:25:26 +0300
Subject: Source: Remove Cog check displaying from command

---
 bot/cogs/source.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index b285b4089..220da535d 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -11,9 +11,6 @@ from bot.constants import URLs
 CANT_RUN_MESSAGE = "You can't run this command here."
 CAN_RUN_MESSAGE = "You are able to run this command."
 
-COG_CHECK_FAIL = "You can't use commands what is in this Cog here."
-COG_CHECK_PASS = "You can use commands from this Cog."
-
 
 class SourceConverter(Converter):
     """Convert argument to help command, command or Cog."""
@@ -96,8 +93,6 @@ class Source(Cog):
 
         if isinstance(source_object, Command):
             embed.set_footer(text=CAN_RUN_MESSAGE if await source_object.can_run(ctx) else CANT_RUN_MESSAGE)
-        elif isinstance(source_object, Cog):
-            embed.set_footer(text=COG_CHECK_PASS if source_object.cog_check(ctx) else COG_CHECK_FAIL)
 
         return embed
 
-- 
cgit v1.2.3


From e2ce4ac6f372a92cc8c31c09237521e6b3aeb23b Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Wed, 20 May 2020 16:35:11 +0300
Subject: Source: Rename cog + move checks status from footer to field

- Renamed cog from `Source` to `BotSource` for itself (bot will be
unable to get cog, because this always return command).
- Moved checks status from footer to field and changed it's content.
---
 bot/cogs/source.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index 220da535d..972507762 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -8,9 +8,6 @@ from discord.ext.commands import BadArgument, Cog, Command, Context, Converter,
 from bot.bot import Bot
 from bot.constants import URLs
 
-CANT_RUN_MESSAGE = "You can't run this command here."
-CAN_RUN_MESSAGE = "You are able to run this command."
-
 
 class SourceConverter(Converter):
     """Convert argument to help command, command or Cog."""
@@ -39,7 +36,7 @@ class SourceConverter(Converter):
         raise BadArgument(f"Unable to convert `{argument}` to valid command or Cog.")
 
 
-class Source(Cog):
+class BotSource(Cog):
     """Cog of Python Discord projects source information."""
 
     def __init__(self, bot: Bot):
@@ -92,11 +89,11 @@ class Source(Cog):
         embed.add_field(name="Source Code", value=f"[Go to GitHub]({link})")
 
         if isinstance(source_object, Command):
-            embed.set_footer(text=CAN_RUN_MESSAGE if await source_object.can_run(ctx) else CANT_RUN_MESSAGE)
+            embed.add_field(name="Can be used by you here?", value=await source_object.can_run(ctx))
 
         return embed
 
 
 def setup(bot: Bot) -> None:
     """Load `Source` cog."""
-    bot.add_cog(Source(bot))
+    bot.add_cog(BotSource(bot))
-- 
cgit v1.2.3


From dc96a187cf7af6d4d1d39a325e3ffad67d3549a5 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Wed, 20 May 2020 16:38:56 +0300
Subject: Source: Fix description of cog

---
 bot/cogs/source.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index 972507762..5b8d8ded2 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -37,7 +37,7 @@ class SourceConverter(Converter):
 
 
 class BotSource(Cog):
-    """Cog of Python Discord projects source information."""
+    """Cog of Python Discord Python bot project source information."""
 
     def __init__(self, bot: Bot):
         self.bot = bot
-- 
cgit v1.2.3


From e5534bc73d4b2d7b4b87326ab3b729b955e7c344 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sun, 31 May 2020 08:26:23 +0300
Subject: Source: Fix docstrings

Co-authored-by: Mark <kozlovmark@gmail.com>
---
 bot/cogs/source.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index 5b8d8ded2..6e71ae5b2 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -10,7 +10,7 @@ from bot.constants import URLs
 
 
 class SourceConverter(Converter):
-    """Convert argument to help command, command or Cog."""
+    """Convert an argument into a help command, command, or cog."""
 
     async def convert(self, ctx: Context, argument: str) -> Union[HelpCommand, Command, Cog]:
         """
@@ -37,14 +37,14 @@ class SourceConverter(Converter):
 
 
 class BotSource(Cog):
-    """Cog of Python Discord Python bot project source information."""
+    """Displays information about the bot's source code."""
 
     def __init__(self, bot: Bot):
         self.bot = bot
 
     @command(name="source", aliases=("src",))
     async def source_command(self, ctx: Context, *, source_item: SourceConverter = None) -> None:
-        """Get GitHub link and information about help command, command or Cog."""
+        """Display information and a GitHub link to the source code of a command or cog."""
         if not source_item:
             embed = Embed(title="Bot GitHub Repository")
             embed.add_field(name="Repository", value=f"[Go to GitHub]({URLs.github_bot_repo})")
@@ -95,5 +95,5 @@ class BotSource(Cog):
 
 
 def setup(bot: Bot) -> None:
-    """Load `Source` cog."""
+    """Load the BotSource cog."""
     bot.add_cog(BotSource(bot))
-- 
cgit v1.2.3


From befbb1afed56b60336c8668a9134e28e069e0eac Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sun, 31 May 2020 08:47:46 +0300
Subject: Source: Remove checks running from source command

---
 bot/cogs/source.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index 6e71ae5b2..7076c1eb3 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -52,7 +52,7 @@ class BotSource(Cog):
             return
 
         url = self.get_source_link(source_item)
-        await ctx.send(embed=await self.build_embed(url, source_item, ctx))
+        await ctx.send(embed=await self.build_embed(url, source_item))
 
     @staticmethod
     def get_source_link(source_item: Union[HelpCommand, Command, Cog]) -> str:
@@ -73,7 +73,7 @@ class BotSource(Cog):
         return f"{URLs.github_bot_repo}/blob/master/{file_location}#L{first_line_no}-L{first_line_no+len(lines)-1}"
 
     @staticmethod
-    async def build_embed(link: str, source_object: Union[HelpCommand, Command, Cog], ctx: Context) -> Embed:
+    async def build_embed(link: str, source_object: Union[HelpCommand, Command, Cog]) -> Embed:
         """Build embed based on source object."""
         if isinstance(source_object, HelpCommand):
             title = "Help"
@@ -88,9 +88,6 @@ class BotSource(Cog):
         embed = Embed(title=title, description=description)
         embed.add_field(name="Source Code", value=f"[Go to GitHub]({link})")
 
-        if isinstance(source_object, Command):
-            embed.add_field(name="Can be used by you here?", value=await source_object.can_run(ctx))
-
         return embed
 
 
-- 
cgit v1.2.3


From 756ed4286339a26e6e1e4edb7431a026d8817881 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sun, 31 May 2020 09:09:35 +0300
Subject: Source: Direct aliases to their original commands

---
 bot/cogs/source.py | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index 7076c1eb3..0880dd62f 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -54,15 +54,20 @@ class BotSource(Cog):
         url = self.get_source_link(source_item)
         await ctx.send(embed=await self.build_embed(url, source_item))
 
-    @staticmethod
-    def get_source_link(source_item: Union[HelpCommand, Command, Cog]) -> str:
+    def get_source_link(self, source_item: Union[HelpCommand, Command, Cog]) -> str:
         """Build GitHub link of source item."""
         if isinstance(source_item, HelpCommand):
             src = type(source_item)
             filename = inspect.getsourcefile(src)
         elif isinstance(source_item, Command):
-            src = source_item.callback.__code__
-            filename = src.co_filename
+            if source_item.cog_name == "Alias":
+                cmd_name = source_item.callback.__name__.replace("_alias", "")
+                cmd = self.bot.get_command(cmd_name.replace("_", " "))
+                src = cmd.callback.__code__
+                filename = src.co_filename
+            else:
+                src = source_item.callback.__code__
+                filename = src.co_filename
         else:
             src = type(source_item)
             filename = inspect.getsourcefile(src)
@@ -72,15 +77,20 @@ class BotSource(Cog):
 
         return f"{URLs.github_bot_repo}/blob/master/{file_location}#L{first_line_no}-L{first_line_no+len(lines)-1}"
 
-    @staticmethod
-    async def build_embed(link: str, source_object: Union[HelpCommand, Command, Cog]) -> Embed:
+    async def build_embed(self, link: str, source_object: Union[HelpCommand, Command, Cog]) -> Embed:
         """Build embed based on source object."""
         if isinstance(source_object, HelpCommand):
             title = "Help"
             description = source_object.__doc__
         elif isinstance(source_object, Command):
+            if source_object.cog_name == "Alias":
+                cmd_name = source_object.callback.__name__.replace("_alias", "")
+                cmd = self.bot.get_command(cmd_name.replace("_", " "))
+                description = cmd.help
+            else:
+                description = source_object.help
+
             title = source_object.qualified_name
-            description = source_object.help
         else:
             title = source_object.qualified_name
             description = source_object.description
-- 
cgit v1.2.3


From a064e2b6b4f6fabdb6a0fae5de5ee957dbb85b75 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sun, 31 May 2020 09:31:07 +0300
Subject: Source: Implement tags file showing to source command

---
 bot/cogs/source.py | 43 +++++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index 0880dd62f..1c702f81d 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -10,21 +10,22 @@ from bot.constants import URLs
 
 
 class SourceConverter(Converter):
-    """Convert an argument into a help command, command, or cog."""
-
-    async def convert(self, ctx: Context, argument: str) -> Union[HelpCommand, Command, Cog]:
-        """
-        Convert argument into source object.
-
-        Order how arguments is checked:
-        1. When argument is `help`, return bot help command
-        2. When argument is valid command, return this command
-        3. When argument is valid Cog, return this Cog
-        4. Otherwise raise `BadArgument` error
-        """
+    """Convert an argument into a help command, tag, command, or cog."""
+
+    async def convert(self, ctx: Context, argument: str) -> Union[HelpCommand, Command, Cog, str]:
+        """Convert argument into source object."""
         if argument.lower() == "help":
             return ctx.bot.help_command
 
+        tags_cog = ctx.bot.get_cog("Tags")
+
+        if argument.lower() in tags_cog._cache:
+            tag = argument.lower()
+            if tags_cog._cache[tag]["restricted_to"] != "developers":
+                return f"bot/resources/tags/{tags_cog._cache[tag]['restricted_to']}/{tag}.md"
+            else:
+                return f"bot/resources/tags/{tag}.md"
+
         cmd = ctx.bot.get_command(argument)
         if cmd:
             return cmd
@@ -44,7 +45,7 @@ class BotSource(Cog):
 
     @command(name="source", aliases=("src",))
     async def source_command(self, ctx: Context, *, source_item: SourceConverter = None) -> None:
-        """Display information and a GitHub link to the source code of a command or cog."""
+        """Display information and a GitHub link to the source code of a command, tag, or cog."""
         if not source_item:
             embed = Embed(title="Bot GitHub Repository")
             embed.add_field(name="Repository", value=f"[Go to GitHub]({URLs.github_bot_repo})")
@@ -54,7 +55,7 @@ class BotSource(Cog):
         url = self.get_source_link(source_item)
         await ctx.send(embed=await self.build_embed(url, source_item))
 
-    def get_source_link(self, source_item: Union[HelpCommand, Command, Cog]) -> str:
+    def get_source_link(self, source_item: Union[HelpCommand, Command, Cog, str]) -> str:
         """Build GitHub link of source item."""
         if isinstance(source_item, HelpCommand):
             src = type(source_item)
@@ -68,14 +69,21 @@ class BotSource(Cog):
             else:
                 src = source_item.callback.__code__
                 filename = src.co_filename
+        elif isinstance(source_item, str):
+            filename = source_item
         else:
             src = type(source_item)
             filename = inspect.getsourcefile(src)
 
-        lines, first_line_no = inspect.getsourcelines(src)
+        if not isinstance(source_item, str):
+            lines, first_line_no = inspect.getsourcelines(src)
+            lines_extension = f"#L{first_line_no}-L{first_line_no+len(lines)-1}"
+        else:
+            lines_extension = ""
+
         file_location = os.path.relpath(filename)
 
-        return f"{URLs.github_bot_repo}/blob/master/{file_location}#L{first_line_no}-L{first_line_no+len(lines)-1}"
+        return f"{URLs.github_bot_repo}/blob/master/{file_location}{lines_extension}"
 
     async def build_embed(self, link: str, source_object: Union[HelpCommand, Command, Cog]) -> Embed:
         """Build embed based on source object."""
@@ -91,6 +99,9 @@ class BotSource(Cog):
                 description = source_object.help
 
             title = source_object.qualified_name
+        elif isinstance(source_object, str):
+            title = f"Tag: {source_object.split('/')[-1].split('.')[0]}"
+            description = ""
         else:
             title = source_object.qualified_name
             description = source_object.description
-- 
cgit v1.2.3


From bb6cc2193cad398d68db29d4f991fce94ae06549 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sun, 31 May 2020 09:44:34 +0300
Subject: Source: Migrate from os.path to Path

---
 bot/cogs/source.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index 1c702f81d..21f18f45f 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -1,5 +1,5 @@
 import inspect
-import os
+from pathlib import Path
 from typing import Union
 
 from discord import Embed
@@ -22,9 +22,9 @@ class SourceConverter(Converter):
         if argument.lower() in tags_cog._cache:
             tag = argument.lower()
             if tags_cog._cache[tag]["restricted_to"] != "developers":
-                return f"bot/resources/tags/{tags_cog._cache[tag]['restricted_to']}/{tag}.md"
+                return f"/bot/bot/resources/tags/{tags_cog._cache[tag]['restricted_to']}/{tag}.md"
             else:
-                return f"bot/resources/tags/{tag}.md"
+                return f"/bot/bot/resources/tags/{tag}.md"
 
         cmd = ctx.bot.get_command(argument)
         if cmd:
@@ -74,6 +74,7 @@ class BotSource(Cog):
         else:
             src = type(source_item)
             filename = inspect.getsourcefile(src)
+            print(filename)
 
         if not isinstance(source_item, str):
             lines, first_line_no = inspect.getsourcelines(src)
@@ -81,7 +82,8 @@ class BotSource(Cog):
         else:
             lines_extension = ""
 
-        file_location = os.path.relpath(filename)
+        file_location = Path(filename).relative_to("/bot/")
+        print(file_location)
 
         return f"{URLs.github_bot_repo}/blob/master/{file_location}{lines_extension}"
 
-- 
cgit v1.2.3


From 9db1377d8c4796d0e2eedc8eeee039566a7770b5 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sun, 31 May 2020 09:46:15 +0300
Subject: Source: Move big unions to variable of type

---
 bot/cogs/source.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index 21f18f45f..40200eb69 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -8,11 +8,13 @@ from discord.ext.commands import BadArgument, Cog, Command, Context, Converter,
 from bot.bot import Bot
 from bot.constants import URLs
 
+SourceType = Union[HelpCommand, Command, Cog, str]
+
 
 class SourceConverter(Converter):
     """Convert an argument into a help command, tag, command, or cog."""
 
-    async def convert(self, ctx: Context, argument: str) -> Union[HelpCommand, Command, Cog, str]:
+    async def convert(self, ctx: Context, argument: str) -> SourceType:
         """Convert argument into source object."""
         if argument.lower() == "help":
             return ctx.bot.help_command
@@ -55,7 +57,7 @@ class BotSource(Cog):
         url = self.get_source_link(source_item)
         await ctx.send(embed=await self.build_embed(url, source_item))
 
-    def get_source_link(self, source_item: Union[HelpCommand, Command, Cog, str]) -> str:
+    def get_source_link(self, source_item: SourceType) -> str:
         """Build GitHub link of source item."""
         if isinstance(source_item, HelpCommand):
             src = type(source_item)
@@ -87,7 +89,7 @@ class BotSource(Cog):
 
         return f"{URLs.github_bot_repo}/blob/master/{file_location}{lines_extension}"
 
-    async def build_embed(self, link: str, source_object: Union[HelpCommand, Command, Cog]) -> Embed:
+    async def build_embed(self, link: str, source_object: SourceType) -> Embed:
         """Build embed based on source object."""
         if isinstance(source_object, HelpCommand):
             title = "Help"
-- 
cgit v1.2.3


From 2db5add0893d090b7bdbc172ea2e83044301b2f6 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sun, 31 May 2020 09:54:01 +0300
Subject: Source: Implement file and line showing in source embed footer

---
 bot/cogs/source.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index 40200eb69..fbe519c43 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -1,6 +1,6 @@
 import inspect
 from pathlib import Path
-from typing import Union
+from typing import Optional, Tuple, Union
 
 from discord import Embed
 from discord.ext.commands import BadArgument, Cog, Command, Context, Converter, HelpCommand, command
@@ -54,10 +54,10 @@ class BotSource(Cog):
             await ctx.send(embed=embed)
             return
 
-        url = self.get_source_link(source_item)
-        await ctx.send(embed=await self.build_embed(url, source_item))
+        url, location, first_line = self.get_source_link(source_item)
+        await ctx.send(embed=await self.build_embed(url, source_item, location, first_line))
 
-    def get_source_link(self, source_item: SourceType) -> str:
+    def get_source_link(self, source_item: SourceType) -> Tuple[str, str, Optional[int]]:
         """Build GitHub link of source item."""
         if isinstance(source_item, HelpCommand):
             src = type(source_item)
@@ -82,14 +82,15 @@ class BotSource(Cog):
             lines, first_line_no = inspect.getsourcelines(src)
             lines_extension = f"#L{first_line_no}-L{first_line_no+len(lines)-1}"
         else:
+            first_line_no = None
             lines_extension = ""
 
         file_location = Path(filename).relative_to("/bot/")
-        print(file_location)
+        url = f"{URLs.github_bot_repo}/blob/master/{file_location}{lines_extension}"
 
-        return f"{URLs.github_bot_repo}/blob/master/{file_location}{lines_extension}"
+        return url, file_location, first_line_no or None
 
-    async def build_embed(self, link: str, source_object: SourceType) -> Embed:
+    async def build_embed(self, link: str, source_object: SourceType, loc: str, first_line: Optional[int]) -> Embed:
         """Build embed based on source object."""
         if isinstance(source_object, HelpCommand):
             title = "Help"
@@ -112,6 +113,8 @@ class BotSource(Cog):
 
         embed = Embed(title=title, description=description)
         embed.add_field(name="Source Code", value=f"[Go to GitHub]({link})")
+        line_text = f":{first_line}" if first_line else ""
+        embed.set_footer(text=f"{loc}{line_text}")
 
         return embed
 
-- 
cgit v1.2.3


From ff308186375eee5ddf734d9d0d49879c49995b29 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sun, 31 May 2020 11:53:28 +0300
Subject: Source: Show only first line of every source item docstring instead
 full

---
 bot/cogs/source.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index fbe519c43..232ee618e 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -76,7 +76,6 @@ class BotSource(Cog):
         else:
             src = type(source_item)
             filename = inspect.getsourcefile(src)
-            print(filename)
 
         if not isinstance(source_item, str):
             lines, first_line_no = inspect.getsourcelines(src)
@@ -94,14 +93,14 @@ class BotSource(Cog):
         """Build embed based on source object."""
         if isinstance(source_object, HelpCommand):
             title = "Help"
-            description = source_object.__doc__
+            description = source_object.__doc__.splitlines()[1]
         elif isinstance(source_object, Command):
             if source_object.cog_name == "Alias":
                 cmd_name = source_object.callback.__name__.replace("_alias", "")
                 cmd = self.bot.get_command(cmd_name.replace("_", " "))
-                description = cmd.help
+                description = cmd.short_doc
             else:
-                description = source_object.help
+                description = source_object.short_doc
 
             title = source_object.qualified_name
         elif isinstance(source_object, str):
@@ -109,7 +108,7 @@ class BotSource(Cog):
             description = ""
         else:
             title = source_object.qualified_name
-            description = source_object.description
+            description = source_object.description.splitlines()[0]
 
         embed = Embed(title=title, description=description)
         embed.add_field(name="Source Code", value=f"[Go to GitHub]({link})")
-- 
cgit v1.2.3


From 522c7489ea86d5c150145d610fc3a0fef7bd16bc Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sun, 31 May 2020 11:55:14 +0300
Subject: Source: Add thumbnail to source command bot repo embed

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

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index 232ee618e..3f03f790c 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -51,6 +51,7 @@ class BotSource(Cog):
         if not source_item:
             embed = Embed(title="Bot GitHub Repository")
             embed.add_field(name="Repository", value=f"[Go to GitHub]({URLs.github_bot_repo})")
+            embed.set_thumbnail(url="https://avatars1.githubusercontent.com/u/9919")
             await ctx.send(embed=embed)
             return
 
-- 
cgit v1.2.3


From ed8298cad287c2bc37566d2688b77dc64d62a7af Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sun, 31 May 2020 11:57:29 +0300
Subject: Source: Few text fixes, made help command detection better

---
 bot/cogs/source.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index 3f03f790c..32f8d5e08 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -16,7 +16,7 @@ class SourceConverter(Converter):
 
     async def convert(self, ctx: Context, argument: str) -> SourceType:
         """Convert argument into source object."""
-        if argument.lower() == "help":
+        if argument.lower().startswith("help"):
             return ctx.bot.help_command
 
         tags_cog = ctx.bot.get_cog("Tags")
@@ -49,7 +49,7 @@ class BotSource(Cog):
     async def source_command(self, ctx: Context, *, source_item: SourceConverter = None) -> None:
         """Display information and a GitHub link to the source code of a command, tag, or cog."""
         if not source_item:
-            embed = Embed(title="Bot GitHub Repository")
+            embed = Embed(title="Bot's GitHub Repository")
             embed.add_field(name="Repository", value=f"[Go to GitHub]({URLs.github_bot_repo})")
             embed.set_thumbnail(url="https://avatars1.githubusercontent.com/u/9919")
             await ctx.send(embed=embed)
@@ -93,7 +93,7 @@ class BotSource(Cog):
     async def build_embed(self, link: str, source_object: SourceType, loc: str, first_line: Optional[int]) -> Embed:
         """Build embed based on source object."""
         if isinstance(source_object, HelpCommand):
-            title = "Help"
+            title = "Help Command"
             description = source_object.__doc__.splitlines()[1]
         elif isinstance(source_object, Command):
             if source_object.cog_name == "Alias":
-- 
cgit v1.2.3


From 0a4b365f5efdb31450647b8d628b3787142d4617 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sun, 31 May 2020 11:58:54 +0300
Subject: Source: Add command and cog prefixes to title of embed

---
 bot/cogs/source.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index 32f8d5e08..9e6109ca2 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -103,12 +103,12 @@ class BotSource(Cog):
             else:
                 description = source_object.short_doc
 
-            title = source_object.qualified_name
+            title = f"Command: {source_object.qualified_name}"
         elif isinstance(source_object, str):
             title = f"Tag: {source_object.split('/')[-1].split('.')[0]}"
             description = ""
         else:
-            title = source_object.qualified_name
+            title = f"Cog: {source_object.qualified_name}"
             description = source_object.description.splitlines()[0]
 
         embed = Embed(title=title, description=description)
-- 
cgit v1.2.3


From 0007fb7e50f273108e70bcafbd736bfc75ce3e51 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sun, 31 May 2020 11:59:44 +0300
Subject: Source: In converter move cog checking before command

---
 bot/cogs/source.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index 9e6109ca2..a5f90e490 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -28,14 +28,14 @@ class SourceConverter(Converter):
             else:
                 return f"/bot/bot/resources/tags/{tag}.md"
 
-        cmd = ctx.bot.get_command(argument)
-        if cmd:
-            return cmd
-
         cog = ctx.bot.get_cog(argument)
         if cog:
             return cog
 
+        cmd = ctx.bot.get_command(argument)
+        if cmd:
+            return cmd
+
         raise BadArgument(f"Unable to convert `{argument}` to valid command or Cog.")
 
 
-- 
cgit v1.2.3


From aa83e72bd28f822c6ba84d73c5be05c6aea5d59b Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sun, 31 May 2020 12:01:26 +0300
Subject: Source: Simplify imports

---
 bot/cogs/source.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index a5f90e490..5668ab6c6 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -3,18 +3,18 @@ from pathlib import Path
 from typing import Optional, Tuple, Union
 
 from discord import Embed
-from discord.ext.commands import BadArgument, Cog, Command, Context, Converter, HelpCommand, command
+from discord.ext import commands
 
 from bot.bot import Bot
 from bot.constants import URLs
 
-SourceType = Union[HelpCommand, Command, Cog, str]
+SourceType = Union[commands.HelpCommand, commands.Command, commands.Cog, str]
 
 
-class SourceConverter(Converter):
+class SourceConverter(commands.Converter):
     """Convert an argument into a help command, tag, command, or cog."""
 
-    async def convert(self, ctx: Context, argument: str) -> SourceType:
+    async def convert(self, ctx: commands.Context, argument: str) -> SourceType:
         """Convert argument into source object."""
         if argument.lower().startswith("help"):
             return ctx.bot.help_command
@@ -36,17 +36,17 @@ class SourceConverter(Converter):
         if cmd:
             return cmd
 
-        raise BadArgument(f"Unable to convert `{argument}` to valid command or Cog.")
+        raise commands.BadArgument(f"Unable to convert `{argument}` to valid command or Cog.")
 
 
-class BotSource(Cog):
+class BotSource(commands.Cog):
     """Displays information about the bot's source code."""
 
     def __init__(self, bot: Bot):
         self.bot = bot
 
-    @command(name="source", aliases=("src",))
-    async def source_command(self, ctx: Context, *, source_item: SourceConverter = None) -> None:
+    @commands.command(name="source", aliases=("src",))
+    async def source_command(self, ctx: commands.Context, *, source_item: SourceConverter = None) -> None:
         """Display information and a GitHub link to the source code of a command, tag, or cog."""
         if not source_item:
             embed = Embed(title="Bot's GitHub Repository")
@@ -60,10 +60,10 @@ class BotSource(Cog):
 
     def get_source_link(self, source_item: SourceType) -> Tuple[str, str, Optional[int]]:
         """Build GitHub link of source item."""
-        if isinstance(source_item, HelpCommand):
+        if isinstance(source_item, commands.HelpCommand):
             src = type(source_item)
             filename = inspect.getsourcefile(src)
-        elif isinstance(source_item, Command):
+        elif isinstance(source_item, commands.Command):
             if source_item.cog_name == "Alias":
                 cmd_name = source_item.callback.__name__.replace("_alias", "")
                 cmd = self.bot.get_command(cmd_name.replace("_", " "))
@@ -92,10 +92,10 @@ class BotSource(Cog):
 
     async def build_embed(self, link: str, source_object: SourceType, loc: str, first_line: Optional[int]) -> Embed:
         """Build embed based on source object."""
-        if isinstance(source_object, HelpCommand):
+        if isinstance(source_object, commands.HelpCommand):
             title = "Help Command"
             description = source_object.__doc__.splitlines()[1]
-        elif isinstance(source_object, Command):
+        elif isinstance(source_object, commands.Command):
             if source_object.cog_name == "Alias":
                 cmd_name = source_object.callback.__name__.replace("_alias", "")
                 cmd = self.bot.get_command(cmd_name.replace("_", " "))
-- 
cgit v1.2.3


From 30510d6cfd877e5441022b8a8d893871fbf2a0a9 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sun, 31 May 2020 12:16:26 +0300
Subject: Source: Show aliases on title of command source embed

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

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index 5668ab6c6..8fd8cbed4 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -103,7 +103,8 @@ class BotSource(commands.Cog):
             else:
                 description = source_object.short_doc
 
-            title = f"Command: {source_object.qualified_name}"
+            aliases_string = f" (or {', '.join(source_object.aliases)})" if source_object.aliases else ""
+            title = f"Command: {source_object.qualified_name}{aliases_string}"
         elif isinstance(source_object, str):
             title = f"Tag: {source_object.split('/')[-1].split('.')[0]}"
             description = ""
-- 
cgit v1.2.3


From 2c0cb510219a27a875628ff4453be2ba7f0a9d7f Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sun, 31 May 2020 12:17:10 +0300
Subject: Source: Include tag into converter's `BadArgument` raising

---
 bot/cogs/source.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index 8fd8cbed4..a3922297a 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -36,7 +36,7 @@ class SourceConverter(commands.Converter):
         if cmd:
             return cmd
 
-        raise commands.BadArgument(f"Unable to convert `{argument}` to valid command or Cog.")
+        raise commands.BadArgument(f"Unable to convert `{argument}` to valid command, tag, or Cog.")
 
 
 class BotSource(commands.Cog):
-- 
cgit v1.2.3


From 00f52a15c67fa2a8dc9dc87769ba56cff9e2cdf4 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Mon, 1 Jun 2020 07:55:49 +0300
Subject: Tags: Add tag file location storage to cache

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

diff --git a/bot/cogs/tags.py b/bot/cogs/tags.py
index 6f03a3475..571c0ed28 100644
--- a/bot/cogs/tags.py
+++ b/bot/cogs/tags.py
@@ -47,6 +47,7 @@ class Tags(Cog):
                         "description": file.read_text(encoding="utf8"),
                     },
                     "restricted_to": "developers",
+                    "location": str(file)
                 }
 
                 # Convert to a list to allow negative indexing.
-- 
cgit v1.2.3


From 9f93a40bb8d8bd7d0538465f9d4eda79d02e540c Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Mon, 1 Jun 2020 08:11:41 +0300
Subject: Source: Simplify tags name and location parsing

---
 bot/cogs/source.py | 22 ++++++++++++++--------
 bot/cogs/tags.py   |  2 +-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index a3922297a..e01209c28 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -21,12 +21,8 @@ class SourceConverter(commands.Converter):
 
         tags_cog = ctx.bot.get_cog("Tags")
 
-        if argument.lower() in tags_cog._cache:
-            tag = argument.lower()
-            if tags_cog._cache[tag]["restricted_to"] != "developers":
-                return f"/bot/bot/resources/tags/{tags_cog._cache[tag]['restricted_to']}/{tag}.md"
-            else:
-                return f"/bot/bot/resources/tags/{tag}.md"
+        if tags_cog and argument.lower() in tags_cog._cache:
+            return argument.lower()
 
         cog = ctx.bot.get_cog(argument)
         if cog:
@@ -56,6 +52,12 @@ class BotSource(commands.Cog):
             return
 
         url, location, first_line = self.get_source_link(source_item)
+
+        # There is no URL only when bot can't fetch Tags cog
+        if not url:
+            await ctx.send("Unable to get `Tags` cog.")
+            return
+
         await ctx.send(embed=await self.build_embed(url, source_item, location, first_line))
 
     def get_source_link(self, source_item: SourceType) -> Tuple[str, str, Optional[int]]:
@@ -73,7 +75,11 @@ class BotSource(commands.Cog):
                 src = source_item.callback.__code__
                 filename = src.co_filename
         elif isinstance(source_item, str):
-            filename = source_item
+            tags_cog = self.bot.get_cog("Tags")
+            if not tags_cog:
+                return "", "", None
+
+            filename = tags_cog._cache[source_item]["location"]
         else:
             src = type(source_item)
             filename = inspect.getsourcefile(src)
@@ -106,7 +112,7 @@ class BotSource(commands.Cog):
             aliases_string = f" (or {', '.join(source_object.aliases)})" if source_object.aliases else ""
             title = f"Command: {source_object.qualified_name}{aliases_string}"
         elif isinstance(source_object, str):
-            title = f"Tag: {source_object.split('/')[-1].split('.')[0]}"
+            title = f"Tag: {source_object}"
             description = ""
         else:
             title = f"Cog: {source_object.qualified_name}"
diff --git a/bot/cogs/tags.py b/bot/cogs/tags.py
index 571c0ed28..3d76c5c08 100644
--- a/bot/cogs/tags.py
+++ b/bot/cogs/tags.py
@@ -47,7 +47,7 @@ class Tags(Cog):
                         "description": file.read_text(encoding="utf8"),
                     },
                     "restricted_to": "developers",
-                    "location": str(file)
+                    "location": f"/bot/{file}"
                 }
 
                 # Convert to a list to allow negative indexing.
-- 
cgit v1.2.3


From c397b871fbce903f251abd32662d40d33a95e0de Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Mon, 1 Jun 2020 08:16:59 +0300
Subject: Source: Move calling `get_source_link` to `build_embed`

---
 bot/cogs/source.py | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index e01209c28..00a5b344b 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -51,14 +51,11 @@ class BotSource(commands.Cog):
             await ctx.send(embed=embed)
             return
 
-        url, location, first_line = self.get_source_link(source_item)
+        embed = await self.build_embed(source_item, ctx)
 
-        # There is no URL only when bot can't fetch Tags cog
-        if not url:
-            await ctx.send("Unable to get `Tags` cog.")
-            return
-
-        await ctx.send(embed=await self.build_embed(url, source_item, location, first_line))
+        # When embed don't exist, then there was error and this is already handled.
+        if embed:
+            await ctx.send(embed=await self.build_embed(source_item, ctx))
 
     def get_source_link(self, source_item: SourceType) -> Tuple[str, str, Optional[int]]:
         """Build GitHub link of source item."""
@@ -96,8 +93,15 @@ class BotSource(commands.Cog):
 
         return url, file_location, first_line_no or None
 
-    async def build_embed(self, link: str, source_object: SourceType, loc: str, first_line: Optional[int]) -> Embed:
+    async def build_embed(self, source_object: SourceType, ctx: commands.Context) -> Optional[Embed]:
         """Build embed based on source object."""
+        url, location, first_line = self.get_source_link(source_object)
+
+        # There is no URL only when bot can't fetch Tags cog
+        if not url:
+            await ctx.send("Unable to get `Tags` cog.")
+            return
+
         if isinstance(source_object, commands.HelpCommand):
             title = "Help Command"
             description = source_object.__doc__.splitlines()[1]
@@ -119,9 +123,9 @@ class BotSource(commands.Cog):
             description = source_object.description.splitlines()[0]
 
         embed = Embed(title=title, description=description)
-        embed.add_field(name="Source Code", value=f"[Go to GitHub]({link})")
+        embed.add_field(name="Source Code", value=f"[Go to GitHub]({url})")
         line_text = f":{first_line}" if first_line else ""
-        embed.set_footer(text=f"{loc}{line_text}")
+        embed.set_footer(text=f"{location}{line_text}")
 
         return embed
 
-- 
cgit v1.2.3


From 18968d27ae5bc3b004c881a0c78bcfb305371158 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Mon, 1 Jun 2020 08:18:27 +0300
Subject: Source: Update `get_source_link` docstring

---
 bot/cogs/source.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index 00a5b344b..50fd4599d 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -58,7 +58,7 @@ class BotSource(commands.Cog):
             await ctx.send(embed=await self.build_embed(source_item, ctx))
 
     def get_source_link(self, source_item: SourceType) -> Tuple[str, str, Optional[int]]:
-        """Build GitHub link of source item."""
+        """Build GitHub link of source item, return this link, file location and first line number."""
         if isinstance(source_item, commands.HelpCommand):
             src = type(source_item)
             filename = inspect.getsourcefile(src)
-- 
cgit v1.2.3


From ea937e5a69b4cf233216510c96800bdf5940ff16 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Mon, 1 Jun 2020 08:19:21 +0300
Subject: Source: Remove showing aliases for commands

---
 bot/cogs/source.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index 50fd4599d..57ae17f77 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -113,8 +113,7 @@ class BotSource(commands.Cog):
             else:
                 description = source_object.short_doc
 
-            aliases_string = f" (or {', '.join(source_object.aliases)})" if source_object.aliases else ""
-            title = f"Command: {source_object.qualified_name}{aliases_string}"
+            title = f"Command: {source_object.qualified_name}"
         elif isinstance(source_object, str):
             title = f"Tag: {source_object}"
             description = ""
-- 
cgit v1.2.3


From 8429c2284901675297c78f00bf0e5a6b15d80e31 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Mon, 1 Jun 2020 13:17:40 +0300
Subject: Source: Refactor Tags cog missing handling

---
 bot/cogs/source.py | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index 57ae17f77..32a78a0c0 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -8,7 +8,7 @@ from discord.ext import commands
 from bot.bot import Bot
 from bot.constants import URLs
 
-SourceType = Union[commands.HelpCommand, commands.Command, commands.Cog, str]
+SourceType = Union[commands.HelpCommand, commands.Command, commands.Cog, str, commands.ExtensionNotLoaded]
 
 
 class SourceConverter(commands.Converter):
@@ -19,11 +19,6 @@ class SourceConverter(commands.Converter):
         if argument.lower().startswith("help"):
             return ctx.bot.help_command
 
-        tags_cog = ctx.bot.get_cog("Tags")
-
-        if tags_cog and argument.lower() in tags_cog._cache:
-            return argument.lower()
-
         cog = ctx.bot.get_cog(argument)
         if cog:
             return cog
@@ -32,6 +27,14 @@ class SourceConverter(commands.Converter):
         if cmd:
             return cmd
 
+        tags_cog = ctx.bot.get_cog("Tags")
+
+        if not tags_cog:
+            await ctx.send("Unable to get `Tags` cog.")
+            return commands.ExtensionNotLoaded("bot.cogs.tags")
+        elif argument.lower() in tags_cog._cache:
+            return argument.lower()
+
         raise commands.BadArgument(f"Unable to convert `{argument}` to valid command, tag, or Cog.")
 
 
@@ -44,6 +47,10 @@ class BotSource(commands.Cog):
     @commands.command(name="source", aliases=("src",))
     async def source_command(self, ctx: commands.Context, *, source_item: SourceConverter = None) -> None:
         """Display information and a GitHub link to the source code of a command, tag, or cog."""
+        # When we have problem to get Tags cog, exit early
+        if isinstance(source_item, commands.ExtensionNotLoaded):
+            return
+
         if not source_item:
             embed = Embed(title="Bot's GitHub Repository")
             embed.add_field(name="Repository", value=f"[Go to GitHub]({URLs.github_bot_repo})")
@@ -51,11 +58,8 @@ class BotSource(commands.Cog):
             await ctx.send(embed=embed)
             return
 
-        embed = await self.build_embed(source_item, ctx)
-
-        # When embed don't exist, then there was error and this is already handled.
-        if embed:
-            await ctx.send(embed=await self.build_embed(source_item, ctx))
+        embed = await self.build_embed(source_item)
+        await ctx.send(embed=embed)
 
     def get_source_link(self, source_item: SourceType) -> Tuple[str, str, Optional[int]]:
         """Build GitHub link of source item, return this link, file location and first line number."""
@@ -73,9 +77,6 @@ class BotSource(commands.Cog):
                 filename = src.co_filename
         elif isinstance(source_item, str):
             tags_cog = self.bot.get_cog("Tags")
-            if not tags_cog:
-                return "", "", None
-
             filename = tags_cog._cache[source_item]["location"]
         else:
             src = type(source_item)
@@ -93,15 +94,10 @@ class BotSource(commands.Cog):
 
         return url, file_location, first_line_no or None
 
-    async def build_embed(self, source_object: SourceType, ctx: commands.Context) -> Optional[Embed]:
+    async def build_embed(self, source_object: SourceType) -> Optional[Embed]:
         """Build embed based on source object."""
         url, location, first_line = self.get_source_link(source_object)
 
-        # There is no URL only when bot can't fetch Tags cog
-        if not url:
-            await ctx.send("Unable to get `Tags` cog.")
-            return
-
         if isinstance(source_object, commands.HelpCommand):
             title = "Help Command"
             description = source_object.__doc__.splitlines()[1]
-- 
cgit v1.2.3


From 780ed87ef3d4f24e45d2cba8020342c1195f7801 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Mon, 8 Jun 2020 18:31:09 +0200
Subject: Incidents: add incidents module & new ext boilerplate

---
 bot/cogs/moderation/__init__.py  |  4 +++-
 bot/cogs/moderation/incidents.py | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 bot/cogs/moderation/incidents.py

diff --git a/bot/cogs/moderation/__init__.py b/bot/cogs/moderation/__init__.py
index 6880ca1bd..4455705f7 100644
--- a/bot/cogs/moderation/__init__.py
+++ b/bot/cogs/moderation/__init__.py
@@ -1,4 +1,5 @@
 from bot.bot import Bot
+from .incidents import Incidents
 from .infractions import Infractions
 from .management import ModManagement
 from .modlog import ModLog
@@ -7,7 +8,8 @@ from .superstarify import Superstarify
 
 
 def setup(bot: Bot) -> None:
-    """Load the Infractions, ModManagement, ModLog, Silence, and Superstarify cogs."""
+    """Load the Incidents, Infractions, ModManagement, ModLog, Silence, and Superstarify cogs."""
+    bot.add_cog(Incidents(bot))
     bot.add_cog(Infractions(bot))
     bot.add_cog(ModLog(bot))
     bot.add_cog(ModManagement(bot))
diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
new file mode 100644
index 000000000..2ff1e949a
--- /dev/null
+++ b/bot/cogs/moderation/incidents.py
@@ -0,0 +1,14 @@
+import logging
+
+from discord.ext.commands import Cog
+
+from bot.bot import Bot
+
+log = logging.getLogger(__name__)
+
+
+class Incidents(Cog):
+    """Automation for the #incidents channel."""
+
+    def __init__(self, bot: Bot) -> None:
+        self.bot = bot
-- 
cgit v1.2.3


From 29ab6dc350f0063bcac2218aee7c9170e83f980a Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Mon, 8 Jun 2020 23:33:58 +0200
Subject: Incidents: add new emoji constants

---
 bot/constants.py   | 4 ++++
 config-default.yml | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/bot/constants.py b/bot/constants.py
index b31a9c99e..02b82cf23 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -271,6 +271,10 @@ class Emojis(metaclass=YAMLGetter):
     status_idle: str
     status_dnd: str
 
+    incident_actioned: str
+    incident_unactioned: str
+    incident_investigating: str
+
     failmail: str
     trashcan: str
 
diff --git a/config-default.yml b/config-default.yml
index 2c85f5ef3..c59abdc39 100644
--- a/config-default.yml
+++ b/config-default.yml
@@ -38,6 +38,10 @@ style:
         status_dnd:     "<:status_dnd:470326272082313216>"
         status_offline: "<:status_offline:470326266537705472>"
 
+        incident_actioned:      "<:incident_actioned:719645530128646266>"
+        incident_unactioned:    "<:incident_unactioned:719645583245180960>"
+        incident_investigating: "<:incident_investigating:719645658671480924>"
+
         failmail: "<:failmail:633660039931887616>"
         trashcan: "<:trashcan:637136429717389331>"
 
-- 
cgit v1.2.3


From 0d3af0d52b23b3390aadf37a82e905e8ee529a90 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Mon, 8 Jun 2020 23:36:20 +0200
Subject: Incidents: create Signal enum & link members with emojis

---
 bot/cogs/moderation/incidents.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 2ff1e949a..baceddf0c 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -1,12 +1,22 @@
 import logging
+from enum import Enum
 
 from discord.ext.commands import Cog
 
 from bot.bot import Bot
+from bot.constants import Emojis
 
 log = logging.getLogger(__name__)
 
 
+class Signal(Enum):
+    """Recognized incident status signals."""
+
+    ACTIONED = Emojis.incident_actioned
+    NOT_ACTIONED = Emojis.incident_unactioned
+    INVESTIGATING = Emojis.incident_investigating
+
+
 class Incidents(Cog):
     """Automation for the #incidents channel."""
 
-- 
cgit v1.2.3


From 78782868040d1b2ca0b655efc4123b3d9b6bfda3 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sat, 23 May 2020 10:23:45 +0300
Subject: Jam Tests: Created base test layout

---
 tests/bot/cogs/test_jams.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 tests/bot/cogs/test_jams.py

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
new file mode 100644
index 000000000..33dee593e
--- /dev/null
+++ b/tests/bot/cogs/test_jams.py
@@ -0,0 +1,14 @@
+import unittest
+
+from bot.constants import Roles
+from tests.helpers import MockBot, MockContext, MockMember, MockRole
+
+
+class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
+    """Tests for `createteam` command."""
+
+    def setUp(self):
+        self.bot = MockBot()
+        self.admin_role = MockRole(name="Admins", id=Roles.admins)
+        self.command_user = MockMember([self.admin_role])
+        self.context = MockContext(bot=self.bot, author=self.command_user)
-- 
cgit v1.2.3


From 6242fbdce8935c681fa575b1c208642fe9d2635b Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sat, 23 May 2020 10:38:41 +0300
Subject: Jam Tests: Created tests for case when too small amount of members
 given

---
 tests/bot/cogs/test_jams.py | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index 33dee593e..3e71370c2 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -1,5 +1,7 @@
 import unittest
+from unittest.mock import patch
 
+from bot.cogs.jams import CodeJams
 from bot.constants import Roles
 from tests.helpers import MockBot, MockContext, MockMember, MockRole
 
@@ -11,4 +13,18 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         self.bot = MockBot()
         self.admin_role = MockRole(name="Admins", id=Roles.admins)
         self.command_user = MockMember([self.admin_role])
-        self.context = MockContext(bot=self.bot, author=self.command_user)
+        self.ctx = MockContext(bot=self.bot, author=self.command_user)
+        self.cog = CodeJams(self.bot)
+
+    @patch("bot.cogs.jams.utils")
+    async def test_too_small_amount_of_team_members_passed(self, utils_mock):
+        """Should `ctx.send` and exit early when too small amount of members."""
+        for case in (1, 2):
+            with self.subTest(amount_of_members=case):
+                self.ctx.reset_mock()
+                utils_mock.reset_mock()
+                await self.cog.createteam(
+                    self.cog, self.ctx, team_name="foo", members=(MockMember() for _ in range(case))
+                )
+                self.ctx.send.assert_awaited_once()
+                utils_mock.get.assert_not_called()
-- 
cgit v1.2.3


From a9122b781191f93f5dd375b5c1d9e7744943b464 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sat, 23 May 2020 10:46:08 +0300
Subject: Jam Tests: Created tests for removing duplicate team members

---
 tests/bot/cogs/test_jams.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index 3e71370c2..1cface1c1 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -28,3 +28,12 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
                 )
                 self.ctx.send.assert_awaited_once()
                 utils_mock.get.assert_not_called()
+
+    @patch("bot.cogs.jams.utils")
+    async def test_duplicate_members_provided(self, utils_mock):
+        """Should `ctx.send` and exit early because duplicate members provided and total there is only 1 member."""
+        self.ctx.reset_mock()
+        member = MockMember()
+        await self.cog.createteam(self.cog, self.ctx, "foo", (member for _ in range(5)))
+        self.ctx.send.assert_awaited_once()
+        utils_mock.get.assert_not_called()
-- 
cgit v1.2.3


From ebaac5988d7ff1558595008540eab5368312d170 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sat, 23 May 2020 17:57:26 +0300
Subject: Jam Tests: Created test for category creating when not exist

---
 tests/bot/cogs/test_jams.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index 1cface1c1..2153178c3 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -3,7 +3,7 @@ from unittest.mock import patch
 
 from bot.cogs.jams import CodeJams
 from bot.constants import Roles
-from tests.helpers import MockBot, MockContext, MockMember, MockRole
+from tests.helpers import MockBot, MockContext, MockGuild, MockMember, MockRole
 
 
 class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
@@ -13,7 +13,8 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         self.bot = MockBot()
         self.admin_role = MockRole(name="Admins", id=Roles.admins)
         self.command_user = MockMember([self.admin_role])
-        self.ctx = MockContext(bot=self.bot, author=self.command_user)
+        self.guild = MockGuild([self.admin_role])
+        self.ctx = MockContext(bot=self.bot, author=self.command_user, guild=self.guild)
         self.cog = CodeJams(self.bot)
 
     @patch("bot.cogs.jams.utils")
@@ -37,3 +38,14 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         await self.cog.createteam(self.cog, self.ctx, "foo", (member for _ in range(5)))
         self.ctx.send.assert_awaited_once()
         utils_mock.get.assert_not_called()
+
+    @patch("bot.cogs.jams.utils")
+    async def test_category_dont_exist(self, utils_mock):
+        """Should create code jam category."""
+        utils_mock.get.return_value = None
+        await self.cog.createteam(self.cog, self.ctx, "foo", (MockMember() for _ in range(5)))
+        self.ctx.guild.create_category_channel.assert_awaited_once()
+        category_overwrites = self.ctx.guild.create_category_channel.call_args[1]["overwrites"]
+
+        self.assertFalse(category_overwrites[self.ctx.guild.default_role].read_messages)
+        self.assertTrue(category_overwrites[self.ctx.guild.me].read_messages)
-- 
cgit v1.2.3


From 14d4eda8b1e7839b286402091ac060d3c869f447 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sat, 23 May 2020 17:58:38 +0300
Subject: Jam Tests: Added utils.get assert to category creating test

---
 tests/bot/cogs/test_jams.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index 2153178c3..f5f87761b 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -44,6 +44,7 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         """Should create code jam category."""
         utils_mock.get.return_value = None
         await self.cog.createteam(self.cog, self.ctx, "foo", (MockMember() for _ in range(5)))
+        utils_mock.get.assert_called_once()
         self.ctx.guild.create_category_channel.assert_awaited_once()
         category_overwrites = self.ctx.guild.create_category_channel.call_args[1]["overwrites"]
 
-- 
cgit v1.2.3


From 464c4bbb53101d4456314bf7a40243337525d514 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sat, 23 May 2020 18:03:17 +0300
Subject: Jam Tests: Created test that make sure when category exist, don't
 create

---
 tests/bot/cogs/test_jams.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index f5f87761b..1ce71a942 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -50,3 +50,11 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
 
         self.assertFalse(category_overwrites[self.ctx.guild.default_role].read_messages)
         self.assertTrue(category_overwrites[self.ctx.guild.me].read_messages)
+
+    @patch("bot.cogs.jams.utils")
+    async def test_category_channel_exist(self, utils_mock):
+        """Should not try to create category channel."""
+        utils_mock.return_value = "foo"
+        await self.cog.createteam(self.cog, self.ctx, "bar", (MockMember() for _ in range(5)))
+        utils_mock.get.assert_called_once()
+        self.ctx.guild.create_category_channel.assert_not_awaited()
-- 
cgit v1.2.3


From a63545510f392cf3e36e310b68792177a178b769 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sat, 23 May 2020 18:08:29 +0300
Subject: Jam Tests: Created test for creating text channel for team

---
 tests/bot/cogs/test_jams.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index 1ce71a942..9d26628ff 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -58,3 +58,8 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         await self.cog.createteam(self.cog, self.ctx, "bar", (MockMember() for _ in range(5)))
         utils_mock.get.assert_called_once()
         self.ctx.guild.create_category_channel.assert_not_awaited()
+
+    async def test_team_text_channel_creation(self):
+        """Should create text channel for team."""
+        await self.cog.createteam(self.cog, self.ctx, "bar", (MockMember() for _ in range(5)))
+        self.ctx.guild.create_text_channel.assert_awaited_once()
-- 
cgit v1.2.3


From 3df28c1b2a64bee3a52442fe42decaa960c45fde Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sat, 23 May 2020 18:18:09 +0300
Subject: Jam Tests: Created test for channel overwrites

---
 tests/bot/cogs/test_jams.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index 9d26628ff..d21c5ea29 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -63,3 +63,27 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         """Should create text channel for team."""
         await self.cog.createteam(self.cog, self.ctx, "bar", (MockMember() for _ in range(5)))
         self.ctx.guild.create_text_channel.assert_awaited_once()
+
+    async def test_channel_overwrites(self):
+        """Should have correct permission overwrites for users and roles."""
+        leader = MockMember()
+        members = [leader] + [MockMember() for _ in range(4)]
+        await self.cog.createteam(self.cog, self.ctx, "foo", members)
+        overwrites = self.ctx.guild.create_text_channel.call_args[1]["overwrites"]
+
+        # Leader permission overwrites
+        self.assertTrue(overwrites[leader].manage_messages)
+        self.assertTrue(overwrites[leader].read_messages)
+        self.assertTrue(overwrites[leader].manage_webhooks)
+        self.assertTrue(overwrites[leader].connect)
+
+        # Other members permission overwrites
+        for member in members[1:]:
+            self.assertTrue(overwrites[member].read_messages)
+            self.assertTrue(overwrites[member].connect)
+
+        # Everyone and verified role overwrite
+        self.assertFalse(overwrites[self.ctx.guild.default_role].read_messages)
+        self.assertFalse(overwrites[self.ctx.guild.default_role].connect)
+        self.assertFalse(overwrites[self.ctx.guild.get_role(Roles.verified)].read_messages)
+        self.assertFalse(overwrites[self.ctx.guild.get_role(Roles.verified)].connect)
-- 
cgit v1.2.3


From 6476d3ba6dfc28441d097aaa15a7c9e13f53f646 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sat, 23 May 2020 18:22:02 +0300
Subject: Jam Tests: Make text channel creation test more specific

---
 tests/bot/cogs/test_jams.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index d21c5ea29..94c48b995 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -59,11 +59,18 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         utils_mock.get.assert_called_once()
         self.ctx.guild.create_category_channel.assert_not_awaited()
 
-    async def test_team_text_channel_creation(self):
+    @patch("bot.cogs.jams.utils")
+    async def test_team_text_channel_creation(self, utils_mock):
         """Should create text channel for team."""
+        utils_mock.get.return_value = "foo"
         await self.cog.createteam(self.cog, self.ctx, "bar", (MockMember() for _ in range(5)))
+        # Make sure that we awaited function before getting call arguments
         self.ctx.guild.create_text_channel.assert_awaited_once()
 
+        # All other arguments is possible to get somewhere else except this
+        overwrites = self.ctx.guild.create_text_channel.call_args[1]["overwrites"]
+        self.ctx.guild.create_text_channel.assert_awaited_once_with("bar", overwrites=overwrites, category="foo")
+
     async def test_channel_overwrites(self):
         """Should have correct permission overwrites for users and roles."""
         leader = MockMember()
-- 
cgit v1.2.3


From b1359f0ed37cdbbb6bae9dbbe92e3bf0db660636 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sat, 23 May 2020 18:26:41 +0300
Subject: Jam Tests: Create test for team voice channel creating

---
 tests/bot/cogs/test_jams.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index 94c48b995..2e1419f8e 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -94,3 +94,15 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         self.assertFalse(overwrites[self.ctx.guild.default_role].connect)
         self.assertFalse(overwrites[self.ctx.guild.get_role(Roles.verified)].read_messages)
         self.assertFalse(overwrites[self.ctx.guild.get_role(Roles.verified)].connect)
+
+    @patch("bot.cogs.jams.utils")
+    async def test_team_voice_channel_creation(self, utils_mock):
+        """Should create new voice channel for team."""
+        utils_mock.get.return_value = "foo"
+        await self.cog.createteam(self.cog, self.ctx, "my-team", (MockMember() for _ in range(5)))
+        # Make sure that we awaited function before getting call arguments
+        self.ctx.guild.create_voice_channel.assert_awaited_once()
+
+        # All other arguments is possible to get somewhere else except this
+        overwrites = self.ctx.guild.create_voice_channel.call_args[1]["overwrites"]
+        self.ctx.guild.create_voice_channel.assert_awaited_once_with("My Team", overwrites=overwrites, category="foo")
-- 
cgit v1.2.3


From b5b05adc41e55dd58810608f4ac7ade6281cdf84 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sat, 23 May 2020 18:37:27 +0300
Subject: Jam Tests: Create test for team jam roles adding

---
 tests/bot/cogs/test_jams.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index 2e1419f8e..16caa98c6 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -106,3 +106,17 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         # All other arguments is possible to get somewhere else except this
         overwrites = self.ctx.guild.create_voice_channel.call_args[1]["overwrites"]
         self.ctx.guild.create_voice_channel.assert_awaited_once_with("My Team", overwrites=overwrites, category="foo")
+
+    async def test_jam_roles_adding(self):
+        """Should add team leader role to leader and jam role to every team member."""
+        leader_role = MockRole(name="Team Leader")
+        jam_role = MockRole(name="Jammer")
+        self.ctx.guild.get_role.side_effect = [MockRole(), leader_role, jam_role]
+
+        leader = MockMember()
+        members = [leader] + [MockMember() for _ in range(4)]
+        await self.cog.createteam(self.cog, self.ctx, "foo", members)
+
+        leader.add_roles.assert_any_await(leader_role)
+        for member in members:
+            member.add_roles.assert_any_await(jam_role)
-- 
cgit v1.2.3


From 76ad4d141027f6351e2feedc466c8acc805f671d Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sat, 23 May 2020 18:39:13 +0300
Subject: Jam Tests: Create test for successful `ctx.send` calling

---
 tests/bot/cogs/test_jams.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index 16caa98c6..7db66ff11 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -120,3 +120,9 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         leader.add_roles.assert_any_await(leader_role)
         for member in members:
             member.add_roles.assert_any_await(jam_role)
+
+    async def test_result_sending(self):
+        """Should call `ctx.send` when everything go right."""
+        self.ctx.reset_mock()
+        await self.cog.createteam(self.cog, self.ctx, "foo", (MockMember() for _ in range(5)))
+        self.ctx.send.assert_awaited_once()
-- 
cgit v1.2.3


From bbe4f137bd583d66a6bcb03102327bc6c586af86 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sat, 23 May 2020 18:42:03 +0300
Subject: Jam Tests: Create test for `setup` function

---
 tests/bot/cogs/test_jams.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index 7db66ff11..2c5cef835 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -1,7 +1,7 @@
 import unittest
 from unittest.mock import patch
 
-from bot.cogs.jams import CodeJams
+from bot.cogs.jams import CodeJams, setup
 from bot.constants import Roles
 from tests.helpers import MockBot, MockContext, MockGuild, MockMember, MockRole
 
@@ -126,3 +126,13 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         self.ctx.reset_mock()
         await self.cog.createteam(self.cog, self.ctx, "foo", (MockMember() for _ in range(5)))
         self.ctx.send.assert_awaited_once()
+
+
+class CodeJamSetup(unittest.TestCase):
+    """Test for `setup` function of `CodeJam` cog."""
+
+    def test_setup(self):
+        """Should call `bot.add_cog`."""
+        bot = MockBot()
+        setup(bot)
+        bot.add_cog.assert_called_once()
-- 
cgit v1.2.3


From 5ca860fb3b2bcb77ab8574d83e8159df471f0faf Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Thu, 11 Jun 2020 08:54:07 +0300
Subject: Jam Tests: Fix `test_result_sending` docstring

Co-authored-by: Mark <kozlovmark@gmail.com>
---
 tests/bot/cogs/test_jams.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index 2c5cef835..51720d957 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -122,7 +122,7 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
             member.add_roles.assert_any_await(jam_role)
 
     async def test_result_sending(self):
-        """Should call `ctx.send` when everything go right."""
+        """Should call `ctx.send` when everything goes right."""
         self.ctx.reset_mock()
         await self.cog.createteam(self.cog, self.ctx, "foo", (MockMember() for _ in range(5)))
         self.ctx.send.assert_awaited_once()
-- 
cgit v1.2.3


From 28f33584b65b1f9d7e7254b4822d8896c7f19284 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Thu, 11 Jun 2020 09:26:43 +0300
Subject: Jam Tests: Use class member of patch instead decorator on most of
 tests

---
 tests/bot/cogs/test_jams.py | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index 51720d957..bf542458b 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -16,53 +16,52 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         self.guild = MockGuild([self.admin_role])
         self.ctx = MockContext(bot=self.bot, author=self.command_user, guild=self.guild)
         self.cog = CodeJams(self.bot)
+        self.utils_mock = patch("bot.cogs.jams.utils").start()
 
-    @patch("bot.cogs.jams.utils")
-    async def test_too_small_amount_of_team_members_passed(self, utils_mock):
+    def tearDown(self):
+        self.utils_mock.stop()
+
+    async def test_too_small_amount_of_team_members_passed(self):
         """Should `ctx.send` and exit early when too small amount of members."""
         for case in (1, 2):
             with self.subTest(amount_of_members=case):
                 self.ctx.reset_mock()
-                utils_mock.reset_mock()
+                self.utils_mock.reset_mock()
                 await self.cog.createteam(
                     self.cog, self.ctx, team_name="foo", members=(MockMember() for _ in range(case))
                 )
                 self.ctx.send.assert_awaited_once()
-                utils_mock.get.assert_not_called()
+                self.utils_mock.get.assert_not_called()
 
-    @patch("bot.cogs.jams.utils")
-    async def test_duplicate_members_provided(self, utils_mock):
+    async def test_duplicate_members_provided(self):
         """Should `ctx.send` and exit early because duplicate members provided and total there is only 1 member."""
         self.ctx.reset_mock()
         member = MockMember()
         await self.cog.createteam(self.cog, self.ctx, "foo", (member for _ in range(5)))
         self.ctx.send.assert_awaited_once()
-        utils_mock.get.assert_not_called()
+        self.utils_mock.get.assert_not_called()
 
-    @patch("bot.cogs.jams.utils")
-    async def test_category_dont_exist(self, utils_mock):
+    async def test_category_dont_exist(self):
         """Should create code jam category."""
-        utils_mock.get.return_value = None
+        self.utils_mock.get.return_value = None
         await self.cog.createteam(self.cog, self.ctx, "foo", (MockMember() for _ in range(5)))
-        utils_mock.get.assert_called_once()
+        self.utils_mock.get.assert_called_once()
         self.ctx.guild.create_category_channel.assert_awaited_once()
         category_overwrites = self.ctx.guild.create_category_channel.call_args[1]["overwrites"]
 
         self.assertFalse(category_overwrites[self.ctx.guild.default_role].read_messages)
         self.assertTrue(category_overwrites[self.ctx.guild.me].read_messages)
 
-    @patch("bot.cogs.jams.utils")
-    async def test_category_channel_exist(self, utils_mock):
+    async def test_category_channel_exist(self):
         """Should not try to create category channel."""
-        utils_mock.return_value = "foo"
+        self.utils_mock.return_value = "foo"
         await self.cog.createteam(self.cog, self.ctx, "bar", (MockMember() for _ in range(5)))
-        utils_mock.get.assert_called_once()
+        self.utils_mock.get.assert_called_once()
         self.ctx.guild.create_category_channel.assert_not_awaited()
 
-    @patch("bot.cogs.jams.utils")
-    async def test_team_text_channel_creation(self, utils_mock):
+    async def test_team_text_channel_creation(self):
         """Should create text channel for team."""
-        utils_mock.get.return_value = "foo"
+        self.utils_mock.get.return_value = "foo"
         await self.cog.createteam(self.cog, self.ctx, "bar", (MockMember() for _ in range(5)))
         # Make sure that we awaited function before getting call arguments
         self.ctx.guild.create_text_channel.assert_awaited_once()
@@ -95,10 +94,9 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         self.assertFalse(overwrites[self.ctx.guild.get_role(Roles.verified)].read_messages)
         self.assertFalse(overwrites[self.ctx.guild.get_role(Roles.verified)].connect)
 
-    @patch("bot.cogs.jams.utils")
-    async def test_team_voice_channel_creation(self, utils_mock):
+    async def test_team_voice_channel_creation(self):
         """Should create new voice channel for team."""
-        utils_mock.get.return_value = "foo"
+        self.utils_mock.get.return_value = "foo"
         await self.cog.createteam(self.cog, self.ctx, "my-team", (MockMember() for _ in range(5)))
         # Make sure that we awaited function before getting call arguments
         self.ctx.guild.create_voice_channel.assert_awaited_once()
-- 
cgit v1.2.3


From 930eaebc185806c25335d9a83c5e0e7f3fddedf4 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Thu, 11 Jun 2020 09:32:44 +0300
Subject: Jams: Move category checking and creation to another function

---
 bot/cogs/jams.py | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/bot/cogs/jams.py b/bot/cogs/jams.py
index 1d062b0c2..0ebff5428 100644
--- a/bot/cogs/jams.py
+++ b/bot/cogs/jams.py
@@ -1,6 +1,6 @@
 import logging
 
-from discord import Member, PermissionOverwrite, utils
+from discord import CategoryChannel, Member, PermissionOverwrite, utils
 from discord.ext import commands
 from more_itertools import unique_everseen
 
@@ -40,21 +40,7 @@ class CodeJams(commands.Cog):
             )
             return
 
-        code_jam_category = utils.get(ctx.guild.categories, name="Code Jam")
-
-        if code_jam_category is None:
-            log.info("Code Jam category not found, creating it.")
-
-            category_overwrites = {
-                ctx.guild.default_role: PermissionOverwrite(read_messages=False),
-                ctx.guild.me: PermissionOverwrite(read_messages=True)
-            }
-
-            code_jam_category = await ctx.guild.create_category_channel(
-                "Code Jam",
-                overwrites=category_overwrites,
-                reason="It's code jam time!"
-            )
+        code_jam_category = await self.get_category(ctx)
 
         # First member is always the team leader
         team_channel_overwrites = {
@@ -108,6 +94,26 @@ class CodeJams(commands.Cog):
             f"**Team Members:** {' '.join(member.mention for member in members[1:])}"
         )
 
+    async def get_category(self, ctx: commands.Context) -> CategoryChannel:
+        """Create Code Jam category when this don't exist and return this."""
+        code_jam_category = utils.get(ctx.guild.categories, name="Code Jam")
+
+        if code_jam_category is None:
+            log.info("Code Jam category not found, creating it.")
+
+            category_overwrites = {
+                ctx.guild.default_role: PermissionOverwrite(read_messages=False),
+                ctx.guild.me: PermissionOverwrite(read_messages=True)
+            }
+
+            code_jam_category = await ctx.guild.create_category_channel(
+                "Code Jam",
+                overwrites=category_overwrites,
+                reason="It's code jam time!"
+            )
+
+        return code_jam_category
+
 
 def setup(bot: Bot) -> None:
     """Load the CodeJams cog."""
-- 
cgit v1.2.3


From 4b194e288aaca445947ad7df2c2202989f76a076 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Thu, 11 Jun 2020 09:36:38 +0300
Subject: Jams: Move overwrites generation to outside of command

---
 bot/cogs/jams.py | 50 ++++++++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/bot/cogs/jams.py b/bot/cogs/jams.py
index 0ebff5428..2b4575d5f 100644
--- a/bot/cogs/jams.py
+++ b/bot/cogs/jams.py
@@ -1,4 +1,5 @@
 import logging
+import typing as t
 
 from discord import CategoryChannel, Member, PermissionOverwrite, utils
 from discord.ext import commands
@@ -41,28 +42,7 @@ class CodeJams(commands.Cog):
             return
 
         code_jam_category = await self.get_category(ctx)
-
-        # First member is always the team leader
-        team_channel_overwrites = {
-            members[0]: PermissionOverwrite(
-                manage_messages=True,
-                read_messages=True,
-                manage_webhooks=True,
-                connect=True
-            ),
-            ctx.guild.default_role: PermissionOverwrite(read_messages=False, connect=False),
-            ctx.guild.get_role(Roles.verified): PermissionOverwrite(
-                read_messages=False,
-                connect=False
-            )
-        }
-
-        # Rest of members should just have read_messages
-        for member in members[1:]:
-            team_channel_overwrites[member] = PermissionOverwrite(
-                read_messages=True,
-                connect=True
-            )
+        team_channel_overwrites = self.get_overwrites(members, ctx)
 
         # Create a text channel for the team
         team_channel = await ctx.guild.create_text_channel(
@@ -114,6 +94,32 @@ class CodeJams(commands.Cog):
 
         return code_jam_category
 
+    def get_overwrites(self, members: t.List[Member], ctx: commands.Context) -> t.Dict[Member, PermissionOverwrite]:
+        """Get Code Jam team channels permission overwrites."""
+        # First member is always the team leader
+        team_channel_overwrites = {
+            members[0]: PermissionOverwrite(
+                manage_messages=True,
+                read_messages=True,
+                manage_webhooks=True,
+                connect=True
+            ),
+            ctx.guild.default_role: PermissionOverwrite(read_messages=False, connect=False),
+            ctx.guild.get_role(Roles.verified): PermissionOverwrite(
+                read_messages=False,
+                connect=False
+            )
+        }
+
+        # Rest of members should just have read_messages
+        for member in members[1:]:
+            team_channel_overwrites[member] = PermissionOverwrite(
+                read_messages=True,
+                connect=True
+            )
+
+        return team_channel_overwrites
+
 
 def setup(bot: Bot) -> None:
     """Load the CodeJams cog."""
-- 
cgit v1.2.3


From e8ef1b0f7ae9426da8be66fdeb6cecc81870c070 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Thu, 11 Jun 2020 09:44:20 +0300
Subject: Jams: Move channels creation to new function instead inside command

---
 bot/cogs/jams.py | 45 ++++++++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/bot/cogs/jams.py b/bot/cogs/jams.py
index 2b4575d5f..9089dcec2 100644
--- a/bot/cogs/jams.py
+++ b/bot/cogs/jams.py
@@ -41,24 +41,7 @@ class CodeJams(commands.Cog):
             )
             return
 
-        code_jam_category = await self.get_category(ctx)
-        team_channel_overwrites = self.get_overwrites(members, ctx)
-
-        # Create a text channel for the team
-        team_channel = await ctx.guild.create_text_channel(
-            team_name,
-            overwrites=team_channel_overwrites,
-            category=code_jam_category
-        )
-
-        # Create a voice channel for the team
-        team_voice_name = " ".join(team_name.split("-")).title()
-
-        await ctx.guild.create_voice_channel(
-            team_voice_name,
-            overwrites=team_channel_overwrites,
-            category=code_jam_category
-        )
+        team_channel = await self.create_channels(ctx, team_name, members)
 
         # Assign team leader role
         await members[0].add_roles(ctx.guild.get_role(Roles.team_leaders))
@@ -69,7 +52,7 @@ class CodeJams(commands.Cog):
             await member.add_roles(jammer_role)
 
         await ctx.send(
-            f":ok_hand: Team created: {team_channel.mention}\n"
+            f":ok_hand: Team created: {team_channel}\n"
             f"**Team Leader:** {members[0].mention}\n"
             f"**Team Members:** {' '.join(member.mention for member in members[1:])}"
         )
@@ -120,6 +103,30 @@ class CodeJams(commands.Cog):
 
         return team_channel_overwrites
 
+    async def create_channels(self, ctx: commands.Context, team_name: str, members: t.List[Member]) -> str:
+        """Create team text and voice channel. Return name of text channel."""
+        # Get permission overwrites and category
+        team_channel_overwrites = self.get_overwrites(members, ctx)
+        code_jam_category = await self.get_category(ctx)
+
+        # Create a text channel for the team
+        team_channel = await ctx.guild.create_text_channel(
+            team_name,
+            overwrites=team_channel_overwrites,
+            category=code_jam_category
+        )
+
+        # Create a voice channel for the team
+        team_voice_name = " ".join(team_name.split("-")).title()
+
+        await ctx.guild.create_voice_channel(
+            team_voice_name,
+            overwrites=team_channel_overwrites,
+            category=code_jam_category
+        )
+
+        return str(team_channel)
+
 
 def setup(bot: Bot) -> None:
     """Load the CodeJams cog."""
-- 
cgit v1.2.3


From 9719612995f2cd7e5b976031bbfd6a1591d76f23 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Thu, 11 Jun 2020 09:45:31 +0300
Subject: Jams: Change return plain text to channel mention in
 `create_channels`

---
 bot/cogs/jams.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/cogs/jams.py b/bot/cogs/jams.py
index 9089dcec2..5576adb2d 100644
--- a/bot/cogs/jams.py
+++ b/bot/cogs/jams.py
@@ -125,7 +125,7 @@ class CodeJams(commands.Cog):
             category=code_jam_category
         )
 
-        return str(team_channel)
+        return team_channel.mention
 
 
 def setup(bot: Bot) -> None:
-- 
cgit v1.2.3


From 8419531b899fbebb2a1f3378b4e1a98a0f45d812 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Thu, 11 Jun 2020 10:49:47 +0300
Subject: Jams: Move roles adding to another function from inside of command

---
 bot/cogs/jams.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/bot/cogs/jams.py b/bot/cogs/jams.py
index 5576adb2d..4173f10fd 100644
--- a/bot/cogs/jams.py
+++ b/bot/cogs/jams.py
@@ -42,14 +42,7 @@ class CodeJams(commands.Cog):
             return
 
         team_channel = await self.create_channels(ctx, team_name, members)
-
-        # Assign team leader role
-        await members[0].add_roles(ctx.guild.get_role(Roles.team_leaders))
-
-        # Assign rest of roles
-        jammer_role = ctx.guild.get_role(Roles.jammers)
-        for member in members:
-            await member.add_roles(jammer_role)
+        await self.add_roles(ctx, members)
 
         await ctx.send(
             f":ok_hand: Team created: {team_channel}\n"
@@ -127,6 +120,16 @@ class CodeJams(commands.Cog):
 
         return team_channel.mention
 
+    async def add_roles(self, ctx: commands.Context, members: t.List[Member]) -> None:
+        """Assign team leader and jammer roles."""
+        # Assign team leader role
+        await members[0].add_roles(ctx.guild.get_role(Roles.team_leaders))
+
+        # Assign rest of roles
+        jammer_role = ctx.guild.get_role(Roles.jammers)
+        for member in members:
+            await member.add_roles(jammer_role)
+
 
 def setup(bot: Bot) -> None:
     """Load the CodeJams cog."""
-- 
cgit v1.2.3


From d3d031fab124b8f147674a2560ae402d469ddb4e Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Thu, 11 Jun 2020 11:13:10 +0300
Subject: Jams: Convert some functions to staticmethod

---
 bot/cogs/jams.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bot/cogs/jams.py b/bot/cogs/jams.py
index 4173f10fd..16dda35c8 100644
--- a/bot/cogs/jams.py
+++ b/bot/cogs/jams.py
@@ -50,7 +50,8 @@ class CodeJams(commands.Cog):
             f"**Team Members:** {' '.join(member.mention for member in members[1:])}"
         )
 
-    async def get_category(self, ctx: commands.Context) -> CategoryChannel:
+    @staticmethod
+    async def get_category(ctx: commands.Context) -> CategoryChannel:
         """Create Code Jam category when this don't exist and return this."""
         code_jam_category = utils.get(ctx.guild.categories, name="Code Jam")
 
@@ -70,7 +71,8 @@ class CodeJams(commands.Cog):
 
         return code_jam_category
 
-    def get_overwrites(self, members: t.List[Member], ctx: commands.Context) -> t.Dict[Member, PermissionOverwrite]:
+    @staticmethod
+    def get_overwrites(members: t.List[Member], ctx: commands.Context) -> t.Dict[Member, PermissionOverwrite]:
         """Get Code Jam team channels permission overwrites."""
         # First member is always the team leader
         team_channel_overwrites = {
@@ -120,7 +122,8 @@ class CodeJams(commands.Cog):
 
         return team_channel.mention
 
-    async def add_roles(self, ctx: commands.Context, members: t.List[Member]) -> None:
+    @staticmethod
+    async def add_roles(ctx: commands.Context, members: t.List[Member]) -> None:
         """Assign team leader and jammer roles."""
         # Assign team leader role
         await members[0].add_roles(ctx.guild.get_role(Roles.team_leaders))
-- 
cgit v1.2.3


From 1c860606a122ff1378cb55e228312acb2bb2d49e Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Thu, 11 Jun 2020 11:16:50 +0300
Subject: Jam Tests: Make early exiting test more secure

---
 tests/bot/cogs/test_jams.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index bf542458b..98fa12f66 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -1,5 +1,5 @@
 import unittest
-from unittest.mock import patch
+from unittest.mock import AsyncMock, patch
 
 from bot.cogs.jams import CodeJams, setup
 from bot.constants import Roles
@@ -25,13 +25,17 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         """Should `ctx.send` and exit early when too small amount of members."""
         for case in (1, 2):
             with self.subTest(amount_of_members=case):
+                self.cog.create_channels = AsyncMock()
+                self.cog.add_roles = AsyncMock()
+
                 self.ctx.reset_mock()
                 self.utils_mock.reset_mock()
                 await self.cog.createteam(
                     self.cog, self.ctx, team_name="foo", members=(MockMember() for _ in range(case))
                 )
                 self.ctx.send.assert_awaited_once()
-                self.utils_mock.get.assert_not_called()
+                self.cog.create_channels.assert_not_awaited()
+                self.cog.add_roles.assert_not_awaited()
 
     async def test_duplicate_members_provided(self):
         """Should `ctx.send` and exit early because duplicate members provided and total there is only 1 member."""
-- 
cgit v1.2.3


From fd05997c1aa9054024ad62dc0cbf19c1a296f4b7 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Thu, 11 Jun 2020 11:22:52 +0300
Subject: Jam Tests: Add more assertions to result message sending test

---
 tests/bot/cogs/test_jams.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index 98fa12f66..4307d7deb 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -126,8 +126,14 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
     async def test_result_sending(self):
         """Should call `ctx.send` when everything goes right."""
         self.ctx.reset_mock()
-        await self.cog.createteam(self.cog, self.ctx, "foo", (MockMember() for _ in range(5)))
+        members = [MockMember() for _ in range(5)]
+        await self.cog.createteam(self.cog, self.ctx, "foo", members)
         self.ctx.send.assert_awaited_once()
+        sent_string = self.ctx.send.call_args[0][0]
+
+        self.assertIn(str(self.ctx.guild.create_text_channel.return_value.mention), sent_string)
+        self.assertIn(members[0].mention, sent_string)
+        self.assertIn(" ".join(member.mention for member in members[1:]), sent_string)
 
 
 class CodeJamSetup(unittest.TestCase):
-- 
cgit v1.2.3


From fa4783c5e15709625e21d6a1aa766664eb2423e2 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Thu, 11 Jun 2020 11:24:27 +0300
Subject: Jam Tests: Apply recent changes to overwrites test

---
 tests/bot/cogs/test_jams.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index 4307d7deb..1cbff2674 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -78,8 +78,7 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         """Should have correct permission overwrites for users and roles."""
         leader = MockMember()
         members = [leader] + [MockMember() for _ in range(4)]
-        await self.cog.createteam(self.cog, self.ctx, "foo", members)
-        overwrites = self.ctx.guild.create_text_channel.call_args[1]["overwrites"]
+        overwrites = self.cog.get_overwrites(members, self.ctx)
 
         # Leader permission overwrites
         self.assertTrue(overwrites[leader].manage_messages)
-- 
cgit v1.2.3


From 0d2b61fd72f7b44d0534901c8f2e6ee3ccaad3f7 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Thu, 11 Jun 2020 11:36:11 +0300
Subject: Jam Tests: Merge text and voice channel creation tests

---
 tests/bot/cogs/test_jams.py | 45 ++++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index 1cbff2674..54f906ed9 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -1,9 +1,9 @@
 import unittest
-from unittest.mock import AsyncMock, patch
+from unittest.mock import AsyncMock, MagicMock, patch
 
 from bot.cogs.jams import CodeJams, setup
 from bot.constants import Roles
-from tests.helpers import MockBot, MockContext, MockGuild, MockMember, MockRole
+from tests.helpers import MockBot, MockContext, MockGuild, MockMember, MockRole, MockTextChannel
 
 
 class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
@@ -63,17 +63,6 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         self.utils_mock.get.assert_called_once()
         self.ctx.guild.create_category_channel.assert_not_awaited()
 
-    async def test_team_text_channel_creation(self):
-        """Should create text channel for team."""
-        self.utils_mock.get.return_value = "foo"
-        await self.cog.createteam(self.cog, self.ctx, "bar", (MockMember() for _ in range(5)))
-        # Make sure that we awaited function before getting call arguments
-        self.ctx.guild.create_text_channel.assert_awaited_once()
-
-        # All other arguments is possible to get somewhere else except this
-        overwrites = self.ctx.guild.create_text_channel.call_args[1]["overwrites"]
-        self.ctx.guild.create_text_channel.assert_awaited_once_with("bar", overwrites=overwrites, category="foo")
-
     async def test_channel_overwrites(self):
         """Should have correct permission overwrites for users and roles."""
         leader = MockMember()
@@ -97,16 +86,30 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         self.assertFalse(overwrites[self.ctx.guild.get_role(Roles.verified)].read_messages)
         self.assertFalse(overwrites[self.ctx.guild.get_role(Roles.verified)].connect)
 
-    async def test_team_voice_channel_creation(self):
-        """Should create new voice channel for team."""
+    async def test_team_channels_creation(self):
+        """Should create new voice and text channel for team."""
         self.utils_mock.get.return_value = "foo"
-        await self.cog.createteam(self.cog, self.ctx, "my-team", (MockMember() for _ in range(5)))
-        # Make sure that we awaited function before getting call arguments
-        self.ctx.guild.create_voice_channel.assert_awaited_once()
+        members = [MockMember() for _ in range(5)]
 
-        # All other arguments is possible to get somewhere else except this
-        overwrites = self.ctx.guild.create_voice_channel.call_args[1]["overwrites"]
-        self.ctx.guild.create_voice_channel.assert_awaited_once_with("My Team", overwrites=overwrites, category="foo")
+        self.cog.get_overwrites = MagicMock()
+        self.cog.get_category = AsyncMock()
+        self.ctx.guild.create_text_channel.return_value = MockTextChannel(mention="foobar-channel")
+        actual = await self.cog.create_channels(self.ctx, "my-team", members)
+
+        self.assertEqual("foobar-channel", actual)
+        self.cog.get_overwrites.assert_called_once_with(members, self.ctx)
+        self.cog.get_category.assert_awaited_once_with(self.ctx)
+
+        self.ctx.guild.create_text_channel.assert_awaited_once_with(
+            "my-team",
+            overwrites=self.cog.get_overwrites.return_value,
+            category=self.cog.get_category.return_value
+        )
+        self.ctx.guild.create_voice_channel.assert_awaited_once_with(
+            "My Team",
+            overwrites=self.cog.get_overwrites.return_value,
+            category=self.cog.get_category.return_value
+        )
 
     async def test_jam_roles_adding(self):
         """Should add team leader role to leader and jam role to every team member."""
-- 
cgit v1.2.3


From 4af2be7310141ab3ddc34a2184366c0d8212cdd5 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Thu, 11 Jun 2020 11:39:46 +0300
Subject: Jam Tests: Simplify and update `test_category_channel_exist`

---
 tests/bot/cogs/test_jams.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index 54f906ed9..ae3e35dbb 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -58,9 +58,7 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
 
     async def test_category_channel_exist(self):
         """Should not try to create category channel."""
-        self.utils_mock.return_value = "foo"
-        await self.cog.createteam(self.cog, self.ctx, "bar", (MockMember() for _ in range(5)))
-        self.utils_mock.get.assert_called_once()
+        await self.cog.get_category(self.ctx)
         self.ctx.guild.create_category_channel.assert_not_awaited()
 
     async def test_channel_overwrites(self):
-- 
cgit v1.2.3


From ea91aefe55bf52fca6714897347bb24d4a4efb5b Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Thu, 11 Jun 2020 11:41:25 +0300
Subject: Jam Tests: Apply recent changes to `test_category_dont_exist`

---
 tests/bot/cogs/test_jams.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index ae3e35dbb..ecd06179f 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -48,8 +48,7 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
     async def test_category_dont_exist(self):
         """Should create code jam category."""
         self.utils_mock.get.return_value = None
-        await self.cog.createteam(self.cog, self.ctx, "foo", (MockMember() for _ in range(5)))
-        self.utils_mock.get.assert_called_once()
+        await self.cog.get_category(self.ctx)
         self.ctx.guild.create_category_channel.assert_awaited_once()
         category_overwrites = self.ctx.guild.create_category_channel.call_args[1]["overwrites"]
 
-- 
cgit v1.2.3


From 6e070a43f616f898e328bfc4581ed48551e73b12 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Thu, 11 Jun 2020 11:47:13 +0300
Subject: Jam Tests: Implement default arguments

To avoid repeating same arguments, added default arguments that is
unpacked on function call.
---
 tests/bot/cogs/test_jams.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index ecd06179f..94be8dd03 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -17,6 +17,7 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         self.ctx = MockContext(bot=self.bot, author=self.command_user, guild=self.guild)
         self.cog = CodeJams(self.bot)
         self.utils_mock = patch("bot.cogs.jams.utils").start()
+        self.default_args = [self.cog, self.ctx, "foo"]
 
     def tearDown(self):
         self.utils_mock.stop()
@@ -30,9 +31,8 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
 
                 self.ctx.reset_mock()
                 self.utils_mock.reset_mock()
-                await self.cog.createteam(
-                    self.cog, self.ctx, team_name="foo", members=(MockMember() for _ in range(case))
-                )
+                await self.cog.createteam(*self.default_args, (MockMember() for _ in range(case)))
+
                 self.ctx.send.assert_awaited_once()
                 self.cog.create_channels.assert_not_awaited()
                 self.cog.add_roles.assert_not_awaited()
@@ -41,7 +41,7 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         """Should `ctx.send` and exit early because duplicate members provided and total there is only 1 member."""
         self.ctx.reset_mock()
         member = MockMember()
-        await self.cog.createteam(self.cog, self.ctx, "foo", (member for _ in range(5)))
+        await self.cog.createteam(*self.default_args, (member for _ in range(5)))
         self.ctx.send.assert_awaited_once()
         self.utils_mock.get.assert_not_called()
 
-- 
cgit v1.2.3


From b129658bf260d458d5fad5925e945c78f881388a Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Thu, 11 Jun 2020 11:49:00 +0300
Subject: Jam Tests: Remove unnecessary `Context` mock resets

---
 tests/bot/cogs/test_jams.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index 94be8dd03..0f8ba3574 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -39,7 +39,6 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
 
     async def test_duplicate_members_provided(self):
         """Should `ctx.send` and exit early because duplicate members provided and total there is only 1 member."""
-        self.ctx.reset_mock()
         member = MockMember()
         await self.cog.createteam(*self.default_args, (member for _ in range(5)))
         self.ctx.send.assert_awaited_once()
@@ -124,7 +123,6 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
 
     async def test_result_sending(self):
         """Should call `ctx.send` when everything goes right."""
-        self.ctx.reset_mock()
         members = [MockMember() for _ in range(5)]
         await self.cog.createteam(self.cog, self.ctx, "foo", members)
         self.ctx.send.assert_awaited_once()
-- 
cgit v1.2.3


From 0481bcc1d99dd9d7fe9d41276599437b11670b27 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Thu, 11 Jun 2020 11:50:40 +0300
Subject: Jam Tests: Apply recent command splitting to `test_jam_roles_adding`

---
 tests/bot/cogs/test_jams.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index 0f8ba3574..54fe0b5f2 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -111,11 +111,11 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         """Should add team leader role to leader and jam role to every team member."""
         leader_role = MockRole(name="Team Leader")
         jam_role = MockRole(name="Jammer")
-        self.ctx.guild.get_role.side_effect = [MockRole(), leader_role, jam_role]
+        self.ctx.guild.get_role.side_effect = [leader_role, jam_role]
 
         leader = MockMember()
         members = [leader] + [MockMember() for _ in range(4)]
-        await self.cog.createteam(self.cog, self.ctx, "foo", members)
+        await self.cog.add_roles(self.ctx, members)
 
         leader.add_roles.assert_any_await(leader_role)
         for member in members:
-- 
cgit v1.2.3


From f4767769afc8c6dfe4ac81d4e9b9e02f2f58054c Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Thu, 11 Jun 2020 18:06:59 +0200
Subject: Incidents: add #incidents-archive channel constant

---
 bot/constants.py   | 1 +
 config-default.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/bot/constants.py b/bot/constants.py
index 02b82cf23..02c8adf43 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -401,6 +401,7 @@ class Channels(metaclass=YAMLGetter):
     helpers: int
     how_to_get_help: int
     incidents: int
+    incidents_archive: int
     message_log: int
     meta: int
     mod_alerts: int
diff --git a/config-default.yml b/config-default.yml
index c59abdc39..a68647f72 100644
--- a/config-default.yml
+++ b/config-default.yml
@@ -176,6 +176,7 @@ guild:
         organisation:       &ORGANISATION   551789653284356126
         staff_lounge:       &STAFF_LOUNGE   464905259261755392
         incidents:                          714214212200562749
+        incidents_archive:                  720668923636351037
 
         # Voice
         admins_voice:       &ADMINS_VOICE   500734494840717332
-- 
cgit v1.2.3


From 5db3a82de9f37d769ed8983c83063dfdd6878fee Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Thu, 11 Jun 2020 18:26:21 +0200
Subject: Incidents: add #incidents-archive webhook constant

---
 bot/constants.py   | 1 +
 config-default.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bot/constants.py b/bot/constants.py
index 02c8adf43..c663db333 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -430,6 +430,7 @@ class Webhooks(metaclass=YAMLGetter):
     reddit: int
     duck_pond: int
     dev_log: int
+    incidents_archive: int
 
 
 class Roles(metaclass=YAMLGetter):
diff --git a/config-default.yml b/config-default.yml
index a68647f72..974ce508d 100644
--- a/config-default.yml
+++ b/config-default.yml
@@ -255,7 +255,7 @@ guild:
         duck_pond:                      637821475327311927
         dev_log:                        680501655111729222
         python_news:    &PYNEWS_WEBHOOK 704381182279942324
-
+        incidents_archive:              720671599790915702
 
 filter:
 
-- 
cgit v1.2.3


From d520203717b8aaa6358071978a1ac9a23418d1c9 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Thu, 11 Jun 2020 18:45:50 +0200
Subject: Incidents: define allowed roles and emoji

These serve as whitelists, i.e. any reaction using an emoji not
explicitly allowed, or from a user not specifically allowed,
will be rejected. Such reactions will be removed by the bot.
---
 bot/cogs/moderation/incidents.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index baceddf0c..49180da7c 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -4,7 +4,7 @@ from enum import Enum
 from discord.ext.commands import Cog
 
 from bot.bot import Bot
-from bot.constants import Emojis
+from bot.constants import Emojis, Roles
 
 log = logging.getLogger(__name__)
 
@@ -17,6 +17,10 @@ class Signal(Enum):
     INVESTIGATING = Emojis.incident_investigating
 
 
+ALLOWED_ROLES: t.Set[int] = {Roles.moderators, Roles.admins, Roles.owners}
+ALLOWED_EMOJI: t.Set[str] = {signal.value for signal in Signal}
+
+
 class Incidents(Cog):
     """Automation for the #incidents channel."""
 
-- 
cgit v1.2.3


From 3195d16cf16f80dca6b66b87bc7b954d10d60e7a Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 12 Jun 2020 13:25:02 +0200
Subject: Incidents: define method stubs for message event handling

---
 bot/cogs/moderation/incidents.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 49180da7c..c85a68a14 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -1,6 +1,7 @@
 import logging
 from enum import Enum
 
+import discord
 from discord.ext.commands import Cog
 
 from bot.bot import Bot
@@ -26,3 +27,12 @@ class Incidents(Cog):
 
     def __init__(self, bot: Bot) -> None:
         self.bot = bot
+
+    async def add_signals(self, incident: discord.Message) -> None:
+        """Add `Signal` member emoji to `incident` as reactions."""
+        ...
+
+    @Cog.listener()
+    async def on_message(self, message: discord.Message) -> None:
+        """Pass each incident sent in #incidents to `add_signals`."""
+        ...
-- 
cgit v1.2.3


From 781d8f8d4bc76cb2ca9db4f3b7149d11892e714b Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 12 Jun 2020 13:28:32 +0200
Subject: Incidents: implement `add_signals` helper

Looks like it can be static, at least for now.
---
 bot/cogs/moderation/incidents.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index c85a68a14..2424c008d 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -1,4 +1,5 @@
 import logging
+import typing as t
 from enum import Enum
 
 import discord
@@ -28,9 +29,12 @@ class Incidents(Cog):
     def __init__(self, bot: Bot) -> None:
         self.bot = bot
 
-    async def add_signals(self, incident: discord.Message) -> None:
+    @staticmethod
+    async def add_signals(incident: discord.Message) -> None:
         """Add `Signal` member emoji to `incident` as reactions."""
-        ...
+        for signal_emoji in Signal:
+            log.debug(f"Adding reaction: {signal_emoji.value}")
+            await incident.add_reaction(signal_emoji.value)
 
     @Cog.listener()
     async def on_message(self, message: discord.Message) -> None:
-- 
cgit v1.2.3


From e8bb1aa59dece803a920efb5ebbdd6098025bdc6 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 12 Jun 2020 13:34:34 +0200
Subject: Incidents: implement `on_message` listener & guards

---
 bot/cogs/moderation/incidents.py | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 2424c008d..91b949173 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -6,7 +6,7 @@ import discord
 from discord.ext.commands import Cog
 
 from bot.bot import Bot
-from bot.constants import Emojis, Roles
+from bot.constants import Channels, Emojis, Roles
 
 log = logging.getLogger(__name__)
 
@@ -38,5 +38,22 @@ class Incidents(Cog):
 
     @Cog.listener()
     async def on_message(self, message: discord.Message) -> None:
-        """Pass each incident sent in #incidents to `add_signals`."""
-        ...
+        """
+        Pass each incident sent in #incidents to `add_signals`.
+
+        We recognize several exceptions. The following will be ignored:
+            * Messages sent outside of #incidents
+            * Messages Sent by bots
+            * Messages starting with the hash symbol #
+
+        Prefix message with # in situations where a verbal response is necessary.
+        Each such message must be deleted manually.
+        """
+        if message.channel.id != Channels.incidents or message.author.bot:
+            return
+
+        if message.content.startswith("#"):
+            log.debug(f"Ignoring comment message: {message.content=}")
+            return
+
+        await self.add_signals(message)
-- 
cgit v1.2.3


From 5b6b2de2fdfb9b2893b4e9321e4a46b19b4bfb20 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 12 Jun 2020 14:01:47 +0200
Subject: Incidents: implement & schedule `crawl_incidents` task

See docstring for further information. This will run on start-up
to retroactively add missing emoji.

Ratelimit-wise this should be fine, as there should never be too
many missing emoji.
---
 bot/cogs/moderation/incidents.py | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 91b949173..e773636e7 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -1,3 +1,4 @@
+import asyncio
 import logging
 import typing as t
 from enum import Enum
@@ -27,7 +28,38 @@ class Incidents(Cog):
     """Automation for the #incidents channel."""
 
     def __init__(self, bot: Bot) -> None:
+        """Schedule `crawl_task` on start-up."""
         self.bot = bot
+        self.crawl_task = self.bot.loop.create_task(self.crawl_incidents())
+
+    async def crawl_incidents(self) -> None:
+        """
+        Crawl #incidents and add missing emoji where necessary.
+
+        This is to catch-up should an incident be reported while the bot wasn't listening.
+        Internally, we simply walk the channel history and pass each message to `on_message`.
+
+        In order to avoid drowning in ratelimits, we take breaks after each message.
+
+        Once this task is scheduled, listeners should await it. The crawl assumes that
+        the channel history doesn't change as we go over it.
+        """
+        await self.bot.wait_until_guild_available()
+        incidents: discord.TextChannel = self.bot.get_channel(Channels.incidents)
+
+        # Limit the query at 50 as in practice, there should never be this many messages,
+        # and if there are, something has likely gone very wrong
+        limit = 50
+
+        # Seconds to sleep after each message
+        sleep = 2
+
+        log.debug(f"Crawling messages in #incidents: {limit=}, {sleep=}")
+        async for message in incidents.history(limit=limit):
+            await self.on_message(message)
+            await asyncio.sleep(sleep)
+
+        log.debug("Crawl task finished!")
 
     @staticmethod
     async def add_signals(incident: discord.Message) -> None:
-- 
cgit v1.2.3


From 1aaaee1144f660af7a69d12f814d0073451da7be Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 12 Jun 2020 14:02:58 +0200
Subject: Incidents: make `on_message` ignore pinned messages

This is now necessary as we call the listener ourselves from the
crawl task. An already existing, pinned message, can be received.
---
 bot/cogs/moderation/incidents.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index e773636e7..1b9d26522 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -77,6 +77,7 @@ class Incidents(Cog):
             * Messages sent outside of #incidents
             * Messages Sent by bots
             * Messages starting with the hash symbol #
+            * Pinned (header) messages
 
         Prefix message with # in situations where a verbal response is necessary.
         Each such message must be deleted manually.
@@ -88,4 +89,8 @@ class Incidents(Cog):
             log.debug(f"Ignoring comment message: {message.content=}")
             return
 
+        if message.pinned:
+            log.debug(f"Ignoring header message: {message.pinned=}")
+            return
+
         await self.add_signals(message)
-- 
cgit v1.2.3


From 1f6cd4313c91ed114a1de04de14355648fe88bf9 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 12 Jun 2020 14:06:12 +0200
Subject: Incidents: only `add_signals` if missing

---
 bot/cogs/moderation/incidents.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 1b9d26522..43b1106ad 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -64,9 +64,17 @@ class Incidents(Cog):
     @staticmethod
     async def add_signals(incident: discord.Message) -> None:
         """Add `Signal` member emoji to `incident` as reactions."""
+        existing_reacts = {str(reaction.emoji) for reaction in incident.reactions if reaction.me}
+
         for signal_emoji in Signal:
-            log.debug(f"Adding reaction: {signal_emoji.value}")
-            await incident.add_reaction(signal_emoji.value)
+
+            # This will not raise, but it is a superfluous API call that can be avoided
+            if signal_emoji.value in existing_reacts:
+                log.debug(f"Skipping emoji as it's already been placed: {signal_emoji}")
+
+            else:
+                log.debug(f"Adding reaction: {signal_emoji}")
+                await incident.add_reaction(signal_emoji.value)
 
     @Cog.listener()
     async def on_message(self, message: discord.Message) -> None:
-- 
cgit v1.2.3


From 0f9f25e703325bae172148bb6a30c1118b905fcb Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 12 Jun 2020 14:22:02 +0200
Subject: Incidents: add `event_lock` for simple event synchronization

---
 bot/cogs/moderation/incidents.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 43b1106ad..1cfa45dc4 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -28,8 +28,10 @@ class Incidents(Cog):
     """Automation for the #incidents channel."""
 
     def __init__(self, bot: Bot) -> None:
-        """Schedule `crawl_task` on start-up."""
+        """Prepare `event_lock` and schedule `crawl_task` on start-up."""
         self.bot = bot
+
+        self.event_lock = asyncio.Lock()
         self.crawl_task = self.bot.loop.create_task(self.crawl_incidents())
 
     async def crawl_incidents(self) -> None:
-- 
cgit v1.2.3


From 5762e57696978843991058f7bbfa826e3020dbba Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 12 Jun 2020 14:53:00 +0200
Subject: Incidents: abstract incident checking into a helper method

The code is now basically self-documenting, the docstring is no
longer necessary.

The ultimate goal is to allow `crawl_incidents` to be more smart
about which messages need to be passed to `add_signals`, so that
it doesn't need to sleep after each message.
---
 bot/cogs/moderation/incidents.py | 38 ++++++++++++++------------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 1cfa45dc4..e3c3922a1 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -24,6 +24,17 @@ ALLOWED_ROLES: t.Set[int] = {Roles.moderators, Roles.admins, Roles.owners}
 ALLOWED_EMOJI: t.Set[str] = {signal.value for signal in Signal}
 
 
+def is_incident(message: discord.Message) -> bool:
+    """True if `message` qualifies as an incident, False otherwise."""
+    conditions = (
+        message.channel.id == Channels.incidents,  # Message sent in #incidents
+        not message.author.bot,                    # Not by a bot
+        not message.content.startswith("#"),       # Doesn't start with a hash
+        not message.pinned,                        # And isn't header
+    )
+    return all(conditions)
+
+
 class Incidents(Cog):
     """Automation for the #incidents channel."""
 
@@ -80,27 +91,6 @@ class Incidents(Cog):
 
     @Cog.listener()
     async def on_message(self, message: discord.Message) -> None:
-        """
-        Pass each incident sent in #incidents to `add_signals`.
-
-        We recognize several exceptions. The following will be ignored:
-            * Messages sent outside of #incidents
-            * Messages Sent by bots
-            * Messages starting with the hash symbol #
-            * Pinned (header) messages
-
-        Prefix message with # in situations where a verbal response is necessary.
-        Each such message must be deleted manually.
-        """
-        if message.channel.id != Channels.incidents or message.author.bot:
-            return
-
-        if message.content.startswith("#"):
-            log.debug(f"Ignoring comment message: {message.content=}")
-            return
-
-        if message.pinned:
-            log.debug(f"Ignoring header message: {message.pinned=}")
-            return
-
-        await self.add_signals(message)
+        """Pass `message` to `add_signals` if and only if it satisfies `is_incident`."""
+        if is_incident(message):
+            await self.add_signals(message)
-- 
cgit v1.2.3


From 166fc5f441a56d86202e857059011fdc75ce2740 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 12 Jun 2020 15:04:24 +0200
Subject: Incidents: implement `own_reactions` helper

---
 bot/cogs/moderation/incidents.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index e3c3922a1..8a49ec8b1 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -35,6 +35,11 @@ def is_incident(message: discord.Message) -> bool:
     return all(conditions)
 
 
+def own_reactions(message: discord.Message) -> t.Set[str]:
+    """Get the set of reactions placed on `message` by the bot itself."""
+    return {str(reaction.emoji) for reaction in message.reactions if reaction.me}
+
+
 class Incidents(Cog):
     """Automation for the #incidents channel."""
 
@@ -77,7 +82,7 @@ class Incidents(Cog):
     @staticmethod
     async def add_signals(incident: discord.Message) -> None:
         """Add `Signal` member emoji to `incident` as reactions."""
-        existing_reacts = {str(reaction.emoji) for reaction in incident.reactions if reaction.me}
+        existing_reacts = own_reactions(incident)
 
         for signal_emoji in Signal:
 
-- 
cgit v1.2.3


From f7756b0246dec293f9918f3ea3ac4d6139affddd Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 12 Jun 2020 15:05:48 +0200
Subject: Incidents: implement `has_signals` helper

---
 bot/cogs/moderation/incidents.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 8a49ec8b1..0d146bdc5 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -40,6 +40,12 @@ def own_reactions(message: discord.Message) -> t.Set[str]:
     return {str(reaction.emoji) for reaction in message.reactions if reaction.me}
 
 
+def has_signals(message: discord.Message) -> bool:
+    """True if `message` already has all `Signal` reactions, False otherwise."""
+    missing_signals = ALLOWED_EMOJI - own_reactions(message)
+    return not missing_signals
+
+
 class Incidents(Cog):
     """Automation for the #incidents channel."""
 
-- 
cgit v1.2.3


From b7f61a4bf92b19a42dd1f72336d67a092b5d8029 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 12 Jun 2020 15:10:21 +0200
Subject: Incidents: move `add_signals` to module namespace

Looks like we'll need quite a few helpers, and I think it's cleaner
to keep them at module level.

It helps avoid the question of: what do I do if a staticmethod
depends on another staticmethod?
---
 bot/cogs/moderation/incidents.py | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 0d146bdc5..f7ef86836 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -46,6 +46,21 @@ def has_signals(message: discord.Message) -> bool:
     return not missing_signals
 
 
+async def add_signals(incident: discord.Message) -> None:
+    """Add `Signal` member emoji to `incident` as reactions."""
+    existing_reacts = own_reactions(incident)
+
+    for signal_emoji in Signal:
+
+        # This will not raise, but it is a superfluous API call that can be avoided
+        if signal_emoji.value in existing_reacts:
+            log.debug(f"Skipping emoji as it's already been placed: {signal_emoji}")
+
+        else:
+            log.debug(f"Adding reaction: {signal_emoji}")
+            await incident.add_reaction(signal_emoji.value)
+
+
 class Incidents(Cog):
     """Automation for the #incidents channel."""
 
@@ -85,23 +100,8 @@ class Incidents(Cog):
 
         log.debug("Crawl task finished!")
 
-    @staticmethod
-    async def add_signals(incident: discord.Message) -> None:
-        """Add `Signal` member emoji to `incident` as reactions."""
-        existing_reacts = own_reactions(incident)
-
-        for signal_emoji in Signal:
-
-            # This will not raise, but it is a superfluous API call that can be avoided
-            if signal_emoji.value in existing_reacts:
-                log.debug(f"Skipping emoji as it's already been placed: {signal_emoji}")
-
-            else:
-                log.debug(f"Adding reaction: {signal_emoji}")
-                await incident.add_reaction(signal_emoji.value)
-
     @Cog.listener()
     async def on_message(self, message: discord.Message) -> None:
         """Pass `message` to `add_signals` if and only if it satisfies `is_incident`."""
         if is_incident(message):
-            await self.add_signals(message)
+            await add_signals(message)
-- 
cgit v1.2.3


From 9a540a344ad79cd5766389d36e75536d751862b0 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 12 Jun 2020 15:19:15 +0200
Subject: Incidents: make `crawl_incidents` smarter

The crawler now avoids making API calls for messages which:
  * Are not incidents
  * Already have all signals

As a result, we can sleep only after making actual calls. This speeds
up the task completion considerable, while also making it lighter
on the API. Victory!
---
 bot/cogs/moderation/incidents.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index f7ef86836..d2b4581e7 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -76,12 +76,10 @@ class Incidents(Cog):
         Crawl #incidents and add missing emoji where necessary.
 
         This is to catch-up should an incident be reported while the bot wasn't listening.
-        Internally, we simply walk the channel history and pass each message to `on_message`.
+        After adding reactions, we take a short break to avoid drowning in ratelimits.
 
-        In order to avoid drowning in ratelimits, we take breaks after each message.
-
-        Once this task is scheduled, listeners should await it. The crawl assumes that
-        the channel history doesn't change as we go over it.
+        Once this task is scheduled, listeners that change messages should await it.
+        The crawl assumes that the channel history doesn't change as we go over it.
         """
         await self.bot.wait_until_guild_available()
         incidents: discord.TextChannel = self.bot.get_channel(Channels.incidents)
@@ -95,7 +93,16 @@ class Incidents(Cog):
 
         log.debug(f"Crawling messages in #incidents: {limit=}, {sleep=}")
         async for message in incidents.history(limit=limit):
-            await self.on_message(message)
+
+            if not is_incident(message):
+                log.debug("Skipping message: not an incident")
+                continue
+
+            if has_signals(message):
+                log.debug("Skipping message: already has all signals")
+                continue
+
+            await add_signals(message)
             await asyncio.sleep(sleep)
 
         log.debug("Crawl task finished!")
-- 
cgit v1.2.3


From 9e6835cef2210910db4ad110c0906a09fd5c5411 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 12 Jun 2020 15:40:39 +0200
Subject: Incidents: implement `resolve_message`

See docstring. The exception log is DEBUG level as failure does not
necessarily indicate that we have done something wrong. We rely on
the API to tell us that the message no longer exists in situations
where we have 2 coroutines racing to archive the same message.
---
 bot/cogs/moderation/incidents.py | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index d2b4581e7..d994054c8 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -107,6 +107,37 @@ class Incidents(Cog):
 
         log.debug("Crawl task finished!")
 
+    async def resolve_message(self, message_id: int) -> t.Optional[discord.Message]:
+        """
+        Get `discord.Message` for `message_id` from cache, or API.
+
+        We first look into the local cache to see if the message is present.
+
+        If not, we try to fetch the message from the API. This is necessary for messages
+        which were sent before the bot's current session.
+
+        However, in an edge-case, it is also possible that the message was already deleted,
+        and the API will return a 404. In such a case, None will be returned. This signals
+        that the event for `message_id` should be ignored.
+        """
+        await self.bot.wait_until_guild_available()  # First make sure that the cache is ready
+        log.debug(f"Resolving message for: {message_id=}")
+        message: discord.Message = self.bot._connection._get_message(message_id)  # noqa: Private attribute
+
+        if message is not None:
+            log.debug("Message was found in cache")
+            return message
+
+        log.debug("Message not found, attempting to fetch")
+        try:
+            message = await self.bot.get_channel(Channels.incidents).fetch_message(message_id)
+        except Exception as exc:
+            log.debug(f"Failed to fetch message: {exc}")
+            return None
+        else:
+            log.debug("Message fetched successfully!")
+            return message
+
     @Cog.listener()
     async def on_message(self, message: discord.Message) -> None:
         """Pass `message` to `add_signals` if and only if it satisfies `is_incident`."""
-- 
cgit v1.2.3


From 3c699936bf3cfa076f7791d6b8fe16ad4dd94aa6 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 12 Jun 2020 15:59:15 +0200
Subject: Incidents: implement reaction listener

See docstring!
---
 bot/cogs/moderation/incidents.py | 46 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index d994054c8..88ed04f45 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -138,6 +138,52 @@ class Incidents(Cog):
             log.debug("Message fetched successfully!")
             return message
 
+    async def process_event(self, reaction: str, message: discord.Message, member: discord.Member) -> None:
+        log.debug("Processing event...")
+
+    @Cog.listener()
+    async def on_raw_reaction_add(self, payload: discord.RawReactionActionEvent) -> None:
+        """
+        Pre-process `payload` and pass it to `process_event` if appropriate.
+
+        We abort instantly if `payload` doesn't relate to a message sent in #incidents.
+
+        If `payload` relates to a message in #incidents, we first ensure that `crawl_task` has
+        finished, to make sure we don't mutate channel state as we're crawling it.
+
+        Next, we acquire `event_lock` - to prevent racing, events are processed one at a time.
+
+        Once we have the lock, the `discord.Message` object for this event must be resolved.
+        If the lock was previously held by an event which successfully relayed the incident,
+        this will fail and we abort the current event.
+
+        Finally, with both the lock and the `discord.Message` instance in our hands, we delegate
+        to `process_event` to handle the event.
+
+        The justification for using a raw listener is the need to receive events for messages
+        which were not cached in the current session. As a result, a certain amount of
+        complexity is introduced, but at the moment this doesn't appear to be avoidable.
+        """
+        if payload.channel_id != Channels.incidents:
+            return
+
+        log.debug(f"Received reaction add event in #incidents, waiting for crawler: {self.crawl_task.done()=}")
+        await self.crawl_task
+
+        log.debug(f"Acquiring event lock: {self.event_lock.locked()=}")
+        async with self.event_lock:
+            message = await self.resolve_message(payload.message_id)
+
+            if message is None:
+                log.debug("Listener will abort as related message does not exist!")
+                return
+
+            if not is_incident(message):
+                log.debug("Ignoring event for a non-incident message")
+                return
+
+            await self.process_event(str(payload.emoji), message, payload.member)
+
     @Cog.listener()
     async def on_message(self, message: discord.Message) -> None:
         """Pass `message` to `add_signals` if and only if it satisfies `is_incident`."""
-- 
cgit v1.2.3


From d7165bf5547340242cb99460a35cabd753d60c42 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 12 Jun 2020 17:17:36 +0200
Subject: Incidents: implement `archive` method

---
 bot/cogs/moderation/incidents.py | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 88ed04f45..8781d6749 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -7,7 +7,7 @@ import discord
 from discord.ext.commands import Cog
 
 from bot.bot import Bot
-from bot.constants import Channels, Emojis, Roles
+from bot.constants import Channels, Emojis, Roles, Webhooks
 
 log = logging.getLogger(__name__)
 
@@ -107,6 +107,44 @@ class Incidents(Cog):
 
         log.debug("Crawl task finished!")
 
+    async def archive(self, incident: discord.Message, outcome: Signal) -> bool:
+        """
+        Relay `incident` to the #incidents-archive channel.
+
+        The following pieces of information are relayed:
+            * Incident message content (clean, pingless)
+            * Incident author name (as webhook author)
+            * Incident author avatar (as webhook avatar)
+            * Resolution signal (`outcome`)
+
+        Return True if the relay finishes successfully. If anything goes wrong, meaning
+        not all information was relayed, return False. This signals that the original
+        message is not safe to be deleted, as we will lose some information.
+        """
+        log.debug(f"Archiving incident: {incident.id} with outcome: {outcome}")
+        try:
+            # First we try to grab the webhook
+            webhook: discord.Webhook = await self.bot.fetch_webhook(Webhooks.incidents_archive)
+
+            # Now relay the incident
+            message: discord.Message = await webhook.send(
+                content=incident.clean_content,  # Clean content will prevent mentions from pinging
+                username=incident.author.name,
+                avatar_url=incident.author.avatar_url,
+                wait=True,  # This makes the method return the sent Message object
+            )
+
+            # Finally add the `outcome` emoji
+            await message.add_reaction(outcome.value)
+
+        except Exception as exc:
+            log.exception("Failed to archive incident to #incidents-archive", exc_info=exc)
+            return False
+
+        else:
+            log.debug("Message archived successfully!")
+            return True
+
     async def resolve_message(self, message_id: int) -> t.Optional[discord.Message]:
         """
         Get `discord.Message` for `message_id` from cache, or API.
-- 
cgit v1.2.3


From 44e30289d9682a92ef6e6d2ca8e9cf9b669ad65c Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 12 Jun 2020 17:23:26 +0200
Subject: Incidents: implement `make_confirmation_task` method

---
 bot/cogs/moderation/incidents.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 8781d6749..2186530d9 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -145,6 +145,21 @@ class Incidents(Cog):
             log.debug("Message archived successfully!")
             return True
 
+    def make_confirmation_task(self, incident: discord.Message, timeout: int = 5) -> asyncio.Task:
+        """
+        Create a task to wait `timeout` seconds for `incident` to be deleted.
+
+        If `timeout` passes, this will raise `asyncio.TimeoutError`, signaling that we haven't
+        been able to confirm that the message was deleted.
+        """
+        log.debug(f"Confirmation task will wait {timeout=} seconds for {incident.id=} to be deleted")
+        coroutine = self.bot.wait_for(
+            event="raw_message_delete",
+            check=lambda payload: payload.message_id == incident.id,
+            timeout=timeout,
+        )
+        return self.bot.loop.create_task(coroutine)
+
     async def resolve_message(self, message_id: int) -> t.Optional[discord.Message]:
         """
         Get `discord.Message` for `message_id` from cache, or API.
-- 
cgit v1.2.3


From 7bc6aff14c5a78b708b11cafbd4eba431b3fe52b Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 12 Jun 2020 17:28:56 +0200
Subject: Incidents: implement `process_event` coroutine

This contains the main logic for handling reactions and glues all the
helpers together.

Unfortunately, gracefully handling everything that can go wrong in
the process requires quite a lot of code ~ but, at least to me, it
seems like this all should now be fairly safe.

The idea to await the message delete event before releasing the lock
was conceived by Ves, while Mark helped me refine it.

Co-authored-by: Sebastiaan Zeeff <sebastiaan.zeeff@gmail.com>
Co-authored-by: MarkKoz <kozlovmark@gmail.com>
---
 bot/cogs/moderation/incidents.py | 55 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 52 insertions(+), 3 deletions(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 2186530d9..00cceca7d 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -160,6 +160,58 @@ class Incidents(Cog):
         )
         return self.bot.loop.create_task(coroutine)
 
+    async def process_event(self, reaction: str, incident: discord.Message, member: discord.Member) -> None:
+        """
+        Process a valid `reaction_add` event in #incidents.
+
+        First, we check that the reaction is a recognized `Signal` member, and that it was sent by
+        a permitted user (at least one role in `ALLOWED_ROLES`). If not, the reaction is removed.
+
+        If the reaction was either `Signal.ACTIONED` or `Signal.NOT_ACTIONED`, we attempt to relay
+        the report to #incidents-archive. If successful, the original message is deleted.
+
+        We do not release `event_lock` until we receive the corresponding `message_delete` event.
+        This ensures that if there is a racing event awaiting the lock, it will fail to find the
+        message, and will abort.
+        """
+        members_roles: t.Set[int] = {role.id for role in member.roles}
+        if not members_roles & ALLOWED_ROLES:  # Intersection is truthy on at least 1 common element
+            log.debug(f"Removing invalid reaction: user {member} is not permitted to send signals")
+            await incident.remove_reaction(reaction, member)
+            return
+
+        if reaction not in ALLOWED_EMOJI:
+            log.debug(f"Removing invalid reaction: emoji {reaction} is not a valid signal")
+            await incident.remove_reaction(reaction, member)
+            return
+
+        # If we reach this point, we know that `emoji` is a `Signal` member
+        signal = Signal(reaction)
+        log.debug(f"Received signal: {signal}")
+
+        if signal not in (Signal.ACTIONED, Signal.NOT_ACTIONED):
+            log.debug("Reaction was valid, but no action is currently defined for it")
+            return
+
+        relay_successful = await self.archive(incident, signal)
+        if not relay_successful:
+            log.debug("Original message will not be deleted as we failed to relay it to the archive")
+            return
+
+        timeout = 5  # Seconds
+        confirmation_task = self.make_confirmation_task(incident, timeout)
+
+        log.debug("Deleting original message")
+        await incident.delete()
+
+        log.debug(f"Awaiting deletion confirmation: {timeout=} seconds")
+        try:
+            await confirmation_task
+        except asyncio.TimeoutError:
+            log.warning(f"Did not receive incident deletion confirmation within {timeout} seconds!")
+        else:
+            log.debug("Deletion was confirmed")
+
     async def resolve_message(self, message_id: int) -> t.Optional[discord.Message]:
         """
         Get `discord.Message` for `message_id` from cache, or API.
@@ -191,9 +243,6 @@ class Incidents(Cog):
             log.debug("Message fetched successfully!")
             return message
 
-    async def process_event(self, reaction: str, message: discord.Message, member: discord.Member) -> None:
-        log.debug("Processing event...")
-
     @Cog.listener()
     async def on_raw_reaction_add(self, payload: discord.RawReactionActionEvent) -> None:
         """
-- 
cgit v1.2.3


From 506f91a77d3dd1bb92222bd3fce4a7316677ddbb Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 12 Jun 2020 17:37:27 +0200
Subject: Incidents: do not process reaction events from bots

---
 bot/cogs/moderation/incidents.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 00cceca7d..f19bdb41f 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -248,7 +248,8 @@ class Incidents(Cog):
         """
         Pre-process `payload` and pass it to `process_event` if appropriate.
 
-        We abort instantly if `payload` doesn't relate to a message sent in #incidents.
+        We abort instantly if `payload` doesn't relate to a message sent in #incidents,
+        or if it was sent by a bot.
 
         If `payload` relates to a message in #incidents, we first ensure that `crawl_task` has
         finished, to make sure we don't mutate channel state as we're crawling it.
@@ -266,7 +267,7 @@ class Incidents(Cog):
         which were not cached in the current session. As a result, a certain amount of
         complexity is introduced, but at the moment this doesn't appear to be avoidable.
         """
-        if payload.channel_id != Channels.incidents:
+        if payload.channel_id != Channels.incidents or payload.member.bot:
             return
 
         log.debug(f"Received reaction add event in #incidents, waiting for crawler: {self.crawl_task.done()=}")
-- 
cgit v1.2.3


From f41794d31135209a7a38cc9c17ac62d3e06f6279 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 12 Jun 2020 17:56:05 +0200
Subject: Incidents: log `event_lock` release

---
 bot/cogs/moderation/incidents.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index f19bdb41f..d69439dc3 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -286,6 +286,7 @@ class Incidents(Cog):
                 return
 
             await self.process_event(str(payload.emoji), message, payload.member)
+            log.debug("Releasing event lock")
 
     @Cog.listener()
     async def on_message(self, message: discord.Message) -> None:
-- 
cgit v1.2.3


From 0eb62724baba42fffffcd47ff4fe5451dc521593 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 12 Jun 2020 18:01:10 +0200
Subject: Incidents: avoid lambda check; make regular function

---
 bot/cogs/moderation/incidents.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index d69439dc3..16af17f99 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -153,11 +153,11 @@ class Incidents(Cog):
         been able to confirm that the message was deleted.
         """
         log.debug(f"Confirmation task will wait {timeout=} seconds for {incident.id=} to be deleted")
-        coroutine = self.bot.wait_for(
-            event="raw_message_delete",
-            check=lambda payload: payload.message_id == incident.id,
-            timeout=timeout,
-        )
+
+        def check(payload: discord.RawReactionActionEvent) -> bool:
+            return payload.message_id == incident.id
+
+        coroutine = self.bot.wait_for(event="raw_message_delete", check=check, timeout=timeout)
         return self.bot.loop.create_task(coroutine)
 
     async def process_event(self, reaction: str, incident: discord.Message, member: discord.Member) -> None:
-- 
cgit v1.2.3


From 39691c052d50907c049f3294cc5eef6536461656 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 12 Jun 2020 21:08:14 +0200
Subject: Incidents: extend documentation

This adds a proper class docstring & small touch-ups to local
comments where necessary.
---
 bot/cogs/moderation/incidents.py | 60 ++++++++++++++++++++++++++++++++--------
 1 file changed, 49 insertions(+), 11 deletions(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 16af17f99..151584d38 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -13,13 +13,19 @@ log = logging.getLogger(__name__)
 
 
 class Signal(Enum):
-    """Recognized incident status signals."""
+    """
+    Recognized incident status signals.
+
+    This binds emoji to actions. The bot will only react to emoji linked here.
+    All other signals are seen as invalid.
+    """
 
     ACTIONED = Emojis.incident_actioned
     NOT_ACTIONED = Emojis.incident_unactioned
     INVESTIGATING = Emojis.incident_investigating
 
 
+# Reactions from roles not listed here, or using emoji not listed here, will be removed
 ALLOWED_ROLES: t.Set[int] = {Roles.moderators, Roles.admins, Roles.owners}
 ALLOWED_EMOJI: t.Set[str] = {signal.value for signal in Signal}
 
@@ -42,12 +48,16 @@ def own_reactions(message: discord.Message) -> t.Set[str]:
 
 def has_signals(message: discord.Message) -> bool:
     """True if `message` already has all `Signal` reactions, False otherwise."""
-    missing_signals = ALLOWED_EMOJI - own_reactions(message)
+    missing_signals = ALLOWED_EMOJI - own_reactions(message)  # In `ALLOWED_EMOJI` but not in `own_reactions(message)`
     return not missing_signals
 
 
 async def add_signals(incident: discord.Message) -> None:
-    """Add `Signal` member emoji to `incident` as reactions."""
+    """
+    Add `Signal` member emoji to `incident` as reactions.
+
+    If the emoji has already been placed on `incident` by the bot, it will be skipped.
+    """
     existing_reacts = own_reactions(incident)
 
     for signal_emoji in Signal:
@@ -62,7 +72,34 @@ async def add_signals(incident: discord.Message) -> None:
 
 
 class Incidents(Cog):
-    """Automation for the #incidents channel."""
+    """
+    Automation for the #incidents channel.
+
+    This cog does not provide a command API, it only reacts to the following events.
+
+    On start-up:
+        * Crawl #incidents and add missing `Signal` emoji where appropriate
+        * This is to retro-actively add the available options for messages which
+          were sent while the bot wasn't listening
+        * Pinned messages and message starting with # do not qualify as incidents
+        * See: `crawl_incidents`
+
+    On message:
+        * Add `Signal` member emoji if message qualifies as an incident
+        * Ignore messages starting with #
+            * Use this if verbal communication is necessary
+            * Each such message must be deleted manually once appropriate
+        * See: `on_message`
+
+    On reaction:
+        * Remove reaction if not permitted (`ALLOWED_EMOJI`, `ALLOWED_ROLES`)
+        * If `Signal.ACTIONED` or `Signal.NOT_ACTIONED` were chosen, attempt to
+          relay the incident message to #incidents-archive
+        * If relay successful, delete original message
+        * See: `on_raw_reaction_add`
+
+    Please refer to function docstrings for implementation details.
+    """
 
     def __init__(self, bot: Bot) -> None:
         """Prepare `event_lock` and schedule `crawl_task` on start-up."""
@@ -76,7 +113,7 @@ class Incidents(Cog):
         Crawl #incidents and add missing emoji where necessary.
 
         This is to catch-up should an incident be reported while the bot wasn't listening.
-        After adding reactions, we take a short break to avoid drowning in ratelimits.
+        After adding each reaction, we take a short break to avoid drowning in ratelimits.
 
         Once this task is scheduled, listeners that change messages should await it.
         The crawl assumes that the channel history doesn't change as we go over it.
@@ -88,7 +125,7 @@ class Incidents(Cog):
         # and if there are, something has likely gone very wrong
         limit = 50
 
-        # Seconds to sleep after each message
+        # Seconds to sleep after adding reactions to a message
         sleep = 2
 
         log.debug(f"Crawling messages in #incidents: {limit=}, {sleep=}")
@@ -162,7 +199,7 @@ class Incidents(Cog):
 
     async def process_event(self, reaction: str, incident: discord.Message, member: discord.Member) -> None:
         """
-        Process a valid `reaction_add` event in #incidents.
+        Process a `reaction_add` event in #incidents.
 
         First, we check that the reaction is a recognized `Signal` member, and that it was sent by
         a permitted user (at least one role in `ALLOWED_ROLES`). If not, the reaction is removed.
@@ -172,7 +209,8 @@ class Incidents(Cog):
 
         We do not release `event_lock` until we receive the corresponding `message_delete` event.
         This ensures that if there is a racing event awaiting the lock, it will fail to find the
-        message, and will abort.
+        message, and will abort. There is a `timeout` to ensure that this doesn't hold the lock
+        forever should something go wrong.
         """
         members_roles: t.Set[int] = {role.id for role in member.roles}
         if not members_roles & ALLOWED_ROLES:  # Intersection is truthy on at least 1 common element
@@ -221,9 +259,9 @@ class Incidents(Cog):
         If not, we try to fetch the message from the API. This is necessary for messages
         which were sent before the bot's current session.
 
-        However, in an edge-case, it is also possible that the message was already deleted,
-        and the API will return a 404. In such a case, None will be returned. This signals
-        that the event for `message_id` should be ignored.
+        In an edge-case, it is also possible that the message was already deleted, and
+        the API will respond with a 404. In such a case, None will be returned.
+        This signals that the event for `message_id` should be ignored.
         """
         await self.bot.wait_until_guild_available()  # First make sure that the cache is ready
         log.debug(f"Resolving message for: {message_id=}")
-- 
cgit v1.2.3


From 5c70a7dad3ee59e865df08affe7905a843a823ce Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 12 Jun 2020 22:05:15 +0200
Subject: Incidents tests: create new test module

---
 tests/bot/cogs/moderation/test_incidents.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 tests/bot/cogs/moderation/test_incidents.py

diff --git a/tests/bot/cogs/moderation/test_incidents.py b/tests/bot/cogs/moderation/test_incidents.py
new file mode 100644
index 000000000..e69de29bb
-- 
cgit v1.2.3


From ae5028d5966ba126f902783db8ad685646f45f37 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 12 Jun 2020 23:14:41 +0200
Subject: Incidents tests: write tests for module-level helpers

---
 tests/bot/cogs/moderation/test_incidents.py | 135 ++++++++++++++++++++++++++++
 1 file changed, 135 insertions(+)

diff --git a/tests/bot/cogs/moderation/test_incidents.py b/tests/bot/cogs/moderation/test_incidents.py
index e69de29bb..4c1f9bc07 100644
--- a/tests/bot/cogs/moderation/test_incidents.py
+++ b/tests/bot/cogs/moderation/test_incidents.py
@@ -0,0 +1,135 @@
+import enum
+import unittest
+from unittest.mock import AsyncMock, MagicMock, call, patch
+
+import discord
+
+from bot.cogs.moderation import incidents
+
+
+@patch("bot.constants.Channels.incidents", 123)
+class TestIsIncident(unittest.TestCase):
+    """
+    Collection of tests for the `is_incident` helper function.
+
+    In `setUp`, we will create a mock message which should qualify as an incident. Each
+    test case will then mutate this instance to make it **not** qualify, in various ways.
+
+    Notice that we patch the #incidents channel id globally for this class.
+    """
+
+    def setUp(self) -> None:
+        """Prepare a mock message which should qualify as an incident."""
+        self.incident = MagicMock(
+            discord.Message,
+            channel=MagicMock(discord.TextChannel, id=123),
+            content="this is an incident",
+            author=MagicMock(discord.User, bot=False),
+            pinned=False,
+        )
+
+    def test_is_incident_true(self):
+        """Message qualifies as an incident if unchanged."""
+        self.assertTrue(incidents.is_incident(self.incident))
+
+    def check_false(self):
+        """Assert that `self.incident` does **not** qualify as an incident."""
+        self.assertFalse(incidents.is_incident(self.incident))
+
+    def test_is_incident_false_channel(self):
+        """Message doesn't qualify if sent outside of #incidents."""
+        self.incident.channel = MagicMock(discord.TextChannel, id=456)
+        self.check_false()
+
+    def test_is_incident_false_content(self):
+        """Message doesn't qualify if content begins with hash symbol."""
+        self.incident.content = "# this is a comment message"
+        self.check_false()
+
+    def test_is_incident_false_author(self):
+        """Message doesn't qualify if author is a bot."""
+        self.incident.author = MagicMock(discord.User, bot=True)
+        self.check_false()
+
+    def test_is_incident_false_pinned(self):
+        """Message doesn't qualify if it is pinned."""
+        self.incident.pinned = True
+        self.check_false()
+
+
+class TestOwnReactions(unittest.TestCase):
+    """Assertions for the `own_reactions` function."""
+
+    def test_own_reactions(self):
+        """Only bot's own emoji are extracted from the input incident."""
+        reactions = (
+            MagicMock(discord.Reaction, emoji="A", me=True),
+            MagicMock(discord.Reaction, emoji="B", me=True),
+            MagicMock(discord.Reaction, emoji="C", me=False),
+        )
+        message = MagicMock(discord.Message, reactions=reactions)
+        self.assertSetEqual(incidents.own_reactions(message), {"A", "B"})
+
+
+@patch("bot.cogs.moderation.incidents.ALLOWED_EMOJI", {"A", "B"})
+class TestHasSignals(unittest.TestCase):
+    """
+    Assertions for the `has_signals` function.
+
+    We patch `ALLOWED_EMOJI` globally. Each test function then patches `own_reactions`
+    as appropriate.
+    """
+
+    def test_has_signals_true(self):
+        """True when `own_reactions` returns all emoji in `ALLOWED_EMOJI`."""
+        message = MagicMock(discord.Message)
+        own_reactions = MagicMock(return_value={"A", "B"})
+
+        with patch("bot.cogs.moderation.incidents.own_reactions", own_reactions):
+            self.assertTrue(incidents.has_signals(message))
+
+    def test_has_signals_false(self):
+        """False when `own_reactions` does not return all emoji in `ALLOWED_EMOJI`."""
+        message = MagicMock(discord.Message)
+        own_reactions = MagicMock(return_value={"A", "C"})
+
+        with patch("bot.cogs.moderation.incidents.own_reactions", own_reactions):
+            self.assertFalse(incidents.has_signals(message))
+
+
+class Signal(enum.Enum):
+    A = "A"
+    B = "B"
+
+
+@patch("bot.cogs.moderation.incidents.Signal", Signal)
+class TestAddSignals(unittest.IsolatedAsyncioTestCase):
+    """
+    Assertions for the `add_signals` coroutine.
+
+    These are all fairly similar and could go into a single test function, but I found the
+    patching & sub-testing fairly awkward in that case and decided to split them up
+    to avoid unnecessary syntax noise.
+    """
+
+    def setUp(self):
+        """Prepare a mock incident message for tests to use."""
+        self.incident = MagicMock(discord.Message, add_reaction=AsyncMock())
+
+    @patch("bot.cogs.moderation.incidents.own_reactions", MagicMock(return_value=set()))
+    async def test_add_signals_missing(self):
+        """All emoji are added when none are present."""
+        await incidents.add_signals(self.incident)
+        self.incident.add_reaction.assert_has_calls([call("A"), call("B")])
+
+    @patch("bot.cogs.moderation.incidents.own_reactions", MagicMock(return_value={"A"}))
+    async def test_add_signals_partial(self):
+        """Only missing emoji are added when some are present."""
+        await incidents.add_signals(self.incident)
+        self.incident.add_reaction.assert_has_calls([call("B")])
+
+    @patch("bot.cogs.moderation.incidents.own_reactions", MagicMock(return_value={"A", "B"}))
+    async def test_add_signals_present(self):
+        """No emoji are added when all are present."""
+        await incidents.add_signals(self.incident)
+        self.incident.add_reaction.assert_not_called()
-- 
cgit v1.2.3


From 314f9a829a6bc12677bac17ff04b2501b4d93f0c Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sat, 13 Jun 2020 08:08:36 +0300
Subject: Fix `create_channels`, `get_category` docstrings

---
 bot/cogs/jams.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bot/cogs/jams.py b/bot/cogs/jams.py
index 16dda35c8..74140b9db 100644
--- a/bot/cogs/jams.py
+++ b/bot/cogs/jams.py
@@ -52,7 +52,7 @@ class CodeJams(commands.Cog):
 
     @staticmethod
     async def get_category(ctx: commands.Context) -> CategoryChannel:
-        """Create Code Jam category when this don't exist and return this."""
+        """Create a Code Jam category if it doesn't exist and return it."""
         code_jam_category = utils.get(ctx.guild.categories, name="Code Jam")
 
         if code_jam_category is None:
@@ -99,7 +99,7 @@ class CodeJams(commands.Cog):
         return team_channel_overwrites
 
     async def create_channels(self, ctx: commands.Context, team_name: str, members: t.List[Member]) -> str:
-        """Create team text and voice channel. Return name of text channel."""
+        """Create team text and voice channels. Return the mention for the text channel."""
         # Get permission overwrites and category
         team_channel_overwrites = self.get_overwrites(members, ctx)
         code_jam_category = await self.get_category(ctx)
-- 
cgit v1.2.3


From 8bb1dca65121b0ceb9ba7a1f26642f7e0b73860c Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sat, 13 Jun 2020 08:17:04 +0300
Subject: Jams: Use `Guild` instead `Context` for helper functions

---
 bot/cogs/jams.py | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/bot/cogs/jams.py b/bot/cogs/jams.py
index 74140b9db..75cf8fe6b 100644
--- a/bot/cogs/jams.py
+++ b/bot/cogs/jams.py
@@ -1,7 +1,7 @@
 import logging
 import typing as t
 
-from discord import CategoryChannel, Member, PermissionOverwrite, utils
+from discord import CategoryChannel, Guild, Member, PermissionOverwrite, utils
 from discord.ext import commands
 from more_itertools import unique_everseen
 
@@ -41,8 +41,8 @@ class CodeJams(commands.Cog):
             )
             return
 
-        team_channel = await self.create_channels(ctx, team_name, members)
-        await self.add_roles(ctx, members)
+        team_channel = await self.create_channels(ctx.guild, team_name, members)
+        await self.add_roles(ctx.guild, members)
 
         await ctx.send(
             f":ok_hand: Team created: {team_channel}\n"
@@ -51,19 +51,19 @@ class CodeJams(commands.Cog):
         )
 
     @staticmethod
-    async def get_category(ctx: commands.Context) -> CategoryChannel:
+    async def get_category(guild: Guild) -> CategoryChannel:
         """Create a Code Jam category if it doesn't exist and return it."""
-        code_jam_category = utils.get(ctx.guild.categories, name="Code Jam")
+        code_jam_category = utils.get(guild.categories, name="Code Jam")
 
         if code_jam_category is None:
             log.info("Code Jam category not found, creating it.")
 
             category_overwrites = {
-                ctx.guild.default_role: PermissionOverwrite(read_messages=False),
-                ctx.guild.me: PermissionOverwrite(read_messages=True)
+                guild.default_role: PermissionOverwrite(read_messages=False),
+                guild.me: PermissionOverwrite(read_messages=True)
             }
 
-            code_jam_category = await ctx.guild.create_category_channel(
+            code_jam_category = await guild.create_category_channel(
                 "Code Jam",
                 overwrites=category_overwrites,
                 reason="It's code jam time!"
@@ -72,7 +72,7 @@ class CodeJams(commands.Cog):
         return code_jam_category
 
     @staticmethod
-    def get_overwrites(members: t.List[Member], ctx: commands.Context) -> t.Dict[Member, PermissionOverwrite]:
+    def get_overwrites(members: t.List[Member], guild: Guild) -> t.Dict[Member, PermissionOverwrite]:
         """Get Code Jam team channels permission overwrites."""
         # First member is always the team leader
         team_channel_overwrites = {
@@ -82,8 +82,8 @@ class CodeJams(commands.Cog):
                 manage_webhooks=True,
                 connect=True
             ),
-            ctx.guild.default_role: PermissionOverwrite(read_messages=False, connect=False),
-            ctx.guild.get_role(Roles.verified): PermissionOverwrite(
+            guild.default_role: PermissionOverwrite(read_messages=False, connect=False),
+            guild.get_role(Roles.verified): PermissionOverwrite(
                 read_messages=False,
                 connect=False
             )
@@ -98,14 +98,14 @@ class CodeJams(commands.Cog):
 
         return team_channel_overwrites
 
-    async def create_channels(self, ctx: commands.Context, team_name: str, members: t.List[Member]) -> str:
+    async def create_channels(self, guild: Guild, team_name: str, members: t.List[Member]) -> str:
         """Create team text and voice channels. Return the mention for the text channel."""
         # Get permission overwrites and category
-        team_channel_overwrites = self.get_overwrites(members, ctx)
-        code_jam_category = await self.get_category(ctx)
+        team_channel_overwrites = self.get_overwrites(members, guild)
+        code_jam_category = await self.get_category(guild)
 
         # Create a text channel for the team
-        team_channel = await ctx.guild.create_text_channel(
+        team_channel = await guild.create_text_channel(
             team_name,
             overwrites=team_channel_overwrites,
             category=code_jam_category
@@ -114,7 +114,7 @@ class CodeJams(commands.Cog):
         # Create a voice channel for the team
         team_voice_name = " ".join(team_name.split("-")).title()
 
-        await ctx.guild.create_voice_channel(
+        await guild.create_voice_channel(
             team_voice_name,
             overwrites=team_channel_overwrites,
             category=code_jam_category
@@ -123,13 +123,13 @@ class CodeJams(commands.Cog):
         return team_channel.mention
 
     @staticmethod
-    async def add_roles(ctx: commands.Context, members: t.List[Member]) -> None:
+    async def add_roles(guild: Guild, members: t.List[Member]) -> None:
         """Assign team leader and jammer roles."""
         # Assign team leader role
-        await members[0].add_roles(ctx.guild.get_role(Roles.team_leaders))
+        await members[0].add_roles(guild.get_role(Roles.team_leaders))
 
         # Assign rest of roles
-        jammer_role = ctx.guild.get_role(Roles.jammers)
+        jammer_role = guild.get_role(Roles.jammers)
         for member in members:
             await member.add_roles(jammer_role)
 
-- 
cgit v1.2.3


From 9dbfe7da4cbc4d1820507e25ce56929b7fb55327 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sat, 13 Jun 2020 08:26:19 +0300
Subject: Jam Tests: Update `Context` to `Guild` for tests too

---
 tests/bot/cogs/test_jams.py | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index 54fe0b5f2..17b86601f 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -47,23 +47,23 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
     async def test_category_dont_exist(self):
         """Should create code jam category."""
         self.utils_mock.get.return_value = None
-        await self.cog.get_category(self.ctx)
-        self.ctx.guild.create_category_channel.assert_awaited_once()
-        category_overwrites = self.ctx.guild.create_category_channel.call_args[1]["overwrites"]
+        await self.cog.get_category(self.guild)
+        self.guild.create_category_channel.assert_awaited_once()
+        category_overwrites = self.guild.create_category_channel.call_args[1]["overwrites"]
 
-        self.assertFalse(category_overwrites[self.ctx.guild.default_role].read_messages)
-        self.assertTrue(category_overwrites[self.ctx.guild.me].read_messages)
+        self.assertFalse(category_overwrites[self.guild.default_role].read_messages)
+        self.assertTrue(category_overwrites[self.guild.me].read_messages)
 
     async def test_category_channel_exist(self):
         """Should not try to create category channel."""
-        await self.cog.get_category(self.ctx)
-        self.ctx.guild.create_category_channel.assert_not_awaited()
+        await self.cog.get_category(self.guild)
+        self.guild.create_category_channel.assert_not_awaited()
 
     async def test_channel_overwrites(self):
         """Should have correct permission overwrites for users and roles."""
         leader = MockMember()
         members = [leader] + [MockMember() for _ in range(4)]
-        overwrites = self.cog.get_overwrites(members, self.ctx)
+        overwrites = self.cog.get_overwrites(members, self.guild)
 
         # Leader permission overwrites
         self.assertTrue(overwrites[leader].manage_messages)
@@ -77,10 +77,10 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
             self.assertTrue(overwrites[member].connect)
 
         # Everyone and verified role overwrite
-        self.assertFalse(overwrites[self.ctx.guild.default_role].read_messages)
-        self.assertFalse(overwrites[self.ctx.guild.default_role].connect)
-        self.assertFalse(overwrites[self.ctx.guild.get_role(Roles.verified)].read_messages)
-        self.assertFalse(overwrites[self.ctx.guild.get_role(Roles.verified)].connect)
+        self.assertFalse(overwrites[self.guild.default_role].read_messages)
+        self.assertFalse(overwrites[self.guild.default_role].connect)
+        self.assertFalse(overwrites[self.guild.get_role(Roles.verified)].read_messages)
+        self.assertFalse(overwrites[self.guild.get_role(Roles.verified)].connect)
 
     async def test_team_channels_creation(self):
         """Should create new voice and text channel for team."""
@@ -90,18 +90,18 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         self.cog.get_overwrites = MagicMock()
         self.cog.get_category = AsyncMock()
         self.ctx.guild.create_text_channel.return_value = MockTextChannel(mention="foobar-channel")
-        actual = await self.cog.create_channels(self.ctx, "my-team", members)
+        actual = await self.cog.create_channels(self.guild, "my-team", members)
 
         self.assertEqual("foobar-channel", actual)
-        self.cog.get_overwrites.assert_called_once_with(members, self.ctx)
-        self.cog.get_category.assert_awaited_once_with(self.ctx)
+        self.cog.get_overwrites.assert_called_once_with(members, self.guild)
+        self.cog.get_category.assert_awaited_once_with(self.guild)
 
-        self.ctx.guild.create_text_channel.assert_awaited_once_with(
+        self.guild.create_text_channel.assert_awaited_once_with(
             "my-team",
             overwrites=self.cog.get_overwrites.return_value,
             category=self.cog.get_category.return_value
         )
-        self.ctx.guild.create_voice_channel.assert_awaited_once_with(
+        self.guild.create_voice_channel.assert_awaited_once_with(
             "My Team",
             overwrites=self.cog.get_overwrites.return_value,
             category=self.cog.get_category.return_value
@@ -111,11 +111,11 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         """Should add team leader role to leader and jam role to every team member."""
         leader_role = MockRole(name="Team Leader")
         jam_role = MockRole(name="Jammer")
-        self.ctx.guild.get_role.side_effect = [leader_role, jam_role]
+        self.guild.get_role.side_effect = [leader_role, jam_role]
 
         leader = MockMember()
         members = [leader] + [MockMember() for _ in range(4)]
-        await self.cog.add_roles(self.ctx, members)
+        await self.cog.add_roles(self.guild, members)
 
         leader.add_roles.assert_any_await(leader_role)
         for member in members:
-- 
cgit v1.2.3


From d0f8272818095fc692e03ce2630fe2302b09393c Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sat, 13 Jun 2020 08:31:16 +0300
Subject: Jams: Fix `get_overwrites` return type

---
 bot/cogs/jams.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bot/cogs/jams.py b/bot/cogs/jams.py
index 75cf8fe6b..a48dbc49a 100644
--- a/bot/cogs/jams.py
+++ b/bot/cogs/jams.py
@@ -1,7 +1,7 @@
 import logging
 import typing as t
 
-from discord import CategoryChannel, Guild, Member, PermissionOverwrite, utils
+from discord import CategoryChannel, Guild, Member, PermissionOverwrite, Role, utils
 from discord.ext import commands
 from more_itertools import unique_everseen
 
@@ -72,7 +72,7 @@ class CodeJams(commands.Cog):
         return code_jam_category
 
     @staticmethod
-    def get_overwrites(members: t.List[Member], guild: Guild) -> t.Dict[Member, PermissionOverwrite]:
+    def get_overwrites(members: t.List[Member], guild: Guild) -> t.Dict[t.Union[Member, Role], PermissionOverwrite]:
         """Get Code Jam team channels permission overwrites."""
         # First member is always the team leader
         team_channel_overwrites = {
-- 
cgit v1.2.3


From 2489b144b5bf131ec8b1b42e2ae1dd249cce4d3f Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sat, 13 Jun 2020 08:35:35 +0300
Subject: Jam Tests: Simplify and make tests more secure

---
 tests/bot/cogs/test_jams.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index 17b86601f..2d2eebabf 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -42,7 +42,8 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         member = MockMember()
         await self.cog.createteam(*self.default_args, (member for _ in range(5)))
         self.ctx.send.assert_awaited_once()
-        self.utils_mock.get.assert_not_called()
+        self.cog.create_channels.assert_now_awaited()
+        self.cog.add_roles.assert_not_awaited()
 
     async def test_category_dont_exist(self):
         """Should create code jam category."""
@@ -125,12 +126,9 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         """Should call `ctx.send` when everything goes right."""
         members = [MockMember() for _ in range(5)]
         await self.cog.createteam(self.cog, self.ctx, "foo", members)
+        self.cog.create_channel.assert_awaited_once()
+        self.cog.add_roles.assert_awaited_once()
         self.ctx.send.assert_awaited_once()
-        sent_string = self.ctx.send.call_args[0][0]
-
-        self.assertIn(str(self.ctx.guild.create_text_channel.return_value.mention), sent_string)
-        self.assertIn(members[0].mention, sent_string)
-        self.assertIn(" ".join(member.mention for member in members[1:]), sent_string)
 
 
 class CodeJamSetup(unittest.TestCase):
-- 
cgit v1.2.3


From 95ae613173bb87719155a95494fe448a45a2d6bc Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sat, 13 Jun 2020 08:39:35 +0300
Subject: Jam Tests: Fix wrong function name and convert them to mocks

---
 tests/bot/cogs/test_jams.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index 2d2eebabf..a66658134 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -124,9 +124,11 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
 
     async def test_result_sending(self):
         """Should call `ctx.send` when everything goes right."""
+        self.cog.create_channels = AsyncMock()
+        self.cog.add_roles = AsyncMock()
         members = [MockMember() for _ in range(5)]
         await self.cog.createteam(self.cog, self.ctx, "foo", members)
-        self.cog.create_channel.assert_awaited_once()
+        self.cog.create_channels.assert_awaited_once()
         self.cog.add_roles.assert_awaited_once()
         self.ctx.send.assert_awaited_once()
 
-- 
cgit v1.2.3


From ef67747e59892d1307246bcad4d32e245098ff58 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sat, 13 Jun 2020 08:44:56 +0300
Subject: Jam Tests: Fix `test_duplicate_member_provided` assertions

---
 tests/bot/cogs/test_jams.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index a66658134..2f2cb4695 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -39,10 +39,12 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
 
     async def test_duplicate_members_provided(self):
         """Should `ctx.send` and exit early because duplicate members provided and total there is only 1 member."""
+        self.cog.create_channels = AsyncMock()
+        self.cog.add_roles = AsyncMock()
         member = MockMember()
         await self.cog.createteam(*self.default_args, (member for _ in range(5)))
         self.ctx.send.assert_awaited_once()
-        self.cog.create_channels.assert_now_awaited()
+        self.cog.create_channels.assert_not_awaited()
         self.cog.add_roles.assert_not_awaited()
 
     async def test_category_dont_exist(self):
-- 
cgit v1.2.3


From e9724dad79e7dab3bb801f50770bb06cf8461019 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Sat, 13 Jun 2020 15:12:38 +0200
Subject: Incidents tests: use our own helper mocks

No reason to build own MagicMocks as we already have helpers that
more accurately mimic the mocked behaviour.
---
 tests/bot/cogs/moderation/test_incidents.py | 30 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/tests/bot/cogs/moderation/test_incidents.py b/tests/bot/cogs/moderation/test_incidents.py
index 4c1f9bc07..d7cc84734 100644
--- a/tests/bot/cogs/moderation/test_incidents.py
+++ b/tests/bot/cogs/moderation/test_incidents.py
@@ -1,10 +1,9 @@
 import enum
 import unittest
-from unittest.mock import AsyncMock, MagicMock, call, patch
-
-import discord
+from unittest.mock import MagicMock, call, patch
 
 from bot.cogs.moderation import incidents
+from tests.helpers import MockMessage, MockReaction, MockTextChannel, MockUser
 
 
 @patch("bot.constants.Channels.incidents", 123)
@@ -20,11 +19,10 @@ class TestIsIncident(unittest.TestCase):
 
     def setUp(self) -> None:
         """Prepare a mock message which should qualify as an incident."""
-        self.incident = MagicMock(
-            discord.Message,
-            channel=MagicMock(discord.TextChannel, id=123),
+        self.incident = MockMessage(
+            channel=MockTextChannel(id=123),
             content="this is an incident",
-            author=MagicMock(discord.User, bot=False),
+            author=MockUser(bot=False),
             pinned=False,
         )
 
@@ -38,7 +36,7 @@ class TestIsIncident(unittest.TestCase):
 
     def test_is_incident_false_channel(self):
         """Message doesn't qualify if sent outside of #incidents."""
-        self.incident.channel = MagicMock(discord.TextChannel, id=456)
+        self.incident.channel = MockTextChannel(id=456)
         self.check_false()
 
     def test_is_incident_false_content(self):
@@ -48,7 +46,7 @@ class TestIsIncident(unittest.TestCase):
 
     def test_is_incident_false_author(self):
         """Message doesn't qualify if author is a bot."""
-        self.incident.author = MagicMock(discord.User, bot=True)
+        self.incident.author = MockUser(bot=True)
         self.check_false()
 
     def test_is_incident_false_pinned(self):
@@ -63,11 +61,11 @@ class TestOwnReactions(unittest.TestCase):
     def test_own_reactions(self):
         """Only bot's own emoji are extracted from the input incident."""
         reactions = (
-            MagicMock(discord.Reaction, emoji="A", me=True),
-            MagicMock(discord.Reaction, emoji="B", me=True),
-            MagicMock(discord.Reaction, emoji="C", me=False),
+            MockReaction(emoji="A", me=True),
+            MockReaction(emoji="B", me=True),
+            MockReaction(emoji="C", me=False),
         )
-        message = MagicMock(discord.Message, reactions=reactions)
+        message = MockMessage(reactions=reactions)
         self.assertSetEqual(incidents.own_reactions(message), {"A", "B"})
 
 
@@ -82,7 +80,7 @@ class TestHasSignals(unittest.TestCase):
 
     def test_has_signals_true(self):
         """True when `own_reactions` returns all emoji in `ALLOWED_EMOJI`."""
-        message = MagicMock(discord.Message)
+        message = MockMessage()
         own_reactions = MagicMock(return_value={"A", "B"})
 
         with patch("bot.cogs.moderation.incidents.own_reactions", own_reactions):
@@ -90,7 +88,7 @@ class TestHasSignals(unittest.TestCase):
 
     def test_has_signals_false(self):
         """False when `own_reactions` does not return all emoji in `ALLOWED_EMOJI`."""
-        message = MagicMock(discord.Message)
+        message = MockMessage()
         own_reactions = MagicMock(return_value={"A", "C"})
 
         with patch("bot.cogs.moderation.incidents.own_reactions", own_reactions):
@@ -114,7 +112,7 @@ class TestAddSignals(unittest.IsolatedAsyncioTestCase):
 
     def setUp(self):
         """Prepare a mock incident message for tests to use."""
-        self.incident = MagicMock(discord.Message, add_reaction=AsyncMock())
+        self.incident = MockMessage()
 
     @patch("bot.cogs.moderation.incidents.own_reactions", MagicMock(return_value=set()))
     async def test_add_signals_missing(self):
-- 
cgit v1.2.3


From 00a44226cb659319b9df5f568b0f67f9a0ed3360 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Sat, 13 Jun 2020 15:51:34 +0200
Subject: Incidents tests: improve mock `Signal` name & move def

Let's make it clear that this is our own mock. We also move the
definition to the top of the module.
---
 tests/bot/cogs/moderation/test_incidents.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/bot/cogs/moderation/test_incidents.py b/tests/bot/cogs/moderation/test_incidents.py
index d7cc84734..a349c1cb7 100644
--- a/tests/bot/cogs/moderation/test_incidents.py
+++ b/tests/bot/cogs/moderation/test_incidents.py
@@ -6,6 +6,11 @@ from bot.cogs.moderation import incidents
 from tests.helpers import MockMessage, MockReaction, MockTextChannel, MockUser
 
 
+class MockSignal(enum.Enum):
+    A = "A"
+    B = "B"
+
+
 @patch("bot.constants.Channels.incidents", 123)
 class TestIsIncident(unittest.TestCase):
     """
@@ -95,12 +100,7 @@ class TestHasSignals(unittest.TestCase):
             self.assertFalse(incidents.has_signals(message))
 
 
-class Signal(enum.Enum):
-    A = "A"
-    B = "B"
-
-
-@patch("bot.cogs.moderation.incidents.Signal", Signal)
+@patch("bot.cogs.moderation.incidents.Signal", MockSignal)
 class TestAddSignals(unittest.IsolatedAsyncioTestCase):
     """
     Assertions for the `add_signals` coroutine.
-- 
cgit v1.2.3


From c66b4a618503352803f73e9272a1d27b6e0a4d52 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Sat, 13 Jun 2020 17:24:31 +0200
Subject: Incidents tests: set up base class for `Incidents`

For cleanliness, I've decided to make a separate class for each method.
Since most tests will want to have an `Incident` instance ready, they
can inherit the `setUp` from `TestIncidents`, which does not make any
assertions on its own.
---
 tests/bot/cogs/moderation/test_incidents.py | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/tests/bot/cogs/moderation/test_incidents.py b/tests/bot/cogs/moderation/test_incidents.py
index a349c1cb7..d52932e0a 100644
--- a/tests/bot/cogs/moderation/test_incidents.py
+++ b/tests/bot/cogs/moderation/test_incidents.py
@@ -2,8 +2,8 @@ import enum
 import unittest
 from unittest.mock import MagicMock, call, patch
 
-from bot.cogs.moderation import incidents
-from tests.helpers import MockMessage, MockReaction, MockTextChannel, MockUser
+from bot.cogs.moderation import Incidents, incidents
+from tests.helpers import MockBot, MockMessage, MockReaction, MockTextChannel, MockUser
 
 
 class MockSignal(enum.Enum):
@@ -131,3 +131,22 @@ class TestAddSignals(unittest.IsolatedAsyncioTestCase):
         """No emoji are added when all are present."""
         await incidents.add_signals(self.incident)
         self.incident.add_reaction.assert_not_called()
+
+
+class TestIncidents(unittest.IsolatedAsyncioTestCase):
+    """
+    Tests for bound methods of the `Incidents` cog.
+
+    Use this as a base class for `Incidents` tests - it will prepare a fresh instance
+    for each test function, but not make any assertions on its own. Tests can mutate
+    the instance as they wish.
+    """
+
+    def setUp(self):
+        """
+        Prepare a fresh `Incidents` instance for each test.
+
+        Note that this will not schedule `crawl_incidents` in the background, as everything
+        is being mocked. The `crawl_task` attribute will end up being None.
+        """
+        self.cog_instance = Incidents(MockBot())
-- 
cgit v1.2.3


From 3c2d227cd067466668e3089f63a6548736edf8ab Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Sat, 13 Jun 2020 17:56:31 +0200
Subject: Incidents tests: write tests for `archive`

---
 tests/bot/cogs/moderation/test_incidents.py | 65 ++++++++++++++++++++++++++++-
 1 file changed, 63 insertions(+), 2 deletions(-)

diff --git a/tests/bot/cogs/moderation/test_incidents.py b/tests/bot/cogs/moderation/test_incidents.py
index d52932e0a..7500235cf 100644
--- a/tests/bot/cogs/moderation/test_incidents.py
+++ b/tests/bot/cogs/moderation/test_incidents.py
@@ -1,9 +1,12 @@
 import enum
 import unittest
-from unittest.mock import MagicMock, call, patch
+from unittest.mock import AsyncMock, MagicMock, call, patch
+
+import aiohttp
+import discord
 
 from bot.cogs.moderation import Incidents, incidents
-from tests.helpers import MockBot, MockMessage, MockReaction, MockTextChannel, MockUser
+from tests.helpers import MockAsyncWebhook, MockBot, MockMessage, MockReaction, MockTextChannel, MockUser
 
 
 class MockSignal(enum.Enum):
@@ -150,3 +153,61 @@ class TestIncidents(unittest.IsolatedAsyncioTestCase):
         is being mocked. The `crawl_task` attribute will end up being None.
         """
         self.cog_instance = Incidents(MockBot())
+
+
+class TestArchive(TestIncidents):
+    """Tests for the `Incidents.archive` coroutine."""
+
+    async def test_archive_webhook_not_found(self):
+        """
+        Method recovers and returns False when the webhook is not found.
+
+        Implicitly, this also tests that the error is handled internally and doesn't
+        propagate out of the method, which is just as important.
+        """
+        mock_404 = discord.NotFound(
+            response=MagicMock(aiohttp.ClientResponse),  # Mock the erroneous response
+            message="Webhook not found",
+        )
+
+        self.cog_instance.bot.fetch_webhook = AsyncMock(side_effect=mock_404)
+        self.assertFalse(await self.cog_instance.archive(incident=MockMessage(), outcome=MagicMock()))
+
+    async def test_archive_relays_incident(self):
+        """
+        If webhook is found, method relays `incident` properly.
+
+        This test will assert the following:
+            * The fetched webhook's `send` method is fed the correct arguments
+            * The message returned by `send` will have `outcome` reaction added
+            * Finally, the `archive` method returns True
+
+        Assertions are made specifically in this order.
+        """
+        webhook_message = MockMessage()  # The message that will be returned by the webhook's `send` method
+        webhook = MockAsyncWebhook(send=AsyncMock(return_value=webhook_message))
+
+        self.cog_instance.bot.fetch_webhook = AsyncMock(return_value=webhook)  # Patch in our webhook
+
+        # Now we'll pas our own `incident` to `archive` and capture the return value
+        incident = MockMessage(
+            clean_content="pingless message",
+            content="pingful message",
+            author=MockUser(name="author_name", avatar_url="author_avatar"),
+            id=123,
+        )
+        archive_return = await self.cog_instance.archive(incident, outcome=MagicMock(value="A"))
+
+        # Check that the webhook was dispatched correctly
+        webhook.send.assert_called_once_with(
+            content="pingless message",
+            username="author_name",
+            avatar_url="author_avatar",
+            wait=True,
+        )
+
+        # Now check that the correct emoji was added to the relayed message
+        webhook_message.add_reaction.assert_called_once_with("A")
+
+        # Finally check that the method returned True
+        self.assertTrue(archive_return)
-- 
cgit v1.2.3


From 39dc3cd229888acac2782237db4b9389c0788478 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Sat, 13 Jun 2020 21:52:20 +0200
Subject: Incidents tests: move `mock_404` into module namespace

This will be useful for others tests as well.
---
 tests/bot/cogs/moderation/test_incidents.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/bot/cogs/moderation/test_incidents.py b/tests/bot/cogs/moderation/test_incidents.py
index 7500235cf..e51bda114 100644
--- a/tests/bot/cogs/moderation/test_incidents.py
+++ b/tests/bot/cogs/moderation/test_incidents.py
@@ -14,6 +14,12 @@ class MockSignal(enum.Enum):
     B = "B"
 
 
+mock_404 = discord.NotFound(
+    response=MagicMock(aiohttp.ClientResponse),  # Mock the erroneous response
+    message="Not found",
+)
+
+
 @patch("bot.constants.Channels.incidents", 123)
 class TestIsIncident(unittest.TestCase):
     """
@@ -165,11 +171,6 @@ class TestArchive(TestIncidents):
         Implicitly, this also tests that the error is handled internally and doesn't
         propagate out of the method, which is just as important.
         """
-        mock_404 = discord.NotFound(
-            response=MagicMock(aiohttp.ClientResponse),  # Mock the erroneous response
-            message="Webhook not found",
-        )
-
         self.cog_instance.bot.fetch_webhook = AsyncMock(side_effect=mock_404)
         self.assertFalse(await self.cog_instance.archive(incident=MockMessage(), outcome=MagicMock()))
 
-- 
cgit v1.2.3


From 8ed5cc7ef5e38885a8e439602b59e56449d3633c Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Sat, 13 Jun 2020 21:52:34 +0200
Subject: Incidents tests: write tests for `resolve_message`

---
 tests/bot/cogs/moderation/test_incidents.py | 56 +++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/tests/bot/cogs/moderation/test_incidents.py b/tests/bot/cogs/moderation/test_incidents.py
index e51bda114..b3beec3ab 100644
--- a/tests/bot/cogs/moderation/test_incidents.py
+++ b/tests/bot/cogs/moderation/test_incidents.py
@@ -212,3 +212,59 @@ class TestArchive(TestIncidents):
 
         # Finally check that the method returned True
         self.assertTrue(archive_return)
+
+
+class TestResolveMessage(TestIncidents):
+    """Tests for the `Incidents.resolve_message` coroutine."""
+
+    async def test_resolve_message_pass_message_id(self):
+        """Method will call `_get_message` with the passed `message_id`."""
+        await self.cog_instance.resolve_message(123)
+        self.cog_instance.bot._connection._get_message.assert_called_once_with(123)
+
+    async def test_resolve_message_in_cache(self):
+        """
+        No API call is made if the queried message exists in the cache.
+
+        We mock the `_get_message` return value regardless of input. Whether it finds the message
+        internally is considered d.py's responsibility, not ours.
+        """
+        cached_message = MockMessage(id=123)
+        self.cog_instance.bot._connection._get_message = MagicMock(return_value=cached_message)
+
+        return_value = await self.cog_instance.resolve_message(123)
+
+        self.assertIs(return_value, cached_message)
+        self.cog_instance.bot.get_channel.assert_not_called()  # The `fetch_message` line was never hit
+
+    async def test_resolve_message_not_in_cache(self):
+        """
+        The message is retrieved from the API if it isn't cached.
+
+        This is desired behaviour for messages which exist, but were sent before the bot's
+        current session.
+        """
+        self.cog_instance.bot._connection._get_message = MagicMock(return_value=None)  # Cache returns None
+
+        # API returns our message
+        uncached_message = MockMessage()
+        fetch_message = AsyncMock(return_value=uncached_message)
+        self.cog_instance.bot.get_channel = MagicMock(return_value=MockTextChannel(fetch_message=fetch_message))
+
+        retrieved_message = await self.cog_instance.resolve_message(123)
+        self.assertIs(retrieved_message, uncached_message)
+
+    async def test_resolve_message_doesnt_exist(self):
+        """
+        If the API returns a 404, the function handles it gracefully and returns None.
+
+        This is an edge-case happening with racing events - event A will relay the message
+        to the archive and delete the original. Once event B acquires the `event_lock`,
+        it will not find the message in the cache, and will ask the API.
+        """
+        self.cog_instance.bot._connection._get_message = MagicMock(return_value=None)  # Cache returns None
+
+        fetch_message = AsyncMock(side_effect=mock_404)
+        self.cog_instance.bot.get_channel = MagicMock(return_value=MockTextChannel(fetch_message=fetch_message))
+
+        self.assertIsNone(await self.cog_instance.resolve_message(123))
-- 
cgit v1.2.3


From 7c43eff17a07471799174c0a0e8813b9f58d2ab5 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Sat, 13 Jun 2020 22:09:44 +0200
Subject: Incidents: log error on non-404 response

We do not wish to log 404 exceptions as those are expected, however,
if something else goes wrong, we shouldn't silence it.

This also removes the explicit None return as it only adds syntax
noise.
---
 bot/cogs/moderation/incidents.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 151584d38..16286bdab 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -274,9 +274,10 @@ class Incidents(Cog):
         log.debug("Message not found, attempting to fetch")
         try:
             message = await self.bot.get_channel(Channels.incidents).fetch_message(message_id)
+        except discord.NotFound:
+            log.debug("Message doesn't exist, it was likely already relayed")
         except Exception as exc:
-            log.debug(f"Failed to fetch message: {exc}")
-            return None
+            log.exception("Failed to fetch message!", exc_info=exc)
         else:
             log.debug("Message fetched successfully!")
             return message
-- 
cgit v1.2.3


From bbedcb377c4c31973f43f076c3f62646f25733b3 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Sat, 13 Jun 2020 22:15:38 +0200
Subject: Incidents tests: test non-404 error response

---
 tests/bot/cogs/moderation/test_incidents.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/tests/bot/cogs/moderation/test_incidents.py b/tests/bot/cogs/moderation/test_incidents.py
index b3beec3ab..cbeb3342c 100644
--- a/tests/bot/cogs/moderation/test_incidents.py
+++ b/tests/bot/cogs/moderation/test_incidents.py
@@ -1,4 +1,5 @@
 import enum
+import logging
 import unittest
 from unittest.mock import AsyncMock, MagicMock, call, patch
 
@@ -268,3 +269,22 @@ class TestResolveMessage(TestIncidents):
         self.cog_instance.bot.get_channel = MagicMock(return_value=MockTextChannel(fetch_message=fetch_message))
 
         self.assertIsNone(await self.cog_instance.resolve_message(123))
+
+    async def test_resolve_message_fetch_fails(self):
+        """
+        Non-404 errors are handled, logged & None is returned.
+
+        In contrast with a 404, this should make an error-level log. We assert that at least
+        one such log was made - we do not make any assertions about the log's message.
+        """
+        self.cog_instance.bot._connection._get_message = MagicMock(return_value=None)  # Cache returns None
+
+        arbitrary_error = discord.HTTPException(
+            response=MagicMock(aiohttp.ClientResponse),
+            message="Arbitrary error",
+        )
+        fetch_message = AsyncMock(side_effect=arbitrary_error)
+        self.cog_instance.bot.get_channel = MagicMock(return_value=MockTextChannel(fetch_message=fetch_message))
+
+        with self.assertLogs(logger=incidents.log, level=logging.ERROR):
+            self.assertIsNone(await self.cog_instance.resolve_message(123))
-- 
cgit v1.2.3


From 14b7fee42ddf6a2cc75526506ef2028bdc742c9a Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Sat, 13 Jun 2020 22:42:58 +0200
Subject: Incidents tests: write tests for `on_message`

---
 tests/bot/cogs/moderation/test_incidents.py | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/tests/bot/cogs/moderation/test_incidents.py b/tests/bot/cogs/moderation/test_incidents.py
index cbeb3342c..0eb13df70 100644
--- a/tests/bot/cogs/moderation/test_incidents.py
+++ b/tests/bot/cogs/moderation/test_incidents.py
@@ -288,3 +288,30 @@ class TestResolveMessage(TestIncidents):
 
         with self.assertLogs(logger=incidents.log, level=logging.ERROR):
             self.assertIsNone(await self.cog_instance.resolve_message(123))
+
+
+class TestOnMessage(TestIncidents):
+    """
+    Tests for the `Incidents.on_message` listener.
+
+    Notice the decorators mocking the `is_incident` return value. The `is_incidents`
+    function is tested in `TestIsIncident` - here we do not worry about it.
+    """
+
+    @patch("bot.cogs.moderation.incidents.is_incident", MagicMock(return_value=True))
+    async def test_on_message_incident(self):
+        """Messages qualifying as incidents are passed to `add_signals`."""
+        incident = MockMessage()
+
+        with patch("bot.cogs.moderation.incidents.add_signals", AsyncMock()) as mock_add_signals:
+            await self.cog_instance.on_message(incident)
+
+        mock_add_signals.assert_called_once_with(incident)
+
+    @patch("bot.cogs.moderation.incidents.is_incident", MagicMock(return_value=False))
+    async def test_on_message_non_incident(self):
+        """Messages not qualifying as incidents are ignored."""
+        with patch("bot.cogs.moderation.incidents.add_signals", AsyncMock()) as mock_add_signals:
+            await self.cog_instance.on_message(MockMessage())
+
+        mock_add_signals.assert_not_called()
-- 
cgit v1.2.3


From 9d35846a67c2bf9ed9e935f8b5e3500ae4b49327 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Sat, 13 Jun 2020 23:24:14 +0200
Subject: Incidents tests: write tests for `make_confirmation_task`

---
 tests/bot/cogs/moderation/test_incidents.py | 35 +++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/tests/bot/cogs/moderation/test_incidents.py b/tests/bot/cogs/moderation/test_incidents.py
index 0eb13df70..c093afc8a 100644
--- a/tests/bot/cogs/moderation/test_incidents.py
+++ b/tests/bot/cogs/moderation/test_incidents.py
@@ -215,6 +215,41 @@ class TestArchive(TestIncidents):
         self.assertTrue(archive_return)
 
 
+class TestMakeConfirmationTask(TestIncidents):
+    """
+    Tests for the `Incidents.make_confirmation_task` method.
+
+    Writing tests for this method is difficult, as it mostly just delegates the provided
+    information elsewhere. There is very little internal logic. Whether our approach
+    works conceptually is difficult to prove using unit tests.
+    """
+
+    def test_make_confirmation_task_check(self):
+        """
+        The internal check will recognize the passed incident.
+
+        This is a little tricky - we first pass a message with a specific `id` in, and then
+        retrieve the built check from the `call_args` of the `wait_for` method. This relies
+        on the check being passed as a kwarg.
+
+        Once the check is retrieved, we assert that it gives True for our incident's `id`,
+        and False for any other.
+
+        If this function begins to fail, first check that `created_check` is being retrieved
+        correctly. It should be the function that is built locally in the tested method.
+        """
+        self.cog_instance.make_confirmation_task(MockMessage(id=123))
+
+        self.cog_instance.bot.wait_for.assert_called_once()
+        created_check = self.cog_instance.bot.wait_for.call_args.kwargs["check"]
+
+        # The `message_id` matches the `id` of our incident
+        self.assertTrue(created_check(payload=MagicMock(message_id=123)))
+
+        # This `message_id` does not match
+        self.assertFalse(created_check(payload=MagicMock(message_id=0)))
+
+
 class TestResolveMessage(TestIncidents):
     """Tests for the `Incidents.resolve_message` coroutine."""
 
-- 
cgit v1.2.3


From 51d681654d9a9acc71763edffcea0d5eb1ef1b29 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Thu, 18 Jun 2020 08:13:15 +0300
Subject: Source: Simplify missing tag cog handling

---
 bot/cogs/source.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index 32a78a0c0..d59371c6e 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -29,10 +29,7 @@ class SourceConverter(commands.Converter):
 
         tags_cog = ctx.bot.get_cog("Tags")
 
-        if not tags_cog:
-            await ctx.send("Unable to get `Tags` cog.")
-            return commands.ExtensionNotLoaded("bot.cogs.tags")
-        elif argument.lower() in tags_cog._cache:
+        if tags_cog and argument.lower() in tags_cog._cache:
             return argument.lower()
 
         raise commands.BadArgument(f"Unable to convert `{argument}` to valid command, tag, or Cog.")
@@ -47,10 +44,6 @@ class BotSource(commands.Cog):
     @commands.command(name="source", aliases=("src",))
     async def source_command(self, ctx: commands.Context, *, source_item: SourceConverter = None) -> None:
         """Display information and a GitHub link to the source code of a command, tag, or cog."""
-        # When we have problem to get Tags cog, exit early
-        if isinstance(source_item, commands.ExtensionNotLoaded):
-            return
-
         if not source_item:
             embed = Embed(title="Bot's GitHub Repository")
             embed.add_field(name="Repository", value=f"[Go to GitHub]({URLs.github_bot_repo})")
-- 
cgit v1.2.3


From 31f53259fd73503399b904e5a7075ceeded4c742 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Thu, 18 Jun 2020 08:58:18 +0300
Subject: Source: Split handling tag and other source items file location

---
 bot/cogs/source.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index d59371c6e..2ca852af3 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -82,7 +82,12 @@ class BotSource(commands.Cog):
             first_line_no = None
             lines_extension = ""
 
-        file_location = Path(filename).relative_to("/bot/")
+        # Handle tag file location differently than others to avoid errors in some cases
+        if not first_line_no:
+            file_location = Path(filename).relative_to("/bot/")
+        else:
+            file_location = Path(filename).relative_to(Path.cwd()).as_posix()
+
         url = f"{URLs.github_bot_repo}/blob/master/{file_location}{lines_extension}"
 
         return url, file_location, first_line_no or None
-- 
cgit v1.2.3


From caa421054669f886750a54fb2fdbea3315c58a58 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Thu, 18 Jun 2020 09:07:47 +0300
Subject: Source: Exclude `tag` from error message when tags cog not loaded

---
 bot/cogs/source.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index 2ca852af3..223552651 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -28,11 +28,14 @@ class SourceConverter(commands.Converter):
             return cmd
 
         tags_cog = ctx.bot.get_cog("Tags")
+        show_tag = True
 
-        if tags_cog and argument.lower() in tags_cog._cache:
+        if not tags_cog:
+            show_tag = False
+        elif argument.lower() in tags_cog._cache:
             return argument.lower()
 
-        raise commands.BadArgument(f"Unable to convert `{argument}` to valid command, tag, or Cog.")
+        raise commands.BadArgument(f"Unable to convert `{argument}` to valid command{', tag,' if show_tag else ''} or Cog.")
 
 
 class BotSource(commands.Cog):
-- 
cgit v1.2.3


From 4c9a62f93fd7b92051dd40e4d799236d65e154ab Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Thu, 18 Jun 2020 09:10:55 +0300
Subject: Source: Split to multiple lines to fix too long line on error raising

---
 bot/cogs/source.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index 223552651..f1db745cd 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -35,7 +35,9 @@ class SourceConverter(commands.Converter):
         elif argument.lower() in tags_cog._cache:
             return argument.lower()
 
-        raise commands.BadArgument(f"Unable to convert `{argument}` to valid command{', tag,' if show_tag else ''} or Cog.")
+        raise commands.BadArgument(
+            f"Unable to convert `{argument}` to valid command{', tag,' if show_tag else ''} or Cog."
+        )
 
 
 class BotSource(commands.Cog):
-- 
cgit v1.2.3


From 40e00ff17465fc5a5fe6b46487bfea37655cd7b9 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Thu, 18 Jun 2020 19:33:59 +0200
Subject: Incidents tests: write tests for `process_event`

This also breaks the helpers import statement into a vertical list,
as the amount of imports has grown too much. I still believe that
this is a preferred alternative to accessing the helpers via module
namespace, as we use them a lot, and the added visual noise would
be annoying to read - their names are already descriptive enough.
---
 tests/bot/cogs/moderation/test_incidents.py | 102 +++++++++++++++++++++++++++-
 1 file changed, 101 insertions(+), 1 deletion(-)

diff --git a/tests/bot/cogs/moderation/test_incidents.py b/tests/bot/cogs/moderation/test_incidents.py
index c093afc8a..6158d5d20 100644
--- a/tests/bot/cogs/moderation/test_incidents.py
+++ b/tests/bot/cogs/moderation/test_incidents.py
@@ -1,3 +1,4 @@
+import asyncio
 import enum
 import logging
 import unittest
@@ -7,7 +8,16 @@ import aiohttp
 import discord
 
 from bot.cogs.moderation import Incidents, incidents
-from tests.helpers import MockAsyncWebhook, MockBot, MockMessage, MockReaction, MockTextChannel, MockUser
+from tests.helpers import (
+    MockAsyncWebhook,
+    MockBot,
+    MockMember,
+    MockMessage,
+    MockReaction,
+    MockRole,
+    MockTextChannel,
+    MockUser,
+)
 
 
 class MockSignal(enum.Enum):
@@ -250,6 +260,96 @@ class TestMakeConfirmationTask(TestIncidents):
         self.assertFalse(created_check(payload=MagicMock(message_id=0)))
 
 
+@patch("bot.cogs.moderation.incidents.ALLOWED_ROLES", {1, 2})
+@patch("bot.cogs.moderation.incidents.Incidents.make_confirmation_task", AsyncMock())  # Generic awaitable
+class TestProcessEvent(TestIncidents):
+    """Tests for the `Incidents.process_event` coroutine."""
+
+    @patch("bot.cogs.moderation.incidents.ALLOWED_ROLES", {1, 2})
+    async def test_process_event_bad_role(self):
+        """The reaction is removed when the author lacks all allowed roles."""
+        incident = MockMessage()
+        member = MockMember(roles=[MockRole(id=0)])  # Must have role 1 or 2
+
+        await self.cog_instance.process_event("reaction", incident, member)
+        incident.remove_reaction.assert_called_once_with("reaction", member)
+
+    async def test_process_event_bad_emoji(self):
+        """
+        The reaction is removed when an invalid emoji is used.
+
+        This requires that we pass in a `member` with valid roles, as we need the role check
+        to succeed.
+        """
+        incident = MockMessage()
+        member = MockMember(roles=[MockRole(id=1)])  # Member has allowed role
+
+        await self.cog_instance.process_event("invalid_signal", incident, member)
+        incident.remove_reaction.assert_called_once_with("invalid_signal", member)
+
+    async def test_process_event_no_archive_on_investigating(self):
+        """Message is not archived on `Signal.INVESTIGATING`."""
+        with patch("bot.cogs.moderation.incidents.Incidents.archive", AsyncMock()) as mocked_archive:
+            await self.cog_instance.process_event(
+                reaction=incidents.Signal.INVESTIGATING.value,
+                incident=MockMessage(),
+                member=MockMember(roles=[MockRole(id=1)]),
+            )
+
+        mocked_archive.assert_not_called()
+
+    async def test_process_event_no_delete_if_archive_fails(self):
+        """
+        Original message is not deleted when `Incidents.archive` returns False.
+
+        This is the way of signaling that the relay failed, and we should not remove the original,
+        as that would result in losing the incident record.
+        """
+        incident = MockMessage()
+
+        with patch("bot.cogs.moderation.incidents.Incidents.archive", AsyncMock(return_value=False)):
+            await self.cog_instance.process_event(
+                reaction=incidents.Signal.ACTIONED.value,
+                incident=incident,
+                member=MockMember(roles=[MockRole(id=1)])
+            )
+
+        incident.delete.assert_not_called()
+
+    async def test_process_event_confirmation_task_is_awaited(self):
+        """Task given by `Incidents.make_confirmation_task` is awaited before method exits."""
+        mock_task = AsyncMock()
+
+        with patch("bot.cogs.moderation.incidents.Incidents.make_confirmation_task", mock_task):
+            await self.cog_instance.process_event(
+                reaction=incidents.Signal.ACTIONED.value,
+                incident=MockMessage(),
+                member=MockMember(roles=[MockRole(id=1)])
+            )
+
+        mock_task.assert_awaited()
+
+    async def test_process_event_confirmation_task_timeout_is_handled(self):
+        """
+        Confirmation task `asyncio.TimeoutError` is handled gracefully.
+
+        We have `make_confirmation_task` return a mock with a side effect, and then catch the
+        exception should it propagate out of `process_event`. This is so that we can then manually
+        fail the test with a more informative message than just the plain traceback.
+        """
+        mock_task = AsyncMock(side_effect=asyncio.TimeoutError())
+
+        try:
+            with patch("bot.cogs.moderation.incidents.Incidents.make_confirmation_task", mock_task):
+                await self.cog_instance.process_event(
+                    reaction=incidents.Signal.ACTIONED.value,
+                    incident=MockMessage(),
+                    member=MockMember(roles=[MockRole(id=1)])
+                )
+        except asyncio.TimeoutError:
+            self.fail("TimeoutError was not handled gracefully, and propagated out of `process_event`!")
+
+
 class TestResolveMessage(TestIncidents):
     """Tests for the `Incidents.resolve_message` coroutine."""
 
-- 
cgit v1.2.3


From ed4097629601704f0c65fc40cceb5fd6757d4779 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 19 Jun 2020 14:32:31 +0200
Subject: Incidents tests: add helper for mocking async for-loops

See the docstring. This does not make the ambition to be powerful
enough to be included in `tests.helpers`, and is only intended
for local purposes.
---
 tests/bot/cogs/moderation/test_incidents.py | 37 +++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/tests/bot/cogs/moderation/test_incidents.py b/tests/bot/cogs/moderation/test_incidents.py
index 6158d5d20..7fa8847ef 100644
--- a/tests/bot/cogs/moderation/test_incidents.py
+++ b/tests/bot/cogs/moderation/test_incidents.py
@@ -1,6 +1,7 @@
 import asyncio
 import enum
 import logging
+import typing as t
 import unittest
 from unittest.mock import AsyncMock, MagicMock, call, patch
 
@@ -20,6 +21,42 @@ from tests.helpers import (
 )
 
 
+class MockAsyncIterable:
+    """
+    Helper for mocking asynchronous for loops.
+
+    It does not appear that the `unittest` library currently provides anything that would
+    allow us to simply mock an async iterator, such as `discord.TextChannel.history`.
+
+    We therefore write our own helper to wrap a regular synchronous iterable, and feed
+    its values via `__anext__` rather than `__next__`.
+
+    This class was written for the purposes of testing the `Incidents` cog - it may not
+    be generic enough to be placed in the `tests.helpers` module.
+    """
+
+    def __init__(self, messages: t.Iterable):
+        """Take a sync iterable to be wrapped."""
+        self.iter_messages = iter(messages)
+
+    def __aiter__(self):
+        """Return `self` as we provide the `__anext__` method."""
+        return self
+
+    async def __anext__(self):
+        """
+        Feed the next item, or raise `StopAsyncIteration`.
+
+        Since we're wrapping a sync iterator, it will communicate that it has been depleted
+        by raising a `StopIteration`. The `async for` construct does not expect it, and we
+        therefore need to substitute it for the appropriate exception type.
+        """
+        try:
+            return next(self.iter_messages)
+        except StopIteration:
+            raise StopAsyncIteration
+
+
 class MockSignal(enum.Enum):
     A = "A"
     B = "B"
-- 
cgit v1.2.3


From d93ed5d801c08b7fb084427906e7ac484ac3563f Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 19 Jun 2020 14:37:44 +0200
Subject: Incidents tests: write tests for `crawl_incidents`

---
 tests/bot/cogs/moderation/test_incidents.py | 58 +++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/tests/bot/cogs/moderation/test_incidents.py b/tests/bot/cogs/moderation/test_incidents.py
index 7fa8847ef..4e6dfd5f7 100644
--- a/tests/bot/cogs/moderation/test_incidents.py
+++ b/tests/bot/cogs/moderation/test_incidents.py
@@ -209,6 +209,64 @@ class TestIncidents(unittest.IsolatedAsyncioTestCase):
         self.cog_instance = Incidents(MockBot())
 
 
+@patch("asyncio.sleep", AsyncMock())  # Prevent the coro from sleeping to speed up the test
+class TestCrawlIncidents(TestIncidents):
+    """
+    Tests for the `Incidents.crawl_incidents` coroutine.
+
+    Apart from `test_crawl_incidents_waits_until_cache_ready`, all tests in this class
+    will patch the return values of `is_incident` and `has_signal` and then observe
+    whether the `AsyncMock` for `add_signals` was awaited or not.
+
+    The `add_signals` mock is added by each test separately to ensure it is clean (has not
+    been awaited by another test yet). The mock can be reset, but this appears to be the
+    cleaner way.
+
+    For each test, we inject a mock channel with a history of 1 message only (see: `setUp`).
+    """
+
+    def setUp(self):
+        """For each test, ensure `bot.get_channel` returns a channel with 1 arbitrary message."""
+        super().setUp()  # First ensure we get `cog_instance` from parent
+
+        incidents_history = MagicMock(return_value=MockAsyncIterable([MockMessage()]))
+        self.cog_instance.bot.get_channel = MagicMock(return_value=MockTextChannel(history=incidents_history))
+
+    async def test_crawl_incidents_waits_until_cache_ready(self):
+        """
+        The coroutine will await the `wait_until_guild_available` event.
+
+        Since this task is schedule in the `__init__`, it is critical that it waits for the
+        cache to be ready, so that it can safely get the #incidents channel.
+        """
+        await self.cog_instance.crawl_incidents()
+        self.cog_instance.bot.wait_until_guild_available.assert_awaited()
+
+    @patch("bot.cogs.moderation.incidents.add_signals", AsyncMock())
+    @patch("bot.cogs.moderation.incidents.is_incident", MagicMock(return_value=False))  # Message doesn't qualify
+    @patch("bot.cogs.moderation.incidents.has_signals", MagicMock(return_value=False))
+    async def test_crawl_incidents_noop_if_is_not_incident(self):
+        """Signals are not added for a non-incident message."""
+        await self.cog_instance.crawl_incidents()
+        incidents.add_signals.assert_not_awaited()
+
+    @patch("bot.cogs.moderation.incidents.add_signals", AsyncMock())
+    @patch("bot.cogs.moderation.incidents.is_incident", MagicMock(return_value=True))  # Message qualifies
+    @patch("bot.cogs.moderation.incidents.has_signals", MagicMock(return_value=True))  # But already has signals
+    async def test_crawl_incidents_noop_if_message_already_has_signals(self):
+        """Signals are not added for messages which already have them."""
+        await self.cog_instance.crawl_incidents()
+        incidents.add_signals.assert_not_awaited()
+
+    @patch("bot.cogs.moderation.incidents.add_signals", AsyncMock())
+    @patch("bot.cogs.moderation.incidents.is_incident", MagicMock(return_value=True))  # Message qualifies
+    @patch("bot.cogs.moderation.incidents.has_signals", MagicMock(return_value=False))  # And doesn't have signals
+    async def test_crawl_incidents_add_signals_called(self):
+        """Message has signals added as it does not have them yet and qualifies as an incident."""
+        await self.cog_instance.crawl_incidents()
+        incidents.add_signals.assert_awaited_once()
+
+
 class TestArchive(TestIncidents):
     """Tests for the `Incidents.archive` coroutine."""
 
-- 
cgit v1.2.3


From 9a58b45cad51c961ad34fa9de9aaa060446c54fd Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 19 Jun 2020 16:57:15 +0200
Subject: Incidents tests: write tests for `on_raw_reaction_add`

---
 tests/bot/cogs/moderation/test_incidents.py | 128 ++++++++++++++++++++++++++++
 1 file changed, 128 insertions(+)

diff --git a/tests/bot/cogs/moderation/test_incidents.py b/tests/bot/cogs/moderation/test_incidents.py
index 4e6dfd5f7..55b15ec9e 100644
--- a/tests/bot/cogs/moderation/test_incidents.py
+++ b/tests/bot/cogs/moderation/test_incidents.py
@@ -520,6 +520,134 @@ class TestResolveMessage(TestIncidents):
             self.assertIsNone(await self.cog_instance.resolve_message(123))
 
 
+@patch("bot.constants.Channels.incidents", 123)
+class TestOnRawReactionAdd(TestIncidents):
+    """
+    Tests for the `Incidents.on_raw_reaction_add` listener.
+
+    Writing tests for this listener comes with additional complexity due to the listener
+    awaiting the `crawl_task` task. See `asyncSetUp` for further details, which attempts
+    to make unit testing this function possible.
+    """
+
+    def setUp(self):
+        """
+        Prepare & assign `payload` attribute.
+
+        This attribute represents an *ideal* payload which will not be rejected by the
+        listener. As each test will receive a fresh instance, it can be mutated to
+        observe how the listener's behaviour changes with different attributes on
+        the passed payload.
+        """
+        super().setUp()  # Ensure `cog_instance` is assigned
+
+        self.payload = MagicMock(
+            discord.RawReactionActionEvent,
+            channel_id=123,  # Patched at class level
+            message_id=456,
+            member=MockMember(bot=False),
+            emoji="reaction",
+        )
+
+    async def asyncSetUp(self):  # noqa: N802
+        """
+        Prepare an empty task and assign it as `crawl_task`.
+
+        It appears that the `unittest` framework does not provide anything for mocking
+        asyncio tasks. An `AsyncMock` instance can be called and then awaited, however,
+        it does not provide the `done` method or any other parts of the `asyncio.Task`
+        interface.
+
+        Although we do not need to make any assertions about the task itself while
+        testing the listener, the code will still await it and call the `done` method,
+        and so we must inject something that will not fail on either action.
+
+        Note that this is done in an `asyncSetUp`, which runs after `setUp`.
+        The justification is that creating an actual task requires the event
+        loop to be ready, which is not the case in the `setUp`.
+        """
+        mock_task = asyncio.create_task(AsyncMock()())  # Mock async func, then a coro
+        self.cog_instance.crawl_task = mock_task
+
+    async def test_on_raw_reaction_add_wrong_channel(self):
+        """
+        Events outside of #incidents will be ignored.
+
+        We check this by asserting that `resolve_message` was never queried.
+        """
+        self.payload.channel_id = 0
+        self.cog_instance.resolve_message = AsyncMock()
+
+        await self.cog_instance.on_raw_reaction_add(self.payload)
+        self.cog_instance.resolve_message.assert_not_called()
+
+    async def test_on_raw_reaction_add_user_is_bot(self):
+        """
+        Events dispatched by bot accounts will be ignored.
+
+        We check this by asserting that `resolve_message` was never queried.
+        """
+        self.payload.member = MockMember(bot=True)
+        self.cog_instance.resolve_message = AsyncMock()
+
+        await self.cog_instance.on_raw_reaction_add(self.payload)
+        self.cog_instance.resolve_message.assert_not_called()
+
+    async def test_on_raw_reaction_add_message_doesnt_exist(self):
+        """
+        Listener gracefully handles the case where `resolve_message` gives None.
+
+        We check this by asserting that `process_event` was never called.
+        """
+        self.cog_instance.process_event = AsyncMock()
+        self.cog_instance.resolve_message = AsyncMock(return_value=None)
+
+        await self.cog_instance.on_raw_reaction_add(self.payload)
+        self.cog_instance.process_event.assert_not_called()
+
+    async def test_on_raw_reaction_add_message_is_not_an_incident(self):
+        """
+        The event won't be processed if the related message is not an incident.
+
+        This is an edge-case that can happen if someone manually leaves a reaction
+        on a pinned message, or a comment.
+
+        We check this by asserting that `process_event` was never called.
+        """
+        self.cog_instance.process_event = AsyncMock()
+        self.cog_instance.resolve_message = AsyncMock(return_value=MockMessage())
+
+        with patch("bot.cogs.moderation.incidents.is_incident", MagicMock(return_value=False)):
+            await self.cog_instance.on_raw_reaction_add(self.payload)
+
+        self.cog_instance.process_event.assert_not_called()
+
+    async def test_on_raw_reaction_add_valid_event_is_processed(self):
+        """
+        If the reaction event is valid, it is passed to `process_event`.
+
+        This is the case when everything goes right:
+            * The reaction was placed in #incidents, and not by a bot
+            * The message was found successfully
+            * The message qualifies as an incident
+
+        Additionally, we check that all arguments were passed as expected.
+        """
+        incident = MockMessage(id=1)
+
+        self.cog_instance.process_event = AsyncMock()
+        self.cog_instance.resolve_message = AsyncMock(return_value=incident)
+
+        with patch("bot.cogs.moderation.incidents.is_incident", MagicMock(return_value=True)):
+            await self.cog_instance.on_raw_reaction_add(self.payload)
+
+        self.cog_instance.process_event.assert_called_with(
+            "reaction",  # Defined in `self.payload`
+            incident,
+            self.payload.member,
+        )
+
+
 class TestOnMessage(TestIncidents):
     """
     Tests for the `Incidents.on_message` listener.
-- 
cgit v1.2.3


From e760bd38b5d625011318a9ddfc98bb52570d1c3a Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 19 Jun 2020 17:08:50 +0200
Subject: Incidents: review log levels; use `trace` where appropriate

Logs useful when observing the internals but too verbose for DEBUG are
reduced to TRACE.
---
 bot/cogs/moderation/incidents.py | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 16286bdab..da04c7d0d 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -64,10 +64,10 @@ async def add_signals(incident: discord.Message) -> None:
 
         # This will not raise, but it is a superfluous API call that can be avoided
         if signal_emoji.value in existing_reacts:
-            log.debug(f"Skipping emoji as it's already been placed: {signal_emoji}")
+            log.trace(f"Skipping emoji as it's already been placed: {signal_emoji}")
 
         else:
-            log.debug(f"Adding reaction: {signal_emoji}")
+            log.trace(f"Adding reaction: {signal_emoji}")
             await incident.add_reaction(signal_emoji.value)
 
 
@@ -132,11 +132,11 @@ class Incidents(Cog):
         async for message in incidents.history(limit=limit):
 
             if not is_incident(message):
-                log.debug("Skipping message: not an incident")
+                log.trace("Skipping message: not an incident")
                 continue
 
             if has_signals(message):
-                log.debug("Skipping message: already has all signals")
+                log.trace("Skipping message: already has all signals")
                 continue
 
             await add_signals(message)
@@ -179,7 +179,7 @@ class Incidents(Cog):
             return False
 
         else:
-            log.debug("Message archived successfully!")
+            log.trace("Message archived successfully!")
             return True
 
     def make_confirmation_task(self, incident: discord.Message, timeout: int = 5) -> asyncio.Task:
@@ -189,7 +189,7 @@ class Incidents(Cog):
         If `timeout` passes, this will raise `asyncio.TimeoutError`, signaling that we haven't
         been able to confirm that the message was deleted.
         """
-        log.debug(f"Confirmation task will wait {timeout=} seconds for {incident.id=} to be deleted")
+        log.trace(f"Confirmation task will wait {timeout=} seconds for {incident.id=} to be deleted")
 
         def check(payload: discord.RawReactionActionEvent) -> bool:
             return payload.message_id == incident.id
@@ -225,7 +225,7 @@ class Incidents(Cog):
 
         # If we reach this point, we know that `emoji` is a `Signal` member
         signal = Signal(reaction)
-        log.debug(f"Received signal: {signal}")
+        log.trace(f"Received signal: {signal}")
 
         if signal not in (Signal.ACTIONED, Signal.NOT_ACTIONED):
             log.debug("Reaction was valid, but no action is currently defined for it")
@@ -233,22 +233,22 @@ class Incidents(Cog):
 
         relay_successful = await self.archive(incident, signal)
         if not relay_successful:
-            log.debug("Original message will not be deleted as we failed to relay it to the archive")
+            log.trace("Original message will not be deleted as we failed to relay it to the archive")
             return
 
         timeout = 5  # Seconds
         confirmation_task = self.make_confirmation_task(incident, timeout)
 
-        log.debug("Deleting original message")
+        log.trace("Deleting original message")
         await incident.delete()
 
-        log.debug(f"Awaiting deletion confirmation: {timeout=} seconds")
+        log.trace(f"Awaiting deletion confirmation: {timeout=} seconds")
         try:
             await confirmation_task
         except asyncio.TimeoutError:
             log.warning(f"Did not receive incident deletion confirmation within {timeout} seconds!")
         else:
-            log.debug("Deletion was confirmed")
+            log.trace("Deletion was confirmed")
 
     async def resolve_message(self, message_id: int) -> t.Optional[discord.Message]:
         """
@@ -264,22 +264,22 @@ class Incidents(Cog):
         This signals that the event for `message_id` should be ignored.
         """
         await self.bot.wait_until_guild_available()  # First make sure that the cache is ready
-        log.debug(f"Resolving message for: {message_id=}")
+        log.trace(f"Resolving message for: {message_id=}")
         message: discord.Message = self.bot._connection._get_message(message_id)  # noqa: Private attribute
 
         if message is not None:
-            log.debug("Message was found in cache")
+            log.trace("Message was found in cache")
             return message
 
-        log.debug("Message not found, attempting to fetch")
+        log.trace("Message not found, attempting to fetch")
         try:
             message = await self.bot.get_channel(Channels.incidents).fetch_message(message_id)
         except discord.NotFound:
-            log.debug("Message doesn't exist, it was likely already relayed")
+            log.trace("Message doesn't exist, it was likely already relayed")
         except Exception as exc:
             log.exception("Failed to fetch message!", exc_info=exc)
         else:
-            log.debug("Message fetched successfully!")
+            log.trace("Message fetched successfully!")
             return message
 
     @Cog.listener()
@@ -309,10 +309,10 @@ class Incidents(Cog):
         if payload.channel_id != Channels.incidents or payload.member.bot:
             return
 
-        log.debug(f"Received reaction add event in #incidents, waiting for crawler: {self.crawl_task.done()=}")
+        log.trace(f"Received reaction add event in #incidents, waiting for crawler: {self.crawl_task.done()=}")
         await self.crawl_task
 
-        log.debug(f"Acquiring event lock: {self.event_lock.locked()=}")
+        log.trace(f"Acquiring event lock: {self.event_lock.locked()=}")
         async with self.event_lock:
             message = await self.resolve_message(payload.message_id)
 
@@ -325,7 +325,7 @@ class Incidents(Cog):
                 return
 
             await self.process_event(str(payload.emoji), message, payload.member)
-            log.debug("Releasing event lock")
+            log.trace("Releasing event lock")
 
     @Cog.listener()
     async def on_message(self, message: discord.Message) -> None:
-- 
cgit v1.2.3


From 8a0263f5a591be51e74c2b26369f74c6d8dfee09 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 19 Jun 2020 17:55:20 +0200
Subject: Incidents: remove broad noqa

This was originally in place to silence a PyCharm warning regarding
accessing the private attributes.

However, since there is no corresponding error code to specify,
the noqa will silence any linter warning, which is potentially
dangerous, and seems to be bad practice.
---
 bot/cogs/moderation/incidents.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index da04c7d0d..c733607e6 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -265,7 +265,7 @@ class Incidents(Cog):
         """
         await self.bot.wait_until_guild_available()  # First make sure that the cache is ready
         log.trace(f"Resolving message for: {message_id=}")
-        message: discord.Message = self.bot._connection._get_message(message_id)  # noqa: Private attribute
+        message: discord.Message = self.bot._connection._get_message(message_id)
 
         if message is not None:
             log.trace("Message was found in cache")
-- 
cgit v1.2.3


From 8a08ca3a29f6d6bda2ab71bc9fd70782be9869e4 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 19 Jun 2020 20:26:06 +0200
Subject: Incidents: annotate possible None type

Caught during review by ks129.

Co-authored-by: ks129 <45097959+ks129@users.noreply.github.com>
---
 bot/cogs/moderation/incidents.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index c733607e6..c09d8e1a7 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -265,7 +265,7 @@ class Incidents(Cog):
         """
         await self.bot.wait_until_guild_available()  # First make sure that the cache is ready
         log.trace(f"Resolving message for: {message_id=}")
-        message: discord.Message = self.bot._connection._get_message(message_id)
+        message: t.Optional[discord.Message] = self.bot._connection._get_message(message_id)
 
         if message is not None:
             log.trace("Message was found in cache")
-- 
cgit v1.2.3


From b563063c1a25a0a775ea1fb6cf31b7ef9725e14e Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 19 Jun 2020 20:33:17 +0200
Subject: Incidents: reduce excessive whitespace

This is way too spacious for how little is happening here.
Suggested by ks129.

Co-authored-by: ks129 <45097959+ks129@users.noreply.github.com>
---
 bot/cogs/moderation/incidents.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index c09d8e1a7..70921462d 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -61,11 +61,8 @@ async def add_signals(incident: discord.Message) -> None:
     existing_reacts = own_reactions(incident)
 
     for signal_emoji in Signal:
-
-        # This will not raise, but it is a superfluous API call that can be avoided
-        if signal_emoji.value in existing_reacts:
+        if signal_emoji.value in existing_reacts:  # This would not raise, but it is a superfluous API call
             log.trace(f"Skipping emoji as it's already been placed: {signal_emoji}")
-
         else:
             log.trace(f"Adding reaction: {signal_emoji}")
             await incident.add_reaction(signal_emoji.value)
-- 
cgit v1.2.3


From 662ca588ac352fc346fae973dead5052c7b4af59 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Sat, 20 Jun 2020 12:22:11 +0200
Subject: Incidents: remove redundant `exc_info` passing

Pointed out by Mark during review that this is unnecessary, as logging
using `exception` automatically appends the `exc_info` of the handled
exception when done in an except block.

Co-authored-by: MarkKoz <kozlovmark@gmail.com>
---
 bot/cogs/moderation/incidents.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 70921462d..5f4291953 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -171,8 +171,8 @@ class Incidents(Cog):
             # Finally add the `outcome` emoji
             await message.add_reaction(outcome.value)
 
-        except Exception as exc:
-            log.exception("Failed to archive incident to #incidents-archive", exc_info=exc)
+        except Exception:
+            log.exception("Failed to archive incident to #incidents-archive")
             return False
 
         else:
@@ -273,8 +273,8 @@ class Incidents(Cog):
             message = await self.bot.get_channel(Channels.incidents).fetch_message(message_id)
         except discord.NotFound:
             log.trace("Message doesn't exist, it was likely already relayed")
-        except Exception as exc:
-            log.exception("Failed to fetch message!", exc_info=exc)
+        except Exception:
+            log.exception("Failed to fetch message!")
         else:
             log.trace("Message fetched successfully!")
             return message
-- 
cgit v1.2.3


From 20b27f32c68673b603a6e6e41859f7672b6e0133 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Sat, 20 Jun 2020 12:28:18 +0200
Subject: Incidents: make logs contain the message id they pertain to

Suggested by Mark during review.

Co-authored-by: MarkKoz <kozlovmark@gmail.com>
---
 bot/cogs/moderation/incidents.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 5f4291953..33c3bee51 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -129,11 +129,11 @@ class Incidents(Cog):
         async for message in incidents.history(limit=limit):
 
             if not is_incident(message):
-                log.trace("Skipping message: not an incident")
+                log.trace(f"Skipping message {message.id}: not an incident")
                 continue
 
             if has_signals(message):
-                log.trace("Skipping message: already has all signals")
+                log.trace(f"Skipping message {message.id}: already has all signals")
                 continue
 
             await add_signals(message)
@@ -172,7 +172,7 @@ class Incidents(Cog):
             await message.add_reaction(outcome.value)
 
         except Exception:
-            log.exception("Failed to archive incident to #incidents-archive")
+            log.exception(f"Failed to archive incident {incident.id} to #incidents-archive")
             return False
 
         else:
@@ -274,7 +274,7 @@ class Incidents(Cog):
         except discord.NotFound:
             log.trace("Message doesn't exist, it was likely already relayed")
         except Exception:
-            log.exception("Failed to fetch message!")
+            log.exception(f"Failed to fetch message {message_id}!")
         else:
             log.trace("Message fetched successfully!")
             return message
-- 
cgit v1.2.3


From 6d3a91cf5d51e6e2a2f10c08718a7c8de0d521ed Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Sat, 20 Jun 2020 12:35:46 +0200
Subject: Incidents: make crawl limit & sleep module-level constants

Requested during review.

Co-authored-by: ks129 <45097959+ks129@users.noreply.github.com>
Co-authored-by: Joseph Banks <joseph@josephbanks.me>
---
 bot/cogs/moderation/incidents.py | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 33c3bee51..4e6743224 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -11,6 +11,14 @@ from bot.constants import Channels, Emojis, Roles, Webhooks
 
 log = logging.getLogger(__name__)
 
+# Amount of messages for `crawl_task` to process at most on start-up - limited to 50
+# as in practice, there should never be this many messages, and if there are,
+# something has likely gone very wrong
+CRAWL_LIMIT = 50
+
+# Seconds for `crawl_task` to sleep after adding reactions to a message
+CRAWL_SLEEP = 2
+
 
 class Signal(Enum):
     """
@@ -114,19 +122,14 @@ class Incidents(Cog):
 
         Once this task is scheduled, listeners that change messages should await it.
         The crawl assumes that the channel history doesn't change as we go over it.
+
+        Behaviour is configured by: `CRAWL_LIMIT`, `CRAWL_SLEEP`.
         """
         await self.bot.wait_until_guild_available()
         incidents: discord.TextChannel = self.bot.get_channel(Channels.incidents)
 
-        # Limit the query at 50 as in practice, there should never be this many messages,
-        # and if there are, something has likely gone very wrong
-        limit = 50
-
-        # Seconds to sleep after adding reactions to a message
-        sleep = 2
-
-        log.debug(f"Crawling messages in #incidents: {limit=}, {sleep=}")
-        async for message in incidents.history(limit=limit):
+        log.debug(f"Crawling messages in #incidents: {CRAWL_LIMIT=}, {CRAWL_SLEEP=}")
+        async for message in incidents.history(limit=CRAWL_LIMIT):
 
             if not is_incident(message):
                 log.trace(f"Skipping message {message.id}: not an incident")
@@ -137,7 +140,7 @@ class Incidents(Cog):
                 continue
 
             await add_signals(message)
-            await asyncio.sleep(sleep)
+            await asyncio.sleep(CRAWL_SLEEP)
 
         log.debug("Crawl task finished!")
 
-- 
cgit v1.2.3


From b8ada89bd45e6b8efd17fba79e70ce91a59b24fc Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Sat, 20 Jun 2020 12:42:53 +0200
Subject: Incidents: simplify set operation in `has_signals`

Using `issubset` is a much simpler & more readable way of expressing
the relationship between the two sets.

Suggested by Mark during review.

Co-authored-by: MarkKoz <kozlovmark@gmail.com>
---
 bot/cogs/moderation/incidents.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 4e6743224..089a5bc9f 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -56,8 +56,7 @@ def own_reactions(message: discord.Message) -> t.Set[str]:
 
 def has_signals(message: discord.Message) -> bool:
     """True if `message` already has all `Signal` reactions, False otherwise."""
-    missing_signals = ALLOWED_EMOJI - own_reactions(message)  # In `ALLOWED_EMOJI` but not in `own_reactions(message)`
-    return not missing_signals
+    return ALLOWED_EMOJI.issubset(own_reactions(message))
 
 
 async def add_signals(incident: discord.Message) -> None:
-- 
cgit v1.2.3


From 98b8947ab7865e33f18da8e2a62b26405676e8e4 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Sat, 20 Jun 2020 13:13:45 +0200
Subject: Incidents: try-except Signal creation

Suggested by Mark during review. This follows the "ask for forgiveness
rather than permission" paradigm, ends up being less code to read, and
may be seen as more logical / safer.

The `ALLOWED_EMOJI` set was renamed to `ALL_SIGNALS` as this now better
communicates the set's purpose.

Tests adjusted as appropriate.

Co-authored-by: MarkKoz <kozlovmark@gmail.com>
---
 bot/cogs/moderation/incidents.py            | 18 +++++++++++-------
 tests/bot/cogs/moderation/test_incidents.py |  8 ++++----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 089a5bc9f..41a98bcb7 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -33,9 +33,11 @@ class Signal(Enum):
     INVESTIGATING = Emojis.incident_investigating
 
 
-# Reactions from roles not listed here, or using emoji not listed here, will be removed
+# Reactions from roles not listed here will be removed
 ALLOWED_ROLES: t.Set[int] = {Roles.moderators, Roles.admins, Roles.owners}
-ALLOWED_EMOJI: t.Set[str] = {signal.value for signal in Signal}
+
+# Message must have all of these emoji to pass the `has_signals` check
+ALL_SIGNALS: t.Set[str] = {signal.value for signal in Signal}
 
 
 def is_incident(message: discord.Message) -> bool:
@@ -56,7 +58,7 @@ def own_reactions(message: discord.Message) -> t.Set[str]:
 
 def has_signals(message: discord.Message) -> bool:
     """True if `message` already has all `Signal` reactions, False otherwise."""
-    return ALLOWED_EMOJI.issubset(own_reactions(message))
+    return ALL_SIGNALS.issubset(own_reactions(message))
 
 
 async def add_signals(incident: discord.Message) -> None:
@@ -96,7 +98,9 @@ class Incidents(Cog):
         * See: `on_message`
 
     On reaction:
-        * Remove reaction if not permitted (`ALLOWED_EMOJI`, `ALLOWED_ROLES`)
+        * Remove reaction if not permitted
+            * User does not have any of the roles in `ALLOWED_ROLES`
+            * Used emoji is not a `Signal` member
         * If `Signal.ACTIONED` or `Signal.NOT_ACTIONED` were chosen, attempt to
           relay the incident message to #incidents-archive
         * If relay successful, delete original message
@@ -217,13 +221,13 @@ class Incidents(Cog):
             await incident.remove_reaction(reaction, member)
             return
 
-        if reaction not in ALLOWED_EMOJI:
+        try:
+            signal = Signal(reaction)
+        except ValueError:
             log.debug(f"Removing invalid reaction: emoji {reaction} is not a valid signal")
             await incident.remove_reaction(reaction, member)
             return
 
-        # If we reach this point, we know that `emoji` is a `Signal` member
-        signal = Signal(reaction)
         log.trace(f"Received signal: {signal}")
 
         if signal not in (Signal.ACTIONED, Signal.NOT_ACTIONED):
diff --git a/tests/bot/cogs/moderation/test_incidents.py b/tests/bot/cogs/moderation/test_incidents.py
index 55b15ec9e..862736785 100644
--- a/tests/bot/cogs/moderation/test_incidents.py
+++ b/tests/bot/cogs/moderation/test_incidents.py
@@ -131,17 +131,17 @@ class TestOwnReactions(unittest.TestCase):
         self.assertSetEqual(incidents.own_reactions(message), {"A", "B"})
 
 
-@patch("bot.cogs.moderation.incidents.ALLOWED_EMOJI", {"A", "B"})
+@patch("bot.cogs.moderation.incidents.ALL_SIGNALS", {"A", "B"})
 class TestHasSignals(unittest.TestCase):
     """
     Assertions for the `has_signals` function.
 
-    We patch `ALLOWED_EMOJI` globally. Each test function then patches `own_reactions`
+    We patch `ALL_SIGNALS` globally. Each test function then patches `own_reactions`
     as appropriate.
     """
 
     def test_has_signals_true(self):
-        """True when `own_reactions` returns all emoji in `ALLOWED_EMOJI`."""
+        """True when `own_reactions` returns all emoji in `ALL_SIGNALS`."""
         message = MockMessage()
         own_reactions = MagicMock(return_value={"A", "B"})
 
@@ -149,7 +149,7 @@ class TestHasSignals(unittest.TestCase):
             self.assertTrue(incidents.has_signals(message))
 
     def test_has_signals_false(self):
-        """False when `own_reactions` does not return all emoji in `ALLOWED_EMOJI`."""
+        """False when `own_reactions` does not return all emoji in `ALL_SIGNALS`."""
         message = MockMessage()
         own_reactions = MagicMock(return_value={"A", "C"})
 
-- 
cgit v1.2.3


From 20dbd177f227511b9c3cb678ab45a67558cd3d7f Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Sat, 20 Jun 2020 13:15:43 +0200
Subject: Incidents tests: remove unnecessary patch

This is already being patched at class-level.
---
 tests/bot/cogs/moderation/test_incidents.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/bot/cogs/moderation/test_incidents.py b/tests/bot/cogs/moderation/test_incidents.py
index 862736785..9f0553216 100644
--- a/tests/bot/cogs/moderation/test_incidents.py
+++ b/tests/bot/cogs/moderation/test_incidents.py
@@ -360,7 +360,6 @@ class TestMakeConfirmationTask(TestIncidents):
 class TestProcessEvent(TestIncidents):
     """Tests for the `Incidents.process_event` coroutine."""
 
-    @patch("bot.cogs.moderation.incidents.ALLOWED_ROLES", {1, 2})
     async def test_process_event_bad_role(self):
         """The reaction is removed when the author lacks all allowed roles."""
         incident = MockMessage()
-- 
cgit v1.2.3


From a8b4e394d9da57287cd9497cd9bb0a97fa467e84 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Sat, 20 Jun 2020 14:02:48 +0200
Subject: Incidents: de-clyde archive webhook username

With PR #1009 merged, we now apply the same fix to our relay function.

This prevents the "clyde" word from sneaking into the webhook username,
which is forbidden and will return a 400.
---
 bot/cogs/moderation/incidents.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 41a98bcb7..040f2c0c8 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -8,6 +8,7 @@ from discord.ext.commands import Cog
 
 from bot.bot import Bot
 from bot.constants import Channels, Emojis, Roles, Webhooks
+from bot.utils.messages import sub_clyde
 
 log = logging.getLogger(__name__)
 
@@ -169,7 +170,7 @@ class Incidents(Cog):
             # Now relay the incident
             message: discord.Message = await webhook.send(
                 content=incident.clean_content,  # Clean content will prevent mentions from pinging
-                username=incident.author.name,
+                username=sub_clyde(incident.author.name),
                 avatar_url=incident.author.avatar_url,
                 wait=True,  # This makes the method return the sent Message object
             )
-- 
cgit v1.2.3


From f240a970c6b97d201959d25a79a8babafed1c2b1 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Sat, 20 Jun 2020 14:15:34 +0200
Subject: Incidents tests: assert webhook username is de-clyded

See: a8b4e394d9da57287cd9497cd9bb0a97fa467e84
---
 tests/bot/cogs/moderation/test_incidents.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/tests/bot/cogs/moderation/test_incidents.py b/tests/bot/cogs/moderation/test_incidents.py
index 9f0553216..2fc9180cf 100644
--- a/tests/bot/cogs/moderation/test_incidents.py
+++ b/tests/bot/cogs/moderation/test_incidents.py
@@ -319,6 +319,25 @@ class TestArchive(TestIncidents):
         # Finally check that the method returned True
         self.assertTrue(archive_return)
 
+    async def test_archive_clyde_username(self):
+        """
+        The archive webhook username is cleansed using `sub_clyde`.
+
+        Discord will reject any webhook with "clyde" in the username field, as it impersonates
+        the official Clyde bot. Since we do not control what the username will be (the incident
+        author name is used), we must ensure the name is cleansed, otherwise the relay may fail.
+
+        This test assumes the username is passed as a kwarg. If this test fails, please review
+        whether the passed argument is being retrieved correctly.
+        """
+        webhook = MockAsyncWebhook()
+        self.cog_instance.bot.fetch_webhook = AsyncMock(return_value=webhook)
+
+        message_from_clyde = MockMessage(author=MockUser(name="clyde the great"))
+        await self.cog_instance.archive(message_from_clyde, MagicMock(incidents.Signal))
+
+        self.assertNotIn("clyde", webhook.send.call_args.kwargs["username"])
+
 
 class TestMakeConfirmationTask(TestIncidents):
     """
-- 
cgit v1.2.3


From 6fa8caed037b247a7c194f58a4635de7dae21fd2 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Sun, 21 Jun 2020 13:51:17 +0200
Subject: Incidents: implement `make_username` helper

The justification is to incorporate the `actioned_by` name into the
username in some way, and so the logical thing to do is to abstract
this process into a helper so that it can easily be adjusted in the
future. For now, I've chosen to separate the names by a pipe.

Discord webhook username cannot exceed 80 characters in length, and
so we cap it at this length by default. This is seen as more of an
edge-case, but it should be accounted for, as we're not joining two
names. The `max_length` param is configurable primarily for testing
purposes, it probably should never be passed explicitly.

This commit also provides two tests for the function.
---
 bot/cogs/moderation/incidents.py            | 24 ++++++++++++++++++++++++
 tests/bot/cogs/moderation/test_incidents.py | 29 +++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 040f2c0c8..2cce9b6fe 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -41,6 +41,30 @@ ALLOWED_ROLES: t.Set[int] = {Roles.moderators, Roles.admins, Roles.owners}
 ALL_SIGNALS: t.Set[str] = {signal.value for signal in Signal}
 
 
+def make_username(reported_by: discord.Member, actioned_by: discord.Member, max_length: int = 80) -> str:
+    """
+    Create a webhook-friendly username from the names of `reported_by` and `actioned_by`.
+
+    If the resulting username length exceeds `max_length`, it will be capped at `max_length - 3`
+    and have 3 dots appended to the end. The default value is 80, which corresponds to the limit
+    Discord imposes on webhook username length.
+
+    If the value of `max_length` is < 3, ValueError is raised.
+    """
+    if max_length < 3:
+        raise ValueError(f"Maximum length cannot be less than 3: {max_length=}")
+
+    username = f"{reported_by.name} | {actioned_by.name}"
+    log.trace(f"Generated webhook username: {username} (length: {len(username)})")
+
+    if len(username) > max_length:
+        stop = max_length - 3
+        username = f"{username[:stop]}..."
+        log.trace(f"Username capped at {max_length=}: {username}")
+
+    return username
+
+
 def is_incident(message: discord.Message) -> bool:
     """True if `message` qualifies as an incident, False otherwise."""
     conditions = (
diff --git a/tests/bot/cogs/moderation/test_incidents.py b/tests/bot/cogs/moderation/test_incidents.py
index 2fc9180cf..5700a5a35 100644
--- a/tests/bot/cogs/moderation/test_incidents.py
+++ b/tests/bot/cogs/moderation/test_incidents.py
@@ -68,6 +68,35 @@ mock_404 = discord.NotFound(
 )
 
 
+class TestMakeUsername(unittest.TestCase):
+    """Collection of tests for the `make_username` helper function."""
+
+    def test_make_username_raises(self):
+        """Raises `ValueError` on `max_length` < 3."""
+        with self.assertRaises(ValueError):
+            incidents.make_username(MockMember(), MockMember(), max_length=2)
+
+    def test_make_username_never_exceed_limit(self):
+        """
+        The return string length is always less than or equal to `max_length`.
+
+        For this test we pass `max_length=10` for convenience. The name of the first
+        user (`reported_by`) is always 1 character in length, but we generate names
+        for the `actioned_by` user starting at length 1 and up to length 20.
+
+        Finally, we assert that the output length never exceeded 10 in total.
+        """
+        user_a = MockMember(name="A")
+
+        max_length = 10
+        test_cases = (MockMember(name="B" * n) for n in range(1, 20))
+
+        for user_b in test_cases:
+            with self.subTest(user_a=user_a, user_b=user_b, max_length=max_length):
+                generated_username = incidents.make_username(user_a, user_b, max_length)
+                self.assertLessEqual(len(generated_username), max_length)
+
+
 @patch("bot.constants.Channels.incidents", 123)
 class TestIsIncident(unittest.TestCase):
     """
-- 
cgit v1.2.3


From a8d179d9b04f54b20c5e870bcfa85c78c42c8dca Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Sun, 21 Jun 2020 14:21:18 +0200
Subject: Incidents: append `actioned_by` to webhook username

Incident author and the moderator who actioned report are now passed
through `make_username` to create the webhook username.

Tests adjusted as appropriate.
---
 bot/cogs/moderation/incidents.py            |  9 +++++----
 tests/bot/cogs/moderation/test_incidents.py | 23 +++++++++++++++++------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 2cce9b6fe..72cc4b26c 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -172,13 +172,14 @@ class Incidents(Cog):
 
         log.debug("Crawl task finished!")
 
-    async def archive(self, incident: discord.Message, outcome: Signal) -> bool:
+    async def archive(self, incident: discord.Message, outcome: Signal, actioned_by: discord.Member) -> bool:
         """
         Relay `incident` to the #incidents-archive channel.
 
         The following pieces of information are relayed:
             * Incident message content (clean, pingless)
-            * Incident author name (as webhook author)
+            * Incident author name (as webhook username)
+            * Name of user who actioned the incident (appended to webhook username)
             * Incident author avatar (as webhook avatar)
             * Resolution signal (`outcome`)
 
@@ -194,7 +195,7 @@ class Incidents(Cog):
             # Now relay the incident
             message: discord.Message = await webhook.send(
                 content=incident.clean_content,  # Clean content will prevent mentions from pinging
-                username=sub_clyde(incident.author.name),
+                username=sub_clyde(make_username(incident.author, actioned_by)),
                 avatar_url=incident.author.avatar_url,
                 wait=True,  # This makes the method return the sent Message object
             )
@@ -259,7 +260,7 @@ class Incidents(Cog):
             log.debug("Reaction was valid, but no action is currently defined for it")
             return
 
-        relay_successful = await self.archive(incident, signal)
+        relay_successful = await self.archive(incident, signal, actioned_by=member)
         if not relay_successful:
             log.trace("Original message will not be deleted as we failed to relay it to the archive")
             return
diff --git a/tests/bot/cogs/moderation/test_incidents.py b/tests/bot/cogs/moderation/test_incidents.py
index 5700a5a35..a811868e5 100644
--- a/tests/bot/cogs/moderation/test_incidents.py
+++ b/tests/bot/cogs/moderation/test_incidents.py
@@ -307,7 +307,9 @@ class TestArchive(TestIncidents):
         propagate out of the method, which is just as important.
         """
         self.cog_instance.bot.fetch_webhook = AsyncMock(side_effect=mock_404)
-        self.assertFalse(await self.cog_instance.archive(incident=MockMessage(), outcome=MagicMock()))
+
+        result = await self.cog_instance.archive(incident=MockMessage(), outcome=MagicMock(), actioned_by=MockMember())
+        self.assertFalse(result)
 
     async def test_archive_relays_incident(self):
         """
@@ -332,12 +334,18 @@ class TestArchive(TestIncidents):
             author=MockUser(name="author_name", avatar_url="author_avatar"),
             id=123,
         )
-        archive_return = await self.cog_instance.archive(incident, outcome=MagicMock(value="A"))
+
+        with patch("bot.cogs.moderation.incidents.make_username", MagicMock(return_value="generated_username")):
+            archive_return = await self.cog_instance.archive(
+                incident=incident,
+                outcome=MagicMock(value="A"),
+                actioned_by=MockMember(name="moderator"),
+            )
 
         # Check that the webhook was dispatched correctly
         webhook.send.assert_called_once_with(
             content="pingless message",
-            username="author_name",
+            username="generated_username",
             avatar_url="author_avatar",
             wait=True,
         )
@@ -354,7 +362,8 @@ class TestArchive(TestIncidents):
 
         Discord will reject any webhook with "clyde" in the username field, as it impersonates
         the official Clyde bot. Since we do not control what the username will be (the incident
-        author name is used), we must ensure the name is cleansed, otherwise the relay may fail.
+        author name, and actioning moderator names are used), we must ensure the name is cleansed,
+        otherwise the relay may fail.
 
         This test assumes the username is passed as a kwarg. If this test fails, please review
         whether the passed argument is being retrieved correctly.
@@ -362,9 +371,11 @@ class TestArchive(TestIncidents):
         webhook = MockAsyncWebhook()
         self.cog_instance.bot.fetch_webhook = AsyncMock(return_value=webhook)
 
-        message_from_clyde = MockMessage(author=MockUser(name="clyde the great"))
-        await self.cog_instance.archive(message_from_clyde, MagicMock(incidents.Signal))
+        # The `make_username` helper will return a string with "clyde" in it
+        with patch("bot.cogs.moderation.incidents.make_username", MagicMock(return_value="clyde the great")):
+            await self.cog_instance.archive(MockMessage(), MagicMock(incidents.Signal), MockMember())
 
+        # Assert that the "clyde" was never passed to `send`
         self.assertNotIn("clyde", webhook.send.call_args.kwargs["username"])
 
 
-- 
cgit v1.2.3


From be4a61fb70c485262d36ca2aabf992f3118abcff Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Tue, 30 Jun 2020 23:09:00 +0200
Subject: Incidents: revert latest 2 commits

Decision was made to use embeds to archive incidents instead of
webhooking the raw message. As such, we're reverting the branch
to a state from which the adjustments will be easier to make.

Reverted commits:
* a8d179d9b04f54b20c5e870bcfa85c78c42c8dca
* 6fa8caed037b247a7c194f58a4635de7dae21fd2
---
 bot/cogs/moderation/incidents.py            | 33 +++---------------
 tests/bot/cogs/moderation/test_incidents.py | 52 ++++-------------------------
 2 files changed, 10 insertions(+), 75 deletions(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 72cc4b26c..040f2c0c8 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -41,30 +41,6 @@ ALLOWED_ROLES: t.Set[int] = {Roles.moderators, Roles.admins, Roles.owners}
 ALL_SIGNALS: t.Set[str] = {signal.value for signal in Signal}
 
 
-def make_username(reported_by: discord.Member, actioned_by: discord.Member, max_length: int = 80) -> str:
-    """
-    Create a webhook-friendly username from the names of `reported_by` and `actioned_by`.
-
-    If the resulting username length exceeds `max_length`, it will be capped at `max_length - 3`
-    and have 3 dots appended to the end. The default value is 80, which corresponds to the limit
-    Discord imposes on webhook username length.
-
-    If the value of `max_length` is < 3, ValueError is raised.
-    """
-    if max_length < 3:
-        raise ValueError(f"Maximum length cannot be less than 3: {max_length=}")
-
-    username = f"{reported_by.name} | {actioned_by.name}"
-    log.trace(f"Generated webhook username: {username} (length: {len(username)})")
-
-    if len(username) > max_length:
-        stop = max_length - 3
-        username = f"{username[:stop]}..."
-        log.trace(f"Username capped at {max_length=}: {username}")
-
-    return username
-
-
 def is_incident(message: discord.Message) -> bool:
     """True if `message` qualifies as an incident, False otherwise."""
     conditions = (
@@ -172,14 +148,13 @@ class Incidents(Cog):
 
         log.debug("Crawl task finished!")
 
-    async def archive(self, incident: discord.Message, outcome: Signal, actioned_by: discord.Member) -> bool:
+    async def archive(self, incident: discord.Message, outcome: Signal) -> bool:
         """
         Relay `incident` to the #incidents-archive channel.
 
         The following pieces of information are relayed:
             * Incident message content (clean, pingless)
-            * Incident author name (as webhook username)
-            * Name of user who actioned the incident (appended to webhook username)
+            * Incident author name (as webhook author)
             * Incident author avatar (as webhook avatar)
             * Resolution signal (`outcome`)
 
@@ -195,7 +170,7 @@ class Incidents(Cog):
             # Now relay the incident
             message: discord.Message = await webhook.send(
                 content=incident.clean_content,  # Clean content will prevent mentions from pinging
-                username=sub_clyde(make_username(incident.author, actioned_by)),
+                username=sub_clyde(incident.author.name),
                 avatar_url=incident.author.avatar_url,
                 wait=True,  # This makes the method return the sent Message object
             )
@@ -260,7 +235,7 @@ class Incidents(Cog):
             log.debug("Reaction was valid, but no action is currently defined for it")
             return
 
-        relay_successful = await self.archive(incident, signal, actioned_by=member)
+        relay_successful = await self.archive(incident, signal)
         if not relay_successful:
             log.trace("Original message will not be deleted as we failed to relay it to the archive")
             return
diff --git a/tests/bot/cogs/moderation/test_incidents.py b/tests/bot/cogs/moderation/test_incidents.py
index a811868e5..2fc9180cf 100644
--- a/tests/bot/cogs/moderation/test_incidents.py
+++ b/tests/bot/cogs/moderation/test_incidents.py
@@ -68,35 +68,6 @@ mock_404 = discord.NotFound(
 )
 
 
-class TestMakeUsername(unittest.TestCase):
-    """Collection of tests for the `make_username` helper function."""
-
-    def test_make_username_raises(self):
-        """Raises `ValueError` on `max_length` < 3."""
-        with self.assertRaises(ValueError):
-            incidents.make_username(MockMember(), MockMember(), max_length=2)
-
-    def test_make_username_never_exceed_limit(self):
-        """
-        The return string length is always less than or equal to `max_length`.
-
-        For this test we pass `max_length=10` for convenience. The name of the first
-        user (`reported_by`) is always 1 character in length, but we generate names
-        for the `actioned_by` user starting at length 1 and up to length 20.
-
-        Finally, we assert that the output length never exceeded 10 in total.
-        """
-        user_a = MockMember(name="A")
-
-        max_length = 10
-        test_cases = (MockMember(name="B" * n) for n in range(1, 20))
-
-        for user_b in test_cases:
-            with self.subTest(user_a=user_a, user_b=user_b, max_length=max_length):
-                generated_username = incidents.make_username(user_a, user_b, max_length)
-                self.assertLessEqual(len(generated_username), max_length)
-
-
 @patch("bot.constants.Channels.incidents", 123)
 class TestIsIncident(unittest.TestCase):
     """
@@ -307,9 +278,7 @@ class TestArchive(TestIncidents):
         propagate out of the method, which is just as important.
         """
         self.cog_instance.bot.fetch_webhook = AsyncMock(side_effect=mock_404)
-
-        result = await self.cog_instance.archive(incident=MockMessage(), outcome=MagicMock(), actioned_by=MockMember())
-        self.assertFalse(result)
+        self.assertFalse(await self.cog_instance.archive(incident=MockMessage(), outcome=MagicMock()))
 
     async def test_archive_relays_incident(self):
         """
@@ -334,18 +303,12 @@ class TestArchive(TestIncidents):
             author=MockUser(name="author_name", avatar_url="author_avatar"),
             id=123,
         )
-
-        with patch("bot.cogs.moderation.incidents.make_username", MagicMock(return_value="generated_username")):
-            archive_return = await self.cog_instance.archive(
-                incident=incident,
-                outcome=MagicMock(value="A"),
-                actioned_by=MockMember(name="moderator"),
-            )
+        archive_return = await self.cog_instance.archive(incident, outcome=MagicMock(value="A"))
 
         # Check that the webhook was dispatched correctly
         webhook.send.assert_called_once_with(
             content="pingless message",
-            username="generated_username",
+            username="author_name",
             avatar_url="author_avatar",
             wait=True,
         )
@@ -362,8 +325,7 @@ class TestArchive(TestIncidents):
 
         Discord will reject any webhook with "clyde" in the username field, as it impersonates
         the official Clyde bot. Since we do not control what the username will be (the incident
-        author name, and actioning moderator names are used), we must ensure the name is cleansed,
-        otherwise the relay may fail.
+        author name is used), we must ensure the name is cleansed, otherwise the relay may fail.
 
         This test assumes the username is passed as a kwarg. If this test fails, please review
         whether the passed argument is being retrieved correctly.
@@ -371,11 +333,9 @@ class TestArchive(TestIncidents):
         webhook = MockAsyncWebhook()
         self.cog_instance.bot.fetch_webhook = AsyncMock(return_value=webhook)
 
-        # The `make_username` helper will return a string with "clyde" in it
-        with patch("bot.cogs.moderation.incidents.make_username", MagicMock(return_value="clyde the great")):
-            await self.cog_instance.archive(MockMessage(), MagicMock(incidents.Signal), MockMember())
+        message_from_clyde = MockMessage(author=MockUser(name="clyde the great"))
+        await self.cog_instance.archive(message_from_clyde, MagicMock(incidents.Signal))
 
-        # Assert that the "clyde" was never passed to `send`
         self.assertNotIn("clyde", webhook.send.call_args.kwargs["username"])
 
 
-- 
cgit v1.2.3


From 968251660768297383401576902a71f8ac9edada Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Tue, 30 Jun 2020 23:15:02 +0200
Subject: Incidents: pass `actioned_by` to `archive`

This is an important piece of information that shall be relayed.
---
 bot/cogs/moderation/incidents.py            | 4 ++--
 tests/bot/cogs/moderation/test_incidents.py | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 040f2c0c8..580a258fe 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -148,7 +148,7 @@ class Incidents(Cog):
 
         log.debug("Crawl task finished!")
 
-    async def archive(self, incident: discord.Message, outcome: Signal) -> bool:
+    async def archive(self, incident: discord.Message, outcome: Signal, actioned_by: discord.Member) -> bool:
         """
         Relay `incident` to the #incidents-archive channel.
 
@@ -235,7 +235,7 @@ class Incidents(Cog):
             log.debug("Reaction was valid, but no action is currently defined for it")
             return
 
-        relay_successful = await self.archive(incident, signal)
+        relay_successful = await self.archive(incident, signal, actioned_by=member)
         if not relay_successful:
             log.trace("Original message will not be deleted as we failed to relay it to the archive")
             return
diff --git a/tests/bot/cogs/moderation/test_incidents.py b/tests/bot/cogs/moderation/test_incidents.py
index 2fc9180cf..c2e32fe6b 100644
--- a/tests/bot/cogs/moderation/test_incidents.py
+++ b/tests/bot/cogs/moderation/test_incidents.py
@@ -278,7 +278,9 @@ class TestArchive(TestIncidents):
         propagate out of the method, which is just as important.
         """
         self.cog_instance.bot.fetch_webhook = AsyncMock(side_effect=mock_404)
-        self.assertFalse(await self.cog_instance.archive(incident=MockMessage(), outcome=MagicMock()))
+        self.assertFalse(
+            await self.cog_instance.archive(incident=MockMessage(), outcome=MagicMock(), actioned_by=MockMember())
+        )
 
     async def test_archive_relays_incident(self):
         """
@@ -303,7 +305,7 @@ class TestArchive(TestIncidents):
             author=MockUser(name="author_name", avatar_url="author_avatar"),
             id=123,
         )
-        archive_return = await self.cog_instance.archive(incident, outcome=MagicMock(value="A"))
+        archive_return = await self.cog_instance.archive(incident, MagicMock(value="A"), MockMember())
 
         # Check that the webhook was dispatched correctly
         webhook.send.assert_called_once_with(
@@ -334,7 +336,7 @@ class TestArchive(TestIncidents):
         self.cog_instance.bot.fetch_webhook = AsyncMock(return_value=webhook)
 
         message_from_clyde = MockMessage(author=MockUser(name="clyde the great"))
-        await self.cog_instance.archive(message_from_clyde, MagicMock(incidents.Signal))
+        await self.cog_instance.archive(message_from_clyde, MagicMock(incidents.Signal), MockMember())
 
         self.assertNotIn("clyde", webhook.send.call_args.kwargs["username"])
 
-- 
cgit v1.2.3


From dd74105d4a4433bb9e9e6fa57960a4956c0f1231 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Tue, 30 Jun 2020 23:42:32 +0200
Subject: Incidents: implement `make_embed` helper & tests

See `make_embed` docstring for further information.

The tests are fairly loose and should be easily adjustable in
the future should changes be made.
---
 bot/cogs/moderation/incidents.py            | 32 ++++++++++++++++++++++++++++-
 tests/bot/cogs/moderation/test_incidents.py | 26 +++++++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 580a258fe..ca591fc6e 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -1,13 +1,14 @@
 import asyncio
 import logging
 import typing as t
+from datetime import datetime
 from enum import Enum
 
 import discord
 from discord.ext.commands import Cog
 
 from bot.bot import Bot
-from bot.constants import Channels, Emojis, Roles, Webhooks
+from bot.constants import Channels, Colours, Emojis, Roles, Webhooks
 from bot.utils.messages import sub_clyde
 
 log = logging.getLogger(__name__)
@@ -41,6 +42,35 @@ ALLOWED_ROLES: t.Set[int] = {Roles.moderators, Roles.admins, Roles.owners}
 ALL_SIGNALS: t.Set[str] = {signal.value for signal in Signal}
 
 
+def make_embed(incident: discord.Message, outcome: Signal, actioned_by: discord.Member) -> discord.Embed:
+    """
+    Create an embed representation of `incident` for the #incidents-archive channel.
+
+    The name & discriminator of `actioned_by` and `outcome` will be presented in the
+    embed footer. Additionally, the embed is coloured based on `outcome`.
+
+    The author of `incident` is not shown in the embed. It is assumed that this piece
+    of information will be relayed in other ways, e.g. webhook username.
+
+    As mentions in embeds do not ping, we do not need to use `incident.clean_content`.
+    """
+    if outcome is Signal.ACTIONED:
+        colour = Colours.soft_green
+        footer = f"Actioned by {actioned_by}"
+    else:
+        colour = Colours.soft_red
+        footer = f"Rejected by {actioned_by}"
+
+    embed = discord.Embed(
+        description=incident.content,
+        timestamp=datetime.utcnow(),
+        colour=colour,
+    )
+    embed.set_footer(text=footer, icon_url=actioned_by.avatar_url)
+
+    return embed
+
+
 def is_incident(message: discord.Message) -> bool:
     """True if `message` qualifies as an incident, False otherwise."""
     conditions = (
diff --git a/tests/bot/cogs/moderation/test_incidents.py b/tests/bot/cogs/moderation/test_incidents.py
index c2e32fe6b..4731a786d 100644
--- a/tests/bot/cogs/moderation/test_incidents.py
+++ b/tests/bot/cogs/moderation/test_incidents.py
@@ -9,6 +9,7 @@ import aiohttp
 import discord
 
 from bot.cogs.moderation import Incidents, incidents
+from bot.constants import Colours
 from tests.helpers import (
     MockAsyncWebhook,
     MockBot,
@@ -68,6 +69,31 @@ mock_404 = discord.NotFound(
 )
 
 
+class TestMakeEmbed(unittest.TestCase):
+    """Collection of tests for the `make_embed` helper function."""
+
+    def test_make_embed_actioned(self):
+        """Embed is coloured green and footer contains 'Actioned' when `outcome=Signal.ACTIONED`."""
+        embed = incidents.make_embed(MockMessage(), incidents.Signal.ACTIONED, MockMember())
+
+        self.assertEqual(embed.colour.value, Colours.soft_green)
+        self.assertIn("Actioned", embed.footer.text)
+
+    def test_make_embed_not_actioned(self):
+        """Embed is coloured red and footer contains 'Rejected' when `outcome=Signal.NOT_ACTIONED`."""
+        embed = incidents.make_embed(MockMessage(), incidents.Signal.NOT_ACTIONED, MockMember())
+
+        self.assertEqual(embed.colour.value, Colours.soft_red)
+        self.assertIn("Rejected", embed.footer.text)
+
+    def test_make_embed_content(self):
+        """Incident content appears as embed description."""
+        incident = MockMessage(content="this is an incident")
+        embed = incidents.make_embed(incident, incidents.Signal.ACTIONED, MockMember())
+
+        self.assertEqual(incident.content, embed.description)
+
+
 @patch("bot.constants.Channels.incidents", 123)
 class TestIsIncident(unittest.TestCase):
     """
-- 
cgit v1.2.3


From 744aed585162cb0547e61a538734f116459ab510 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Wed, 1 Jul 2020 16:52:58 +0200
Subject: Incidents: relay incidents as embeds rather than raw content

This applies the previously defined `make_embed` function.

As the `archive` function is now simpler, I decided to reduce the
amount of whitespace ~ it's a lot more compact now.

Tests are adjusted as appropriate.
---
 bot/cogs/moderation/incidents.py            | 24 ++++++++--------------
 tests/bot/cogs/moderation/test_incidents.py | 32 ++++++++++-------------------
 2 files changed, 19 insertions(+), 37 deletions(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index ca591fc6e..3a1a3d84e 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -180,38 +180,30 @@ class Incidents(Cog):
 
     async def archive(self, incident: discord.Message, outcome: Signal, actioned_by: discord.Member) -> bool:
         """
-        Relay `incident` to the #incidents-archive channel.
+        Relay an embed representation of `incident` to the #incidents-archive channel.
 
         The following pieces of information are relayed:
-            * Incident message content (clean, pingless)
+            * Incident message content (as embed description)
             * Incident author name (as webhook author)
             * Incident author avatar (as webhook avatar)
-            * Resolution signal (`outcome`)
+            * Resolution signal `outcome` (as embed colour & footer)
+            * Moderator `actioned_by` (name & discriminator shown in footer)
 
         Return True if the relay finishes successfully. If anything goes wrong, meaning
         not all information was relayed, return False. This signals that the original
         message is not safe to be deleted, as we will lose some information.
         """
-        log.debug(f"Archiving incident: {incident.id} with outcome: {outcome}")
+        log.debug(f"Archiving incident: {incident.id} (outcome: {outcome}, actioned by: {actioned_by})")
         try:
-            # First we try to grab the webhook
-            webhook: discord.Webhook = await self.bot.fetch_webhook(Webhooks.incidents_archive)
-
-            # Now relay the incident
-            message: discord.Message = await webhook.send(
-                content=incident.clean_content,  # Clean content will prevent mentions from pinging
+            webhook = await self.bot.fetch_webhook(Webhooks.incidents_archive)
+            await webhook.send(
+                embed=make_embed(incident, outcome, actioned_by),
                 username=sub_clyde(incident.author.name),
                 avatar_url=incident.author.avatar_url,
-                wait=True,  # This makes the method return the sent Message object
             )
-
-            # Finally add the `outcome` emoji
-            await message.add_reaction(outcome.value)
-
         except Exception:
             log.exception(f"Failed to archive incident {incident.id} to #incidents-archive")
             return False
-
         else:
             log.trace("Message archived successfully!")
             return True
diff --git a/tests/bot/cogs/moderation/test_incidents.py b/tests/bot/cogs/moderation/test_incidents.py
index 4731a786d..70dfe6b5f 100644
--- a/tests/bot/cogs/moderation/test_incidents.py
+++ b/tests/bot/cogs/moderation/test_incidents.py
@@ -312,39 +312,29 @@ class TestArchive(TestIncidents):
         """
         If webhook is found, method relays `incident` properly.
 
-        This test will assert the following:
-            * The fetched webhook's `send` method is fed the correct arguments
-            * The message returned by `send` will have `outcome` reaction added
-            * Finally, the `archive` method returns True
-
-        Assertions are made specifically in this order.
+        This test will assert that the fetched webhook's `send` method is fed the correct arguments,
+        and that the `archive` method returns True.
         """
-        webhook_message = MockMessage()  # The message that will be returned by the webhook's `send` method
-        webhook = MockAsyncWebhook(send=AsyncMock(return_value=webhook_message))
-
+        webhook = MockAsyncWebhook()
         self.cog_instance.bot.fetch_webhook = AsyncMock(return_value=webhook)  # Patch in our webhook
 
-        # Now we'll pas our own `incident` to `archive` and capture the return value
+        # Define our own `incident` for archivation
         incident = MockMessage(
-            clean_content="pingless message",
-            content="pingful message",
+            content="this is an incident",
             author=MockUser(name="author_name", avatar_url="author_avatar"),
             id=123,
         )
-        archive_return = await self.cog_instance.archive(incident, MagicMock(value="A"), MockMember())
+        built_embed = MagicMock(discord.Embed, id=123)  # We patch `make_embed` to return this
 
-        # Check that the webhook was dispatched correctly
+        with patch("bot.cogs.moderation.incidents.make_embed", MagicMock(return_value=built_embed)):
+            archive_return = await self.cog_instance.archive(incident, MagicMock(value="A"), MockMember())
+
+        # Now we check that the webhook was given the correct args, and that `archive` returned True
         webhook.send.assert_called_once_with(
-            content="pingless message",
+            embed=built_embed,
             username="author_name",
             avatar_url="author_avatar",
-            wait=True,
         )
-
-        # Now check that the correct emoji was added to the relayed message
-        webhook_message.add_reaction.assert_called_once_with("A")
-
-        # Finally check that the method returned True
         self.assertTrue(archive_return)
 
     async def test_archive_clyde_username(self):
-- 
cgit v1.2.3


From 36de1ea49bb6597179bf9931adfef41ed59e5d5f Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Thu, 2 Jul 2020 15:53:22 +0300
Subject: Help System: Implement question message pinning

---
 bot/cogs/help_channels.py | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/bot/cogs/help_channels.py b/bot/cogs/help_channels.py
index 187adfe51..bb97759ee 100644
--- a/bot/cogs/help_channels.py
+++ b/bot/cogs/help_channels.py
@@ -113,6 +113,10 @@ class HelpChannels(Scheduler, commands.Cog):
     # RedisCache[discord.TextChannel.id, UtcPosixTimestamp]
     claim_times = RedisCache()
 
+    # This cache maps a help channel to original question message in same channel.
+    # RedisCache[discord.TextChannel.id, discord.Message.id]
+    question_messages = RedisCache()
+
     def __init__(self, bot: Bot):
         super().__init__()
 
@@ -548,6 +552,22 @@ class HelpChannels(Scheduler, commands.Cog):
 
         A caller argument is provided for metrics.
         """
+        msg_id = await self.question_messages.pop(channel.id)
+
+        # When message ID exist in cache, try to get it from cache first. When this fail, use API request.
+        # When this return 404, this mean that message is deleted and can't be unpinned.
+        if msg_id:
+            msg = discord.utils.get(self.bot.cached_messages, id=msg_id)
+            if msg is None:
+                try:
+                    msg = await channel.fetch_message(msg_id)
+                except discord.NotFound:
+                    log.debug(f"Can't unpin message {msg_id} because this is deleted.")
+
+            # When we got message, then unpin it
+            if msg:
+                await msg.unpin()
+
         log.info(f"Moving #{channel} ({channel.id}) to the Dormant category.")
 
         await self.move_to_bottom_position(
@@ -688,6 +708,14 @@ class HelpChannels(Scheduler, commands.Cog):
             log.info(f"Channel #{channel} was claimed by `{message.author.id}`.")
             await self.move_to_in_use(channel)
             await self.revoke_send_permissions(message.author)
+            # Pin message for better access and storage this to cache
+            try:
+                await message.pin()
+            except discord.NotFound:
+                log.info(f"Pinning message {message.id} ({channel}) failed because message got deleted.")
+            else:
+                await self.question_messages.set(channel.id, message.id)
+
             # Add user with channel for dormant check.
             await self.help_channel_claimants.set(channel.id, message.author.id)
 
-- 
cgit v1.2.3


From d2732ce299cf2071b92fdf0c1eecbb0f16f0afbd Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Thu, 2 Jul 2020 15:52:05 +0200
Subject: Incidents: trace-level log incident embed creation

---
 bot/cogs/moderation/incidents.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 3a1a3d84e..8970c2c5c 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -54,6 +54,8 @@ def make_embed(incident: discord.Message, outcome: Signal, actioned_by: discord.
 
     As mentions in embeds do not ping, we do not need to use `incident.clean_content`.
     """
+    log.trace(f"Creating embed for {incident.id=}")
+
     if outcome is Signal.ACTIONED:
         colour = Colours.soft_green
         footer = f"Actioned by {actioned_by}"
-- 
cgit v1.2.3


From 83544ca0f91dd7bc8510e4fc7a64bc73712ddaf8 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 3 Jul 2020 10:47:47 +0200
Subject: Incidents: archive incident attachments

There is no handling of file types as explained in the `archive`
docstring. Testing indicates that relaying incidents with e.g. a text
file attachment is simply a noop in the Discord GUI.

If there is at least one attachment, we always only relay the one
at index 0, as it is believed the user-sent messages can only contain
one attachment at maximum.

This also adds an extra test asserting the behaviour when an incident
with an attachment is archived. The existing test for `archive` is
adjusted to assume no attachments.

Joe helped me conceive & test this.

Co-authored-by: Joseph Banks <joseph@josephbanks.me>
---
 bot/cogs/moderation/incidents.py            | 21 +++++++++++++++++++-
 tests/bot/cogs/moderation/test_incidents.py | 30 +++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 8970c2c5c..1a12c8bbd 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -186,22 +186,41 @@ class Incidents(Cog):
 
         The following pieces of information are relayed:
             * Incident message content (as embed description)
+            * Incident attachment (if image, shown in archive embed)
             * Incident author name (as webhook author)
             * Incident author avatar (as webhook avatar)
             * Resolution signal `outcome` (as embed colour & footer)
             * Moderator `actioned_by` (name & discriminator shown in footer)
 
+        If `incident` contains an attachment, we try to add it to the archive embed. There is
+        no handing of extensions / file types - we simply dispatch the attachment file with the
+        webhook, and try to display it in the embed. Testing indicates that if the attachment
+        cannot be displayed (e.g. a text file), it's invisible in the embed, with no error.
+
         Return True if the relay finishes successfully. If anything goes wrong, meaning
         not all information was relayed, return False. This signals that the original
         message is not safe to be deleted, as we will lose some information.
         """
         log.debug(f"Archiving incident: {incident.id} (outcome: {outcome}, actioned by: {actioned_by})")
+        embed = make_embed(incident, outcome, actioned_by)
+
+        # If the incident had an attachment, we will try to relay it
+        if incident.attachments:
+            attachment = incident.attachments[0]  # User-sent messages can only contain one attachment
+            log.debug(f"Attempting to archive incident attachment: {attachment.filename}")
+
+            attachment_file = await attachment.to_file()  # The file will be sent with the webhook
+            embed.set_image(url=f"attachment://{attachment.filename}")  # Embed displays the attached file
+        else:
+            attachment_file = None
+
         try:
             webhook = await self.bot.fetch_webhook(Webhooks.incidents_archive)
             await webhook.send(
-                embed=make_embed(incident, outcome, actioned_by),
+                embed=embed,
                 username=sub_clyde(incident.author.name),
                 avatar_url=incident.author.avatar_url,
+                file=attachment_file,
             )
         except Exception:
             log.exception(f"Failed to archive incident {incident.id} to #incidents-archive")
diff --git a/tests/bot/cogs/moderation/test_incidents.py b/tests/bot/cogs/moderation/test_incidents.py
index 70dfe6b5f..f8d479cef 100644
--- a/tests/bot/cogs/moderation/test_incidents.py
+++ b/tests/bot/cogs/moderation/test_incidents.py
@@ -323,6 +323,7 @@ class TestArchive(TestIncidents):
             content="this is an incident",
             author=MockUser(name="author_name", avatar_url="author_avatar"),
             id=123,
+            attachments=[],  # This incident has no attachments
         )
         built_embed = MagicMock(discord.Embed, id=123)  # We patch `make_embed` to return this
 
@@ -334,9 +335,38 @@ class TestArchive(TestIncidents):
             embed=built_embed,
             username="author_name",
             avatar_url="author_avatar",
+            file=None,
         )
         self.assertTrue(archive_return)
 
+    async def test_archive_relays_incident_with_attachments(self):
+        """
+        Incident attachments are relayed and displayed in the embed.
+
+        This test asserts the two things that need to happen in order to relay the attachment.
+        The embed returned by `make_embed` must have the `set_image` method called with the
+        attachment's filename, and the file must be passed to the webhook's send method.
+        """
+        attachment_file = MagicMock(discord.File)
+        attachment = MagicMock(
+            discord.Attachment,
+            filename="abc.png",
+            to_file=AsyncMock(return_value=attachment_file),
+        )
+        incident = MockMessage(
+            attachments=[attachment],
+        )
+        built_embed = MagicMock(discord.Embed)
+
+        with patch("bot.cogs.moderation.incidents.make_embed", MagicMock(return_value=built_embed)):
+            await self.cog_instance.archive(incident, incidents.Signal.ACTIONED, actioned_by=MockMember())
+
+        built_embed.set_image.assert_called_once_with(url="attachment://abc.png")
+
+        send_kwargs = self.cog_instance.bot.fetch_webhook.return_value.send.call_args.kwargs
+        self.assertIn("file", send_kwargs)
+        self.assertIs(send_kwargs["file"], attachment_file)
+
     async def test_archive_clyde_username(self):
         """
         The archive webhook username is cleansed using `sub_clyde`.
-- 
cgit v1.2.3


From a201e76c805fe69e70e39bbd8a24f81ee5d0fe9b Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Wed, 8 Jul 2020 21:39:17 +0300
Subject: Help Channels: Simplify unpinning

Remove complex None checking message fetching and replace it with `bot.http.unpin_message` and catch exception when message don't exist.
---
 bot/cogs/help_channels.py | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/bot/cogs/help_channels.py b/bot/cogs/help_channels.py
index bb97759ee..9313efc67 100644
--- a/bot/cogs/help_channels.py
+++ b/bot/cogs/help_channels.py
@@ -554,19 +554,12 @@ class HelpChannels(Scheduler, commands.Cog):
         """
         msg_id = await self.question_messages.pop(channel.id)
 
-        # When message ID exist in cache, try to get it from cache first. When this fail, use API request.
-        # When this return 404, this mean that message is deleted and can't be unpinned.
-        if msg_id:
-            msg = discord.utils.get(self.bot.cached_messages, id=msg_id)
-            if msg is None:
-                try:
-                    msg = await channel.fetch_message(msg_id)
-                except discord.NotFound:
-                    log.debug(f"Can't unpin message {msg_id} because this is deleted.")
-
-            # When we got message, then unpin it
-            if msg:
-                await msg.unpin()
+        try:
+            await self.bot.http.unpin_message(channel.id, msg_id)
+        except discord.HTTPException:
+            log.trace(f"Message {msg_id} don't exist, can't unpin.")
+        else:
+            log.trace(f"Unpinned message {msg_id}.")
 
         log.info(f"Moving #{channel} ({channel.id}) to the Dormant category.")
 
-- 
cgit v1.2.3


From 918e1b9ca628abd7867812b32096d05dcf69f32f Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Thu, 9 Jul 2020 12:07:30 +0200
Subject: Incidents: use `moderation_roles` constant

Better than building the set manually. Tested against regression by
comparing the two sets for equality.

Suggested by vivax.

Co-authored-by: vivax3794 <51753506+vivax3794@users.noreply.github.com>
---
 bot/cogs/moderation/incidents.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 1a12c8bbd..be46c8202 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -8,7 +8,7 @@ import discord
 from discord.ext.commands import Cog
 
 from bot.bot import Bot
-from bot.constants import Channels, Colours, Emojis, Roles, Webhooks
+from bot.constants import Channels, Colours, Emojis, Guild, Webhooks
 from bot.utils.messages import sub_clyde
 
 log = logging.getLogger(__name__)
@@ -35,8 +35,8 @@ class Signal(Enum):
     INVESTIGATING = Emojis.incident_investigating
 
 
-# Reactions from roles not listed here will be removed
-ALLOWED_ROLES: t.Set[int] = {Roles.moderators, Roles.admins, Roles.owners}
+# Reactions from non-mod roles will be removed
+ALLOWED_ROLES: t.Set[int] = set(Guild.moderation_roles)
 
 # Message must have all of these emoji to pass the `has_signals` check
 ALL_SIGNALS: t.Set[str] = {signal.value for signal in Signal}
-- 
cgit v1.2.3


From ddb1f556ace346a97b8639f278fae8915078e78d Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Thu, 9 Jul 2020 12:11:16 +0200
Subject: Incidents tests: improve in-line comment wording

Co-authored-by: MarkKoz <kozlovmark@gmail.com>
---
 tests/bot/cogs/moderation/test_incidents.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/bot/cogs/moderation/test_incidents.py b/tests/bot/cogs/moderation/test_incidents.py
index f8d479cef..789a37cd4 100644
--- a/tests/bot/cogs/moderation/test_incidents.py
+++ b/tests/bot/cogs/moderation/test_incidents.py
@@ -318,7 +318,7 @@ class TestArchive(TestIncidents):
         webhook = MockAsyncWebhook()
         self.cog_instance.bot.fetch_webhook = AsyncMock(return_value=webhook)  # Patch in our webhook
 
-        # Define our own `incident` for archivation
+        # Define our own `incident` to be archived
         incident = MockMessage(
             content="this is an incident",
             author=MockUser(name="author_name", avatar_url="author_avatar"),
-- 
cgit v1.2.3


From d10a61d3ef21cbf511304a97a5e2871bd1fcb2dd Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Thu, 9 Jul 2020 12:18:21 +0200
Subject: Config: refactor #incidents constants to lexicographical sorting

Co-authored-by: MarkKoz <kozlovmark@gmail.com>
---
 bot/constants.py   |  6 +++---
 config-default.yml | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bot/constants.py b/bot/constants.py
index b3ef1660f..cd660acee 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -427,12 +427,12 @@ class Webhooks(metaclass=YAMLGetter):
     section = "guild"
     subsection = "webhooks"
 
-    talent_pool: int
     big_brother: int
-    reddit: int
-    duck_pond: int
     dev_log: int
+    duck_pond: int
     incidents_archive: int
+    reddit: int
+    talent_pool: int
 
 
 class Roles(metaclass=YAMLGetter):
diff --git a/config-default.yml b/config-default.yml
index 4c0196dc5..7fcc27d64 100644
--- a/config-default.yml
+++ b/config-default.yml
@@ -171,13 +171,13 @@ guild:
         admin_spam:         &ADMIN_SPAM     563594791770914816
         defcon:             &DEFCON         464469101889454091
         helpers:            &HELPERS        385474242440986624
+        incidents:                          714214212200562749
+        incidents_archive:                  720668923636351037
         mods:               &MODS           305126844661760000
         mod_alerts:         &MOD_ALERTS     473092532147060736
         mod_spam:           &MOD_SPAM       620607373828030464
         organisation:       &ORGANISATION   551789653284356126
         staff_lounge:       &STAFF_LOUNGE   464905259261755392
-        incidents:                          714214212200562749
-        incidents_archive:                  720668923636351037
 
         # Voice
         admins_voice:       &ADMINS_VOICE   500734494840717332
@@ -250,13 +250,13 @@ guild:
         - *HELPERS_ROLE
 
     webhooks:
-        talent_pool:                    569145364800602132
-        big_brother:                    569133704568373283
-        reddit:                         635408384794951680
-        duck_pond:                      637821475327311927
-        dev_log:                        680501655111729222
-        python_news:    &PYNEWS_WEBHOOK 704381182279942324
-        incidents_archive:              720671599790915702
+        big_brother:                        569133704568373283
+        dev_log:                            680501655111729222
+        duck_pond:                          637821475327311927
+        incidents_archive:                  720671599790915702
+        python_news:        &PYNEWS_WEBHOOK 704381182279942324
+        reddit:                             635408384794951680
+        talent_pool:                        569145364800602132
 
 filter:
 
-- 
cgit v1.2.3


From de924691e4967b85424fe6e802d7f92846bb0850 Mon Sep 17 00:00:00 2001
From: Dennis Pham <dennis@dennispham.me>
Date: Sat, 11 Jul 2020 21:46:12 -0400
Subject: Fix comment

---
 bot/cogs/help_channels.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/cogs/help_channels.py b/bot/cogs/help_channels.py
index 9313efc67..b06934eff 100644
--- a/bot/cogs/help_channels.py
+++ b/bot/cogs/help_channels.py
@@ -701,7 +701,7 @@ class HelpChannels(Scheduler, commands.Cog):
             log.info(f"Channel #{channel} was claimed by `{message.author.id}`.")
             await self.move_to_in_use(channel)
             await self.revoke_send_permissions(message.author)
-            # Pin message for better access and storage this to cache
+            # Pin message for better access and store this to cache
             try:
                 await message.pin()
             except discord.NotFound:
-- 
cgit v1.2.3


From c4e9060a76a901c7d2e6035e6ca19d51770a4ab3 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Mon, 13 Jul 2020 15:04:40 +0200
Subject: Incidents: add `download_file` helper & tests

Co-authored-by: MarkKoz <kozlovmark@gmail.com>
---
 bot/cogs/moderation/incidents.py            | 13 +++++++++++++
 tests/bot/cogs/moderation/test_incidents.py | 20 ++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index be46c8202..65b0e458e 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -42,6 +42,19 @@ ALLOWED_ROLES: t.Set[int] = set(Guild.moderation_roles)
 ALL_SIGNALS: t.Set[str] = {signal.value for signal in Signal}
 
 
+async def download_file(attachment: discord.Attachment) -> t.Optional[discord.File]:
+    """
+    Download & return `attachment` file.
+
+    If the download fails, the reason is logged and None will be returned.
+    """
+    log.debug(f"Attempting to download attachment: {attachment.filename}")
+    try:
+        return await attachment.to_file()
+    except Exception:
+        log.exception("Failed to download attachment")
+
+
 def make_embed(incident: discord.Message, outcome: Signal, actioned_by: discord.Member) -> discord.Embed:
     """
     Create an embed representation of `incident` for the #incidents-archive channel.
diff --git a/tests/bot/cogs/moderation/test_incidents.py b/tests/bot/cogs/moderation/test_incidents.py
index 789a37cd4..273916199 100644
--- a/tests/bot/cogs/moderation/test_incidents.py
+++ b/tests/bot/cogs/moderation/test_incidents.py
@@ -12,6 +12,7 @@ from bot.cogs.moderation import Incidents, incidents
 from bot.constants import Colours
 from tests.helpers import (
     MockAsyncWebhook,
+    MockAttachment,
     MockBot,
     MockMember,
     MockMessage,
@@ -69,6 +70,25 @@ mock_404 = discord.NotFound(
 )
 
 
+class TestDownloadFile(unittest.IsolatedAsyncioTestCase):
+    """Collection of tests for the `download_file` helper function."""
+
+    async def test_download_file_success(self):
+        """If `to_file` succeeds, function returns the acquired `discord.File`."""
+        file = MagicMock(discord.File, filename="bigbadlemon.jpg")
+        attachment = MockAttachment(to_file=AsyncMock(return_value=file))
+
+        acquired_file = await incidents.download_file(attachment)
+        self.assertIs(file, acquired_file)
+
+    async def test_download_file_fail(self):
+        """If `to_file` fails, function handles the exception & returns None."""
+        attachment = MockAttachment(to_file=AsyncMock(side_effect=mock_404))
+
+        acquired_file = await incidents.download_file(attachment)
+        self.assertIsNone(acquired_file)
+
+
 class TestMakeEmbed(unittest.TestCase):
     """Collection of tests for the `make_embed` helper function."""
 
-- 
cgit v1.2.3


From 6e48d666b31d13d801c394b527ce545b039b478f Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Tue, 14 Jul 2020 17:28:53 +0200
Subject: Incidents: link `proxy_url` if attachment fails to download

Suggested by Mark during review. If the download fails, we fallback
on showing an informative message, which will link the attachment
cdn link.

The attachment-handling logic was moved from the `archive` coroutine
into `make_embed`, which now also returns the file, if available.
In the end, this appears to be the smoothest approach.

Co-authored-by: MarkKoz <kozlovmark@gmail.com>
---
 bot/cogs/moderation/incidents.py            | 36 +++++++++-----
 tests/bot/cogs/moderation/test_incidents.py | 73 ++++++++++++++---------------
 2 files changed, 59 insertions(+), 50 deletions(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 65b0e458e..018538040 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -41,6 +41,10 @@ ALLOWED_ROLES: t.Set[int] = set(Guild.moderation_roles)
 # Message must have all of these emoji to pass the `has_signals` check
 ALL_SIGNALS: t.Set[str] = {signal.value for signal in Signal}
 
+# An embed coupled with an optional file to be dispatched
+# If the file is not None, the embed attempts to show it in its body
+FileEmbed = t.Tuple[discord.Embed, t.Optional[discord.File]]
+
 
 async def download_file(attachment: discord.Attachment) -> t.Optional[discord.File]:
     """
@@ -55,7 +59,7 @@ async def download_file(attachment: discord.Attachment) -> t.Optional[discord.Fi
         log.exception("Failed to download attachment")
 
 
-def make_embed(incident: discord.Message, outcome: Signal, actioned_by: discord.Member) -> discord.Embed:
+async def make_embed(incident: discord.Message, outcome: Signal, actioned_by: discord.Member) -> FileEmbed:
     """
     Create an embed representation of `incident` for the #incidents-archive channel.
 
@@ -66,6 +70,11 @@ def make_embed(incident: discord.Message, outcome: Signal, actioned_by: discord.
     of information will be relayed in other ways, e.g. webhook username.
 
     As mentions in embeds do not ping, we do not need to use `incident.clean_content`.
+
+    If `incident` contains attachments, the first attachment will be downloaded and
+    returned alongside the embed. The embed attempts to display the attachment.
+    Should the download fail, we fallback on linking the `proxy_url`, which should
+    remain functional for some time after the original message is deleted.
     """
     log.trace(f"Creating embed for {incident.id=}")
 
@@ -83,7 +92,18 @@ def make_embed(incident: discord.Message, outcome: Signal, actioned_by: discord.
     )
     embed.set_footer(text=footer, icon_url=actioned_by.avatar_url)
 
-    return embed
+    if incident.attachments:
+        attachment = incident.attachments[0]  # User-sent messages can only contain one attachment
+        file = await download_file(attachment)
+
+        if file is not None:
+            embed.set_image(url=f"attachment://{attachment.filename}")  # Embed displays the attached file
+        else:
+            embed.set_author(name="[Failed to relay attachment]", url=attachment.proxy_url)  # Embed links the file
+    else:
+        file = None
+
+    return embed, file
 
 
 def is_incident(message: discord.Message) -> bool:
@@ -215,17 +235,7 @@ class Incidents(Cog):
         message is not safe to be deleted, as we will lose some information.
         """
         log.debug(f"Archiving incident: {incident.id} (outcome: {outcome}, actioned by: {actioned_by})")
-        embed = make_embed(incident, outcome, actioned_by)
-
-        # If the incident had an attachment, we will try to relay it
-        if incident.attachments:
-            attachment = incident.attachments[0]  # User-sent messages can only contain one attachment
-            log.debug(f"Attempting to archive incident attachment: {attachment.filename}")
-
-            attachment_file = await attachment.to_file()  # The file will be sent with the webhook
-            embed.set_image(url=f"attachment://{attachment.filename}")  # Embed displays the attached file
-        else:
-            attachment_file = None
+        embed, attachment_file = await make_embed(incident, outcome, actioned_by)
 
         try:
             webhook = await self.bot.fetch_webhook(Webhooks.incidents_archive)
diff --git a/tests/bot/cogs/moderation/test_incidents.py b/tests/bot/cogs/moderation/test_incidents.py
index 273916199..9b6054f55 100644
--- a/tests/bot/cogs/moderation/test_incidents.py
+++ b/tests/bot/cogs/moderation/test_incidents.py
@@ -89,30 +89,58 @@ class TestDownloadFile(unittest.IsolatedAsyncioTestCase):
         self.assertIsNone(acquired_file)
 
 
-class TestMakeEmbed(unittest.TestCase):
+class TestMakeEmbed(unittest.IsolatedAsyncioTestCase):
     """Collection of tests for the `make_embed` helper function."""
 
-    def test_make_embed_actioned(self):
+    async def test_make_embed_actioned(self):
         """Embed is coloured green and footer contains 'Actioned' when `outcome=Signal.ACTIONED`."""
-        embed = incidents.make_embed(MockMessage(), incidents.Signal.ACTIONED, MockMember())
+        embed, file = await incidents.make_embed(MockMessage(), incidents.Signal.ACTIONED, MockMember())
 
         self.assertEqual(embed.colour.value, Colours.soft_green)
         self.assertIn("Actioned", embed.footer.text)
 
-    def test_make_embed_not_actioned(self):
+    async def test_make_embed_not_actioned(self):
         """Embed is coloured red and footer contains 'Rejected' when `outcome=Signal.NOT_ACTIONED`."""
-        embed = incidents.make_embed(MockMessage(), incidents.Signal.NOT_ACTIONED, MockMember())
+        embed, file = await incidents.make_embed(MockMessage(), incidents.Signal.NOT_ACTIONED, MockMember())
 
         self.assertEqual(embed.colour.value, Colours.soft_red)
         self.assertIn("Rejected", embed.footer.text)
 
-    def test_make_embed_content(self):
+    async def test_make_embed_content(self):
         """Incident content appears as embed description."""
         incident = MockMessage(content="this is an incident")
-        embed = incidents.make_embed(incident, incidents.Signal.ACTIONED, MockMember())
+        embed, file = await incidents.make_embed(incident, incidents.Signal.ACTIONED, MockMember())
 
         self.assertEqual(incident.content, embed.description)
 
+    async def test_make_embed_with_attachment_succeeds(self):
+        """Incident's attachment is downloaded and displayed in the embed's image field."""
+        file = MagicMock(discord.File, filename="bigbadjoe.jpg")
+        attachment = MockAttachment(filename="bigbadjoe.jpg")
+        incident = MockMessage(content="this is an incident", attachments=[attachment])
+
+        # Patch `download_file` to return our `file`
+        with patch("bot.cogs.moderation.incidents.download_file", AsyncMock(return_value=file)):
+            embed, returned_file = await incidents.make_embed(incident, incidents.Signal.ACTIONED, MockMember())
+
+        self.assertIs(file, returned_file)
+        self.assertEqual("attachment://bigbadjoe.jpg", embed.image.url)
+
+    async def test_make_embed_with_attachment_fails(self):
+        """Incident's attachment fails to download, proxy url is linked instead."""
+        attachment = MockAttachment(proxy_url="discord.com/bigbadjoe.jpg")
+        incident = MockMessage(content="this is an incident", attachments=[attachment])
+
+        # Patch `download_file` to return None as if the download failed
+        with patch("bot.cogs.moderation.incidents.download_file", AsyncMock(return_value=None)):
+            embed, returned_file = await incidents.make_embed(incident, incidents.Signal.ACTIONED, MockMember())
+
+        self.assertIsNone(returned_file)
+
+        # The author name field is simply expected to have something in it, we do not assert the message
+        self.assertGreater(len(embed.author.name), 0)
+        self.assertEqual(embed.author.url, "discord.com/bigbadjoe.jpg")  # However, it should link the exact url
+
 
 @patch("bot.constants.Channels.incidents", 123)
 class TestIsIncident(unittest.TestCase):
@@ -343,11 +371,10 @@ class TestArchive(TestIncidents):
             content="this is an incident",
             author=MockUser(name="author_name", avatar_url="author_avatar"),
             id=123,
-            attachments=[],  # This incident has no attachments
         )
         built_embed = MagicMock(discord.Embed, id=123)  # We patch `make_embed` to return this
 
-        with patch("bot.cogs.moderation.incidents.make_embed", MagicMock(return_value=built_embed)):
+        with patch("bot.cogs.moderation.incidents.make_embed", AsyncMock(return_value=(built_embed, None))):
             archive_return = await self.cog_instance.archive(incident, MagicMock(value="A"), MockMember())
 
         # Now we check that the webhook was given the correct args, and that `archive` returned True
@@ -359,34 +386,6 @@ class TestArchive(TestIncidents):
         )
         self.assertTrue(archive_return)
 
-    async def test_archive_relays_incident_with_attachments(self):
-        """
-        Incident attachments are relayed and displayed in the embed.
-
-        This test asserts the two things that need to happen in order to relay the attachment.
-        The embed returned by `make_embed` must have the `set_image` method called with the
-        attachment's filename, and the file must be passed to the webhook's send method.
-        """
-        attachment_file = MagicMock(discord.File)
-        attachment = MagicMock(
-            discord.Attachment,
-            filename="abc.png",
-            to_file=AsyncMock(return_value=attachment_file),
-        )
-        incident = MockMessage(
-            attachments=[attachment],
-        )
-        built_embed = MagicMock(discord.Embed)
-
-        with patch("bot.cogs.moderation.incidents.make_embed", MagicMock(return_value=built_embed)):
-            await self.cog_instance.archive(incident, incidents.Signal.ACTIONED, actioned_by=MockMember())
-
-        built_embed.set_image.assert_called_once_with(url="attachment://abc.png")
-
-        send_kwargs = self.cog_instance.bot.fetch_webhook.return_value.send.call_args.kwargs
-        self.assertIn("file", send_kwargs)
-        self.assertIs(send_kwargs["file"], attachment_file)
-
     async def test_archive_clyde_username(self):
         """
         The archive webhook username is cleansed using `sub_clyde`.
-- 
cgit v1.2.3


From 281ffdfdcaa900cb82c4f0a9f0b0ae5c859a4de4 Mon Sep 17 00:00:00 2001
From: Senjan21 <53477086+Senjan21@users.noreply.github.com>
Date: Wed, 15 Jul 2020 18:28:03 +0200
Subject: Added command&system to purge all messages up to given message

---
 bot/cogs/clean.py | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/bot/cogs/clean.py b/bot/cogs/clean.py
index 368d91c85..7b2b83a02 100644
--- a/bot/cogs/clean.py
+++ b/bot/cogs/clean.py
@@ -45,6 +45,7 @@ class Clean(Cog):
         bots_only: bool = False,
         user: User = None,
         regex: Optional[str] = None,
+        until_message: Optional[Message] = None,
     ) -> None:
         """A helper function that does the actual message cleaning."""
         def predicate_bots_only(message: Message) -> bool:
@@ -129,6 +130,25 @@ class Clean(Cog):
                 if not self.cleaning:
                     return
 
+                # If we are looking for specific message.
+                if until_message:
+                    # Since we will be using `delete_messages` method
+                    # of a TextChannel
+                    # and we need message objects to use it
+                    # as well as to send logs
+                    # we will start appending messages here
+                    # instead adding them from purge.
+                    messages.append(message)
+                    # we could use ID's here however
+                    # in case if the message we are looking for
+                    # gets deleted, we won't have a way to figure that out
+                    # thus checking for datetime should be more reliable
+                    if message.created_at <= until_message.created_at:
+                        # means we have found the message until which
+                        # we were supposed to be deleting.
+                        message_ids.append(message.id)
+                        break
+
                 # If the message passes predicate, let's save it.
                 if predicate is None or predicate(message):
                     message_ids.append(message.id)
@@ -138,7 +158,14 @@ class Clean(Cog):
         # Now let's delete the actual messages with purge.
         self.mod_log.ignore(Event.message_delete, *message_ids)
         for channel in channels:
-            messages += await channel.purge(limit=amount, check=predicate)
+            if until_message:
+                for i in range(0, len(messages), 100):
+                    # while purge automatically handles the amount of messages
+                    # delete_messages only allows for up to 100 messages at once
+                    # thus we need to paginate the amount to always be <= 100
+                    await channel.delete_messages(messages[i:i + 100])
+            else:
+                messages += await channel.purge(limit=amount, check=predicate)
 
         # Reverse the list to restore chronological order
         if messages:
@@ -221,6 +248,17 @@ class Clean(Cog):
         """Delete all messages that match a certain regex, stop cleaning after traversing `amount` messages."""
         await self._clean_messages(amount, ctx, regex=regex, channels=channels)
 
+    @clean_group.command(name="message", aliases=["messages"])
+    @with_role(*MODERATION_ROLES)
+    async def clean_message(self, ctx: Context, message: Message) -> None:
+        """Delete all messages until certain message, stop cleaning after hitting the `message`"""
+        await self._clean_messages(
+            CleanMessages.message_limit,
+            ctx,
+            channels=[message.channel],
+            until_message=message
+        )
+
     @clean_group.command(name="stop", aliases=["cancel", "abort"])
     @with_role(*MODERATION_ROLES)
     async def clean_cancel(self, ctx: Context) -> None:
-- 
cgit v1.2.3


From ace60c4776ee02104390f0c782543118290e53c8 Mon Sep 17 00:00:00 2001
From: Senjan21 <53477086+Senjan21@users.noreply.github.com>
Date: Wed, 15 Jul 2020 19:04:15 +0200
Subject: Fix docstring and comments

---
 bot/cogs/clean.py | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/bot/cogs/clean.py b/bot/cogs/clean.py
index 7b2b83a02..aee7fa055 100644
--- a/bot/cogs/clean.py
+++ b/bot/cogs/clean.py
@@ -132,20 +132,14 @@ class Clean(Cog):
 
                 # If we are looking for specific message.
                 if until_message:
-                    # Since we will be using `delete_messages` method
-                    # of a TextChannel
-                    # and we need message objects to use it
-                    # as well as to send logs
-                    # we will start appending messages here
-                    # instead adding them from purge.
+                    # Since we will be using `delete_messages` method of a TextChannel and we need message objects to
+                    # use it as well as to send logs we will start appending messages here instead adding them from
+                    # purge.
                     messages.append(message)
-                    # we could use ID's here however
-                    # in case if the message we are looking for
-                    # gets deleted, we won't have a way to figure that out
-                    # thus checking for datetime should be more reliable
+                    # we could use ID's here however in case if the message we are looking for gets deleted,
+                    # we won't have a way to figure that out thus checking for datetime should be more reliable
                     if message.created_at <= until_message.created_at:
-                        # means we have found the message until which
-                        # we were supposed to be deleting.
+                        # means we have found the message until which we were supposed to be deleting.
                         message_ids.append(message.id)
                         break
 
@@ -251,7 +245,7 @@ class Clean(Cog):
     @clean_group.command(name="message", aliases=["messages"])
     @with_role(*MODERATION_ROLES)
     async def clean_message(self, ctx: Context, message: Message) -> None:
-        """Delete all messages until certain message, stop cleaning after hitting the `message`"""
+        """Delete all messages until certain message, stop cleaning after hitting the `message`."""
         await self._clean_messages(
             CleanMessages.message_limit,
             ctx,
-- 
cgit v1.2.3


From 776b4379c478284803a4a526b5f14fe63d8e7c01 Mon Sep 17 00:00:00 2001
From: kosayoda <kieransiek@protonmail.com>
Date: Thu, 16 Jul 2020 11:45:15 +0800
Subject: Remove duplicate reminder deletion.

The function `_delete_reminder` was called twice, once in
`schedule_reminder`, which calls `send_reminder`, then another in
`send_reminder` itself. This led to a 404 response from the site api, as
the reminder was already deleted the first time.

Fixes BOT-6W
---
 bot/cogs/reminders.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/cogs/reminders.py b/bot/cogs/reminders.py
index 0d20bdb2b..4f2ab1781 100644
--- a/bot/cogs/reminders.py
+++ b/bot/cogs/reminders.py
@@ -55,6 +55,7 @@ class Reminders(Cog):
             if remind_at < now:
                 late = relativedelta(now, remind_at)
                 await self.send_reminder(reminder, late)
+                await self._delete_reminder(reminder["id"])
             else:
                 self.schedule_reminder(reminder)
 
@@ -157,7 +158,6 @@ class Reminders(Cog):
             content=user.mention,
             embed=embed
         )
-        await self._delete_reminder(reminder["id"])
 
     @group(name="remind", aliases=("reminder", "reminders", "remindme"), invoke_without_command=True)
     async def remind_group(self, ctx: Context, expiration: Duration, *, content: str) -> None:
-- 
cgit v1.2.3


From 9389543fe89f623301842b3f850cf767d1bf45ea Mon Sep 17 00:00:00 2001
From: kosayoda <kieransiek@protonmail.com>
Date: Thu, 16 Jul 2020 12:29:20 +0800
Subject: Extract sending error embed to a separate method.

---
 bot/cogs/reminders.py | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/bot/cogs/reminders.py b/bot/cogs/reminders.py
index 4f2ab1781..ebf85cc4d 100644
--- a/bot/cogs/reminders.py
+++ b/bot/cogs/reminders.py
@@ -100,6 +100,16 @@ class Reminders(Cog):
 
         await ctx.send(embed=embed)
 
+    @staticmethod
+    async def _send_denial(ctx: Context, reason: str) -> None:
+        """Send an embed denying the user from creating a reminder."""
+        embed = discord.Embed()
+        embed.colour = discord.Colour.red()
+        embed.title = random.choice(NEGATIVE_REPLIES)
+        embed.description = reason
+
+        await ctx.send(embed=embed)
+
     def schedule_reminder(self, reminder: dict) -> None:
         """A coroutine which sends the reminder once the time is reached, and cancels the running task."""
         reminder_id = reminder["id"]
@@ -171,18 +181,12 @@ class Reminders(Cog):
 
         Expiration is parsed per: http://strftime.org/
         """
-        embed = discord.Embed()
-
         # If the user is not staff, we need to verify whether or not to make a reminder at all.
         if without_role_check(ctx, *STAFF_ROLES):
 
             # If they don't have permission to set a reminder in this channel
             if ctx.channel.id not in WHITELISTED_CHANNELS:
-                embed.colour = discord.Colour.red()
-                embed.title = random.choice(NEGATIVE_REPLIES)
-                embed.description = "Sorry, you can't do that here!"
-
-                return await ctx.send(embed=embed)
+                return await self._send_denial(ctx, "Sorry, you can't do that here!")
 
             # Get their current active reminders
             active_reminders = await self.bot.api_client.get(
@@ -195,12 +199,7 @@ class Reminders(Cog):
             # Let's limit this, so we don't get 10 000
             # reminders from kip or something like that :P
             if len(active_reminders) > MAXIMUM_REMINDERS:
-                embed.colour = discord.Colour.red()
-                embed.title = random.choice(NEGATIVE_REPLIES)
-                embed.description = "You have too many active reminders!"
-
-                return await ctx.send(embed=embed)
-
+                return await self._send_denial(ctx, "You have too many active reminders!")
         # Now we can attempt to actually set the reminder.
         reminder = await self.bot.api_client.post(
             'bot/reminders',
-- 
cgit v1.2.3


From 61459ed1fd40b10eb9c61d2b2d3ae1cea3547ea8 Mon Sep 17 00:00:00 2001
From: kosayoda <kieransiek@protonmail.com>
Date: Thu, 16 Jul 2020 13:01:54 +0800
Subject: Add method to check if user is allowed to mention in reminders.

---
 bot/cogs/reminders.py | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/bot/cogs/reminders.py b/bot/cogs/reminders.py
index ebf85cc4d..aefc4a359 100644
--- a/bot/cogs/reminders.py
+++ b/bot/cogs/reminders.py
@@ -9,10 +9,11 @@ from operator import itemgetter
 import discord
 from dateutil.parser import isoparse
 from dateutil.relativedelta import relativedelta
+from discord import Member, Role
 from discord.ext.commands import Cog, Context, group
 
 from bot.bot import Bot
-from bot.constants import Guild, Icons, NEGATIVE_REPLIES, POSITIVE_REPLIES, STAFF_ROLES
+from bot.constants import Guild, Icons, MODERATION_ROLES, NEGATIVE_REPLIES, POSITIVE_REPLIES, STAFF_ROLES
 from bot.converters import Duration
 from bot.pagination import LinePaginator
 from bot.utils.checks import without_role_check
@@ -24,6 +25,8 @@ log = logging.getLogger(__name__)
 WHITELISTED_CHANNELS = Guild.reminder_whitelist
 MAXIMUM_REMINDERS = 5
 
+Mentionable = t.Union[Member, Role]
+
 
 class Reminders(Cog):
     """Provide in-channel reminder functionality."""
@@ -110,6 +113,23 @@ class Reminders(Cog):
 
         await ctx.send(embed=embed)
 
+    @staticmethod
+    async def allow_mentions(ctx: Context, mentions: t.List[Mentionable]) -> t.Tuple[bool, str]:
+        """
+        Returns whether or not the list of mentions is allowed.
+
+        Conditions:
+        - Role reminders are Mods+
+        - Reminders for other users are Helpers+
+        If mentions aren't allowed, also return the type of mention(s) disallowed.
+        """
+        if without_role_check(ctx, *STAFF_ROLES):
+            return False, "members/roles"
+        elif without_role_check(ctx, *MODERATION_ROLES):
+            return all(isinstance(mention, Member) for mention in mentions), "roles"
+        else:
+            return True, ""
+
     def schedule_reminder(self, reminder: dict) -> None:
         """A coroutine which sends the reminder once the time is reached, and cancels the running task."""
         reminder_id = reminder["id"]
-- 
cgit v1.2.3


From 76b8e4625e853bcc96c946fa408c2267e78dbc72 Mon Sep 17 00:00:00 2001
From: kosayoda <kieransiek@protonmail.com>
Date: Thu, 16 Jul 2020 13:10:28 +0800
Subject: Add generator that converts IDs to Role or Member objects.

---
 bot/cogs/reminders.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/bot/cogs/reminders.py b/bot/cogs/reminders.py
index aefc4a359..ab47f3b11 100644
--- a/bot/cogs/reminders.py
+++ b/bot/cogs/reminders.py
@@ -130,6 +130,13 @@ class Reminders(Cog):
         else:
             return True, ""
 
+    def get_mentionables_from_ids(self, mention_ids: t.List[str]) -> t.Iterator[Mentionable]:
+        """Converts Role and Member ids to their corresponding objects if possible."""
+        guild = self.bot.get_guild(Guild.id)
+        for mention_id in mention_ids:
+            if (mentionable := (guild.get_member(mention_id) or guild.get_role(mention_id))):
+                yield mentionable
+
     def schedule_reminder(self, reminder: dict) -> None:
         """A coroutine which sends the reminder once the time is reached, and cancels the running task."""
         reminder_id = reminder["id"]
-- 
cgit v1.2.3


From da2849a4fbbc5b2180cc042be66f1511017b2488 Mon Sep 17 00:00:00 2001
From: kosayoda <kieransiek@protonmail.com>
Date: Thu, 16 Jul 2020 13:12:12 +0800
Subject: Allow mentioning other users and roles in reminders.

---
 bot/cogs/reminders.py | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/bot/cogs/reminders.py b/bot/cogs/reminders.py
index ab47f3b11..5ef35602c 100644
--- a/bot/cogs/reminders.py
+++ b/bot/cogs/reminders.py
@@ -10,7 +10,7 @@ import discord
 from dateutil.parser import isoparse
 from dateutil.relativedelta import relativedelta
 from discord import Member, Role
-from discord.ext.commands import Cog, Context, group
+from discord.ext.commands import Cog, Context, Greedy, group
 
 from bot.bot import Bot
 from bot.constants import Guild, Icons, MODERATION_ROLES, NEGATIVE_REPLIES, POSITIVE_REPLIES, STAFF_ROLES
@@ -197,12 +197,16 @@ class Reminders(Cog):
         )
 
     @group(name="remind", aliases=("reminder", "reminders", "remindme"), invoke_without_command=True)
-    async def remind_group(self, ctx: Context, expiration: Duration, *, content: str) -> None:
+    async def remind_group(
+        self, ctx: Context, mentions: Greedy[Mentionable], expiration: Duration, *, content: str
+    ) -> None:
         """Commands for managing your reminders."""
-        await ctx.invoke(self.new_reminder, expiration=expiration, content=content)
+        await ctx.invoke(self.new_reminder, mentions=mentions, expiration=expiration, content=content)
 
     @remind_group.command(name="new", aliases=("add", "create"))
-    async def new_reminder(self, ctx: Context, expiration: Duration, *, content: str) -> t.Optional[discord.Message]:
+    async def new_reminder(
+        self, ctx: Context, mentions: Greedy[Mentionable], expiration: Duration, *, content: str
+    ) -> t.Optional[discord.Message]:
         """
         Set yourself a simple reminder.
 
@@ -227,6 +231,17 @@ class Reminders(Cog):
             # reminders from kip or something like that :P
             if len(active_reminders) > MAXIMUM_REMINDERS:
                 return await self._send_denial(ctx, "You have too many active reminders!")
+
+        # Filter mentions to see if the user can mention members/roles
+        if mentions:
+            mentions_allowed, disallowed_mentions = await self.allow_mentions(ctx, mentions)
+            if not mentions_allowed:
+                return await self._send_denial(
+                    ctx, f"You can't mention other {disallowed_mentions} in your reminder!"
+                )
+
+        mention_ids = [mention.id for mention in mentions]
+
         # Now we can attempt to actually set the reminder.
         reminder = await self.bot.api_client.post(
             'bot/reminders',
@@ -235,17 +250,22 @@ class Reminders(Cog):
                 'channel_id': ctx.message.channel.id,
                 'jump_url': ctx.message.jump_url,
                 'content': content,
-                'expiration': expiration.isoformat()
+                'expiration': expiration.isoformat(),
+                'mentions': mention_ids,
             }
         )
 
         now = datetime.utcnow() - timedelta(seconds=1)
         humanized_delta = humanize_delta(relativedelta(expiration, now))
+        mention_string = (
+            f"Your reminder will arrive in {humanized_delta} "
+            f"and will mention {len(mentions)} other(s)!"
+        )
 
         # Confirm to the user that it worked.
         await self._send_confirmation(
             ctx,
-            on_success=f"Your reminder will arrive in {humanized_delta}!",
+            on_success=mention_string,
             reminder_id=reminder["id"],
             delivery_dt=expiration,
         )
-- 
cgit v1.2.3


From 1ee3febc398deafa4d87b6db93b4e3af6976b0e7 Mon Sep 17 00:00:00 2001
From: kosayoda <kieransiek@protonmail.com>
Date: Thu, 16 Jul 2020 13:13:05 +0800
Subject: Send additional mentions in reminders.

---
 bot/cogs/reminders.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bot/cogs/reminders.py b/bot/cogs/reminders.py
index 5ef35602c..a004902c2 100644
--- a/bot/cogs/reminders.py
+++ b/bot/cogs/reminders.py
@@ -191,8 +191,12 @@ class Reminders(Cog):
                 name=f"Sorry it arrived {humanize_delta(late, max_units=2)} late!"
             )
 
+        additional_mentions = ' '.join(
+            mentionable.mention for mentionable in self.get_mentionables_from_ids(reminder["mentions"])
+        )
+
         await channel.send(
-            content=user.mention,
+            content=f"{user.mention} {additional_mentions}",
             embed=embed
         )
 
-- 
cgit v1.2.3


From cf9a350934a099ae71fcc0c46fbf57d7fb82dd86 Mon Sep 17 00:00:00 2001
From: kosayoda <kieransiek@protonmail.com>
Date: Thu, 16 Jul 2020 13:14:10 +0800
Subject: List additional mentions in `!reminder list`.

---
 bot/cogs/reminders.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/bot/cogs/reminders.py b/bot/cogs/reminders.py
index a004902c2..fd3c6efa2 100644
--- a/bot/cogs/reminders.py
+++ b/bot/cogs/reminders.py
@@ -290,7 +290,7 @@ class Reminders(Cog):
         # Make a list of tuples so it can be sorted by time.
         reminders = sorted(
             (
-                (rem['content'], rem['expiration'], rem['id'])
+                (rem['content'], rem['expiration'], rem['id'], rem['mentions'])
                 for rem in data
             ),
             key=itemgetter(1)
@@ -298,13 +298,19 @@ class Reminders(Cog):
 
         lines = []
 
-        for content, remind_at, id_ in reminders:
+        for content, remind_at, id_, mentions in reminders:
             # Parse and humanize the time, make it pretty :D
             remind_datetime = isoparse(remind_at).replace(tzinfo=None)
             time = humanize_delta(relativedelta(remind_datetime, now))
 
+            mentions = ", ".join(
+                # Both Role and User objects have the `name` attribute
+                mention.name for mention in self.get_mentionables_from_ids(mentions)
+            )
+            mention_string = f"\n**Mentions:** {mentions}" if mentions else ""
+
             text = textwrap.dedent(f"""
-            **Reminder #{id_}:** *expires in {time}* (ID: {id_})
+            **Reminder #{id_}:** *expires in {time}* (ID: {id_}) {mention_string}
             {content}
             """).strip()
 
-- 
cgit v1.2.3


From 3f319488f479cd38e719201b4c926ace68ef9102 Mon Sep 17 00:00:00 2001
From: kosayoda <kieransiek@protonmail.com>
Date: Thu, 16 Jul 2020 13:14:38 +0800
Subject: Allow editing additional mentions for reminders.

---
 bot/cogs/reminders.py | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/bot/cogs/reminders.py b/bot/cogs/reminders.py
index fd3c6efa2..9eddd283b 100644
--- a/bot/cogs/reminders.py
+++ b/bot/cogs/reminders.py
@@ -384,6 +384,34 @@ class Reminders(Cog):
         )
         await self._reschedule_reminder(reminder)
 
+    @edit_reminder_group.command(name="mentions", aliases=("pings",))
+    async def edit_reminder_mentions(self, ctx: Context, id_: int, mentions: Greedy[Mentionable]) -> None:
+        """Edit one of your reminder's mentions."""
+        # Filter mentions to see if the user can mention members/roles
+        mentions_allowed, disallowed_mentions = await self.allow_mentions(ctx, mentions)
+        if not mentions_allowed:
+            return await self._send_denial(
+                ctx, f"You can't mention other {disallowed_mentions} in your reminder!"
+            )
+
+        mention_ids = [mention.id for mention in mentions]
+        reminder = await self.bot.api_client.patch(
+            'bot/reminders/' + str(id_),
+            json={"mentions": mention_ids}
+        )
+
+        # Parse the reminder expiration back into a datetime for the confirmation message
+        expiration = isoparse(reminder['expiration']).replace(tzinfo=None)
+
+        # Send a confirmation message to the channel
+        await self._send_confirmation(
+            ctx,
+            on_success="That reminder has been edited successfully!",
+            reminder_id=id_,
+            delivery_dt=expiration,
+        )
+        await self._reschedule_reminder(reminder)
+
     @remind_group.command("delete", aliases=("remove", "cancel"))
     async def delete_reminder(self, ctx: Context, id_: int) -> None:
         """Delete one of your active reminders."""
-- 
cgit v1.2.3


From b6abe9cbb2e63f562bb44e14d51ea87f19da32ac Mon Sep 17 00:00:00 2001
From: Senjan21 <53477086+Senjan21@users.noreply.github.com>
Date: Thu, 16 Jul 2020 10:41:54 +0200
Subject: Prevent deleting messages above the desired message.

---
 bot/cogs/clean.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/bot/cogs/clean.py b/bot/cogs/clean.py
index aee7fa055..f436e531a 100644
--- a/bot/cogs/clean.py
+++ b/bot/cogs/clean.py
@@ -132,17 +132,18 @@ class Clean(Cog):
 
                 # If we are looking for specific message.
                 if until_message:
-                    # Since we will be using `delete_messages` method of a TextChannel and we need message objects to
-                    # use it as well as to send logs we will start appending messages here instead adding them from
-                    # purge.
-                    messages.append(message)
+
                     # we could use ID's here however in case if the message we are looking for gets deleted,
                     # we won't have a way to figure that out thus checking for datetime should be more reliable
-                    if message.created_at <= until_message.created_at:
+                    if message.created_at < until_message.created_at:
                         # means we have found the message until which we were supposed to be deleting.
-                        message_ids.append(message.id)
                         break
 
+                    # Since we will be using `delete_messages` method of a TextChannel and we need message objects to
+                    # use it as well as to send logs we will start appending messages here instead adding them from
+                    # purge.
+                    messages.append(message)
+
                 # If the message passes predicate, let's save it.
                 if predicate is None or predicate(message):
                     message_ids.append(message.id)
-- 
cgit v1.2.3


From 6f5fb205bcc3f9b468ef585f83e123e5b19d7340 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Thu, 16 Jul 2020 17:03:02 +0200
Subject: Incidents: reduce log level of 404 exception

Co-authored-by: MarkKoz <kozlovmark@gmail.com>
---
 bot/cogs/moderation/incidents.py            |  2 ++
 tests/bot/cogs/moderation/test_incidents.py | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 018538040..2d5f26f20 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -55,6 +55,8 @@ async def download_file(attachment: discord.Attachment) -> t.Optional[discord.Fi
     log.debug(f"Attempting to download attachment: {attachment.filename}")
     try:
         return await attachment.to_file()
+    except discord.NotFound as not_found:
+        log.debug(f"Failed to download attachment: {not_found}")
     except Exception:
         log.exception("Failed to download attachment")
 
diff --git a/tests/bot/cogs/moderation/test_incidents.py b/tests/bot/cogs/moderation/test_incidents.py
index 9b6054f55..435a1cd51 100644
--- a/tests/bot/cogs/moderation/test_incidents.py
+++ b/tests/bot/cogs/moderation/test_incidents.py
@@ -81,13 +81,23 @@ class TestDownloadFile(unittest.IsolatedAsyncioTestCase):
         acquired_file = await incidents.download_file(attachment)
         self.assertIs(file, acquired_file)
 
-    async def test_download_file_fail(self):
-        """If `to_file` fails, function handles the exception & returns None."""
+    async def test_download_file_404(self):
+        """If `to_file` encounters a 404, function handles the exception & returns None."""
         attachment = MockAttachment(to_file=AsyncMock(side_effect=mock_404))
 
         acquired_file = await incidents.download_file(attachment)
         self.assertIsNone(acquired_file)
 
+    async def test_download_file_fail(self):
+        """If `to_file` fails on a non-404 error, function logs the exception & returns None."""
+        arbitrary_error = discord.HTTPException(MagicMock(aiohttp.ClientResponse), "Arbitrary API error")
+        attachment = MockAttachment(to_file=AsyncMock(side_effect=arbitrary_error))
+
+        with self.assertLogs(logger=incidents.log, level=logging.ERROR):
+            acquired_file = await incidents.download_file(attachment)
+
+        self.assertIsNone(acquired_file)
+
 
 class TestMakeEmbed(unittest.IsolatedAsyncioTestCase):
     """Collection of tests for the `make_embed` helper function."""
-- 
cgit v1.2.3


From 476d4070940830d14859f7cc8970a14409d142a6 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Thu, 16 Jul 2020 20:27:32 +0200
Subject: Incidents: reduce log level of 403 exception

In addition to 404, this shouldn't send Sentry notifs.

Co-authored-by: MarkKoz <kozlovmark@gmail.com>
---
 bot/cogs/moderation/incidents.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bot/cogs/moderation/incidents.py b/bot/cogs/moderation/incidents.py
index 2d5f26f20..3605ab1d2 100644
--- a/bot/cogs/moderation/incidents.py
+++ b/bot/cogs/moderation/incidents.py
@@ -51,12 +51,13 @@ async def download_file(attachment: discord.Attachment) -> t.Optional[discord.Fi
     Download & return `attachment` file.
 
     If the download fails, the reason is logged and None will be returned.
+    404 and 403 errors are only logged at debug level.
     """
     log.debug(f"Attempting to download attachment: {attachment.filename}")
     try:
         return await attachment.to_file()
-    except discord.NotFound as not_found:
-        log.debug(f"Failed to download attachment: {not_found}")
+    except (discord.NotFound, discord.Forbidden) as exc:
+        log.debug(f"Failed to download attachment: {exc}")
     except Exception:
         log.exception("Failed to download attachment")
 
-- 
cgit v1.2.3


From cdf4e2595b8321158bcb514936b7c2a23a88cd0d Mon Sep 17 00:00:00 2001
From: Kieran Siek <kieransiek@protonmail.com>
Date: Sun, 19 Jul 2020 13:10:14 +0800
Subject: Add whitespace to improve readability

Co-authored-by: Mark <kozlovmark@gmail.com>
---
 bot/cogs/reminders.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bot/cogs/reminders.py b/bot/cogs/reminders.py
index 9eddd283b..5f76164cd 100644
--- a/bot/cogs/reminders.py
+++ b/bot/cogs/reminders.py
@@ -121,6 +121,7 @@ class Reminders(Cog):
         Conditions:
         - Role reminders are Mods+
         - Reminders for other users are Helpers+
+
         If mentions aren't allowed, also return the type of mention(s) disallowed.
         """
         if without_role_check(ctx, *STAFF_ROLES):
-- 
cgit v1.2.3


From 1d9efd32278688adebd539b15c4d16d4dd88e74c Mon Sep 17 00:00:00 2001
From: kosayoda <kieransiek@protonmail.com>
Date: Sun, 19 Jul 2020 13:17:45 +0800
Subject: Namespace Member and Role to avoid extra imports

---
 bot/cogs/reminders.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bot/cogs/reminders.py b/bot/cogs/reminders.py
index 9eddd283b..ae387f09a 100644
--- a/bot/cogs/reminders.py
+++ b/bot/cogs/reminders.py
@@ -9,7 +9,6 @@ from operator import itemgetter
 import discord
 from dateutil.parser import isoparse
 from dateutil.relativedelta import relativedelta
-from discord import Member, Role
 from discord.ext.commands import Cog, Context, Greedy, group
 
 from bot.bot import Bot
@@ -25,7 +24,7 @@ log = logging.getLogger(__name__)
 WHITELISTED_CHANNELS = Guild.reminder_whitelist
 MAXIMUM_REMINDERS = 5
 
-Mentionable = t.Union[Member, Role]
+Mentionable = t.Union[discord.Member, discord.Role]
 
 
 class Reminders(Cog):
@@ -126,7 +125,7 @@ class Reminders(Cog):
         if without_role_check(ctx, *STAFF_ROLES):
             return False, "members/roles"
         elif without_role_check(ctx, *MODERATION_ROLES):
-            return all(isinstance(mention, Member) for mention in mentions), "roles"
+            return all(isinstance(mention, discord.Member) for mention in mentions), "roles"
         else:
             return True, ""
 
-- 
cgit v1.2.3


From ced9117e848a9eb1e003576d4f355ba7aa220cd8 Mon Sep 17 00:00:00 2001
From: kosayoda <kieransiek@protonmail.com>
Date: Sun, 19 Jul 2020 13:31:00 +0800
Subject: Extract `send_denial` to a utility function

---
 bot/cogs/reminders.py | 21 ++++++---------------
 bot/utils/messages.py | 16 ++++++++++++++--
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/bot/cogs/reminders.py b/bot/cogs/reminders.py
index ae387f09a..f36b67f5a 100644
--- a/bot/cogs/reminders.py
+++ b/bot/cogs/reminders.py
@@ -12,10 +12,11 @@ from dateutil.relativedelta import relativedelta
 from discord.ext.commands import Cog, Context, Greedy, group
 
 from bot.bot import Bot
-from bot.constants import Guild, Icons, MODERATION_ROLES, NEGATIVE_REPLIES, POSITIVE_REPLIES, STAFF_ROLES
+from bot.constants import Guild, Icons, MODERATION_ROLES, POSITIVE_REPLIES, STAFF_ROLES
 from bot.converters import Duration
 from bot.pagination import LinePaginator
 from bot.utils.checks import without_role_check
+from bot.utils.messages import send_denial
 from bot.utils.scheduling import Scheduler
 from bot.utils.time import humanize_delta
 
@@ -102,16 +103,6 @@ class Reminders(Cog):
 
         await ctx.send(embed=embed)
 
-    @staticmethod
-    async def _send_denial(ctx: Context, reason: str) -> None:
-        """Send an embed denying the user from creating a reminder."""
-        embed = discord.Embed()
-        embed.colour = discord.Colour.red()
-        embed.title = random.choice(NEGATIVE_REPLIES)
-        embed.description = reason
-
-        await ctx.send(embed=embed)
-
     @staticmethod
     async def allow_mentions(ctx: Context, mentions: t.List[Mentionable]) -> t.Tuple[bool, str]:
         """
@@ -220,7 +211,7 @@ class Reminders(Cog):
 
             # If they don't have permission to set a reminder in this channel
             if ctx.channel.id not in WHITELISTED_CHANNELS:
-                return await self._send_denial(ctx, "Sorry, you can't do that here!")
+                return await send_denial(ctx, "Sorry, you can't do that here!")
 
             # Get their current active reminders
             active_reminders = await self.bot.api_client.get(
@@ -233,13 +224,13 @@ class Reminders(Cog):
             # Let's limit this, so we don't get 10 000
             # reminders from kip or something like that :P
             if len(active_reminders) > MAXIMUM_REMINDERS:
-                return await self._send_denial(ctx, "You have too many active reminders!")
+                return await send_denial(ctx, "You have too many active reminders!")
 
         # Filter mentions to see if the user can mention members/roles
         if mentions:
             mentions_allowed, disallowed_mentions = await self.allow_mentions(ctx, mentions)
             if not mentions_allowed:
-                return await self._send_denial(
+                return await send_denial(
                     ctx, f"You can't mention other {disallowed_mentions} in your reminder!"
                 )
 
@@ -389,7 +380,7 @@ class Reminders(Cog):
         # Filter mentions to see if the user can mention members/roles
         mentions_allowed, disallowed_mentions = await self.allow_mentions(ctx, mentions)
         if not mentions_allowed:
-            return await self._send_denial(
+            return await send_denial(
                 ctx, f"You can't mention other {disallowed_mentions} in your reminder!"
             )
 
diff --git a/bot/utils/messages.py b/bot/utils/messages.py
index a40a12e98..670289941 100644
--- a/bot/utils/messages.py
+++ b/bot/utils/messages.py
@@ -1,15 +1,17 @@
 import asyncio
 import contextlib
 import logging
+import random
 import re
 from io import BytesIO
 from typing import List, Optional, Sequence, Union
 
-from discord import Client, Embed, File, Member, Message, Reaction, TextChannel, Webhook
+from discord import Client, Colour, Embed, File, Member, Message, Reaction, TextChannel, Webhook
 from discord.abc import Snowflake
 from discord.errors import HTTPException
+from discord.ext.commands import Context
 
-from bot.constants import Emojis
+from bot.constants import Emojis, NEGATIVE_REPLIES
 
 log = logging.getLogger(__name__)
 
@@ -132,3 +134,13 @@ def sub_clyde(username: Optional[str]) -> Optional[str]:
         return re.sub(r"(clyd)(e)", replace_e, username, flags=re.I)
     else:
         return username  # Empty string or None
+
+
+async def send_denial(ctx: Context, reason: str) -> None:
+    """Send an embed denying the user with the given reason."""
+    embed = Embed()
+    embed.colour = Colour.red()
+    embed.title = random.choice(NEGATIVE_REPLIES)
+    embed.description = reason
+
+    await ctx.send(embed=embed)
-- 
cgit v1.2.3


From 010373673700f821b5860bd749f40fdf8d59d134 Mon Sep 17 00:00:00 2001
From: kosayoda <kieransiek@protonmail.com>
Date: Sun, 19 Jul 2020 13:39:24 +0800
Subject: Fix incorrect typehint and shorten method name

---
 bot/cogs/reminders.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bot/cogs/reminders.py b/bot/cogs/reminders.py
index f36b67f5a..d36494a69 100644
--- a/bot/cogs/reminders.py
+++ b/bot/cogs/reminders.py
@@ -120,7 +120,7 @@ class Reminders(Cog):
         else:
             return True, ""
 
-    def get_mentionables_from_ids(self, mention_ids: t.List[str]) -> t.Iterator[Mentionable]:
+    def get_mentionables(self, mention_ids: t.List[int]) -> t.Iterator[Mentionable]:
         """Converts Role and Member ids to their corresponding objects if possible."""
         guild = self.bot.get_guild(Guild.id)
         for mention_id in mention_ids:
@@ -182,7 +182,7 @@ class Reminders(Cog):
             )
 
         additional_mentions = ' '.join(
-            mentionable.mention for mentionable in self.get_mentionables_from_ids(reminder["mentions"])
+            mentionable.mention for mentionable in self.get_mentionables(reminder["mentions"])
         )
 
         await channel.send(
@@ -295,7 +295,7 @@ class Reminders(Cog):
 
             mentions = ", ".join(
                 # Both Role and User objects have the `name` attribute
-                mention.name for mention in self.get_mentionables_from_ids(mentions)
+                mention.name for mention in self.get_mentionables(mentions)
             )
             mention_string = f"\n**Mentions:** {mentions}" if mentions else ""
 
-- 
cgit v1.2.3


From 4ef9770ed26b46bc5916f4147acce1cf57f4f9af Mon Sep 17 00:00:00 2001
From: kosayoda <kieransiek@protonmail.com>
Date: Sun, 19 Jul 2020 21:13:08 +0800
Subject: Rename method to improve readability

---
 bot/cogs/reminders.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bot/cogs/reminders.py b/bot/cogs/reminders.py
index d36494a69..6755993a0 100644
--- a/bot/cogs/reminders.py
+++ b/bot/cogs/reminders.py
@@ -104,7 +104,7 @@ class Reminders(Cog):
         await ctx.send(embed=embed)
 
     @staticmethod
-    async def allow_mentions(ctx: Context, mentions: t.List[Mentionable]) -> t.Tuple[bool, str]:
+    async def check_mentions(ctx: Context, mentions: t.List[Mentionable]) -> t.Tuple[bool, str]:
         """
         Returns whether or not the list of mentions is allowed.
 
@@ -228,7 +228,7 @@ class Reminders(Cog):
 
         # Filter mentions to see if the user can mention members/roles
         if mentions:
-            mentions_allowed, disallowed_mentions = await self.allow_mentions(ctx, mentions)
+            mentions_allowed, disallowed_mentions = await self.check_mentions(ctx, mentions)
             if not mentions_allowed:
                 return await send_denial(
                     ctx, f"You can't mention other {disallowed_mentions} in your reminder!"
@@ -378,7 +378,7 @@ class Reminders(Cog):
     async def edit_reminder_mentions(self, ctx: Context, id_: int, mentions: Greedy[Mentionable]) -> None:
         """Edit one of your reminder's mentions."""
         # Filter mentions to see if the user can mention members/roles
-        mentions_allowed, disallowed_mentions = await self.allow_mentions(ctx, mentions)
+        mentions_allowed, disallowed_mentions = await self.check_mentions(ctx, mentions)
         if not mentions_allowed:
             return await send_denial(
                 ctx, f"You can't mention other {disallowed_mentions} in your reminder!"
-- 
cgit v1.2.3


From ff7707f8306c26ef9d14944e2826671bbcfcf113 Mon Sep 17 00:00:00 2001
From: kosayoda <kieransiek@protonmail.com>
Date: Sun, 19 Jul 2020 22:17:48 +0800
Subject: Refactor reminder edits to reduce code duplication

The reminder expiration returnedfrom the API call is also now parsed
again even when the edit is to the duration since it does not matter and
trying to keep it DRY while still doing that check is a pain.
---
 bot/cogs/reminders.py | 65 ++++++++++++++++++++-------------------------------
 1 file changed, 25 insertions(+), 40 deletions(-)

diff --git a/bot/cogs/reminders.py b/bot/cogs/reminders.py
index 6755993a0..d99979ace 100644
--- a/bot/cogs/reminders.py
+++ b/bot/cogs/reminders.py
@@ -148,6 +148,19 @@ class Reminders(Cog):
             # Now we can remove it from the schedule list
             self.scheduler.cancel(reminder_id)
 
+    async def _edit_reminder(self, reminder_id: int, payload: dict) -> dict:
+        """
+        Edits a reminder in the database given the ID and payload.
+
+        Returns the edited reminder.
+        """
+        # Send the request to update the reminder in the database
+        reminder = await self.bot.api_client.patch(
+            'bot/reminders/' + str(reminder_id),
+            json=payload
+        )
+        return reminder
+
     async def _reschedule_reminder(self, reminder: dict) -> None:
         """Reschedule a reminder object."""
         log.trace(f"Cancelling old task #{reminder['id']}")
@@ -300,7 +313,7 @@ class Reminders(Cog):
             mention_string = f"\n**Mentions:** {mentions}" if mentions else ""
 
             text = textwrap.dedent(f"""
-            **Reminder #{id_}:** *expires in {time}* (ID: {id_}) {mention_string}
+            **Reminder #{id_}:** *expires in {time}* (ID: {id_}){mention_string}
             {content}
             """).strip()
 
@@ -333,46 +346,16 @@ class Reminders(Cog):
     @edit_reminder_group.command(name="duration", aliases=("time",))
     async def edit_reminder_duration(self, ctx: Context, id_: int, expiration: Duration) -> None:
         """
-         Edit one of your reminder's expiration.
+        Edit one of your reminder's expiration.
 
         Expiration is parsed per: http://strftime.org/
         """
-        # Send the request to update the reminder in the database
-        reminder = await self.bot.api_client.patch(
-            'bot/reminders/' + str(id_),
-            json={'expiration': expiration.isoformat()}
-        )
-
-        # Send a confirmation message to the channel
-        await self._send_confirmation(
-            ctx,
-            on_success="That reminder has been edited successfully!",
-            reminder_id=id_,
-            delivery_dt=expiration,
-        )
-
-        await self._reschedule_reminder(reminder)
+        await self.edit_reminder(ctx, id_, {'expiration': expiration.isoformat()})
 
     @edit_reminder_group.command(name="content", aliases=("reason",))
     async def edit_reminder_content(self, ctx: Context, id_: int, *, content: str) -> None:
         """Edit one of your reminder's content."""
-        # Send the request to update the reminder in the database
-        reminder = await self.bot.api_client.patch(
-            'bot/reminders/' + str(id_),
-            json={'content': content}
-        )
-
-        # Parse the reminder expiration back into a datetime for the confirmation message
-        expiration = isoparse(reminder['expiration']).replace(tzinfo=None)
-
-        # Send a confirmation message to the channel
-        await self._send_confirmation(
-            ctx,
-            on_success="That reminder has been edited successfully!",
-            reminder_id=id_,
-            delivery_dt=expiration,
-        )
-        await self._reschedule_reminder(reminder)
+        await self.edit_reminder(ctx, id_, {"content": content})
 
     @edit_reminder_group.command(name="mentions", aliases=("pings",))
     async def edit_reminder_mentions(self, ctx: Context, id_: int, mentions: Greedy[Mentionable]) -> None:
@@ -385,13 +368,15 @@ class Reminders(Cog):
             )
 
         mention_ids = [mention.id for mention in mentions]
-        reminder = await self.bot.api_client.patch(
-            'bot/reminders/' + str(id_),
-            json={"mentions": mention_ids}
-        )
 
-        # Parse the reminder expiration back into a datetime for the confirmation message
-        expiration = isoparse(reminder['expiration']).replace(tzinfo=None)
+        await self.edit_reminder(ctx, id_, {"mentions": mention_ids})
+
+    async def edit_reminder(self, ctx: Context, id_: int, payload: dict) -> None:
+        """Edits a reminder with the given payload, then sends a confirmation message."""
+        reminder = await self._edit_reminder(id_, payload)
+
+        # Parse the reminder expiration back into a datetime
+        expiration = isoparse(reminder["expiration"]).replace(tzinfo=None)
 
         # Send a confirmation message to the channel
         await self._send_confirmation(
-- 
cgit v1.2.3


From c491d054daaa9f3e2ff3ecffba626b9991f93005 Mon Sep 17 00:00:00 2001
From: kosayoda <kieransiek@protonmail.com>
Date: Sun, 19 Jul 2020 22:37:08 +0800
Subject: Move mentions validation to another method

---
 bot/cogs/reminders.py | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/bot/cogs/reminders.py b/bot/cogs/reminders.py
index d99979ace..cc20897e0 100644
--- a/bot/cogs/reminders.py
+++ b/bot/cogs/reminders.py
@@ -104,7 +104,7 @@ class Reminders(Cog):
         await ctx.send(embed=embed)
 
     @staticmethod
-    async def check_mentions(ctx: Context, mentions: t.List[Mentionable]) -> t.Tuple[bool, str]:
+    async def _check_mentions(ctx: Context, mentions: t.List[Mentionable]) -> t.Tuple[bool, str]:
         """
         Returns whether or not the list of mentions is allowed.
 
@@ -120,6 +120,21 @@ class Reminders(Cog):
         else:
             return True, ""
 
+    @staticmethod
+    async def validate_mentions(ctx: Context, mentions: t.List[Mentionable]) -> bool:
+        """
+        Filter mentions to see if the user can mention, and sends a denial if not allowed.
+
+        Returns whether or not the validation is successful.
+        """
+        mentions_allowed, disallowed_mentions = await Reminders._check_mentions(ctx, mentions)
+
+        if not mentions or mentions_allowed:
+            return True
+        else:
+            await send_denial(ctx, f"You can't mention other {disallowed_mentions} in your reminder!")
+            return False
+
     def get_mentionables(self, mention_ids: t.List[int]) -> t.Iterator[Mentionable]:
         """Converts Role and Member ids to their corresponding objects if possible."""
         guild = self.bot.get_guild(Guild.id)
@@ -240,12 +255,8 @@ class Reminders(Cog):
                 return await send_denial(ctx, "You have too many active reminders!")
 
         # Filter mentions to see if the user can mention members/roles
-        if mentions:
-            mentions_allowed, disallowed_mentions = await self.check_mentions(ctx, mentions)
-            if not mentions_allowed:
-                return await send_denial(
-                    ctx, f"You can't mention other {disallowed_mentions} in your reminder!"
-                )
+        if not await self.validate_mentions(ctx, mentions):
+            return
 
         mention_ids = [mention.id for mention in mentions]
 
@@ -361,14 +372,10 @@ class Reminders(Cog):
     async def edit_reminder_mentions(self, ctx: Context, id_: int, mentions: Greedy[Mentionable]) -> None:
         """Edit one of your reminder's mentions."""
         # Filter mentions to see if the user can mention members/roles
-        mentions_allowed, disallowed_mentions = await self.check_mentions(ctx, mentions)
-        if not mentions_allowed:
-            return await send_denial(
-                ctx, f"You can't mention other {disallowed_mentions} in your reminder!"
-            )
+        if not await self.validate_mentions(ctx, mentions):
+            return
 
         mention_ids = [mention.id for mention in mentions]
-
         await self.edit_reminder(ctx, id_, {"mentions": mention_ids})
 
     async def edit_reminder(self, ctx: Context, id_: int, payload: dict) -> None:
-- 
cgit v1.2.3


From daff90ef6ff5de8c9f08b8394979da758e484001 Mon Sep 17 00:00:00 2001
From: kosayoda <kieransiek@protonmail.com>
Date: Sun, 19 Jul 2020 22:39:12 +0800
Subject: Refactor commands return type

---
 bot/cogs/reminders.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/bot/cogs/reminders.py b/bot/cogs/reminders.py
index cc20897e0..1410bfea6 100644
--- a/bot/cogs/reminders.py
+++ b/bot/cogs/reminders.py
@@ -228,7 +228,7 @@ class Reminders(Cog):
     @remind_group.command(name="new", aliases=("add", "create"))
     async def new_reminder(
         self, ctx: Context, mentions: Greedy[Mentionable], expiration: Duration, *, content: str
-    ) -> t.Optional[discord.Message]:
+    ) -> None:
         """
         Set yourself a simple reminder.
 
@@ -239,7 +239,8 @@ class Reminders(Cog):
 
             # If they don't have permission to set a reminder in this channel
             if ctx.channel.id not in WHITELISTED_CHANNELS:
-                return await send_denial(ctx, "Sorry, you can't do that here!")
+                await send_denial(ctx, "Sorry, you can't do that here!")
+                return
 
             # Get their current active reminders
             active_reminders = await self.bot.api_client.get(
@@ -252,7 +253,8 @@ class Reminders(Cog):
             # Let's limit this, so we don't get 10 000
             # reminders from kip or something like that :P
             if len(active_reminders) > MAXIMUM_REMINDERS:
-                return await send_denial(ctx, "You have too many active reminders!")
+                await send_denial(ctx, "You have too many active reminders!")
+                return
 
         # Filter mentions to see if the user can mention members/roles
         if not await self.validate_mentions(ctx, mentions):
@@ -291,7 +293,7 @@ class Reminders(Cog):
         self.schedule_reminder(reminder)
 
     @remind_group.command(name="list")
-    async def list_reminders(self, ctx: Context) -> t.Optional[discord.Message]:
+    async def list_reminders(self, ctx: Context) -> None:
         """View a paginated embed of all reminders for your user."""
         # Get all the user's reminders from the database.
         data = await self.bot.api_client.get(
@@ -337,7 +339,8 @@ class Reminders(Cog):
         # Remind the user that they have no reminders :^)
         if not lines:
             embed.description = "No active reminders could be found."
-            return await ctx.send(embed=embed)
+            await ctx.send(embed=embed)
+            return
 
         # Construct the embed and paginate it.
         embed.colour = discord.Colour.blurple()
-- 
cgit v1.2.3


From d658fabaa1238eda9d26175af751e2e8b7f1fc13 Mon Sep 17 00:00:00 2001
From: kosayoda <kieransiek@protonmail.com>
Date: Sun, 19 Jul 2020 22:51:51 +0800
Subject: Remove duplicate mentions from reminder arguments

This also accounts for the author passing themselves to mention, and
therefore avoids the user from being told they're not allowed to mention
themselves even though they could.
---
 bot/cogs/reminders.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/bot/cogs/reminders.py b/bot/cogs/reminders.py
index 1410bfea6..60fa70d74 100644
--- a/bot/cogs/reminders.py
+++ b/bot/cogs/reminders.py
@@ -104,7 +104,7 @@ class Reminders(Cog):
         await ctx.send(embed=embed)
 
     @staticmethod
-    async def _check_mentions(ctx: Context, mentions: t.List[Mentionable]) -> t.Tuple[bool, str]:
+    async def _check_mentions(ctx: Context, mentions: t.Iterable[Mentionable]) -> t.Tuple[bool, str]:
         """
         Returns whether or not the list of mentions is allowed.
 
@@ -121,7 +121,7 @@ class Reminders(Cog):
             return True, ""
 
     @staticmethod
-    async def validate_mentions(ctx: Context, mentions: t.List[Mentionable]) -> bool:
+    async def validate_mentions(ctx: Context, mentions: t.Iterable[Mentionable]) -> bool:
         """
         Filter mentions to see if the user can mention, and sends a denial if not allowed.
 
@@ -256,6 +256,10 @@ class Reminders(Cog):
                 await send_denial(ctx, "You have too many active reminders!")
                 return
 
+        # Remove duplicate mentions
+        mentions = set(mentions)
+        mentions.discard(ctx.author)
+
         # Filter mentions to see if the user can mention members/roles
         if not await self.validate_mentions(ctx, mentions):
             return
@@ -374,6 +378,10 @@ class Reminders(Cog):
     @edit_reminder_group.command(name="mentions", aliases=("pings",))
     async def edit_reminder_mentions(self, ctx: Context, id_: int, mentions: Greedy[Mentionable]) -> None:
         """Edit one of your reminder's mentions."""
+        # Remove duplicate mentions
+        mentions = set(mentions)
+        mentions.discard(ctx.author)
+
         # Filter mentions to see if the user can mention members/roles
         if not await self.validate_mentions(ctx, mentions):
             return
-- 
cgit v1.2.3


From 69e3a2e31e4c91c1932efe5a584708a3a370bb35 Mon Sep 17 00:00:00 2001
From: kosayoda <kieransiek@protonmail.com>
Date: Sun, 19 Jul 2020 22:54:10 +0800
Subject: Revert "Remove duplicate reminder deletion."

This reverts commit 776b4379c478284803a4a526b5f14fe63d8e7c01.
This is already being fixed in #835, and therefore is no longer
required.
---
 bot/cogs/reminders.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/cogs/reminders.py b/bot/cogs/reminders.py
index 60fa70d74..219c52659 100644
--- a/bot/cogs/reminders.py
+++ b/bot/cogs/reminders.py
@@ -58,7 +58,6 @@ class Reminders(Cog):
             if remind_at < now:
                 late = relativedelta(now, remind_at)
                 await self.send_reminder(reminder, late)
-                await self._delete_reminder(reminder["id"])
             else:
                 self.schedule_reminder(reminder)
 
@@ -217,6 +216,7 @@ class Reminders(Cog):
             content=f"{user.mention} {additional_mentions}",
             embed=embed
         )
+        await self._delete_reminder(reminder["id"])
 
     @group(name="remind", aliases=("reminder", "reminders", "remindme"), invoke_without_command=True)
     async def remind_group(
-- 
cgit v1.2.3


From 10b17a5026489c6fa28ed93edef340e4cacdc8c3 Mon Sep 17 00:00:00 2001
From: wookie184 <wookie1840@gmail.com>
Date: Mon, 20 Jul 2020 14:58:00 +0100
Subject: Removed python formatting from returned codeblock

---
 bot/cogs/snekbox.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/cogs/snekbox.py b/bot/cogs/snekbox.py
index 662f90869..52c8b6f88 100644
--- a/bot/cogs/snekbox.py
+++ b/bot/cogs/snekbox.py
@@ -202,7 +202,7 @@ class Snekbox(Cog):
                 output, paste_link = await self.format_output(results["stdout"])
 
             icon = self.get_status_emoji(results)
-            msg = f"{ctx.author.mention} {icon} {msg}.\n\n```py\n{output}\n```"
+            msg = f"{ctx.author.mention} {icon} {msg}.\n\n```\n{output}\n```"
             if paste_link:
                 msg = f"{msg}\nFull output: {paste_link}"
 
-- 
cgit v1.2.3


From e93fdaf57d1d35394b466a6bd1c84712e29415d7 Mon Sep 17 00:00:00 2001
From: wookie184 <wookie1840@gmail.com>
Date: Mon, 20 Jul 2020 16:05:32 +0100
Subject: Edited tests to reflect changes (removed py formatting)

---
 tests/bot/cogs/test_snekbox.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/bot/cogs/test_snekbox.py b/tests/bot/cogs/test_snekbox.py
index 98dee7a1b..343e37db9 100644
--- a/tests/bot/cogs/test_snekbox.py
+++ b/tests/bot/cogs/test_snekbox.py
@@ -239,7 +239,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
 
         await self.cog.send_eval(ctx, 'MyAwesomeCode')
         ctx.send.assert_called_once_with(
-            '@LemonLemonishBeard#0042 :yay!: Return code 0.\n\n```py\n[No output]\n```'
+            '@LemonLemonishBeard#0042 :yay!: Return code 0.\n\n```\n[No output]\n```'
         )
         self.cog.post_eval.assert_called_once_with('MyAwesomeCode')
         self.cog.get_status_emoji.assert_called_once_with({'stdout': '', 'returncode': 0})
@@ -265,7 +265,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         await self.cog.send_eval(ctx, 'MyAwesomeCode')
         ctx.send.assert_called_once_with(
             '@LemonLemonishBeard#0042 :yay!: Return code 0.'
-            '\n\n```py\nWay too long beard\n```\nFull output: lookatmybeard.com'
+            '\n\n```\nWay too long beard\n```\nFull output: lookatmybeard.com'
         )
         self.cog.post_eval.assert_called_once_with('MyAwesomeCode')
         self.cog.get_status_emoji.assert_called_once_with({'stdout': 'Way too long beard', 'returncode': 0})
@@ -289,7 +289,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
 
         await self.cog.send_eval(ctx, 'MyAwesomeCode')
         ctx.send.assert_called_once_with(
-            '@LemonLemonishBeard#0042 :nope!: Return code 127.\n\n```py\nBeard got stuck in the eval\n```'
+            '@LemonLemonishBeard#0042 :nope!: Return code 127.\n\n```\nBeard got stuck in the eval\n```'
         )
         self.cog.post_eval.assert_called_once_with('MyAwesomeCode')
         self.cog.get_status_emoji.assert_called_once_with({'stdout': 'ERROR', 'returncode': 127})
-- 
cgit v1.2.3


From b6f11f518acc29cf0bc025f2c89005556a06553a Mon Sep 17 00:00:00 2001
From: Joe Banks <joseph@josephbanks.me>
Date: Tue, 21 Jul 2020 01:26:09 +0100
Subject: Use max_units for time since join in user command instead of
 precision

---
 bot/cogs/information.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/cogs/information.py b/bot/cogs/information.py
index f0bd1afdb..d6090d481 100644
--- a/bot/cogs/information.py
+++ b/bot/cogs/information.py
@@ -226,7 +226,7 @@ class Information(Cog):
         if user.nick:
             name = f"{user.nick} ({name})"
 
-        joined = time_since(user.joined_at, precision="days")
+        joined = time_since(user.joined_at, max_units=3)
         roles = ", ".join(role.mention for role in user.roles[1:])
 
         description = [
-- 
cgit v1.2.3


From bb774296cf613c66dc8d2863547c1147e8ad6520 Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Tue, 21 Jul 2020 13:28:07 -0700
Subject: Charinfo: use send_denial helper

---
 bot/cogs/utils.py | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/bot/cogs/utils.py b/bot/cogs/utils.py
index 697bf60ce..60e160ed0 100644
--- a/bot/cogs/utils.py
+++ b/bot/cogs/utils.py
@@ -12,6 +12,7 @@ from discord.ext.commands import BadArgument, Cog, Context, command
 from bot.bot import Bot
 from bot.constants import Channels, MODERATION_ROLES, STAFF_ROLES
 from bot.decorators import in_whitelist, with_role
+from bot.utils import messages
 
 log = logging.getLogger(__name__)
 
@@ -120,22 +121,15 @@ class Utils(Cog):
         """Shows you information on up to 25 unicode characters."""
         match = re.match(r"<(a?):(\w+):(\d+)>", characters)
         if match:
-            embed = Embed(
-                title="Non-Character Detected",
-                description=(
-                    "Only unicode characters can be processed, but a custom Discord emoji "
-                    "was found. Please remove it and try again."
-                )
+            return await messages.send_denial(
+                ctx,
+                "**Non-Character Detected**\n"
+                "Only unicode characters can be processed, but a custom Discord emoji "
+                "was found. Please remove it and try again."
             )
-            embed.colour = Colour.red()
-            await ctx.send(embed=embed)
-            return
 
         if len(characters) > 25:
-            embed = Embed(title=f"Too many characters ({len(characters)}/25)")
-            embed.colour = Colour.red()
-            await ctx.send(embed=embed)
-            return
+            return await messages.send_denial(ctx, f"Too many characters ({len(characters)}/25)")
 
         def get_info(char: str) -> Tuple[str, str]:
             digit = f"{ord(char):x}"
-- 
cgit v1.2.3


From 6c367269032b85fd60094228178209760aa8d282 Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Tue, 21 Jul 2020 13:48:21 -0700
Subject: Charinfo: paginate the results

Pagination ensures the results will never go over the char limit for
an embed.

Fixes #897
Fixes BOT-3D
---
 bot/cogs/utils.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bot/cogs/utils.py b/bot/cogs/utils.py
index 60e160ed0..d70fb300d 100644
--- a/bot/cogs/utils.py
+++ b/bot/cogs/utils.py
@@ -12,6 +12,7 @@ from discord.ext.commands import BadArgument, Cog, Context, command
 from bot.bot import Bot
 from bot.constants import Channels, MODERATION_ROLES, STAFF_ROLES
 from bot.decorators import in_whitelist, with_role
+from bot.pagination import LinePaginator
 from bot.utils import messages
 
 log = logging.getLogger(__name__)
@@ -142,15 +143,14 @@ class Utils(Cog):
             info = f"`{u_code.ljust(10)}`: {name} - {utils.escape_markdown(char)}"
             return info, u_code
 
-        charlist, rawlist = zip(*(get_info(c) for c in characters))
-
-        embed = Embed(description="\n".join(charlist))
-        embed.set_author(name="Character Info")
+        char_list, raw_list = zip(*(get_info(c) for c in characters))
+        embed = Embed().set_author(name="Character Info")
 
         if len(characters) > 1:
-            embed.add_field(name='Raw', value=f"`{''.join(rawlist)}`", inline=False)
+            # Maximum length possible is 252 so no need to truncate.
+            embed.add_field(name='Raw', value=f"`{''.join(raw_list)}`", inline=False)
 
-        await ctx.send(embed=embed)
+        await LinePaginator.paginate(char_list, ctx, embed, max_size=2000, empty=False)
 
     @command()
     async def zen(self, ctx: Context, *, search_value: Union[int, str, None] = None) -> None:
-- 
cgit v1.2.3


From 63c7827d9d9025c7505747904237b37eb46464df Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Wed, 22 Jul 2020 11:42:31 -0700
Subject: Jam Tests: fix utils patch

stop needs to be called on the patcher, not the mock. Furthermore,
using addCleanup is safer than tearDown because the latter may not be
called if an exception is raised in setUp.
---
 tests/bot/cogs/test_jams.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index 2f2cb4695..28eb1ab53 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -16,11 +16,12 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         self.guild = MockGuild([self.admin_role])
         self.ctx = MockContext(bot=self.bot, author=self.command_user, guild=self.guild)
         self.cog = CodeJams(self.bot)
-        self.utils_mock = patch("bot.cogs.jams.utils").start()
-        self.default_args = [self.cog, self.ctx, "foo"]
 
-    def tearDown(self):
-        self.utils_mock.stop()
+        utils_patcher = patch("bot.cogs.jams.utils")
+        self.utils_mock = utils_patcher.start()
+        self.addCleanup(utils_patcher.stop)
+
+        self.default_args = [self.cog, self.ctx, "foo"]
 
     async def test_too_small_amount_of_team_members_passed(self):
         """Should `ctx.send` and exit early when too small amount of members."""
-- 
cgit v1.2.3


From f7e177357e7a47d9a43b492aac7703961af72c19 Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Wed, 22 Jul 2020 11:43:58 -0700
Subject: Jam Tests: re-arrange tests to follow definition order in the cog

---
 tests/bot/cogs/test_jams.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index 28eb1ab53..e0018e006 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -48,6 +48,16 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         self.cog.create_channels.assert_not_awaited()
         self.cog.add_roles.assert_not_awaited()
 
+    async def test_result_sending(self):
+        """Should call `ctx.send` when everything goes right."""
+        self.cog.create_channels = AsyncMock()
+        self.cog.add_roles = AsyncMock()
+        members = [MockMember() for _ in range(5)]
+        await self.cog.createteam(self.cog, self.ctx, "foo", members)
+        self.cog.create_channels.assert_awaited_once()
+        self.cog.add_roles.assert_awaited_once()
+        self.ctx.send.assert_awaited_once()
+
     async def test_category_dont_exist(self):
         """Should create code jam category."""
         self.utils_mock.get.return_value = None
@@ -125,16 +135,6 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         for member in members:
             member.add_roles.assert_any_await(jam_role)
 
-    async def test_result_sending(self):
-        """Should call `ctx.send` when everything goes right."""
-        self.cog.create_channels = AsyncMock()
-        self.cog.add_roles = AsyncMock()
-        members = [MockMember() for _ in range(5)]
-        await self.cog.createteam(self.cog, self.ctx, "foo", members)
-        self.cog.create_channels.assert_awaited_once()
-        self.cog.add_roles.assert_awaited_once()
-        self.ctx.send.assert_awaited_once()
-
 
 class CodeJamSetup(unittest.TestCase):
     """Test for `setup` function of `CodeJam` cog."""
-- 
cgit v1.2.3


From b1d0f36356ecf4eee729bf276c8b0ed10653ad54 Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Wed, 22 Jul 2020 11:47:49 -0700
Subject: Jam Tests: remove default_args attribute

Kind of redundant since it's only used by two tests.
---
 tests/bot/cogs/test_jams.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index e0018e006..0fce2a67c 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -21,8 +21,6 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         self.utils_mock = utils_patcher.start()
         self.addCleanup(utils_patcher.stop)
 
-        self.default_args = [self.cog, self.ctx, "foo"]
-
     async def test_too_small_amount_of_team_members_passed(self):
         """Should `ctx.send` and exit early when too small amount of members."""
         for case in (1, 2):
@@ -32,7 +30,8 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
 
                 self.ctx.reset_mock()
                 self.utils_mock.reset_mock()
-                await self.cog.createteam(*self.default_args, (MockMember() for _ in range(case)))
+                members = (MockMember() for _ in range(case))
+                await self.cog.createteam(self.cog, self.ctx, "foo", members)
 
                 self.ctx.send.assert_awaited_once()
                 self.cog.create_channels.assert_not_awaited()
@@ -43,7 +42,7 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         self.cog.create_channels = AsyncMock()
         self.cog.add_roles = AsyncMock()
         member = MockMember()
-        await self.cog.createteam(*self.default_args, (member for _ in range(5)))
+        await self.cog.createteam(self.cog, self.ctx, "foo", (member for _ in range(5)))
         self.ctx.send.assert_awaited_once()
         self.cog.create_channels.assert_not_awaited()
         self.cog.add_roles.assert_not_awaited()
-- 
cgit v1.2.3


From 44cd1d989d491d692d48324228ccc9593a545cd2 Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Wed, 22 Jul 2020 11:51:08 -0700
Subject: Jam Tests: space out lines for readability

---
 tests/bot/cogs/test_jams.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index 0fce2a67c..81fbcb798 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -41,8 +41,10 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         """Should `ctx.send` and exit early because duplicate members provided and total there is only 1 member."""
         self.cog.create_channels = AsyncMock()
         self.cog.add_roles = AsyncMock()
+
         member = MockMember()
         await self.cog.createteam(self.cog, self.ctx, "foo", (member for _ in range(5)))
+
         self.ctx.send.assert_awaited_once()
         self.cog.create_channels.assert_not_awaited()
         self.cog.add_roles.assert_not_awaited()
@@ -51,8 +53,10 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         """Should call `ctx.send` when everything goes right."""
         self.cog.create_channels = AsyncMock()
         self.cog.add_roles = AsyncMock()
+
         members = [MockMember() for _ in range(5)]
         await self.cog.createteam(self.cog, self.ctx, "foo", members)
+
         self.cog.create_channels.assert_awaited_once()
         self.cog.add_roles.assert_awaited_once()
         self.ctx.send.assert_awaited_once()
@@ -60,7 +64,9 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
     async def test_category_dont_exist(self):
         """Should create code jam category."""
         self.utils_mock.get.return_value = None
+
         await self.cog.get_category(self.guild)
+
         self.guild.create_category_channel.assert_awaited_once()
         category_overwrites = self.guild.create_category_channel.call_args[1]["overwrites"]
 
-- 
cgit v1.2.3


From 1f0222129a3d9b01d97671360296d982629bd25d Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Wed, 22 Jul 2020 15:50:30 -0700
Subject: Jams: create a new category if others are full

---
 bot/cogs/jams.py | 51 +++++++++++++++++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 20 deletions(-)

diff --git a/bot/cogs/jams.py b/bot/cogs/jams.py
index a48dbc49a..b3102db2f 100644
--- a/bot/cogs/jams.py
+++ b/bot/cogs/jams.py
@@ -1,7 +1,7 @@
 import logging
 import typing as t
 
-from discord import CategoryChannel, Guild, Member, PermissionOverwrite, Role, utils
+from discord import CategoryChannel, Guild, Member, PermissionOverwrite, Role
 from discord.ext import commands
 from more_itertools import unique_everseen
 
@@ -11,6 +11,9 @@ from bot.decorators import with_role
 
 log = logging.getLogger(__name__)
 
+MAX_CHANNELS = 50
+CATEGORY_NAME = "Code Jam"
+
 
 class CodeJams(commands.Cog):
     """Manages the code-jam related parts of our server."""
@@ -50,30 +53,38 @@ class CodeJams(commands.Cog):
             f"**Team Members:** {' '.join(member.mention for member in members[1:])}"
         )
 
+    async def get_category(self, guild: Guild) -> CategoryChannel:
+        """
+        Return a code jam category.
+
+        If all categories are full or none exist, create a new category.
+        """
+        for category in guild.categories:
+            # Need 2 available spaces: one for the text channel and one for voice.
+            if category.name == CATEGORY_NAME and MAX_CHANNELS - len(category.channels) >= 2:
+                return category
+
+        return await self.create_category(guild)
+
     @staticmethod
-    async def get_category(guild: Guild) -> CategoryChannel:
-        """Create a Code Jam category if it doesn't exist and return it."""
-        code_jam_category = utils.get(guild.categories, name="Code Jam")
-
-        if code_jam_category is None:
-            log.info("Code Jam category not found, creating it.")
-
-            category_overwrites = {
-                guild.default_role: PermissionOverwrite(read_messages=False),
-                guild.me: PermissionOverwrite(read_messages=True)
-            }
-
-            code_jam_category = await guild.create_category_channel(
-                "Code Jam",
-                overwrites=category_overwrites,
-                reason="It's code jam time!"
-            )
+    async def create_category(guild: Guild) -> CategoryChannel:
+        """Create a new code jam category and return it."""
+        log.info("Creating a new code jam category.")
 
-        return code_jam_category
+        category_overwrites = {
+            guild.default_role: PermissionOverwrite(read_messages=False),
+            guild.me: PermissionOverwrite(read_messages=True)
+        }
+
+        return await guild.create_category_channel(
+            CATEGORY_NAME,
+            overwrites=category_overwrites,
+            reason="It's code jam time!"
+        )
 
     @staticmethod
     def get_overwrites(members: t.List[Member], guild: Guild) -> t.Dict[t.Union[Member, Role], PermissionOverwrite]:
-        """Get Code Jam team channels permission overwrites."""
+        """Get code jam team channels permission overwrites."""
         # First member is always the team leader
         team_channel_overwrites = {
             members[0]: PermissionOverwrite(
-- 
cgit v1.2.3


From 12168766a153d9d1bd134ff64f74997eef8ff7b0 Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Wed, 22 Jul 2020 16:11:32 -0700
Subject: Jam tests: fix category test

---
 tests/bot/cogs/test_jams.py | 38 ++++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index 81fbcb798..54a096703 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -1,11 +1,22 @@
 import unittest
-from unittest.mock import AsyncMock, MagicMock, patch
+from unittest.mock import AsyncMock, MagicMock, create_autospec
 
-from bot.cogs.jams import CodeJams, setup
+from discord import CategoryChannel
+
+from bot.cogs import jams
 from bot.constants import Roles
 from tests.helpers import MockBot, MockContext, MockGuild, MockMember, MockRole, MockTextChannel
 
 
+def get_mock_category(channel_count: int, name: str) -> CategoryChannel:
+    """Return a mocked code jam category."""
+    category = create_autospec(CategoryChannel, spec_set=True, instance=True)
+    category.name = name
+    category.channels = [MockTextChannel() for _ in range(channel_count)]
+
+    return category
+
+
 class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
     """Tests for `createteam` command."""
 
@@ -15,11 +26,7 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         self.command_user = MockMember([self.admin_role])
         self.guild = MockGuild([self.admin_role])
         self.ctx = MockContext(bot=self.bot, author=self.command_user, guild=self.guild)
-        self.cog = CodeJams(self.bot)
-
-        utils_patcher = patch("bot.cogs.jams.utils")
-        self.utils_mock = utils_patcher.start()
-        self.addCleanup(utils_patcher.stop)
+        self.cog = jams.CodeJams(self.bot)
 
     async def test_too_small_amount_of_team_members_passed(self):
         """Should `ctx.send` and exit early when too small amount of members."""
@@ -29,7 +36,6 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
                 self.cog.add_roles = AsyncMock()
 
                 self.ctx.reset_mock()
-                self.utils_mock.reset_mock()
                 members = (MockMember() for _ in range(case))
                 await self.cog.createteam(self.cog, self.ctx, "foo", members)
 
@@ -63,8 +69,6 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
 
     async def test_category_dont_exist(self):
         """Should create code jam category."""
-        self.utils_mock.get.return_value = None
-
         await self.cog.get_category(self.guild)
 
         self.guild.create_category_channel.assert_awaited_once()
@@ -75,8 +79,15 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
 
     async def test_category_channel_exist(self):
         """Should not try to create category channel."""
-        await self.cog.get_category(self.guild)
-        self.guild.create_category_channel.assert_not_awaited()
+        expected_category = get_mock_category(48, jams.CATEGORY_NAME)
+        self.guild.categories = [
+            get_mock_category(48, "other"),
+            expected_category,
+            get_mock_category(6, jams.CATEGORY_NAME),
+        ]
+
+        actual_category = await self.cog.get_category(self.guild)
+        self.assertEqual(expected_category, actual_category)
 
     async def test_channel_overwrites(self):
         """Should have correct permission overwrites for users and roles."""
@@ -103,7 +114,6 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
 
     async def test_team_channels_creation(self):
         """Should create new voice and text channel for team."""
-        self.utils_mock.get.return_value = "foo"
         members = [MockMember() for _ in range(5)]
 
         self.cog.get_overwrites = MagicMock()
@@ -147,5 +157,5 @@ class CodeJamSetup(unittest.TestCase):
     def test_setup(self):
         """Should call `bot.add_cog`."""
         bot = MockBot()
-        setup(bot)
+        jams.setup(bot)
         bot.add_cog.assert_called_once()
-- 
cgit v1.2.3


From 92d3f88eb5c2348f3e4cb53a22a833bed61c6fb7 Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Wed, 22 Jul 2020 16:21:38 -0700
Subject: Jam tests: add subtests to non-existent category test

The test has to account for not only the name not matching, but also
a lack of available spaces for new channels.
---
 tests/bot/cogs/test_jams.py | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index 54a096703..e6b2ac588 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -67,15 +67,26 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         self.cog.add_roles.assert_awaited_once()
         self.ctx.send.assert_awaited_once()
 
-    async def test_category_dont_exist(self):
-        """Should create code jam category."""
-        await self.cog.get_category(self.guild)
+    async def test_category_doesnt_exist(self):
+        """Should create a new code jam category."""
+        subtests = (
+            [],
+            [get_mock_category(jams.MAX_CHANNELS - 1, jams.CATEGORY_NAME)],
+            [get_mock_category(48, "other")],
+        )
+
+        for categories in subtests:
+            self.guild.reset_mock()
+            self.guild.categories = categories
+
+            with self.subTest(categories=categories):
+                await self.cog.get_category(self.guild)
 
-        self.guild.create_category_channel.assert_awaited_once()
-        category_overwrites = self.guild.create_category_channel.call_args[1]["overwrites"]
+                self.guild.create_category_channel.assert_awaited_once()
+                category_overwrites = self.guild.create_category_channel.call_args[1]["overwrites"]
 
-        self.assertFalse(category_overwrites[self.guild.default_role].read_messages)
-        self.assertTrue(category_overwrites[self.guild.me].read_messages)
+                self.assertFalse(category_overwrites[self.guild.default_role].read_messages)
+                self.assertTrue(category_overwrites[self.guild.me].read_messages)
 
     async def test_category_channel_exist(self):
         """Should not try to create category channel."""
-- 
cgit v1.2.3


From ddba3f5fcfbda0f72baa3f15055c8a92e94c6d88 Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Wed, 22 Jul 2020 16:27:02 -0700
Subject: Jam tests: assert equality of new category

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

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index e6b2ac588..a76a8a051 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -80,13 +80,14 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
             self.guild.categories = categories
 
             with self.subTest(categories=categories):
-                await self.cog.get_category(self.guild)
+                actual_category = await self.cog.get_category(self.guild)
 
                 self.guild.create_category_channel.assert_awaited_once()
                 category_overwrites = self.guild.create_category_channel.call_args[1]["overwrites"]
 
                 self.assertFalse(category_overwrites[self.guild.default_role].read_messages)
                 self.assertTrue(category_overwrites[self.guild.me].read_messages)
+                self.assertEqual(self.guild.create_category_channel.return_value, actual_category)
 
     async def test_category_channel_exist(self):
         """Should not try to create category channel."""
-- 
cgit v1.2.3


From 8e3c05210f057ab76d135afbe12035847c9029f4 Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Wed, 22 Jul 2020 16:54:53 -0700
Subject: Jam tests: use the MAX_CHANNELS constant more

It's clearer to write MAX_CHANNELS - 2 than a literal 48.
---
 tests/bot/cogs/test_jams.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/bot/cogs/test_jams.py b/tests/bot/cogs/test_jams.py
index a76a8a051..b4ad8535f 100644
--- a/tests/bot/cogs/test_jams.py
+++ b/tests/bot/cogs/test_jams.py
@@ -72,7 +72,7 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
         subtests = (
             [],
             [get_mock_category(jams.MAX_CHANNELS - 1, jams.CATEGORY_NAME)],
-            [get_mock_category(48, "other")],
+            [get_mock_category(jams.MAX_CHANNELS - 2, "other")],
         )
 
         for categories in subtests:
@@ -91,11 +91,11 @@ class JamCreateTeamTests(unittest.IsolatedAsyncioTestCase):
 
     async def test_category_channel_exist(self):
         """Should not try to create category channel."""
-        expected_category = get_mock_category(48, jams.CATEGORY_NAME)
+        expected_category = get_mock_category(jams.MAX_CHANNELS - 2, jams.CATEGORY_NAME)
         self.guild.categories = [
-            get_mock_category(48, "other"),
+            get_mock_category(jams.MAX_CHANNELS - 2, "other"),
             expected_category,
-            get_mock_category(6, jams.CATEGORY_NAME),
+            get_mock_category(0, jams.CATEGORY_NAME),
         ]
 
         actual_category = await self.cog.get_category(self.guild)
-- 
cgit v1.2.3


From 14b00ad1fdc065f1f5412a875f31182d4ccfe7a2 Mon Sep 17 00:00:00 2001
From: Mark <kozlovmark@gmail.com>
Date: Wed, 22 Jul 2020 23:30:53 -0700
Subject: Charinfo: use more descriptive field name

Since the raw field is displayed on every page, but pages are
incomplete, it may be unclear whether the field's value is for the
current page or for all pages.

Co-authored-by: Kieran Siek <kieransiek@protonmail.com>
---
 bot/cogs/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/cogs/utils.py b/bot/cogs/utils.py
index d70fb300d..8171706d0 100644
--- a/bot/cogs/utils.py
+++ b/bot/cogs/utils.py
@@ -148,7 +148,7 @@ class Utils(Cog):
 
         if len(characters) > 1:
             # Maximum length possible is 252 so no need to truncate.
-            embed.add_field(name='Raw', value=f"`{''.join(raw_list)}`", inline=False)
+            embed.add_field(name='Full Raw Text', value=f"`{''.join(raw_list)}`", inline=False)
 
         await LinePaginator.paginate(char_list, ctx, embed, max_size=2000, empty=False)
 
-- 
cgit v1.2.3


From c35842b30d7bf8c58251ce780c4fe75eaf23a69f Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Wed, 22 Jul 2020 23:35:51 -0700
Subject: Charinfo: up char limit and reduce line limit

Pagination means more characters can be supported without cluttering
anything. It also means infinite lines, so there's no longer a need to
squeeze out the most from a single page. Reducing the line limit leads
to a smaller, tidier presentation.
---
 bot/cogs/utils.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bot/cogs/utils.py b/bot/cogs/utils.py
index 8171706d0..c0dc284e4 100644
--- a/bot/cogs/utils.py
+++ b/bot/cogs/utils.py
@@ -119,7 +119,7 @@ class Utils(Cog):
     @command()
     @in_whitelist(channels=(Channels.bot_commands,), roles=STAFF_ROLES)
     async def charinfo(self, ctx: Context, *, characters: str) -> None:
-        """Shows you information on up to 25 unicode characters."""
+        """Shows you information on up to 50 unicode characters."""
         match = re.match(r"<(a?):(\w+):(\d+)>", characters)
         if match:
             return await messages.send_denial(
@@ -129,7 +129,7 @@ class Utils(Cog):
                 "was found. Please remove it and try again."
             )
 
-        if len(characters) > 25:
+        if len(characters) > 50:
             return await messages.send_denial(ctx, f"Too many characters ({len(characters)}/25)")
 
         def get_info(char: str) -> Tuple[str, str]:
@@ -147,10 +147,10 @@ class Utils(Cog):
         embed = Embed().set_author(name="Character Info")
 
         if len(characters) > 1:
-            # Maximum length possible is 252 so no need to truncate.
+            # Maximum length possible is 502 out of 1024, so there's no need to truncate.
             embed.add_field(name='Full Raw Text', value=f"`{''.join(raw_list)}`", inline=False)
 
-        await LinePaginator.paginate(char_list, ctx, embed, max_size=2000, empty=False)
+        await LinePaginator.paginate(char_list, ctx, embed, max_lines=10, max_size=2000, empty=False)
 
     @command()
     async def zen(self, ctx: Context, *, search_value: Union[int, str, None] = None) -> None:
-- 
cgit v1.2.3


From 53fe5d44f2a44a2102d00d29c73b4cde733f9f26 Mon Sep 17 00:00:00 2001
From: kosayoda <kieransiek@protonmail.com>
Date: Thu, 23 Jul 2020 14:39:01 +0800
Subject: Check that embed desc is not Empty before stripping.

---
 bot/cogs/help_channels.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bot/cogs/help_channels.py b/bot/cogs/help_channels.py
index 0c8cbb417..e0fd06654 100644
--- a/bot/cogs/help_channels.py
+++ b/bot/cogs/help_channels.py
@@ -428,8 +428,11 @@ class HelpChannels(commands.Cog):
         if not message or not message.embeds:
             return False
 
-        embed = message.embeds[0]
-        return message.author == self.bot.user and embed.description.strip() == description.strip()
+        bot_msg_desc = message.embeds[0].description
+        if bot_msg_desc is discord.Embed.Empty:
+            log.trace("Last message was a bot embed but it was empty.")
+            return False
+        return message.author == self.bot.user and bot_msg_desc.strip() == description.strip()
 
     @staticmethod
     def is_in_category(channel: discord.TextChannel, category_id: int) -> bool:
-- 
cgit v1.2.3


From e15ceb83ac0ac081325ee47b1f6dddc581229197 Mon Sep 17 00:00:00 2001
From: Mark <kozlovmark@gmail.com>
Date: Wed, 22 Jul 2020 23:46:51 -0700
Subject: Charinfo: correct char limit used in error message

Co-authored-by: Kieran Siek <kieransiek@protonmail.com>
---
 bot/cogs/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/cogs/utils.py b/bot/cogs/utils.py
index c0dc284e4..017f3419e 100644
--- a/bot/cogs/utils.py
+++ b/bot/cogs/utils.py
@@ -130,7 +130,7 @@ class Utils(Cog):
             )
 
         if len(characters) > 50:
-            return await messages.send_denial(ctx, f"Too many characters ({len(characters)}/25)")
+            return await messages.send_denial(ctx, f"Too many characters ({len(characters)}/50)")
 
         def get_info(char: str) -> Tuple[str, str]:
             digit = f"{ord(char):x}"
-- 
cgit v1.2.3


From be14db91b1c70993773e67cfa663fef0cfa85666 Mon Sep 17 00:00:00 2001
From: Joe Banks <joseph@josephbanks.me>
Date: Thu, 23 Jul 2020 18:27:55 +0100
Subject: Disabled burst_shared filter temporarily

---
 config-default.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/config-default.yml b/config-default.yml
index ad6149f6f..d0262be33 100644
--- a/config-default.yml
+++ b/config-default.yml
@@ -459,10 +459,6 @@ anti_spam:
             interval: 10
             max: 7
 
-        burst_shared:
-            interval: 10
-            max: 20
-
         chars:
             interval: 5
             max: 3_000
-- 
cgit v1.2.3


From 6bab215b45b5ad2d40b68459a70e7731af2eb7a2 Mon Sep 17 00:00:00 2001
From: kosayoda <kieransiek@protonmail.com>
Date: Fri, 24 Jul 2020 17:42:42 +0800
Subject: Fix: Implicit string concatenation considered harmful

Python joins two string adjacent string literals implicitly, which may
cause unintended side effects when used with certain string methods.

>>> 'A' ' '.join(['1', '2', '3'])
'1A 2A 3'
---
 bot/cogs/information.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/bot/cogs/information.py b/bot/cogs/information.py
index d6090d481..8982196d1 100644
--- a/bot/cogs/information.py
+++ b/bot/cogs/information.py
@@ -116,10 +116,7 @@ class Information(Cog):
             parsed_roles.append(role)
 
         if failed_roles:
-            await ctx.send(
-                ":x: I could not convert the following role names to a role: \n- "
-                "\n- ".join(failed_roles)
-            )
+            await ctx.send(f":x: Could not retrieve the following roles: {', '.join(failed_roles)}")
 
         for role in parsed_roles:
             h, s, v = colorsys.rgb_to_hsv(*role.colour.to_rgb())
-- 
cgit v1.2.3


From 71b9ab4e1e9d75e9240bc0c6825f43d978ef922b Mon Sep 17 00:00:00 2001
From: Sebastiaan Zeeff <33516116+SebastiaanZ@users.noreply.github.com>
Date: Mon, 27 Jul 2020 12:18:25 +0200
Subject: Update IDs of Code Jam roles

I've updated the IDs of the two Code Jam Roles to the
newly create roles we have.
---
 config-default.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config-default.yml b/config-default.yml
index d0262be33..fc093cc32 100644
--- a/config-default.yml
+++ b/config-default.yml
@@ -236,8 +236,8 @@ guild:
         owners:             &OWNERS_ROLE    267627879762755584
 
         # Code Jam
-        jammers:        591786436651646989
-        team_leaders:   501324292341104650
+        jammers:        737249140966162473
+        team_leaders:   737250302834638889
 
     moderation_roles:
         - *OWNERS_ROLE
-- 
cgit v1.2.3


From 1c6e2f23a9b75be5e2a7e410c70fadfbf6c6b090 Mon Sep 17 00:00:00 2001
From: kosayoda <kieransiek@protonmail.com>
Date: Tue, 28 Jul 2020 16:04:10 +0800
Subject: Allow specifying a channel to send !embed embeds

---
 bot/cogs/bot.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/bot/cogs/bot.py b/bot/cogs/bot.py
index a79b37d25..79510739c 100644
--- a/bot/cogs/bot.py
+++ b/bot/cogs/bot.py
@@ -72,10 +72,14 @@ class BotCog(Cog, name="Bot"):
 
     @command(name='embed')
     @with_role(*MODERATION_ROLES)
-    async def embed_command(self, ctx: Context, *, text: str) -> None:
-        """Send the input within an embed to the current channel."""
+    async def embed_command(self, ctx: Context, channel: Optional[TextChannel], *, text: str) -> None:
+        """Send the input within an embed to either a specified channel or the current channel."""
         embed = Embed(description=text)
-        await ctx.send(embed=embed)
+
+        if channel is None:
+            await ctx.send(embed=embed)
+        else:
+            await channel.send(embed=embed)
 
     def codeblock_stripping(self, msg: str, bad_ticks: bool) -> Optional[Tuple[Tuple[str, ...], str]]:
         """
-- 
cgit v1.2.3


From 3fa1a0d03446500246f94df74fc3e3f86afe91ca Mon Sep 17 00:00:00 2001
From: Senjan21 <53477086+Senjan21@users.noreply.github.com>
Date: Tue, 28 Jul 2020 10:22:39 +0200
Subject: fix poll command by using clean_content converter

---
 bot/cogs/utils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bot/cogs/utils.py b/bot/cogs/utils.py
index 017f3419e..11b8e3e5e 100644
--- a/bot/cogs/utils.py
+++ b/bot/cogs/utils.py
@@ -7,7 +7,7 @@ from io import StringIO
 from typing import Tuple, Union
 
 from discord import Colour, Embed, utils
-from discord.ext.commands import BadArgument, Cog, Context, command
+from discord.ext.commands import BadArgument, Cog, Context, command, clean_content
 
 from bot.bot import Bot
 from bot.constants import Channels, MODERATION_ROLES, STAFF_ROLES
@@ -225,7 +225,7 @@ class Utils(Cog):
 
     @command(aliases=("poll",))
     @with_role(*MODERATION_ROLES)
-    async def vote(self, ctx: Context, title: str, *options: str) -> None:
+    async def vote(self, ctx: Context, title: clean_content(fix_channel_mentions=True), *options: str) -> None:
         """
         Build a quick voting poll with matching reactions with the provided options.
 
-- 
cgit v1.2.3


From 8be7126e17e1fa9f671ab8acc52cb6d495084bd1 Mon Sep 17 00:00:00 2001
From: Senjan21 <53477086+Senjan21@users.noreply.github.com>
Date: Tue, 28 Jul 2020 10:30:00 +0200
Subject: correct import order

---
 bot/cogs/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/cogs/utils.py b/bot/cogs/utils.py
index 11b8e3e5e..91c6cb36e 100644
--- a/bot/cogs/utils.py
+++ b/bot/cogs/utils.py
@@ -7,7 +7,7 @@ from io import StringIO
 from typing import Tuple, Union
 
 from discord import Colour, Embed, utils
-from discord.ext.commands import BadArgument, Cog, Context, command, clean_content
+from discord.ext.commands import BadArgument, Cog, Context, clean_content, command
 
 from bot.bot import Bot
 from bot.constants import Channels, MODERATION_ROLES, STAFF_ROLES
-- 
cgit v1.2.3


From f3fb8190c7c9541146ed79df2b0ad906fc067414 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Tue, 28 Jul 2020 21:24:25 +0300
Subject: Handle message unpinning better

---
 bot/cogs/help_channels.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bot/cogs/help_channels.py b/bot/cogs/help_channels.py
index b06934eff..2c53069f0 100644
--- a/bot/cogs/help_channels.py
+++ b/bot/cogs/help_channels.py
@@ -556,8 +556,11 @@ class HelpChannels(Scheduler, commands.Cog):
 
         try:
             await self.bot.http.unpin_message(channel.id, msg_id)
-        except discord.HTTPException:
-            log.trace(f"Message {msg_id} don't exist, can't unpin.")
+        except discord.HTTPException as e:
+            if e.code == 10008:
+                log.trace(f"Message {msg_id} don't exist, can't unpin.")
+            else:
+                log.warn(f"Got unexpected status {e.code} when unpinning message {msg_id}: {e.text}")
         else:
             log.trace(f"Unpinned message {msg_id}.")
 
-- 
cgit v1.2.3


From a4e5044596492fe56f2c2d36468f126907602b98 Mon Sep 17 00:00:00 2001
From: Leon Sandøy <leon.sandoy@conmodo.com>
Date: Wed, 29 Jul 2020 13:18:06 +0200
Subject: Don't ping everyone when tripping filter in DMs.

We don't need a ping in #mod-alerts whenever someone is tripping a
filter (like invites or bad language) in a DM to the bot. We can still
send an embed, so that we can action it, but there is no urgent need to
respond if it's just a direct message to the bot.

This is particularly true now that we have #dm-log.
---
 bot/cogs/filtering.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/cogs/filtering.py b/bot/cogs/filtering.py
index bd665f424..29aac812f 100644
--- a/bot/cogs/filtering.py
+++ b/bot/cogs/filtering.py
@@ -339,7 +339,7 @@ class Filtering(Cog):
                             text=message,
                             thumbnail=msg.author.avatar_url_as(static_format="png"),
                             channel_id=Channels.mod_alerts,
-                            ping_everyone=Filter.ping_everyone,
+                            ping_everyone=Filter.ping_everyone if not is_private else False,
                             additional_embeds=additional_embeds,
                             additional_embeds_msg=additional_embeds_msg
                         )
-- 
cgit v1.2.3


From f97defcab304e6f2e3175f10e9888db30a0be0c8 Mon Sep 17 00:00:00 2001
From: Senjan21 <53477086+Senjan21@users.noreply.github.com>
Date: Thu, 30 Jul 2020 13:54:55 +0200
Subject: Fix channel moving incase `message.pin` fails

---
 bot/cogs/help_channels.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bot/cogs/help_channels.py b/bot/cogs/help_channels.py
index 1f87c3e39..5d4346000 100644
--- a/bot/cogs/help_channels.py
+++ b/bot/cogs/help_channels.py
@@ -701,6 +701,8 @@ class HelpChannels(commands.Cog):
                 await message.pin()
             except discord.NotFound:
                 log.info(f"Pinning message {message.id} ({channel}) failed because message got deleted.")
+            except discord.HTTPException as e:
+                log.info(f"Pinning message {message.id} ({channel.id}) failed with code {e.code}", exc_info=e)
             else:
                 await self.question_messages.set(channel.id, message.id)
 
-- 
cgit v1.2.3


From 873ecb9e11e72b1d62aa288660e0e582038d365e Mon Sep 17 00:00:00 2001
From: Senjan21 <53477086+Senjan21@users.noreply.github.com>
Date: Thu, 30 Jul 2020 18:49:26 +0200
Subject: Change regex so it catches new discord URL

---
 bot/cogs/webhook_remover.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/cogs/webhook_remover.py b/bot/cogs/webhook_remover.py
index 543869215..91bcaa1e9 100644
--- a/bot/cogs/webhook_remover.py
+++ b/bot/cogs/webhook_remover.py
@@ -8,7 +8,7 @@ from bot.bot import Bot
 from bot.cogs.moderation.modlog import ModLog
 from bot.constants import Channels, Colours, Event, Icons
 
-WEBHOOK_URL_RE = re.compile(r"((?:https?://)?discordapp\.com/api/webhooks/\d+/)\S+/?", re.I)
+WEBHOOK_URL_RE = re.compile(r"((?:https?://)?discord(app)?\.com/api/webhooks/\d+/)\S+/?", re.I)
 
 ALERT_MESSAGE_TEMPLATE = (
     "{user}, looks like you posted a Discord webhook URL. Therefore, your "
-- 
cgit v1.2.3


From 663eac8f9f30812f6ee6c95b134e5e62fa7273d6 Mon Sep 17 00:00:00 2001
From: Senjan21 <53477086+Senjan21@users.noreply.github.com>
Date: Thu, 30 Jul 2020 19:03:33 +0200
Subject: Use non-capturing group instead.

---
 bot/cogs/webhook_remover.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/cogs/webhook_remover.py b/bot/cogs/webhook_remover.py
index 91bcaa1e9..1ed8072f2 100644
--- a/bot/cogs/webhook_remover.py
+++ b/bot/cogs/webhook_remover.py
@@ -8,7 +8,7 @@ from bot.bot import Bot
 from bot.cogs.moderation.modlog import ModLog
 from bot.constants import Channels, Colours, Event, Icons
 
-WEBHOOK_URL_RE = re.compile(r"((?:https?://)?discord(app)?\.com/api/webhooks/\d+/)\S+/?", re.I)
+WEBHOOK_URL_RE = re.compile(r"((?:https?://)?discord(?:app)\.com/api/webhooks/\d+/)\S+/?", re.I)
 
 ALERT_MESSAGE_TEMPLATE = (
     "{user}, looks like you posted a Discord webhook URL. Therefore, your "
-- 
cgit v1.2.3


From 3586c1e187ecbee957084b2e2e6fbcf9bc2e2859 Mon Sep 17 00:00:00 2001
From: Senjan21 <53477086+Senjan21@users.noreply.github.com>
Date: Thu, 30 Jul 2020 19:05:28 +0200
Subject: Missed `?` in regex.

---
 bot/cogs/webhook_remover.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/cogs/webhook_remover.py b/bot/cogs/webhook_remover.py
index 1ed8072f2..ac9f7c20f 100644
--- a/bot/cogs/webhook_remover.py
+++ b/bot/cogs/webhook_remover.py
@@ -8,7 +8,7 @@ from bot.bot import Bot
 from bot.cogs.moderation.modlog import ModLog
 from bot.constants import Channels, Colours, Event, Icons
 
-WEBHOOK_URL_RE = re.compile(r"((?:https?://)?discord(?:app)\.com/api/webhooks/\d+/)\S+/?", re.I)
+WEBHOOK_URL_RE = re.compile(r"((?:https?://)?discord(?:app)?\.com/api/webhooks/\d+/)\S+/?", re.I)
 
 ALERT_MESSAGE_TEMPLATE = (
     "{user}, looks like you posted a Discord webhook URL. Therefore, your "
-- 
cgit v1.2.3


From 6ee96040febd8ba1f0b1f781ca996c1097f4b87c Mon Sep 17 00:00:00 2001
From: Senjan21 <53477086+Senjan21@users.noreply.github.com>
Date: Thu, 30 Jul 2020 19:10:18 +0200
Subject: Use full flag name for case-insensitivity

requested by lemon
---
 bot/cogs/webhook_remover.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/cogs/webhook_remover.py b/bot/cogs/webhook_remover.py
index ac9f7c20f..5812da87c 100644
--- a/bot/cogs/webhook_remover.py
+++ b/bot/cogs/webhook_remover.py
@@ -8,7 +8,7 @@ from bot.bot import Bot
 from bot.cogs.moderation.modlog import ModLog
 from bot.constants import Channels, Colours, Event, Icons
 
-WEBHOOK_URL_RE = re.compile(r"((?:https?://)?discord(?:app)?\.com/api/webhooks/\d+/)\S+/?", re.I)
+WEBHOOK_URL_RE = re.compile(r"((?:https?://)?discord(?:app)?\.com/api/webhooks/\d+/)\S+/?", re.IGNORECASE)
 
 ALERT_MESSAGE_TEMPLATE = (
     "{user}, looks like you posted a Discord webhook URL. Therefore, your "
-- 
cgit v1.2.3


From da484b1b22a0d346a1dbc1abf2ffe1027a7e5031 Mon Sep 17 00:00:00 2001
From: Leon Sandøy <leon.sandoy@conmodo.com>
Date: Fri, 31 Jul 2020 19:52:01 +0200
Subject: Remove superfluous Available help channels.

This adds a little bit of logic to the Help Channel `init_available`
coroutine, which runs when the cog loads. This ensures that if there are
more help channels in available than there should be, we remove the
superfluos ones.

Previously, if the bot started with too many channels, it would maintain
and defend that excessive amount. This is because we never actually
count the number of channels before adding in new available channels
whenever one disappears.

If we ever get too many available channels in the future, this can be
solved by simply reloading this cog.
---
 bot/cogs/help_channels.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/bot/cogs/help_channels.py b/bot/cogs/help_channels.py
index 5d4346000..1be980472 100644
--- a/bot/cogs/help_channels.py
+++ b/bot/cogs/help_channels.py
@@ -364,10 +364,18 @@ class HelpChannels(commands.Cog):
         channels = list(self.get_category_channels(self.available_category))
         missing = constants.HelpChannels.max_available - len(channels)
 
-        log.trace(f"Moving {missing} missing channels to the Available category.")
-
-        for _ in range(missing):
-            await self.move_to_available()
+        # If we've got less than `max_available` channel available, we should add some.
+        if missing > 0:
+            log.trace(f"Moving {missing} missing channels to the Available category.")
+            for _ in range(missing):
+                await self.move_to_available()
+
+        # If for some reason we have more than `max_available` channels available,
+        # we should move the superfluous ones over to dormant.
+        elif missing < 0:
+            log.trace(f"Moving {abs(missing)} superfluous available channels over to the Dormant category.")
+            for channel in channels[:abs(missing)]:
+                await self.move_to_dormant(channel, "auto")
 
     async def init_categories(self) -> None:
         """Get the help category objects. Remove the cog if retrieval fails."""
-- 
cgit v1.2.3