Fix regression with unresolved channels due to reordering.
Channels are meant to fallback to Object if the message is out of order. Somewhere along the commit line this got removed despite the issue still existing.
This commit is contained in:
parent
68342db04d
commit
2c16e43e8a
@ -47,6 +47,7 @@ from .role import Role
|
|||||||
from .enums import ChannelType, try_enum, Status, Enum
|
from .enums import ChannelType, try_enum, Status, Enum
|
||||||
from . import utils
|
from . import utils
|
||||||
from .embeds import Embed
|
from .embeds import Embed
|
||||||
|
from .object import Object
|
||||||
|
|
||||||
class ListenerType(Enum):
|
class ListenerType(Enum):
|
||||||
chunk = 0
|
chunk = 0
|
||||||
@ -260,15 +261,16 @@ class ConnectionState:
|
|||||||
yield self.receive_chunk(guild.id)
|
yield self.receive_chunk(guild.id)
|
||||||
|
|
||||||
def _get_guild_channel(self, data):
|
def _get_guild_channel(self, data):
|
||||||
|
channel_id = int(data['channel_id'])
|
||||||
try:
|
try:
|
||||||
guild = self._get_guild(int(data['guild_id']))
|
guild = self._get_guild(int(data['guild_id']))
|
||||||
except KeyError:
|
except KeyError:
|
||||||
channel = self.get_channel(int(data['channel_id']))
|
channel = self.get_channel(channel_id)
|
||||||
guild = None
|
guild = None
|
||||||
else:
|
else:
|
||||||
channel = guild and guild.get_channel(int(data['channel_id']))
|
channel = guild and guild.get_channel(channel_id)
|
||||||
|
|
||||||
return channel, guild
|
return channel or Object(id=channel_id), guild
|
||||||
|
|
||||||
async def request_offline_members(self, guilds):
|
async def request_offline_members(self, guilds):
|
||||||
# get all the chunks
|
# get all the chunks
|
||||||
|
Loading…
x
Reference in New Issue
Block a user