aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar S. Co1 <[email protected]>2019-09-06 15:11:42 -0400
committerGravatar S. Co1 <[email protected]>2019-09-06 15:11:42 -0400
commit9e22147e61b61d8ed489df970fe08440424337d9 (patch)
tree2cef3f536728233b097f3fc2035b85321a39af9d
parentFix broken cancellation logic for waiting SaL game (diff)
Fix bug in Candy Collection Cog
When the ten_recent_msg helper coro is called, it grabs the most recent message by ID, but some of the following lines assume this object is a Message ID, not an integer.
-rw-r--r--bot/seasons/halloween/candy_collection.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/bot/seasons/halloween/candy_collection.py b/bot/seasons/halloween/candy_collection.py
index d35cbee5..a7232e0d 100644
--- a/bot/seasons/halloween/candy_collection.py
+++ b/bot/seasons/halloween/candy_collection.py
@@ -121,15 +121,16 @@ class CandyCollection(commands.Cog):
async def ten_recent_msg(self):
"""Get the last 10 messages sent in the channel."""
ten_recent = []
- recent_msg = max(message.id for message
- in self.bot._connection._messages
- if message.channel.id == Channels.seasonalbot_chat)
+ recent_msg_id = max(
+ message.id for message in self.bot._connection._messages
+ if message.channel.id == Channels.seasonalbot_chat
+ )
channel = await self.hacktober_channel()
- ten_recent.append(recent_msg.id)
+ ten_recent.append(recent_msg_id)
for i in range(9):
- o = discord.Object(id=recent_msg.id + i)
+ o = discord.Object(id=recent_msg_id + i)
msg = await next(channel.history(limit=1, before=o))
ten_recent.append(msg.id)