Merge branch 'master' into fix/poll-to-dict-id-tuple

Signed-off-by: Paillat <paillat@pycord.dev>

Author: Paillat-dev

CHANGELOG.md

@@ -16,6 +16,8 @@ These changes are available on the `master` branch, but have not yet been releas
 
 ### Fixed
 
+- Fix error message for `Guild.create_sticker`.
+  ([#3263](https://github.com/Pycord-Development/pycord/pull/3263))
 - Fix typehint for `SlashCommandGroup.__new__`.
   ([#3235](https://github.com/Pycord-Development/pycord/pull/3235))
 - Include `bypass_slowmode` in `Permissions.all`.
@@ -24,6 +26,9 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#3245](https://github.com/Pycord-Development/pycord/pull/3245))
 - Fix `PollAnswer.to_dict` incorrectly setting `answer_id` as a tuple instead of an int.
   ([#3260](https://github.com/Pycord-Development/pycord/pull/3260))
+- Fix a bug where `TextChannel.archived_threads` would ignore any limit parameter
+  smaller than 50 and use 50 instead.
+  ([#3266](https://github.com/Pycord-Development/pycord/pull/3266))
 
 ### Deprecated
 

discord/components.py

@@ -850,10 +850,9 @@ def to_dict(self) -> SectionComponentPayload:
         return payload
 
     def walk_components(self) -> Iterator[Component]:
-        r = self.components
+        yield from self.components
         if self.accessory:
-            yield from r + [self.accessory]
-        yield from r
+            yield self.accessory
 
     def get_component(self, id: str | int) -> Component | None:
         """Get a component from this section. Roughly equivalent to `utils.get(section.walk_components(), ...)`.

discord/emoji.py

@@ -364,7 +364,7 @@ def __repr__(self) -> str:
         return f"<AppEmoji id={self.id} name={self.name!r} animated={self.animated}>"
 
     @property
-    def guild(self) -> Guild:
+    def guild(self) -> None:
         """The guild this emoji belongs to. This is always `None` for :class:`AppEmoji`."""
         return None
 

discord/flags.py

@@ -765,15 +765,6 @@ def moderation(self):
         return 1 << 2
 
     @flag_value
-    def emojis(self):
-        """:class:`bool`: Alias of :attr:`.emojis_and_stickers`.
-
-        .. versionchanged:: 2.0
-            Changed to an alias.
-        """
-        return 1 << 3
-
-    @alias_flag_value
     def emojis_and_stickers(self):
         """:class:`bool`: Whether guild emoji and sticker related events are enabled.
 
@@ -797,6 +788,15 @@ def emojis_and_stickers(self):
         """
         return 1 << 3
 
+    @alias_flag_value
+    def emojis(self):
+        """:class:`bool`: Alias of :attr:`.emojis_and_stickers`.
+
+        .. versionchanged:: 2.0
+            Changed to an alias.
+        """
+        return 1 << 3
+
     @flag_value
     def integrations(self):
         """:class:`bool`: Whether guild integration related events are enabled.
@@ -1495,8 +1495,8 @@ def gateway_message_content(self):
 
     @flag_value
     def gateway_message_content_limited(self):
-        """:class:`bool`: Returns ``True`` if the application is currently pending verification
-        and has hit the guild limit.
+        """:class:`bool`: Returns ``True`` if the application is allowed to receive limited
+        message content information over the gateway.
         """
         return 1 << 19
 

discord/guild.py

@@ -3084,7 +3084,7 @@ async def create_sticker(
             raise TypeError('"name" parameter must be 2 to 30 characters long.')
 
         if description and not (2 <= len(description) <= 100):
-            raise TypeError('"description" parameter must be 2 to 200 characters long.')
+            raise TypeError('"description" parameter must be 2 to 100 characters long.')
 
         payload = {"name": name, "description": description or ""}
 
@@ -3327,7 +3327,7 @@ async def fetch_role(self, role_id: int) -> Role:
         data = await self._state.http.get_role(self.id, role_id)
         return Role(guild=self, state=self._state, data=data)
 
-    async def _fetch_role(self, role_id: int) -> Role:
+    async def _fetch_role(self, role_id: int) -> Role | None:
         """|coro|
 
         Retrieves a :class:`Role` that the guild has.

discord/iterators.py

@@ -870,7 +870,7 @@ async def fill_queue(self) -> None:
         if not self.has_more:
             raise NoMoreItems()
 
-        limit = 50 if self.limit is None else max(self.limit, 50)
+        limit = 50 if self.limit is None else min(self.limit, 50)
         data = await self.endpoint(self.channel_id, before=self.before, limit=limit)
 
         # This stuff is obviously WIP because 'members' is always empty

discord/member.py

@@ -48,7 +48,7 @@
 from .role import RoleColours
 from .types.collectibles import AvatarDecoration
 from .user import BaseUser, User, _UserTag
-from .utils import MISSING
+from .utils import MISSING, utcnow
 
 __all__ = (
     "VoiceState",
@@ -821,8 +821,7 @@ def timed_out(self) -> bool:
         """
         return (
             self.communication_disabled_until is not None
-            and self.communication_disabled_until
-            > datetime.datetime.now(datetime.timezone.utc)
+            and self.communication_disabled_until > utcnow()
         )
 
     async def ban(
@@ -1019,8 +1018,9 @@ async def edit(
             else:
                 if not suppress:
                     voice_state_payload["request_to_speak_timestamp"] = (
-                        datetime.datetime.utcnow().isoformat()
+                        utcnow().isoformat()
                     )
+
                 await http.edit_voice_state(guild_id, self.id, voice_state_payload)
 
         if voice_channel is not MISSING:
@@ -1121,9 +1121,7 @@ async def timeout_for(
         HTTPException
             An error occurred doing the request.
         """
-        await self.timeout(
-            datetime.datetime.now(datetime.timezone.utc) + duration, reason=reason
-        )
+        await self.timeout(utcnow() + duration, reason=reason)
 
     async def remove_timeout(self, *, reason: str | None = None) -> None:
         """|coro|
@@ -1172,7 +1170,7 @@ async def request_to_speak(self) -> None:
         """
         payload = {
             "channel_id": self.voice.channel.id,
-            "request_to_speak_timestamp": datetime.datetime.utcnow().isoformat(),
+            "request_to_speak_timestamp": utcnow().isoformat(),
         }
 
         if self._state.self_id != self.id:

discord/reaction.py

@@ -133,7 +133,7 @@ def burst_colors(self) -> list[Colour]:
         return self.burst_colours
 
     @property
-    def count_details(self):
+    def count_details(self) -> ReactionCountDetails:
         """Returns :class:`ReactionCountDetails` for the individual counts of normal and super reactions made."""
         return ReactionCountDetails(self._count_details)
 

discord/state.py

@@ -2075,12 +2075,9 @@ def _update_sound(self, sound: SoundboardSound) -> SoundboardSound | None:
         return before
 
     def parse_soundboard_sounds(self, data) -> None:
-        guild_id = int(data["guild_id"])
         for sound_data in data["soundboard_sounds"]:
             self._add_sound(
-                SoundboardSound(
-                    state=self, http=self.http, data=sound_data, guild_id=guild_id
-                )
+                SoundboardSound(state=self, http=self.http, data=sound_data)
             )
 
     def parse_guild_soundboard_sounds_update(self, data):