Yadciel/Titan
1
0
Fork 0
mirror of https://github.com/TitanEmbeds/Titan.git synced 2025-10-31 13:59:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix if guild not initialized yet and no reactions

Browse Source
This commit is contained in:
Jeremy Zhang
2019-01-05 20:54:50 +00:00
parent ec80761a5f
commit e566276fc4
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
discordbot/titanembeds/bot.py
View File

@@ -229,7 +229,8 @@ class Titan(discord.AutoShardedClient):
me = channel.guild.get_member(self.user.id) me = channel.guild.get_member(self.user.id)
if channel.permissions_for(me).read_messages: if channel.permissions_for(me).read_messages:
message = await channel.get_message(message_id) message = await channel.get_message(message_id)
await self.on_reaction_add(message.reactions[0], None) if len(message.reactions):
await self.on_reaction_add(message.reactions[0], None)
async def on_raw_reaction_remove(self, payload): async def on_raw_reaction_remove(self, payload):
message_id = payload.message_id message_id = payload.message_id

7
discordbot/titanembeds/redisqueue.py
View File

@@ -139,8 +139,11 @@ class RedisQueue:
guild = self.bot.get_guild(int(params["guild_id"])) guild = self.bot.get_guild(int(params["guild_id"]))
query = params["query"] query = params["query"]
result = None result = None
members = guild.members if guild:
if len(query) > 5 and query[-5] == '#': members = guild.members
else:
members = None
if members and len(query) > 5 and query[-5] == '#':
potential_discriminator = query[-4:] potential_discriminator = query[-4:]
result = discord.utils.get(members, name=query[:-5], discriminator=potential_discriminator) result = discord.utils.get(members, name=query[:-5], discriminator=potential_discriminator)
if not result: if not result: