flifloo/Administrator-py
Archived
1
0
Fork 0
Code Activity

Merge pull request #42 from flifloo/poll

Browse source 
Fix payload with optional member
This commit is contained in:
Ethanell 2020-11-03 16:26:47 +01:00
commit 654937f17a
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
extensions/poll.py
View file

@ -63,16 +63,21 @@ class Poll(commands.Cog):
@commands.Cog.listener() @commands.Cog.listener()
async def on_raw_reaction_add(self, payload: RawReactionActionEvent): async def on_raw_reaction_add(self, payload: RawReactionActionEvent):
if not payload.member.bot: if not payload.member:
user = await self.bot.fetch_user(payload.user_id)
else:
user = payload.member
if not user.bot:
s = db.Session() s = db.Session()
p = s.query(db.Polls).filter(db.Polls.message == payload.message_id).first() p = s.query(db.Polls).filter(db.Polls.message == payload.message_id).first()
if p: if p:
message = await self.bot.get_channel(p.channel).fetch_message(p.message) message = await self.bot.get_channel(p.channel).fetch_message(p.message)
if str(payload.emoji) not in eval(p.reactions): if str(payload.emoji) not in eval(p.reactions):
await message.remove_reaction(payload.emoji, payload.member) await message.remove_reaction(payload.emoji, user)
elif str(payload.emoji) == "\U0001F5D1": elif str(payload.emoji) == "\U0001F5D1":
if payload.member.id != p.author: if user.id != p.author:
await message.remove_reaction(payload.emoji, payload.member) await message.remove_reaction(payload.emoji, user)
else: else:
await self.close_poll(s, p) await self.close_poll(s, p)
elif not p.multi: elif not p.multi:
@ -80,8 +85,8 @@ class Poll(commands.Cog):
for r in message.reactions: for r in message.reactions:
if str(r.emoji) != str(payload.emoji): if str(r.emoji) != str(payload.emoji):
async for u in r.users(): async for u in r.users():
if u == payload.member: if u == user:
await r.remove(payload.member) await r.remove(user)
f = True f = True
break break
if f: if f: