Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions essentials/membercache.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
self._cache_dict = defaultdict(dict)
3 changes: 2 additions & 1 deletion models/poll.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down