Fixed some trivia bugs, added some additional features to the printsettings command.

checks.py

@@ -20,6 +20,8 @@ def is_admin_or_mod():
 		else:
 			admin_roles =  ServerConfig().load_config()[str(ctx.guild.id)]["perm_roles"]["admin"]
 			mod_roles = ServerConfig().load_config()[str(ctx.guild.id)]["perm_roles"]["mod"]
+			print(admin_roles)
+			print(mod_roles)
 			for role in ctx.message.author.roles:
 				if role.id in mod_roles or role.id in admin_roles:
 					return True

cogs/trivia.py

@@ -213,7 +213,8 @@ class Trivia:
 
 	@commands.group(aliases=["tr"])
 	async def trivia(self, ctx):
-		if ctx.invoked_subcommand == self.start:
+		"""Command group for the Roxbot Trivia game."""
+		if ctx.invoked_subcommand == self.start and not self.games[ctx.channel.id]:
 			embed = discord.Embed(colour=0xDEADBF)
 			embed.set_footer(text="Roxbot Trivia uses the Open Trivia DB, made and maintained by Pixeltail Games LLC. Find out more at https://opentdb.com/")
 			embed.set_image(url="https://i.imgur.com/yhRVl9e.png")
@@ -223,6 +224,7 @@ class Trivia:
 
 	@trivia.command()
 	async def about(self, ctx):
+		"""He;p using the trivia game."""
 		embed = discord.Embed(
 			title="About Roxbot Trivia",
 			description="Roxbot Trivia is a trivia game in *your* discord server. It's heavily inspired by Tower Unite's trivia game. (and even uses the same questions database!) To start, just type `{}trivia start`.".format(self.bot.command_prefix),
@@ -237,12 +239,13 @@ class Trivia:
 	@trivia.command()
 	@commands.bot_has_permissions(manage_messages=True)
 	async def start(self, ctx, amount = "medium"):
+		"""Starts a trivia game and waits 20 seconds for other people to join."""
 		channel = ctx.channel
 		player = ctx.author
 		# Check if a game is already running and if so exit.
 		if channel.id in self.games:
 			# Game active in this channel already
-			await ctx.send(discord.Embed(description="A game is already being run in this channel.", colour=self.error_colour))
+			await ctx.send(embed=discord.Embed(description="A game is already being run in this channel.", colour=self.error_colour))
 			await asyncio.sleep(2)
 			return await ctx.message.delete()
 

config/settings.py

@@ -161,21 +161,28 @@ class Settings:
 
 	@bot.command()
 	@checks.is_owner_or_admin()
-	async def printsettings(self, ctx):
+	async def printsettings(self, ctx, option=None):
 		"OWNER OR ADMIN ONLY: Prints the servers config file."
 		self.serverconfig = self.con.load_config()
 		config = self.serverconfig[str(ctx.guild.id)]
 		em = discord.Embed(colour=0xDEADBF)
 		em.set_author(name="{} settings for {}.".format(self.bot.user.name, ctx.message.guild.name), icon_url=self.bot.user.avatar_url)
-		for settings in config:
-			if settings != "custom_commands" and settings != "warnings":
-				settingcontent = ""
-				for x in config[settings].items():
-					settingcontent += str(x).strip("()") + "\n"
-				em.add_field(name=settings, value=settingcontent, inline=False)
-			elif settings == "custom_commands":
-				em.add_field(name="custom_commands", value="For Custom Commands, use the custom list command.", inline=False)
-		return await ctx.send(embed=em)
+		if option in config:
+			settingcontent = ""
+			for x in config[option].items():
+				settingcontent += str(x).strip("()") + "\n"
+			em.add_field(name=option, value=settingcontent, inline=False)
+			return await ctx.send(embed=em)
+		else:
+			for settings in config:
+				if settings != "custom_commands" and settings != "warnings":
+					settingcontent = ""
+					for x in config[settings].items():
+						settingcontent += str(x).strip("()") + "\n"
+					em.add_field(name=settings, value=settingcontent, inline=False)
+				elif settings == "custom_commands":
+					em.add_field(name="custom_commands", value="For Custom Commands, use the custom list command.", inline=False)
+			return await ctx.send(embed=em)
 
 	@group()
 	@checks.is_admin_or_mod()