diff options
| -rw-r--r-- | discord/guild.py | 10 | ||||
| -rw-r--r-- | discord/role.py | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/discord/guild.py b/discord/guild.py index 68c7a697..799e9ea2 100644 --- a/discord/guild.py +++ b/discord/guild.py @@ -73,7 +73,7 @@ class Guild(Hashable): will be a ``str`` if the value is not recognised by the enumerator. afk_timeout: int The timeout to get sent to the AFK channel. - afk_channel: :class:`Channel` + afk_channel: Optional[:class:`VoiceChannel`] The channel that denotes the AFK channel. None if it doesn't exist. icon: str The guild's icon. @@ -265,7 +265,7 @@ class Guild(Hashable): return [ch for ch in self._channels.values() if isinstance(ch, TextChannel)] def get_channel(self, channel_id): - """Returns a :class:`Channel` with the given ID. If not found, returns None.""" + """Returns a :class:`abc.GuildChannel` with the given ID. If not found, returns None.""" return self._channels.get(channel_id) @property @@ -280,12 +280,12 @@ class Guild(Hashable): @utils.cached_slot_property('_default_role') def default_role(self): """Gets the @everyone role that all members have by default.""" - return utils.find(lambda r: r.is_everyone, self.roles) + return utils.find(lambda r: r.is_default(), self.roles) @utils.cached_slot_property('_default_channel') def default_channel(self): - """Gets the default :class:`Channel` for the guild.""" - return utils.find(lambda c: c.is_default, self.channels) + """Gets the default :class:`TextChannel` for the guild.""" + return utils.find(lambda c: c.is_default(), self.text_channels) @property def owner(self): diff --git a/discord/role.py b/discord/role.py index 652a7fb5..52ec0580 100644 --- a/discord/role.py +++ b/discord/role.py @@ -135,8 +135,8 @@ class Role(Hashable): self.mentionable = data.get('mentionable', False) self.color = self.colour - def is_everyone(self): - """Checks if the role is the @everyone role.""" + def is_default(self): + """Checks if the role is the default role.""" return self.guild.id == self.id @property @@ -153,7 +153,7 @@ class Role(Hashable): def members(self): """Returns a list of :class:`Member` with this role.""" all_members = self.guild.members - if self.is_everyone(): + if self.is_default(): return all_members ret = [] @@ -167,7 +167,7 @@ class Role(Hashable): if position <= 0: raise InvalidArgument("Cannot move role to position 0 or below") - if self.is_everyone(): + if self.is_default(): raise InvalidArgument("Cannot move default role") if self.position == position: |