Browse Source

Merge branch 'development'

tags/v2.1.1
Roxie Gibson 5 years ago
parent
commit
3d32b5d232
3 changed files with 7 additions and 2 deletions
  1. +5
    -0
      CHANGELOG.md
  2. +1
    -1
      roxbot/__init__.py
  3. +1
    -1
      roxbot/cogs/trivia.py

+ 5
- 0
CHANGELOG.md View File

## v2.1.1

#### Bug Fixes
- Fixed error that spammed the log but was harmless

## v2.1.0 ## v2.1.0


#### New features #### New features

+ 1
- 1
roxbot/__init__.py View File

__author__ = "Roxanne Gibson" __author__ = "Roxanne Gibson"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright 2015-2017 Roxanne Gibson <me@roxxers.xyz>" __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. __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 is designed be a multi-purpose bot and provide many different services for users and moderators alike with a focus on customisability.

+ 1
- 1
roxbot/cogs/trivia.py View File



channel = reaction.message.channel channel = reaction.message.channel
message = reaction.message message = reaction.message
user_in_game = bool(user.id in self.games[channel.id]["players"])
try: try:
reaction_is_on_question = bool(message.id == self.games[channel.id]["current_question"].id) reaction_is_on_question = bool(message.id == self.games[channel.id]["current_question"].id)
except AttributeError: except AttributeError:
reaction_is_on_question = None reaction_is_on_question = None


if channel.id in self.games: 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 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"]: 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) self.games[channel.id]["players_answered"].append(user.id)

Loading…
Cancel
Save