From c608963a0672b8396190f521366799d649a8cb90 Mon Sep 17 00:00:00 2001
From: Numerlor <25886452+Numerlor@users.noreply.github.com>
Date: Mon, 6 Apr 2020 00:15:07 +0200
Subject: Remove dormant invokation message after move.

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

diff --git a/bot/cogs/help_channels.py b/bot/cogs/help_channels.py
index 697a4d3b7..75b61f6cb 100644
--- a/bot/cogs/help_channels.py
+++ b/bot/cogs/help_channels.py
@@ -196,6 +196,7 @@ class HelpChannels(Scheduler, commands.Cog):
         if ctx.channel.category == self.in_use_category:
             self.cancel_task(ctx.channel.id)
             await self.move_to_dormant(ctx.channel)
+            await ctx.message.delete()
         else:
             log.debug(f"{ctx.author} invoked command 'dormant' outside an in-use help channel")
 
-- 
cgit v1.2.3


From 1a58b34565e612a48d8dc59cb3f4ed75ee593744 Mon Sep 17 00:00:00 2001
From: Numerlor <25886452+Numerlor@users.noreply.github.com>
Date: Mon, 6 Apr 2020 01:46:57 +0200
Subject: Allow help session starters to invoke dormant.

Removing the `with_role` check from the command and
replcaing it with a new `dormant_check` that's used in the body,
which also checks against a cache of users that started the sessions,
allows them to close their own channels along with the role check.
---
 bot/cogs/help_channels.py | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/bot/cogs/help_channels.py b/bot/cogs/help_channels.py
index 75b61f6cb..cdfe4e72c 100644
--- a/bot/cogs/help_channels.py
+++ b/bot/cogs/help_channels.py
@@ -13,7 +13,7 @@ from discord.ext import commands
 
 from bot import constants
 from bot.bot import Bot
-from bot.decorators import with_role
+from bot.utils.checks import with_role_check
 from bot.utils.scheduling import Scheduler
 
 log = logging.getLogger(__name__)
@@ -108,6 +108,7 @@ class HelpChannels(Scheduler, commands.Cog):
         super().__init__()
 
         self.bot = bot
+        self.help_channel_users: t.Dict[discord.User, discord.TextChannel] = {}
 
         # Categories
         self.available_category: discord.CategoryChannel = None
@@ -187,16 +188,24 @@ class HelpChannels(Scheduler, commands.Cog):
         log.trace("Populating the name queue with names.")
         return deque(available_names)
 
+    async def dormant_check(self, ctx: commands.Context) -> bool:
+        """Return True if the user started the help channel session or passes the role check."""
+        if self.help_channel_users.get(ctx.author) == ctx.channel:
+            log.trace(f"{ctx.author} started the help session, passing the check for dormant.")
+            return True
+
+        log.trace(f"{ctx.author} did not start the help session, checking roles.")
+        return with_role_check(ctx, *constants.HelpChannels.cmd_whitelist)
+
     @commands.command(name="dormant", aliases=["close"], enabled=False)
-    @with_role(*constants.HelpChannels.cmd_whitelist)
     async def dormant_command(self, ctx: commands.Context) -> None:
         """Make the current in-use help channel dormant."""
         log.trace("dormant command invoked; checking if the channel is in-use.")
-
         if ctx.channel.category == self.in_use_category:
-            self.cancel_task(ctx.channel.id)
-            await self.move_to_dormant(ctx.channel)
-            await ctx.message.delete()
+            if await self.dormant_check(ctx):
+                self.cancel_task(ctx.channel.id)
+                await self.move_to_dormant(ctx.channel)
+                await ctx.message.delete()
         else:
             log.debug(f"{ctx.author} invoked command 'dormant' outside an in-use help channel")
 
@@ -543,6 +552,8 @@ class HelpChannels(Scheduler, commands.Cog):
 
             await self.move_to_in_use(channel)
             await self.revoke_send_permissions(message.author)
+            # Add user with channel for dormant check.
+            self.help_channel_users[message.author] = channel
 
             log.trace(f"Releasing on_message lock for {message.id}.")
 
-- 
cgit v1.2.3


From 7ccfa21f38b0df50f582ceb6e64d1ce1fe9c6617 Mon Sep 17 00:00:00 2001
From: Numerlor <25886452+Numerlor@users.noreply.github.com>
Date: Mon, 6 Apr 2020 02:02:41 +0200
Subject: Reset cooldown after channel is made dormant.

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

diff --git a/bot/cogs/help_channels.py b/bot/cogs/help_channels.py
index cdfe4e72c..7bfb33875 100644
--- a/bot/cogs/help_channels.py
+++ b/bot/cogs/help_channels.py
@@ -206,6 +206,7 @@ class HelpChannels(Scheduler, commands.Cog):
                 self.cancel_task(ctx.channel.id)
                 await self.move_to_dormant(ctx.channel)
                 await ctx.message.delete()
+                await self.reset_send_permissions_for_help_user(ctx.channel)
         else:
             log.debug(f"{ctx.author} invoked command 'dormant' outside an in-use help channel")
 
@@ -610,6 +611,19 @@ class HelpChannels(Scheduler, commands.Cog):
         log.trace(f"Ensuring channels in `Help: Available` are synchronized after permissions reset.")
         await self.ensure_permissions_synchronization(self.available_category)
 
+    async def reset_send_permissions_for_help_user(self, channel: discord.TextChannel) -> None:
+        """Reset send permissions in the Available category for member that started the help session in `channel`."""
+        # Get mapping of channels to users that started the help session in them.
+        channels_to_users = {value: key for key, value in self.help_channel_users.items()}
+        log.trace(f"Attempting to find user for help session in #{channel.name} ({channel.id}).")
+        try:
+            member: discord.Member = channels_to_users[channel]
+        except KeyError:
+            log.trace(f"Channel #{channel.name} ({channel.id}) not in help session cache, permissions unchanged.")
+            return
+        log.trace(f"Resetting send permissions for {member} ({member.id}).")
+        await self.available_category.set_permissions(member, send_messages=None)
+
     async def revoke_send_permissions(self, member: discord.Member) -> None:
         """
         Disallow `member` to send messages in the Available category for a certain time.
-- 
cgit v1.2.3


From c6355f67192e247f6b207cb0e18b2ff80d5b710f Mon Sep 17 00:00:00 2001
From: Numerlor <25886452+Numerlor@users.noreply.github.com>
Date: Mon, 6 Apr 2020 02:03:13 +0200
Subject: Extend docstrings to include new behaviour.

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

diff --git a/bot/cogs/help_channels.py b/bot/cogs/help_channels.py
index 7bfb33875..912ce4f44 100644
--- a/bot/cogs/help_channels.py
+++ b/bot/cogs/help_channels.py
@@ -199,7 +199,13 @@ class HelpChannels(Scheduler, commands.Cog):
 
     @commands.command(name="dormant", aliases=["close"], enabled=False)
     async def dormant_command(self, ctx: commands.Context) -> None:
-        """Make the current in-use help channel dormant."""
+        """
+        Make the current in-use help channel dormant.
+
+        Make the channel dormant if the user passes the `dormant_check`,
+        delete the message that invoked this,
+        and reset the send permissions cooldown for the user who started the session.
+        """
         log.trace("dormant command invoked; checking if the channel is in-use.")
         if ctx.channel.category == self.in_use_category:
             if await self.dormant_check(ctx):
-- 
cgit v1.2.3


From acee84d044c65b9a8d6ab4a164d189fa0eaa174a Mon Sep 17 00:00:00 2001
From: Numerlor <25886452+Numerlor@users.noreply.github.com>
Date: Mon, 6 Apr 2020 02:06:07 +0200
Subject: Handle dormant invokation not being found.

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

diff --git a/bot/cogs/help_channels.py b/bot/cogs/help_channels.py
index 912ce4f44..bc973cd4d 100644
--- a/bot/cogs/help_channels.py
+++ b/bot/cogs/help_channels.py
@@ -5,6 +5,7 @@ import logging
 import random
 import typing as t
 from collections import deque
+from contextlib import suppress
 from datetime import datetime
 from pathlib import Path
 
@@ -211,7 +212,9 @@ class HelpChannels(Scheduler, commands.Cog):
             if await self.dormant_check(ctx):
                 self.cancel_task(ctx.channel.id)
                 await self.move_to_dormant(ctx.channel)
-                await ctx.message.delete()
+                with suppress(discord.errors.NotFound):
+                    await ctx.message.delete()
+                    log.trace("Deleting dormant invokation message.")
                 await self.reset_send_permissions_for_help_user(ctx.channel)
         else:
             log.debug(f"{ctx.author} invoked command 'dormant' outside an in-use help channel")
-- 
cgit v1.2.3


From c2e9ec459cd28832a1e797d7c755b5aab57d69dd Mon Sep 17 00:00:00 2001
From: Numerlor <25886452+Numerlor@users.noreply.github.com>
Date: Mon, 6 Apr 2020 02:13:36 +0200
Subject: Cancel permission restoration task.

After the dormant command is used and the permissions
are restored for the user that started the session,
the task for restoring them after the claim time
has passed is no longer necessary.
---
 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 bc973cd4d..03bac27a4 100644
--- a/bot/cogs/help_channels.py
+++ b/bot/cogs/help_channels.py
@@ -632,6 +632,8 @@ class HelpChannels(Scheduler, commands.Cog):
             return
         log.trace(f"Resetting send permissions for {member} ({member.id}).")
         await self.available_category.set_permissions(member, send_messages=None)
+        # Cancel task, ignore no task existing when the claim time passed but idle time has not.
+        self.cancel_task(member.id, ignore_missing=True)
 
     async def revoke_send_permissions(self, member: discord.Member) -> None:
         """
-- 
cgit v1.2.3


From 7f1be2882dde670d12000fe661424d3b6f406f89 Mon Sep 17 00:00:00 2001
From: Numerlor <25886452+Numerlor@users.noreply.github.com>
Date: Mon, 6 Apr 2020 22:34:17 +0200
Subject: Reverse help_channel_user pairs.

Pairing users to channels was a design flaw,
because the keys didn't get overwritten.
This allowed multiple users to access the dormant command
for the running session of the bot.
Replacing this with a reversed paring fixes both issues
because the cache is overwritten on channel activation.
---
 bot/cogs/help_channels.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/bot/cogs/help_channels.py b/bot/cogs/help_channels.py
index 03bac27a4..dbe7cedc1 100644
--- a/bot/cogs/help_channels.py
+++ b/bot/cogs/help_channels.py
@@ -109,7 +109,7 @@ class HelpChannels(Scheduler, commands.Cog):
         super().__init__()
 
         self.bot = bot
-        self.help_channel_users: t.Dict[discord.User, discord.TextChannel] = {}
+        self.help_channel_users: t.Dict[discord.TextChannel, discord.User] = {}
 
         # Categories
         self.available_category: discord.CategoryChannel = None
@@ -191,7 +191,7 @@ class HelpChannels(Scheduler, commands.Cog):
 
     async def dormant_check(self, ctx: commands.Context) -> bool:
         """Return True if the user started the help channel session or passes the role check."""
-        if self.help_channel_users.get(ctx.author) == ctx.channel:
+        if self.help_channel_users.get(ctx.channel) == ctx.author:
             log.trace(f"{ctx.author} started the help session, passing the check for dormant.")
             return True
 
@@ -563,7 +563,7 @@ class HelpChannels(Scheduler, commands.Cog):
             await self.move_to_in_use(channel)
             await self.revoke_send_permissions(message.author)
             # Add user with channel for dormant check.
-            self.help_channel_users[message.author] = channel
+            self.help_channel_users[channel] = message.author
 
             log.trace(f"Releasing on_message lock for {message.id}.")
 
@@ -622,11 +622,9 @@ class HelpChannels(Scheduler, commands.Cog):
 
     async def reset_send_permissions_for_help_user(self, channel: discord.TextChannel) -> None:
         """Reset send permissions in the Available category for member that started the help session in `channel`."""
-        # Get mapping of channels to users that started the help session in them.
-        channels_to_users = {value: key for key, value in self.help_channel_users.items()}
         log.trace(f"Attempting to find user for help session in #{channel.name} ({channel.id}).")
         try:
-            member: discord.Member = channels_to_users[channel]
+            member = self.help_channel_users[channel]
         except KeyError:
             log.trace(f"Channel #{channel.name} ({channel.id}) not in help session cache, permissions unchanged.")
             return
-- 
cgit v1.2.3


From 25c15171020613f0123ed83654adad5c7c584d84 Mon Sep 17 00:00:00 2001
From: Numerlor <25886452+Numerlor@users.noreply.github.com>
Date: Tue, 7 Apr 2020 01:11:37 +0200
Subject: Delete overwrite instead of send_messages permission.

Only resetting the permission caused the overwrites for the users
to remain on the category, potentially piling up and causing further issues.
---
 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 dbe7cedc1..f49149d8a 100644
--- a/bot/cogs/help_channels.py
+++ b/bot/cogs/help_channels.py
@@ -629,7 +629,7 @@ class HelpChannels(Scheduler, commands.Cog):
             log.trace(f"Channel #{channel.name} ({channel.id}) not in help session cache, permissions unchanged.")
             return
         log.trace(f"Resetting send permissions for {member} ({member.id}).")
-        await self.available_category.set_permissions(member, send_messages=None)
+        await self.available_category.set_permissions(member, overwrite=None)
         # Cancel task, ignore no task existing when the claim time passed but idle time has not.
         self.cancel_task(member.id, ignore_missing=True)
 
-- 
cgit v1.2.3


From 4d6c342d2a35a54f65f25a973994c7dc55ca4be8 Mon Sep 17 00:00:00 2001
From: Numerlor <25886452+Numerlor@users.noreply.github.com>
Date: Tue, 7 Apr 2020 01:12:57 +0200
Subject: Change names to more descriptive ones.

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

diff --git a/bot/cogs/help_channels.py b/bot/cogs/help_channels.py
index f49149d8a..73c7adb15 100644
--- a/bot/cogs/help_channels.py
+++ b/bot/cogs/help_channels.py
@@ -109,7 +109,7 @@ class HelpChannels(Scheduler, commands.Cog):
         super().__init__()
 
         self.bot = bot
-        self.help_channel_users: t.Dict[discord.TextChannel, discord.User] = {}
+        self.help_channel_claimants: t.Dict[discord.TextChannel, discord.User] = {}
 
         # Categories
         self.available_category: discord.CategoryChannel = None
@@ -191,7 +191,7 @@ class HelpChannels(Scheduler, commands.Cog):
 
     async def dormant_check(self, ctx: commands.Context) -> bool:
         """Return True if the user started the help channel session or passes the role check."""
-        if self.help_channel_users.get(ctx.channel) == ctx.author:
+        if self.help_channel_claimants.get(ctx.channel) == ctx.author:
             log.trace(f"{ctx.author} started the help session, passing the check for dormant.")
             return True
 
@@ -215,7 +215,7 @@ class HelpChannels(Scheduler, commands.Cog):
                 with suppress(discord.errors.NotFound):
                     await ctx.message.delete()
                     log.trace("Deleting dormant invokation message.")
-                await self.reset_send_permissions_for_help_user(ctx.channel)
+                await self.reset_claimant_send_permission(ctx.channel)
         else:
             log.debug(f"{ctx.author} invoked command 'dormant' outside an in-use help channel")
 
@@ -563,7 +563,7 @@ class HelpChannels(Scheduler, commands.Cog):
             await self.move_to_in_use(channel)
             await self.revoke_send_permissions(message.author)
             # Add user with channel for dormant check.
-            self.help_channel_users[channel] = message.author
+            self.help_channel_claimants[channel] = message.author
 
             log.trace(f"Releasing on_message lock for {message.id}.")
 
@@ -620,11 +620,11 @@ class HelpChannels(Scheduler, commands.Cog):
         log.trace(f"Ensuring channels in `Help: Available` are synchronized after permissions reset.")
         await self.ensure_permissions_synchronization(self.available_category)
 
-    async def reset_send_permissions_for_help_user(self, channel: discord.TextChannel) -> None:
+    async def reset_claimant_send_permission(self, channel: discord.TextChannel) -> None:
         """Reset send permissions in the Available category for member that started the help session in `channel`."""
         log.trace(f"Attempting to find user for help session in #{channel.name} ({channel.id}).")
         try:
-            member = self.help_channel_users[channel]
+            member = self.help_channel_claimants[channel]
         except KeyError:
             log.trace(f"Channel #{channel.name} ({channel.id}) not in help session cache, permissions unchanged.")
             return
-- 
cgit v1.2.3


From 52f19185752358cff21aadc7902493f78030a94f Mon Sep 17 00:00:00 2001
From: Numerlor <25886452+Numerlor@users.noreply.github.com>
Date: Tue, 7 Apr 2020 01:14:21 +0200
Subject: Reword strings to reflect name changes.

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

diff --git a/bot/cogs/help_channels.py b/bot/cogs/help_channels.py
index 73c7adb15..3418ad210 100644
--- a/bot/cogs/help_channels.py
+++ b/bot/cogs/help_channels.py
@@ -190,12 +190,12 @@ class HelpChannels(Scheduler, commands.Cog):
         return deque(available_names)
 
     async def dormant_check(self, ctx: commands.Context) -> bool:
-        """Return True if the user started the help channel session or passes the role check."""
+        """Return True if the user is the help channel claimant or passes the role check."""
         if self.help_channel_claimants.get(ctx.channel) == ctx.author:
-            log.trace(f"{ctx.author} started the help session, passing the check for dormant.")
+            log.trace(f"{ctx.author} is the help channel claimant, passing the check for dormant.")
             return True
 
-        log.trace(f"{ctx.author} did not start the help session, checking roles.")
+        log.trace(f"{ctx.author} is not the help channel claimant, checking roles.")
         return with_role_check(ctx, *constants.HelpChannels.cmd_whitelist)
 
     @commands.command(name="dormant", aliases=["close"], enabled=False)
@@ -621,12 +621,12 @@ class HelpChannels(Scheduler, commands.Cog):
         await self.ensure_permissions_synchronization(self.available_category)
 
     async def reset_claimant_send_permission(self, channel: discord.TextChannel) -> None:
-        """Reset send permissions in the Available category for member that started the help session in `channel`."""
-        log.trace(f"Attempting to find user for help session in #{channel.name} ({channel.id}).")
+        """Reset send permissions in the Available category for the help `channel` claimant."""
+        log.trace(f"Attempting to find claimant for #{channel.name} ({channel.id}).")
         try:
             member = self.help_channel_claimants[channel]
         except KeyError:
-            log.trace(f"Channel #{channel.name} ({channel.id}) not in help session cache, permissions unchanged.")
+            log.trace(f"Channel #{channel.name} ({channel.id}) not in claimant cache, permissions unchanged.")
             return
         log.trace(f"Resetting send permissions for {member} ({member.id}).")
         await self.available_category.set_permissions(member, overwrite=None)
-- 
cgit v1.2.3


From a0daa7e77c4920fc51229fb751a48d08280ed42d Mon Sep 17 00:00:00 2001
From: Numerlor <25886452+Numerlor@users.noreply.github.com>
Date: Tue, 7 Apr 2020 01:20:03 +0200
Subject: Add spacing.

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

diff --git a/bot/cogs/help_channels.py b/bot/cogs/help_channels.py
index 3418ad210..421d41baf 100644
--- a/bot/cogs/help_channels.py
+++ b/bot/cogs/help_channels.py
@@ -628,6 +628,7 @@ class HelpChannels(Scheduler, commands.Cog):
         except KeyError:
             log.trace(f"Channel #{channel.name} ({channel.id}) not in claimant cache, permissions unchanged.")
             return
+
         log.trace(f"Resetting send permissions for {member} ({member.id}).")
         await self.available_category.set_permissions(member, overwrite=None)
         # Cancel task, ignore no task existing when the claim time passed but idle time has not.
-- 
cgit v1.2.3


From 3532d06db7083c8a7dc6a4b87a28d11423d2e605 Mon Sep 17 00:00:00 2001
From: Numerlor <25886452+Numerlor@users.noreply.github.com>
Date: Tue, 7 Apr 2020 01:20:48 +0200
Subject: Reword comment.

Co-authored-by: MarkKoz <KozlovMark@gmail.com>
---
 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 421d41baf..52af03d27 100644
--- a/bot/cogs/help_channels.py
+++ b/bot/cogs/help_channels.py
@@ -631,7 +631,7 @@ class HelpChannels(Scheduler, commands.Cog):
 
         log.trace(f"Resetting send permissions for {member} ({member.id}).")
         await self.available_category.set_permissions(member, overwrite=None)
-        # Cancel task, ignore no task existing when the claim time passed but idle time has not.
+        # Ignore missing task when claim cooldown has passed but the channel still isn't dormant.
         self.cancel_task(member.id, ignore_missing=True)
 
     async def revoke_send_permissions(self, member: discord.Member) -> None:
-- 
cgit v1.2.3


From 44333ae53b6692ab34b4fe967ecbf4f215e7fb0e Mon Sep 17 00:00:00 2001
From: Numerlor <25886452+Numerlor@users.noreply.github.com>
Date: Thu, 9 Apr 2020 15:20:02 +0200
Subject: Move message deletion up.

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

diff --git a/bot/cogs/help_channels.py b/bot/cogs/help_channels.py
index 52af03d27..8dca2ede0 100644
--- a/bot/cogs/help_channels.py
+++ b/bot/cogs/help_channels.py
@@ -210,11 +210,12 @@ class HelpChannels(Scheduler, commands.Cog):
         log.trace("dormant command invoked; checking if the channel is in-use.")
         if ctx.channel.category == self.in_use_category:
             if await self.dormant_check(ctx):
-                self.cancel_task(ctx.channel.id)
-                await self.move_to_dormant(ctx.channel)
                 with suppress(discord.errors.NotFound):
-                    await ctx.message.delete()
                     log.trace("Deleting dormant invokation message.")
+                    await ctx.message.delete()
+
+                self.cancel_task(ctx.channel.id)
+                await self.move_to_dormant(ctx.channel)
                 await self.reset_claimant_send_permission(ctx.channel)
         else:
             log.debug(f"{ctx.author} invoked command 'dormant' outside an in-use help channel")
-- 
cgit v1.2.3


From 93a511da2be49305bc27fcce18f10f9758418dc5 Mon Sep 17 00:00:00 2001
From: Numerlor <25886452+Numerlor@users.noreply.github.com>
Date: Thu, 9 Apr 2020 15:22:55 +0200
Subject: Move permissions reset up.

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

diff --git a/bot/cogs/help_channels.py b/bot/cogs/help_channels.py
index 8dca2ede0..f53f7a7ba 100644
--- a/bot/cogs/help_channels.py
+++ b/bot/cogs/help_channels.py
@@ -214,9 +214,10 @@ class HelpChannels(Scheduler, commands.Cog):
                     log.trace("Deleting dormant invokation message.")
                     await ctx.message.delete()
 
+                await self.reset_claimant_send_permission(ctx.channel)
+
                 self.cancel_task(ctx.channel.id)
                 await self.move_to_dormant(ctx.channel)
-                await self.reset_claimant_send_permission(ctx.channel)
         else:
             log.debug(f"{ctx.author} invoked command 'dormant' outside an in-use help channel")
 
-- 
cgit v1.2.3


From 221426d91fa1db5f334562ac0af52d93bbe7ab10 Mon Sep 17 00:00:00 2001
From: Numerlor <25886452+Numerlor@users.noreply.github.com>
Date: Thu, 9 Apr 2020 15:23:26 +0200
Subject: Suppress errors when resetting permissions.

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

diff --git a/bot/cogs/help_channels.py b/bot/cogs/help_channels.py
index f53f7a7ba..a6fa05d90 100644
--- a/bot/cogs/help_channels.py
+++ b/bot/cogs/help_channels.py
@@ -214,7 +214,8 @@ class HelpChannels(Scheduler, commands.Cog):
                     log.trace("Deleting dormant invokation message.")
                     await ctx.message.delete()
 
-                await self.reset_claimant_send_permission(ctx.channel)
+                with suppress(discord.errors.HTTPException, discord.errors.NotFound):
+                    await self.reset_claimant_send_permission(ctx.channel)
 
                 self.cancel_task(ctx.channel.id)
                 await self.move_to_dormant(ctx.channel)
-- 
cgit v1.2.3


From 9d6425474b8efa2dd4aba0086c1e8aaeb5eafeed Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Thu, 9 Apr 2020 08:00:39 -0700
Subject: HelpChannels: check author of dormant message

In a testing environment, the bot may try to edit the message of a
different bot. Therefore, the author of the message should be checked
to ensure the current bot sent it.
---
 bot/cogs/help_channels.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bot/cogs/help_channels.py b/bot/cogs/help_channels.py
index a6fa05d90..5f59a9d60 100644
--- a/bot/cogs/help_channels.py
+++ b/bot/cogs/help_channels.py
@@ -390,14 +390,13 @@ class HelpChannels(Scheduler, commands.Cog):
         log.info("Cog is ready!")
         self.ready.set()
 
-    @staticmethod
-    def is_dormant_message(message: t.Optional[discord.Message]) -> bool:
+    def is_dormant_message(self, message: t.Optional[discord.Message]) -> bool:
         """Return True if the contents of the `message` match `DORMANT_MSG`."""
         if not message or not message.embeds:
             return False
 
         embed = message.embeds[0]
-        return embed.description.strip() == DORMANT_MSG.strip()
+        return message.author == self.bot.user and embed.description.strip() == DORMANT_MSG.strip()
 
     async def move_idle_channel(self, channel: discord.TextChannel, has_task: bool = True) -> None:
         """
-- 
cgit v1.2.3


From 65aba04130533154cf9cb3ebb64414f41d987305 Mon Sep 17 00:00:00 2001
From: Numerlor <25886452+Numerlor@users.noreply.github.com>
Date: Thu, 9 Apr 2020 17:48:31 +0200
Subject: Reverse order of moving to dormant and task cancellation.

Reversing the order ensures the task is not cancelled
when moving to dormant fails which gives a fallback to move it
after the initial period of time.
---
 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 5f59a9d60..69812eda0 100644
--- a/bot/cogs/help_channels.py
+++ b/bot/cogs/help_channels.py
@@ -217,8 +217,8 @@ class HelpChannels(Scheduler, commands.Cog):
                 with suppress(discord.errors.HTTPException, discord.errors.NotFound):
                     await self.reset_claimant_send_permission(ctx.channel)
 
-                self.cancel_task(ctx.channel.id)
                 await self.move_to_dormant(ctx.channel)
+                self.cancel_task(ctx.channel.id)
         else:
             log.debug(f"{ctx.author} invoked command 'dormant' outside an in-use help channel")
 
-- 
cgit v1.2.3


From d0a9404cb0cfee64bf26df5ec7cce2ea71cb4f15 Mon Sep 17 00:00:00 2001
From: Numerlor <25886452+Numerlor@users.noreply.github.com>
Date: Thu, 9 Apr 2020 18:02:30 +0200
Subject: Delete channel from claimant cache.

Deleting the channel from the claimant cache on
invokation of the dormant command prevents users running
the command multiple times before the bot moves it.
---
 bot/cogs/help_channels.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bot/cogs/help_channels.py b/bot/cogs/help_channels.py
index 69812eda0..346d35aa8 100644
--- a/bot/cogs/help_channels.py
+++ b/bot/cogs/help_channels.py
@@ -210,6 +210,9 @@ class HelpChannels(Scheduler, commands.Cog):
         log.trace("dormant command invoked; checking if the channel is in-use.")
         if ctx.channel.category == self.in_use_category:
             if await self.dormant_check(ctx):
+                with suppress(KeyError):
+                    del self.help_channel_claimants[ctx.channel]
+
                 with suppress(discord.errors.NotFound):
                     log.trace("Deleting dormant invokation message.")
                     await ctx.message.delete()
-- 
cgit v1.2.3


From 4ac17f806c2f9d98503067dbd181ae2a839bc74c Mon Sep 17 00:00:00 2001
From: Numerlor <25886452+Numerlor@users.noreply.github.com>
Date: Thu, 9 Apr 2020 18:31:55 +0200
Subject: Specify encoding to logging file handler.

With the new addition of non latin-11 chars in channel names - which get logged,
the logging to files fails on those entries on OSs where the default
encoding is not utf8 or an other encoding capable of handling them.
---
 bot/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/__init__.py b/bot/__init__.py
index c9dbc3f40..2dd4af225 100644
--- a/bot/__init__.py
+++ b/bot/__init__.py
@@ -33,7 +33,7 @@ log_format = logging.Formatter(format_string)
 
 log_file = Path("logs", "bot.log")
 log_file.parent.mkdir(exist_ok=True)
-file_handler = handlers.RotatingFileHandler(log_file, maxBytes=5242880, backupCount=7)
+file_handler = handlers.RotatingFileHandler(log_file, maxBytes=5242880, backupCount=7, encoding="utf8")
 file_handler.setFormatter(log_format)
 
 root_log = logging.getLogger()
-- 
cgit v1.2.3


From 3eecb147d6f788c83b230e9f79edf44da4d5c621 Mon Sep 17 00:00:00 2001
From: Numerlor <25886452+Numerlor@users.noreply.github.com>
Date: Fri, 10 Apr 2020 15:38:19 +0200
Subject: Use synchronized permission reset.

---
 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 346d35aa8..daadcc9a4 100644
--- a/bot/cogs/help_channels.py
+++ b/bot/cogs/help_channels.py
@@ -635,7 +635,7 @@ class HelpChannels(Scheduler, commands.Cog):
             return
 
         log.trace(f"Resetting send permissions for {member} ({member.id}).")
-        await self.available_category.set_permissions(member, overwrite=None)
+        await self.update_category_permissions(self.available_category, member, overwrite=None)
         # Ignore missing task when claim cooldown has passed but the channel still isn't dormant.
         self.cancel_task(member.id, ignore_missing=True)
 
-- 
cgit v1.2.3


From d8e54d9921d204a0a95118136982186c790e0dd8 Mon Sep 17 00:00:00 2001
From: Numerlor <25886452+Numerlor@users.noreply.github.com>
Date: Fri, 10 Apr 2020 15:43:34 +0200
Subject: Fix `help_channel_claimants` typehint.

`ctx.author` that is used to populate the dict returns
a `Member` object in most cases while only `User` was documented
as a possible value.
---
 bot/cogs/help_channels.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bot/cogs/help_channels.py b/bot/cogs/help_channels.py
index daadcc9a4..4404ecc17 100644
--- a/bot/cogs/help_channels.py
+++ b/bot/cogs/help_channels.py
@@ -109,7 +109,9 @@ class HelpChannels(Scheduler, commands.Cog):
         super().__init__()
 
         self.bot = bot
-        self.help_channel_claimants: t.Dict[discord.TextChannel, discord.User] = {}
+        self.help_channel_claimants: (
+            t.Dict[discord.TextChannel, t.Union[discord.Member, discord.User]]
+        ) = {}
 
         # Categories
         self.available_category: discord.CategoryChannel = None
-- 
cgit v1.2.3