From 0e84279c66b74ad3c697775723e8bc6d5aef5d61 Mon Sep 17 00:00:00 2001 From: boonebytes Date: Sun, 6 Mar 2022 06:23:27 -0330 Subject: [PATCH 1/2] Updated PMs to send on all anonymous votes, and to PM when vote removed --- models/poll.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/models/poll.py b/models/poll.py index 7cb01a2..15561ac 100644 --- a/models/poll.py +++ b/models/poll.py @@ -1487,6 +1487,7 @@ async def vote(self, user, option, message): if vote: await vote.delete_from_db() await self.refresh(message) + await self.bot.loop.create_task(user.send(f'Your vote for **{self.options_reaction[choice]}** has been REMOVED.')) return # check if already voted for the same choice @@ -1524,7 +1525,7 @@ async def vote(self, user, option, message): if not answer or answer.lower() == "-": answer = "No Answer" - if self.anonymous and self.hide_count: + if self.anonymous or self.hide_count: self.bot.loop.create_task(user.send(f'Your vote for **{self.options_reaction[choice]}** has been counted.')) # commit From 3a18ab354786f64e6e281859f3c609c886ce9f3d Mon Sep 17 00:00:00 2001 From: boonebytes Date: Sun, 18 Sep 2022 09:04:22 -0230 Subject: [PATCH 2/2] Fixed issue with producing an export after a member has left the server --- essentials/membercache.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/essentials/membercache.py b/essentials/membercache.py index d54e102..997ac90 100644 --- a/essentials/membercache.py +++ b/essentials/membercache.py @@ -11,11 +11,14 @@ def __init__(self): self._cache_dict = defaultdict(dict) async def add(self, guild: discord.Guild, member_id: int) -> discord.Member: - member = await guild.fetch_member(member_id) - self._cache_dict[guild.id][member_id] = member - if len(self._cache_dict[guild.id]) % 1 == 0: - logger.info("member cache size: " + str(len(self._cache_dict[guild.id]))) - return member + try: + member = await guild.fetch_member(member_id) + self._cache_dict[guild.id][member_id] = member + if len(self._cache_dict[guild.id]) % 1 == 0: + logger.info("member cache size: " + str(len(self._cache_dict[guild.id]))) + return member + except: + pass async def get(self, guild: discord.Guild, member_id: int) -> discord.Member: member = self._cache_dict[guild.id].get(member_id, None) @@ -24,4 +27,4 @@ async def get(self, guild: discord.Guild, member_id: int) -> discord.Member: return member def clear(self): - self._cache_dict = defaultdict(dict) \ No newline at end of file + self._cache_dict = defaultdict(dict)