mirrors/discord.py
1
0
Fork 0
mirror of https://github.com/Rapptz/discord.py.git synced 2025-07-23 19:34:23 +00:00
Code Issues Projects Releases Wiki Activity

Fix Guild.afk_channel and VoiceState.channel being None at startup

Browse Source
This commit is contained in:
z03h 2022-07-26 06:38:36 -07:00 committed by GitHub
parent 24b619a516
commit 9f1c511b47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
discord/guild.py
View File

@ -520,22 +520,12 @@ class Guild(Hashable):
self._scheduled_events[scheduled_event.id] = scheduled_event self._scheduled_events[scheduled_event.id] = scheduled_event
self.owner_id: Optional[int] = utils._get_as_snowflake(guild, 'owner_id') self.owner_id: Optional[int] = utils._get_as_snowflake(guild, 'owner_id')
self.afk_channel: Optional[VocalGuildChannel] = self.get_channel(utils._get_as_snowflake(guild, 'afk_channel_id')) # type: ignore
for obj in guild.get('voice_states', []):
self._update_voice_state(obj, int(obj['channel_id']))
cache_joined = self._state.member_cache_flags.joined
cache_voice = self._state.member_cache_flags.voice
self_id = self._state.self_id
for mdata in guild.get('members', []):
member = Member(data=mdata, guild=self, state=state) # type: ignore # Members will have the 'user' key in this scenario
if cache_joined or member.id == self_id or (cache_voice and member.id in self._voice_states):
self._add_member(member)
self._sync(guild) self._sync(guild)
self._large: Optional[bool] = None if self._member_count is None else self._member_count >= 250 self._large: Optional[bool] = None if self._member_count is None else self._member_count >= 250
self.afk_channel: Optional[VocalGuildChannel] = self.get_channel(utils._get_as_snowflake(guild, 'afk_channel_id')) # type: ignore
# TODO: refactor/remove? # TODO: refactor/remove?
def _sync(self, data: GuildPayload) -> None: def _sync(self, data: GuildPayload) -> None:
try: try:
@ -543,13 +533,6 @@ class Guild(Hashable):
except KeyError: except KeyError:
pass pass
empty_tuple = tuple()
for presence in data.get('presences', []):
user_id = int(presence['user']['id'])
member = self.get_member(user_id)
if member is not None:
member._presence_update(presence, empty_tuple) # type: ignore
if 'channels' in data: if 'channels' in data:
channels = data['channels'] channels = data['channels']
for c in channels: for c in channels:
@ -557,6 +540,24 @@ class Guild(Hashable):
if factory: if factory:
self._add_channel(factory(guild=self, data=c, state=self._state)) # type: ignore self._add_channel(factory(guild=self, data=c, state=self._state)) # type: ignore
for obj in data.get('voice_states', []):
self._update_voice_state(obj, int(obj['channel_id']))
cache_joined = self._state.member_cache_flags.joined
cache_voice = self._state.member_cache_flags.voice
self_id = self._state.self_id
for mdata in data.get('members', []):
member = Member(data=mdata, guild=self, state=self._state) # type: ignore # Members will have the 'user' key in this scenario
if cache_joined or member.id == self_id or (cache_voice and member.id in self._voice_states):
self._add_member(member)
empty_tuple = tuple()
for presence in data.get('presences', []):
user_id = int(presence['user']['id'])
member = self.get_member(user_id)
if member is not None:
member._presence_update(presence, empty_tuple) # type: ignore
if 'threads' in data: if 'threads' in data:
threads = data['threads'] threads = data['threads']
for thread in threads: for thread in threads: