Skip to content

Commit a07a8e7

Browse files
authored
Merge branch 'master' into fix/is_holographic-checks
2 parents c4259f4 + 40dc21c commit a07a8e7

3 files changed

Lines changed: 14 additions & 15 deletions

File tree

discord/components.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -850,10 +850,9 @@ def to_dict(self) -> SectionComponentPayload:
850850
return payload
851851

852852
def walk_components(self) -> Iterator[Component]:
853-
r = self.components
853+
yield from self.components
854854
if self.accessory:
855-
yield from r + [self.accessory]
856-
yield from r
855+
yield self.accessory
857856

858857
def get_component(self, id: str | int) -> Component | None:
859858
"""Get a component from this section. Roughly equivalent to `utils.get(section.walk_components(), ...)`.

discord/emoji.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ def __repr__(self) -> str:
364364
return f"<AppEmoji id={self.id} name={self.name!r} animated={self.animated}>"
365365

366366
@property
367-
def guild(self) -> Guild:
367+
def guild(self) -> None:
368368
"""The guild this emoji belongs to. This is always `None` for :class:`AppEmoji`."""
369369
return None
370370

discord/flags.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -765,15 +765,6 @@ def moderation(self):
765765
return 1 << 2
766766

767767
@flag_value
768-
def emojis(self):
769-
""":class:`bool`: Alias of :attr:`.emojis_and_stickers`.
770-
771-
.. versionchanged:: 2.0
772-
Changed to an alias.
773-
"""
774-
return 1 << 3
775-
776-
@alias_flag_value
777768
def emojis_and_stickers(self):
778769
""":class:`bool`: Whether guild emoji and sticker related events are enabled.
779770
@@ -797,6 +788,15 @@ def emojis_and_stickers(self):
797788
"""
798789
return 1 << 3
799790

791+
@alias_flag_value
792+
def emojis(self):
793+
""":class:`bool`: Alias of :attr:`.emojis_and_stickers`.
794+
795+
.. versionchanged:: 2.0
796+
Changed to an alias.
797+
"""
798+
return 1 << 3
799+
800800
@flag_value
801801
def integrations(self):
802802
""":class:`bool`: Whether guild integration related events are enabled.
@@ -1495,8 +1495,8 @@ def gateway_message_content(self):
14951495

14961496
@flag_value
14971497
def gateway_message_content_limited(self):
1498-
""":class:`bool`: Returns ``True`` if the application is currently pending verification
1499-
and has hit the guild limit.
1498+
""":class:`bool`: Returns ``True`` if the application is allowed to receive limited
1499+
message content information over the gateway.
15001500
"""
15011501
return 1 << 19
15021502

0 commit comments

Comments
 (0)