NQN specific changes

Compute send message permissions in threads properly

Flags should be optional

Allow various cv2 components to be used with nqn_common components

Add `serialise` to base components, and remove fields on media items that are receive only

Author: muddyfish

discord/components.py

@@ -165,6 +165,9 @@ def _raw_construct(cls, **kwargs) -> Self:
     def to_dict(self) -> ComponentPayload:
         raise NotImplementedError
 
+    async def serialise(self, ctx) -> ComponentPayload:
+        return self.to_dict()
+
 
 class ActionRow(Component):
     """Represents a Discord Bot UI Kit Action Row.

discord/emoji.py

@@ -120,7 +120,7 @@ def __init__(self, *, guild: Snowflake, state: ConnectionState, data: EmojiPaylo
         self._from_data(data)
 
     def _from_data(self, emoji: EmojiPayload) -> None:
-        self.require_colons: bool = emoji.get('require_colons', False)
+        self.require_colons: bool = emoji.get('require_colons', True)
         self.managed: bool = emoji.get('managed', False)
         self.id: int = int(emoji['id'])  # type: ignore # This won't be None for full emoji objects.
         self.name: str = emoji['name']  # type: ignore # This won't be None for full emoji objects.

discord/guild.py

@@ -598,16 +598,8 @@ def _from_data(self, guild: GuildPayload) -> None:
             role = Role(guild=self, data=r, state=state)
             self._roles[role.id] = role
 
-        self.emojis: Tuple[Emoji, ...] = (
-            tuple(map(lambda d: state.store_emoji(self, d), guild.get('emojis', [])))
-            if state.cache_guild_expressions
-            else ()
-        )
-        self.stickers: Tuple[GuildSticker, ...] = (
-            tuple(map(lambda d: state.store_sticker(self, d), guild.get('stickers', [])))
-            if state.cache_guild_expressions
-            else ()
-        )
+        self.emojis: Tuple[Emoji, ...] = tuple(map(lambda d: state.store_emoji(self, d), guild.get('emojis', [])))
+        self.stickers: Tuple[GuildSticker, ...] = ()
         self.features: List[GuildFeature] = guild.get('features', [])
         self._splash: Optional[str] = guild.get('splash')
         self._system_channel_id: Optional[int] = utils._get_as_snowflake(guild, 'system_channel_id')

discord/http.py

@@ -1447,6 +1447,46 @@ def follow_webhook(
             Route('POST', '/channels/{channel_id}/followers', channel_id=channel_id), json=payload, reason=reason
         )
 
+    def edit_webhook_message(self, webhook_id, webhook_token, message_id, thread_id=None, **fields):
+        if thread_id is None:
+            r = Route(
+                'PATCH',
+                '/webhooks/{webhook_id}/{webhook_token}/messages/{message_id}',
+                webhook_id=webhook_id,
+                webhook_token=webhook_token,
+                message_id=message_id
+            )
+        else:
+            r = Route(
+                'PATCH',
+                '/webhooks/{webhook_id}/{webhook_token}/messages/{message_id}?thread_id={thread_id}',
+                webhook_id=webhook_id,
+                webhook_token=webhook_token,
+                message_id=message_id,
+                thread_id=thread_id
+            )
+        return self.request(r, json=fields)
+
+    def delete_webhook_message(self, webhook_id, webhook_token, message_id, thread_id=None):
+        if thread_id is None:
+            r = Route(
+                'DELETE',
+                '/webhooks/{webhook_id}/{webhook_token}/messages/{message_id}',
+                webhook_id=webhook_id,
+                webhook_token=webhook_token,
+                message_id=message_id
+            )
+        else:
+            r = Route(
+                'DELETE',
+                '/webhooks/{webhook_id}/{webhook_token}/messages/{message_id}?thread_id={thread_id}',
+                webhook_id=webhook_id,
+                webhook_token=webhook_token,
+                message_id=message_id,
+                thread_id=thread_id
+            )
+        return self.request(r)
+
     # Guild management
 
     def get_guilds(

discord/member.py

@@ -328,7 +328,7 @@ def __init__(self, *, data: MemberWithUserPayload, guild: Guild, state: Connecti
         self._avatar: Optional[str] = data.get('avatar')
         self._banner: Optional[str] = data.get('banner')
         self._permissions: Optional[int]
-        self._flags: int = data['flags']
+        self._flags: int = data.get('flags', 0)
         self._avatar_decoration_data: Optional[AvatarDecorationData] = data.get('avatar_decoration_data')
         try:
             self._permissions = int(data['permissions'])  # pyright: ignore[reportTypedDictNotRequiredAccess]

discord/message.py

@@ -63,6 +63,7 @@
 from .mixins import Hashable
 from .sticker import StickerItem, GuildSticker
 from .threads import Thread
+from .user import User
 from .channel import PartialMessageable
 from .poll import Poll
 
@@ -2452,11 +2453,7 @@ def _handle_nonce(self, value: Union[str, int]) -> None:
         self.nonce = value
 
     def _handle_author(self, author: UserPayload) -> None:
-        self.author = self._state.store_user(author, cache=self.webhook_id is None)
-        if isinstance(self.guild, Guild):
-            found = self.guild.get_member(self.author.id)
-            if found is not None:
-                self.author = found
+        self.author = User(state=self._state, data=author)
 
     def _handle_member(self, member: MemberPayload) -> None:
         # The gateway now gives us full Member objects sometimes with the following keys
@@ -2497,7 +2494,7 @@ def _handle_mention_roles(self, role_mentions: List[int]) -> None:
                 if role is not None:
                     self.role_mentions.append(role)
 
-    def _handle_components(self, data: List[ComponentPayload]) -> None:
+    def _handle_components(self, data: List[ComponentPayload]):
         self.components = []
 
         for component_data in data:

discord/state.py

@@ -381,16 +381,10 @@ def _update_references(self, ws: DiscordWebSocket) -> None:
         for vc in self.voice_clients:
             vc.main_ws = ws  # type: ignore # Silencing the unknown attribute (ok at runtime).
 
-    def store_user(self, data: Union[UserPayload, PartialUserPayload], *, cache: bool = True) -> User:
-        # this way is 300% faster than `dict.setdefault`.
-        user_id = int(data['id'])
-        try:
-            return self._users[user_id]
-        except KeyError:
-            user = User(state=self, data=data)
-            if cache:
-                self._users[user_id] = user
-            return user
+    def store_user(self, data: UserPayload) -> User:
+        if isinstance(data, User):
+            return data
+        return User(state=self, data=data)
 
     def store_user_no_intents(self, data: Union[UserPayload, PartialUserPayload], *, cache: bool = True) -> User:
         return User(state=self, data=data)
@@ -402,20 +396,13 @@ def get_user(self, id: int) -> Optional[User]:
         return self._users.get(id)
 
     def store_emoji(self, guild: Guild, data: EmojiPayload) -> Emoji:
-        # the id will be present here
-        emoji_id = int(data['id'])  # type: ignore
-        self._emojis[emoji_id] = emoji = Emoji(guild=guild, state=self, data=data)
-        return emoji
+        return Emoji(guild=guild, state=self, data=data)
 
     def store_sticker(self, guild: Guild, data: GuildStickerPayload) -> GuildSticker:
-        sticker_id = int(data['id'])
-        self._stickers[sticker_id] = sticker = GuildSticker(state=self, data=data)
-        return sticker
+        pass
 
     def store_view(self, view: BaseView, message_id: Optional[int] = None, interaction_id: Optional[int] = None) -> None:
-        if interaction_id is not None:
-            self._view_store.remove_interaction_mapping(interaction_id)
-        self._view_store.add_view(view, message_id)
+        pass
 
     def prevent_view_updates_for(self, message_id: int) -> Optional[BaseView]:
         return self._view_store.remove_message_tracking(message_id)

discord/threads.py

@@ -228,6 +228,19 @@ def _update(self, data: ThreadPayload) -> None:
         except KeyError:
             pass
 
+    def overwrites_for(self, obj, /) -> PermissionOverwrite:
+        parent = self.parent
+        if parent is None:
+            raise ClientException('Parent channel not found')
+        return parent.overwrites_for(obj)
+
+    @property
+    def _overwrites(self):
+        parent = self.parent
+        if parent is None:
+            raise ClientException('Parent channel not found')
+        return parent._overwrites
+
     @property
     def type(self) -> ThreadChannelType:
         """:class:`ChannelType`: The channel's Discord type."""

discord/ui/container.py

@@ -24,6 +24,7 @@
 
 from __future__ import annotations
 
+import asyncio
 import copy
 from typing import (
     TYPE_CHECKING,
@@ -242,6 +243,12 @@ def _total_count(self) -> int:
     def _is_v2(self) -> bool:
         return True
 
+    async def serialise(self, ctx) -> Dict[str, Any]:
+        components = await asyncio.gather(*[
+            child.serialise(ctx) for child in self._children
+        ])
+        return self._to_component_dict(components)
+
     def to_components(self) -> List[Dict[str, Any]]:
         components = []
         for i in self._children:
@@ -250,7 +257,9 @@ def to_components(self) -> List[Dict[str, Any]]:
 
     def to_component_dict(self) -> Dict[str, Any]:
         components = self.to_components()
+        return self._to_component_dict(components)
 
+    def _to_component_dict(self, components: List[Dict[str, Any]]):
         colour = None
         if self._colour:
             colour = self._colour if isinstance(self._colour, int) else self._colour.value
@@ -315,8 +324,8 @@ def add_item(self, item: Item[Any]) -> Self:
         ValueError
             Maximum number of children has been exceeded (40) for the entire view.
         """
-        if not isinstance(item, Item):
-            raise TypeError(f'expected Item not {item.__class__.__name__}')
+        # if not isinstance(item, Item):
+        #     raise TypeError(f'expected Item not {item.__class__.__name__}')
 
         if self._view:
             self._view._add_count(item._total_count)

discord/ui/item.py

@@ -91,6 +91,9 @@ def __init__(self):
         self._id: Optional[int] = None
         self._parent: Optional[Item] = None
 
+    async def serialise(self, ctx) -> Dict[str, Any]:
+        return self.to_component_dict()
+
     def to_component_dict(self) -> Dict[str, Any]:
         raise NotImplementedError