diff options
| author | Rapptz <[email protected]> | 2016-10-10 20:09:06 -0400 |
|---|---|---|
| committer | Rapptz <[email protected]> | 2017-01-03 09:51:49 -0500 |
| commit | 45c729b167509deb5e389a7812d0ae8f4cbc4e72 (patch) | |
| tree | 5617af109edb3d7b7fb0e28934bf57e4f664f362 /discord/channel.py | |
| parent | Remove Message.timestamp and make Message.channel_mentions lazy. (diff) | |
| download | discord.py-45c729b167509deb5e389a7812d0ae8f4cbc4e72.tar.xz discord.py-45c729b167509deb5e389a7812d0ae8f4cbc4e72.zip | |
Switch IDs to use int instead of str
Diffstat (limited to 'discord/channel.py')
| -rw-r--r-- | discord/channel.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/discord/channel.py b/discord/channel.py index 91bf878c..87ce67ef 100644 --- a/discord/channel.py +++ b/discord/channel.py @@ -58,7 +58,7 @@ class Channel(Hashable): The channel name. server: :class:`Server` The server the channel belongs to. - id: str + id: int The channel ID. topic: Optional[str] The channel's topic. None if it doesn't exist. @@ -87,6 +87,7 @@ class Channel(Hashable): def __init__(self, *, state, server, data): self._state = state + self.id = int(data['id']) self._update(server, data) self.voice_members = [] @@ -96,7 +97,6 @@ class Channel(Hashable): def _update(self, server, data): self.server = server self.name = data['name'] - self.id = data['id'] self.topic = data.get('topic') self.position = data['position'] self.bitrate = data.get('bitrate') @@ -107,8 +107,8 @@ class Channel(Hashable): everyone_id = self.server.id for index, overridden in enumerate(data.get('permission_overwrites', [])): - overridden_id = overridden['id'] - self._permission_overwrites.append(Overwrites(**overridden)) + overridden_id = int(overridden.pop('id')) + self._permission_overwrites.append(Overwrites(id=overridden_id, **overridden)) if overridden['type'] == 'member': continue @@ -336,7 +336,7 @@ class PrivateChannel(Hashable): The users you are participating with in the private channel. me: :class:`User` The user presenting yourself. - id: str + id: int The private channel ID. is_private: bool ``True`` if the channel is a private channel (i.e. PM). ``True`` in this case. @@ -358,13 +358,13 @@ class PrivateChannel(Hashable): def __init__(self, *, me, state, data): self._state = state self.recipients = [state.try_insert_user(u) for u in data['recipients']] - self.id = data['id'] + self.id = int(data['id']) self.me = me - self.type = ChannelType(data['type']) + self.type = try_enum(ChannelType, data['type']) self._update_group(data) def _update_group(self, data): - owner_id = data.get('owner_id') + owner_id = utils._get_as_snowflake(data, 'owner_id') self.icon = data.get('icon') self.name = data.get('name') self.owner = utils.find(lambda u: u.id == owner_id, self.recipients) |