diff --git a/discord/guild.py b/discord/guild.py index fda921f94..278b78cd3 100644 --- a/discord/guild.py +++ b/discord/guild.py @@ -1293,8 +1293,7 @@ class Guild(Hashable): overwrites: Mapping[Union[Role, Member, Object], PermissionOverwrite] = ..., category: Optional[Snowflake] = ..., **options: Any, - ) -> Coroutine[Any, Any, TextChannelPayload]: - ... + ) -> Coroutine[Any, Any, TextChannelPayload]: ... @overload def _create_channel( @@ -1304,8 +1303,7 @@ class Guild(Hashable): overwrites: Mapping[Union[Role, Member, Object], PermissionOverwrite] = ..., category: Optional[Snowflake] = ..., **options: Any, - ) -> Coroutine[Any, Any, VoiceChannelPayload]: - ... + ) -> Coroutine[Any, Any, VoiceChannelPayload]: ... @overload def _create_channel( @@ -1315,8 +1313,7 @@ class Guild(Hashable): overwrites: Mapping[Union[Role, Member, Object], PermissionOverwrite] = ..., category: Optional[Snowflake] = ..., **options: Any, - ) -> Coroutine[Any, Any, StageChannelPayload]: - ... + ) -> Coroutine[Any, Any, StageChannelPayload]: ... @overload def _create_channel( @@ -1326,8 +1323,7 @@ class Guild(Hashable): overwrites: Mapping[Union[Role, Member, Object], PermissionOverwrite] = ..., category: Optional[Snowflake] = ..., **options: Any, - ) -> Coroutine[Any, Any, CategoryChannelPayload]: - ... + ) -> Coroutine[Any, Any, CategoryChannelPayload]: ... @overload def _create_channel( @@ -1337,8 +1333,7 @@ class Guild(Hashable): overwrites: Mapping[Union[Role, Member, Object], PermissionOverwrite] = ..., category: Optional[Snowflake] = ..., **options: Any, - ) -> Coroutine[Any, Any, NewsChannelPayload]: - ... + ) -> Coroutine[Any, Any, NewsChannelPayload]: ... @overload def _create_channel( @@ -1348,8 +1343,7 @@ class Guild(Hashable): overwrites: Mapping[Union[Role, Member, Object], PermissionOverwrite] = ..., category: Optional[Snowflake] = ..., **options: Any, - ) -> Coroutine[Any, Any, Union[TextChannelPayload, NewsChannelPayload]]: - ... + ) -> Coroutine[Any, Any, Union[TextChannelPayload, NewsChannelPayload]]: ... @overload def _create_channel( @@ -1359,8 +1353,7 @@ class Guild(Hashable): overwrites: Mapping[Union[Role, Member, Object], PermissionOverwrite] = ..., category: Optional[Snowflake] = ..., **options: Any, - ) -> Coroutine[Any, Any, ForumChannelPayload]: - ... + ) -> Coroutine[Any, Any, ForumChannelPayload]: ... @overload def _create_channel( @@ -1370,8 +1363,7 @@ class Guild(Hashable): overwrites: Mapping[Union[Role, Member, Object], PermissionOverwrite] = ..., category: Optional[Snowflake] = ..., **options: Any, - ) -> Coroutine[Any, Any, GuildChannelPayload]: - ... + ) -> Coroutine[Any, Any, GuildChannelPayload]: ... def _create_channel( self, @@ -3202,8 +3194,7 @@ class Guild(Hashable): description: str = ..., image: bytes = ..., reason: Optional[str] = ..., - ) -> ScheduledEvent: - ... + ) -> ScheduledEvent: ... @overload async def create_scheduled_event( @@ -3218,8 +3209,7 @@ class Guild(Hashable): description: str = ..., image: bytes = ..., reason: Optional[str] = ..., - ) -> ScheduledEvent: - ... + ) -> ScheduledEvent: ... @overload async def create_scheduled_event( @@ -3233,8 +3223,7 @@ class Guild(Hashable): description: str = ..., image: bytes = ..., reason: Optional[str] = ..., - ) -> ScheduledEvent: - ... + ) -> ScheduledEvent: ... @overload async def create_scheduled_event( @@ -3248,8 +3237,7 @@ class Guild(Hashable): description: str = ..., image: bytes = ..., reason: Optional[str] = ..., - ) -> ScheduledEvent: - ... + ) -> ScheduledEvent: ... async def create_scheduled_event( self, @@ -3617,8 +3605,7 @@ class Guild(Hashable): primary_color: Union[Colour, int, None] = ..., secondary_color: Union[Colour, int, None] = ..., tertiary_color: Union[Colour, int, None] = ..., - ) -> Role: - ... + ) -> Role: ... @overload async def create_role( @@ -3634,8 +3621,7 @@ class Guild(Hashable): primary_color: Union[Colour, int, None] = ..., secondary_color: Union[Colour, int, None] = ..., tertiary_color: Union[Colour, int, None] = ..., - ) -> Role: - ... + ) -> Role: ... async def create_role( self, @@ -3728,17 +3714,13 @@ class Guild(Hashable): fields['color'] = actual_colour.value solid_color_used = color is not MISSING or colour is not MISSING - colors_used = ( - primary_color is not MISSING or - secondary_color is not MISSING or - tertiary_color is not MISSING - ) + colors_used = primary_color is not MISSING or secondary_color is not MISSING or tertiary_color is not MISSING if solid_color_used and colors_used: raise TypeError( "You must choose either only solid color (color/colour) or colors (primary_color/secondary_color/tertiary_color), not both." ) - - colors_payload: Dict[str, Any]= {} + + colors_payload: Dict[str, Any] = {} if primary_color is not MISSING: if primary_color is None: colors_payload['primary_color'] = None @@ -3763,7 +3745,7 @@ class Guild(Hashable): if colors_payload: fields['colors'] = colors_payload - + if not colors_payload: actual_colour = colour or color or Colour.default() if isinstance(actual_colour, int): diff --git a/discord/role.py b/discord/role.py index 929d4446b..e3ea79a31 100644 --- a/discord/role.py +++ b/discord/role.py @@ -224,7 +224,7 @@ class Role(Hashable): '_state', '_primary_color', '_secondary_color', - '_tertiary_color', + '_tertiary_color', ) def __init__(self, *, guild: Guild, state: ConnectionState, data: RolePayload): @@ -344,6 +344,7 @@ class Role(Hashable): def tertiary_color(self) -> Optional[Colour]: """Optional[:class:`Colour`]: The role's tertiary color.""" return Colour(self._tertiary_color) if self._tertiary_color is not None else None + @property def permissions(self) -> Permissions: """:class:`Permissions`: Returns the role's permissions.""" @@ -552,16 +553,12 @@ class Role(Hashable): payload['mentionable'] = mentionable solid_color_used = color is not MISSING or colour is not MISSING - colors_used = ( - primary_color is not MISSING or - secondary_color is not MISSING or - tertiary_color is not MISSING - ) + colors_used = primary_color is not MISSING or secondary_color is not MISSING or tertiary_color is not MISSING if solid_color_used and colors_used: raise TypeError( "You must choose either only solid color (color/colour) or colors (primary_color/secondary_color/tertiary_color), not both." ) - + colors_payload: Dict[str, Any] = {} if primary_color is not MISSING: if primary_color is None: @@ -586,25 +583,21 @@ class Role(Hashable): colors_payload['tertiary_color'] = tertiary_color.value if colors_payload: payload['colors'] = colors_payload - + data = await self._state.http.edit_role(self.guild.id, self.id, reason=reason, **payload) return Role(guild=self.guild, data=data, state=self._state) @overload - async def move(self, *, beginning: bool, offset: int = ..., reason: Optional[str] = ...): - ... + async def move(self, *, beginning: bool, offset: int = ..., reason: Optional[str] = ...): ... @overload - async def move(self, *, end: bool, offset: int = ..., reason: Optional[str] = ...): - ... + async def move(self, *, end: bool, offset: int = ..., reason: Optional[str] = ...): ... @overload - async def move(self, *, above: Role, offset: int = ..., reason: Optional[str] = ...): - ... + async def move(self, *, above: Role, offset: int = ..., reason: Optional[str] = ...): ... @overload - async def move(self, *, below: Role, offset: int = ..., reason: Optional[str] = ...): - ... + async def move(self, *, below: Role, offset: int = ..., reason: Optional[str] = ...): ... async def move( self,