Merge pull request #1569 from python-discord/sebastiaan/prevent-accidental-addition-talentpool-cache

Prevent accidental addition of users to talentpool cache when using `!talentpool get_review`

1 files changed, 8 insertions, 4 deletions

diff --git a/bot/exts/recruitment/talentpool/_review.py b/bot/exts/recruitment/talentpool/_review.py
index 11aa3b62b..4ae1c5ad6 100644
--- a/bot/exts/recruitment/talentpool/_review.py
+++ b/bot/exts/recruitment/talentpool/_review.py
@@ -57,7 +57,7 @@ class Reviewer:
         """Schedules a single user for review."""
         log.trace(f"Scheduling review of user with ID {user_id}")
 
-        user_data = self._pool.watched_users[user_id]
+        user_data = self._pool.watched_users.get(user_id)
         inserted_at = isoparse(user_data['inserted_at']).replace(tzinfo=None)
         review_at = inserted_at + timedelta(days=MAX_DAYS_IN_POOL)
 
@@ -81,14 +81,18 @@ class Reviewer:
                 await message.add_reaction(reaction)
 
         if update_database:
-            nomination = self._pool.watched_users[user_id]
+            nomination = self._pool.watched_users.get(user_id)
             await self.bot.api_client.patch(f"{self._pool.api_endpoint}/{nomination['id']}", json={"reviewed": True})
 
     async def make_review(self, user_id: int) -> typing.Tuple[str, Optional[Emoji]]:
         """Format a generic review of a user and return it with the seen emoji."""
         log.trace(f"Formatting the review of {user_id}")
 
-        nomination = self._pool.watched_users[user_id]
+        # Since `watched_users` is a defaultdict, we should take care
+        # not to accidentally insert the IDs of users that have no
+        # active nominated by using the `watched_users.get(user_id)`
+        # instead of `watched_users[user_id]`.
+        nomination = self._pool.watched_users.get(user_id)
         if not nomination:
             log.trace(f"There doesn't appear to be an active nomination for {user_id}")
             return "", None
@@ -303,7 +307,7 @@ class Reviewer:
             await ctx.send(f":x: Can't find a currently nominated user with id `{user_id}`")
             return False
 
-        nomination = self._pool.watched_users[user_id]
+        nomination = self._pool.watched_users.get(user_id)
         if nomination["reviewed"]:
             await ctx.send(":x: This nomination was already reviewed, but here's a cookie :cookie:")
             return False