matthew/enhanced-discord.py
1
0
Fork 0
Code Issues 4 Pull Requests 21 Projects Releases Wiki Activity

Fix error with templates not having access to member cache flags.

Browse Source 
This also changes the attribute from having an underscore

Fix #5986
This commit is contained in:
Rapptz
2020-11-21 22:40:19 -05:00
parent bdcc645cbf
commit 431ee8794b
4 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
discord/state.py
View File

@ -181,7 +181,7 @@ class ConnectionState:
cache_flags._verify_intents(intents)
self._member_cache_flags = cache_flags
self.member_cache_flags = cache_flags
self._activity = activity
self._status = status
self._intents = intents
@ -604,7 +604,7 @@ class ConnectionState:
user = data['user']
member_id = int(user['id'])
member = guild.get_member(member_id)
flags = self._member_cache_flags
flags = self.member_cache_flags
if member is None:
if 'username' not in user:
# sometimes we receive 'incomplete' member data post-removal.
@ -742,7 +742,7 @@ class ConnectionState:
return
member = Member(guild=guild, data=data, state=self)
if self._member_cache_flags.joined:
if self.member_cache_flags.joined:
guild._add_member(member)
try:
@ -786,7 +786,7 @@ class ConnectionState:
self.dispatch('member_update', old_member, member)
else:
if self._member_cache_flags.joined:
if self.member_cache_flags.joined:
member = Member(data=data, guild=guild, state=self)
guild._add_member(member)
log.debug('GUILD_MEMBER_UPDATE referencing an unknown member ID: %s. Discarding.', user_id)
@ -817,7 +817,7 @@ class ConnectionState:
return self._add_guild_from_data(data)
async def chunk_guild(self, guild, *, wait=True, cache=None):
cache = cache or self._member_cache_flags.joined
cache = cache or self.member_cache_flags.joined
request = self._chunk_requests.get(guild.id)
if request is None:
self._chunk_requests[guild.id] = request = ChunkRequest(guild.id, self.loop, self._get_guild, cache=cache)
@ -984,7 +984,7 @@ class ConnectionState:
def parse_voice_state_update(self, data):
guild = self._get_guild(utils._get_as_snowflake(data, 'guild_id'))
channel_id = utils._get_as_snowflake(data, 'channel_id')
flags = self._member_cache_flags
flags = self.member_cache_flags
self_id = self.user.id
if guild is not None:
if int(data['user_id']) == self_id: