Merge branch 'development'

CHANGELOG.md

@@ -1,3 +1,8 @@
+## v2.1.1
+
+#### Bug Fixes
+- Fixed error that spammed the log but was harmless
+
 ## v2.1.0
 
 #### New features

roxbot/__init__.py

@@ -12,7 +12,7 @@ __title__ = "roxbot"
 __author__ = "Roxanne Gibson"
 __license__ = "MIT"
 __copyright__ = "Copyright 2015-2017 Roxanne Gibson <me@roxxers.xyz>"
-__version__ = "2.1.0"
+__version__ = "2.1.1"
 __description__ = """Roxbot: An inclusive modular multi-purpose Discord bot. Built with love (and discord.py) by Roxxers#7443.
 
 Roxbot is designed be a multi-purpose bot and provide many different services for users and moderators alike with a focus on customisability. 

roxbot/cogs/trivia.py

@@ -290,7 +290,6 @@ class Trivia:
 
 		channel = reaction.message.channel
 		message = reaction.message
-		user_in_game = bool(user.id in self.games[channel.id]["players"])
 		try:
 			reaction_is_on_question = bool(message.id == self.games[channel.id]["current_question"].id)
 		except AttributeError:
@@ -301,6 +300,7 @@ class Trivia:
 				reaction_is_on_question = None
 
 		if channel.id in self.games:
+			user_in_game = bool(user.id in self.games[channel.id]["players"])
 			if user_in_game and reaction_is_on_question:
 				if reaction.emoji in self.emojis and user.id not in self.games[channel.id]["players_answered"]:
 					self.games[channel.id]["players_answered"].append(user.id)