Skip to content

Commit

Permalink
Merge branch 'master' into code-cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Lulalaby authored Jul 22, 2022
2 parents cf113a0 + 8e941f3 commit 4a38c22
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions discord/guild.py
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ def _sync(self, data: GuildPayload) -> None:

@property
def channels(self) -> List[GuildChannel]:
"""List[:class:`abc.GuildChannel`]: A list of channels that belongs to this guild."""
"""List[:class:`abc.GuildChannel`]: A list of channels that belong to this guild."""
return list(self._channels.values())

@property
Expand Down Expand Up @@ -615,7 +615,7 @@ def large(self) -> bool:

@property
def voice_channels(self) -> List[VoiceChannel]:
"""List[:class:`VoiceChannel`]: A list of voice channels that belongs to this guild.
"""List[:class:`VoiceChannel`]: A list of voice channels that belong to this guild.
This is sorted by the position and are in UI order from top to bottom.
"""
Expand All @@ -625,7 +625,7 @@ def voice_channels(self) -> List[VoiceChannel]:

@property
def stage_channels(self) -> List[StageChannel]:
"""List[:class:`StageChannel`]: A list of stage channels that belongs to this guild.
"""List[:class:`StageChannel`]: A list of stage channels that belong to this guild.
.. versionadded:: 1.7
Expand All @@ -637,7 +637,7 @@ def stage_channels(self) -> List[StageChannel]:

@property
def forum_channels(self) -> List[ForumChannel]:
"""List[:class:`ForumChannel`]: A list of forum channels that belongs to this guild.
"""List[:class:`ForumChannel`]: A list of forum channels that belong to this guild.
.. versionadded:: 2.0
Expand All @@ -663,7 +663,7 @@ def voice_client(self) -> Optional[VoiceProtocol]:

@property
def text_channels(self) -> List[TextChannel]:
"""List[:class:`TextChannel`]: A list of text channels that belongs to this guild.
"""List[:class:`TextChannel`]: A list of text channels that belong to this guild.
This is sorted by the position and are in UI order from top to bottom.
"""
Expand All @@ -673,7 +673,7 @@ def text_channels(self) -> List[TextChannel]:

@property
def categories(self) -> List[CategoryChannel]:
"""List[:class:`CategoryChannel`]: A list of categories that belongs to this guild.
"""List[:class:`CategoryChannel`]: A list of categories that belong to this guild.
This is sorted by the position and are in UI order from top to bottom.
"""
Expand Down
4 changes: 2 additions & 2 deletions docs/migrating_to_v2.rst
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Asset-related attributes that previously returned hash strings (e.g. :attr:`User
+------------------------------------------------------------+----------------------------------------------------------------------+
| ``str(emoji.url_as(size=32))`` | ``emoji.with_size(32).url`` |
+------------------------------------------------------------+----------------------------------------------------------------------+
| ``str(url_as(size=128, static_format="png"))`` | ``emoji.replace(size=32, static_format="png").url`` |
| ``str(url_as(size=128, static_format="png"))`` | ``emoji.replace(size=128, static_format="png").url`` |
+------------------------------------------------------------+----------------------------------------------------------------------+
| ``str(sticker.image_url)`` | ``sticker.url`` |
+------------------------------------------------------------+----------------------------------------------------------------------+
Expand Down Expand Up @@ -259,4 +259,4 @@ The following were changed in types:
Parting Words
-------------

The v2.0 of the library implemented a lot of new features. To implement newer features, such as slash commands, they can be seen on our :resource:`guide <guide>`.
The v2.0 of the library implemented a lot of new features. To implement newer features, such as slash commands, they can be seen on our :resource:`guide <guide>`.

0 comments on commit 4a38c22

Please sign in to comment.