Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix not handling null last_message_id when deserializing stage channels #1680

Merged
merged 1 commit into from
Aug 5, 2023
Merged

Fix not handling null last_message_id when deserializing stage channels #1680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 hikari/impl/entity_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1169,18 +1169,21 @@ def deserialize_guild_stage_channel(
guild_id: undefined.UndefinedOr[snowflakes.Snowflake] = undefined.UNDEFINED,
) -> channel_models.GuildStageChannel:
channel_fields = self._set_guild_channel_attrsibutes(payload, guild_id=guild_id)
permission_overwrites = {
snowflakes.Snowflake(overwrite["id"]): self.deserialize_permission_overwrite(overwrite)
for overwrite in payload["permission_overwrites"]
}
last_message_id = snowflakes.Snowflake(payload["last_message_id"]) if "last_message_id" in payload else None

last_message_id: typing.Optional[snowflakes.Snowflake] = None
if (raw_last_message_id := payload.get("last_message_id")) is not None:
last_message_id = snowflakes.Snowflake(raw_last_message_id)

return channel_models.GuildStageChannel(
app=self._app,
id=channel_fields.id,
name=channel_fields.name,
type=channel_fields.type,
guild_id=channel_fields.guild_id,
permission_overwrites=permission_overwrites,
permission_overwrites={
snowflakes.Snowflake(overwrite["id"]): self.deserialize_permission_overwrite(overwrite)
for overwrite in payload["permission_overwrites"]
},
is_nsfw=payload.get("nsfw", False),
parent_id=channel_fields.parent_id,
region=payload["rtc_region"],
Expand Down
2 changes: 1 addition & 1 deletion tests/hikari/impl/test_entity_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2023,7 +2023,7 @@ def test_deserialize_guild_stage_channel(
assert isinstance(voice_channel, channel_models.GuildStageChannel)

def test_deserialize_guild_stage_channel_with_null_fields(self, entity_factory_impl):
voice_channel = entity_factory_impl.deserialize_guild_voice_channel(
voice_channel = entity_factory_impl.deserialize_guild_stage_channel(
{
"id": "123",
"permission_overwrites": [],
Expand Down