componentsv2 0.2.3__tar.gz → 0.3.0__tar.gz

{componentsv2-0.2.3 → componentsv2-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: componentsv2
-Version: 0.2.3
+Version: 0.3.0
 License-File: LICENSE.txt
 Requires-Dist: nextcord
 Dynamic: license-file

{componentsv2-0.2.3 → componentsv2-0.3.0}/componentsv2/component_holder.py

@@ -100,9 +100,7 @@ class ComponentHolder():
                 return child
             
 class ModalV2():
-    def __init__(self, custom_id: str, title: str):
-        if custom_id == None:
-            raise ValueError("With this wrapper, custom_ids for modals are required!")
+    def __init__(self, title: str, custom_id: str = None):
         
         self.custom_id = custom_id
         self.title = title
@@ -138,6 +136,9 @@ class ModalV2():
         if initial == True:
             await self.on_form_submit(interaction)
 
+    def on_submit_decorator(self, func):
+        self.on_form_submit = func
+
     async def on_form_submit(self, interaction):
         pass
 

{componentsv2-0.2.3 → componentsv2-0.3.0}/componentsv2/components/action_row.py

@@ -12,11 +12,11 @@ class ActionRow(ComponentV2):
         8: 1,
     }
 
-    def __init__(self, id: Optional[int] = None):
+    def __init__(self, components: list[ComponentV2] = [], id: Optional[int] = None):
         super().__init__(1, id)
 
         self.component_type: Optional[int] = None
-        self.components: list[ComponentV2] = []
+        self.components: list[ComponentV2] = components
 
         self.__container_compatible__ = True
     
@@ -41,4 +41,11 @@ class ActionRow(ComponentV2):
         if len(self.components) >= max:
             raise ValueError(f"Cannot add more components to this action row! Max: {max}")
         
-        self.components.append(component)
+        self.components.append(component)
+        return self
+    
+    def append_components(self, *args: ComponentV2):
+        components = list(args)
+
+        for component in components:
+            self.append_component(component)

{componentsv2-0.2.3 → componentsv2-0.3.0}/componentsv2/components/button.py

@@ -30,6 +30,8 @@ class ButtonV2(ComponentV2):
         self.callback = None
         self.registered = False
 
+        self.__has_holder = None
+
     def __call__(self, func):
         if self.registered == True:
             raise ValueError("Buttons cannot be registered to multiple callbacks!")
@@ -38,6 +40,17 @@ class ButtonV2(ComponentV2):
         self.registered = True
 
         return self
+    
+    def on_callback(self, func):
+        if self.registered == True:
+            raise ValueError("Buttons cannot be registered to multiple callbacks!")
+        
+        self.callback = func
+        self.registered = True
+
+        self.__has_holder = False
+
+        return self
 
     def serialize(self):
         base_dict: dict = super(ButtonV2, self).serialize()
@@ -63,17 +76,7 @@ class ButtonV2(ComponentV2):
         if self.registered == False:
             raise ValueError("Attempted to activate button, but it is not registered to a callback!")
         
-        await self.callback(self.parent_holder, self, interaction)
-
-class UIButtonV2(ButtonV2):
-    def __init__(self, style, label = None, custom_id = None, url = None, disabled = False, emoji = None, row = 1, id = None):
-        super().__init__(style, label, custom_id, url, disabled, emoji, row, id)
-
-    async def activated(self, interaction):
-        if self.disabled == True:
-            return
-        
-        await self.ui_callback(interaction)
-
-    async def ui_callback(self, interaction):
-        pass
+        if self.__has_holder != False:
+            await self.callback(self.parent_holder, self, interaction)
+        else:
+            await self.callback(interaction)

{componentsv2-0.2.3 → componentsv2-0.3.0}/componentsv2/components/holders/container.py

@@ -2,6 +2,7 @@ from .nestable import Nestable
 from ..base import ComponentV2
 
 from ..action_row import ActionRow
+from ..text_display import TextDisplay
 
 from typing import Optional
 
@@ -45,6 +46,13 @@ class Container(Nestable):
         self.components.append(component)
 
         return self
+    
+    def add_field(self, title: str, content: str):
+        return self.append_component(
+            TextDisplay(
+                f"**{title}**\n{content}"
+            )
+        )
 
     def serialize(self):
         base_dict = super().serialize()

{componentsv2-0.2.3 → componentsv2-0.3.0}/componentsv2/components/select.py

@@ -53,6 +53,15 @@ class SelectObject(ComponentV2):
         self.callback = func
 
         return self
+    
+    def on_submit(self, func):
+        if self.registered == True:
+            raise ValueError("Cannot register a Select component to multiple callbacks!")
+        
+        self.registered = True
+        self.callback = func
+
+        return self
 
 class StringSelect(SelectObject):
     class SelectOption():
@@ -265,38 +274,4 @@ class ChannelSelect(SelectObject):
             raise ValueError("Attempted to activate Select component, but it is not registered to a callback!")
         
         values = interaction.data.get("values")
-        await self.callback(self.parent_holder, self, interaction, values) ## due to a nextcord limitation, i am only able to send the list of values, not user objects.
-
-## UI SELECTS
-class UISelectObject(SelectObject):
-    def __init__(self, type: int, custom_id: str, placeholder: str = None, min_values: int = None, max_values: int = None, required: int = True, disabled: int = False):
-        super().__init__(type, custom_id, placeholder, min_values, max_values, required, disabled)
-
-    async def activated(self, interaction):
-        if self.disabled == True:
-            return
-        
-        await self.ui_callback(interaction)
-
-    async def ui_callback(self, interaction: Interaction):
-        pass
-
-class UIStringSelect(UISelectObject, StringSelect):
-    def __init__(self, custom_id: str, options: list[StringSelect.SelectOption], placeholder: str = None, min_values: int = None, max_values: int = None, required: bool = True, disabled: bool = False):
-        StringSelect.__init__(self, custom_id, options, placeholder, min_values, max_values, required, disabled)
-
-class UIUserSelect(UISelectObject, UserSelect):
-    def __init__(self, custom_id: str, default_values: list[DefaultValue] = None, placeholder: str = None, min_values: int = None, max_values: int = None, required: bool = True, disabled: bool = False):
-        UserSelect.__init__(self, custom_id, default_values, placeholder, min_values, max_values, required, disabled)
-
-class UIRoleSelect(UISelectObject, RoleSelect):
-    def __init__(self, custom_id: str, default_values: list[DefaultValue] = None, placeholder: str = None, min_values: int = None, max_values: int = None, required: bool = True, disabled: bool = False):
-        RoleSelect.__init__(self, custom_id, default_values, placeholder, min_values, max_values, required, disabled)
-
-class UIChannelSelect(UISelectObject, ChannelSelect):
-    def __init__(self, custom_id: str, default_values: list[DefaultValue] = None, placeholder: str = None, min_values: int = None, max_values: int = None, required: bool = True, disabled: bool = False):
-        ChannelSelect.__init__(self, custom_id, default_values, placeholder, min_values, max_values, required, disabled)
-
-class UIMentionableSelect(UISelectObject, MentionableSelect):
-    def __init__(self, custom_id: str, default_values: list[DefaultValue] = None, placeholder: str = None, min_values: int = None, max_values: int = None, required: bool = True, disabled: bool = False):
-        MentionableSelect.__init__(self, custom_id, default_values, placeholder, min_values, max_values, required, disabled)
+        await self.callback(self.parent_holder, self, interaction, values) ## due to a nextcord limitation, i am only able to send the list of values, not user objects.

{componentsv2-0.2.3 → componentsv2-0.3.0}/componentsv2/wrapper.py

@@ -37,13 +37,39 @@ class NextcordAPIWrapperV2():
         if interaction.type == nextcord.InteractionType.component:
             holder: ComponentHolder = self.active_holders.get(str(interaction.message.id))
             if holder != None:
-                component = holder.get_component(interaction.data.get("custom_id"))
+                id = interaction.data.get("custom_id")
+                component = holder.get_component(id) if isinstance(holder, ComponentHolder) else self.__get_list_component(holder, id)
+
                 if component != None:
                     await component.activated(interaction)
         elif interaction.type == nextcord.InteractionType.modal_submit:
             modal: ModalV2 = self.active_modals.get(interaction.user.id)
             if modal != None:
                 await modal.submitted(interaction, interaction.data.get("components"))
+
+    def __get_list_component(self, comps: list[ComponentV2], id: str):
+        if id is None:
+            return
+        
+        for component in comps:
+            if hasattr(component, "custom_id") and component.custom_id == id:
+                return component
+            
+            if hasattr(component, "components"):
+                found = self.__get_list_component(component.components, id)
+                if found is not None:
+                    return found
+                
+            inner = getattr(component, "component", None)
+            if inner is not None:
+                if getattr(inner, "custom_id", None) == id:
+                    return inner
+
+                found = self.__get_list_component([inner], id)
+                if found is not None:
+                    return found
+                
+        return None
     
     def __message_interaction_payload(self, components: list[ComponentV2], content: str = None, flags: int = None) -> dict[str]:
         return {
@@ -63,30 +89,60 @@ class NextcordAPIWrapperV2():
                 "components": components
             }
         }
+
+    def __serialize_components(self, components: list[ComponentV2]):
+        serialized = []
+
+        for component in components:
+            serialized.append(component.serialize())
+
+        return serialized
+    
+    def __serialize_modal(self, components: list[ComponentV2], title: str, custom_id: str = None):
+        serialized = []
+
+        for component in components:
+            serialized.append(component.serialize())
+
+        return {
+            "type": 9,
+
+            "data": {
+                "title": title,
+                "custom_id": custom_id,
+                "components": serialized,
+            }
+        }
     
     async def send_modal(self, interaction: Interaction, modal: ModalV2):
         self.active_modals[interaction.user.id] = modal
+            
+        payload = modal.serialize()
 
         await self.bot.http.request(
             nextcord.http.Route("POST", f"/interactions/{interaction.id}/{interaction.token}/callback"),
-            json = modal.serialize()
+            json = payload
         )
 
-    async def send_message(self, interaction: Interaction, component_holder: ComponentHolder, content: str = None, *, ephemeral: bool = False, is_components_v2: bool = False):
+    async def send_message(self, interaction: Interaction, component_holder: ComponentHolder | list[ComponentV2], content: str = None, *, ephemeral: bool = False, is_components_v2: bool = False):
         if is_components_v2 == True and content != None:
             raise TypeError("ComponentsV2 messages cannot contain content!")
         
+        payload = component_holder.serialize if isinstance(component_holder, ComponentHolder) else self.__serialize_components(component_holder)
+
         flags = MessageFlags(ephemeral=ephemeral, is_components_v2=is_components_v2).value
         response = await self.bot.http.request(
             nextcord.http.Route("POST", f"/interactions/{interaction.id}/{interaction.token}/callback?with_response=true"),
-            json=self.__message_interaction_payload(components=component_holder.serialize(), content=content, flags=flags)
+            json=self.__message_interaction_payload(payload, content=content, flags=flags)
         )
 
         self.active_holders[response["interaction"]["response_message_id"]] = component_holder
 
-    async def send_followup(self, interaction: Interaction, component_holder: ComponentHolder, content: str = None, *, ephemeral: bool = False, is_components_v2: bool = False):
+    async def send_followup(self, interaction: Interaction, component_holder: ComponentHolder | list[ComponentV2], content: str = None, *, ephemeral: bool = False, is_components_v2: bool = False):
         if is_components_v2 == True and content != None:
             raise TypeError("ComponentsV2 messages cannot contain content!")
+        
+        payload = component_holder.serialize if isinstance(component_holder, ComponentHolder) else self.__serialize_components(component_holder)
 
         flags = MessageFlags(ephemeral=ephemeral, is_components_v2=is_components_v2).value
         response = await self.bot.http.request(
@@ -96,8 +152,10 @@ class NextcordAPIWrapperV2():
 
         self.active_holders[response["id"]] = component_holder
 
-    async def edit_message(self, interaction: Interaction, component_holder: ComponentHolder, content: str = None):
+    async def edit_message(self, interaction: Interaction, component_holder: ComponentHolder | list[ComponentV2], content: str = None):
+        payload = component_holder.serialize if isinstance(component_holder, ComponentHolder) else self.__serialize_components(component_holder)
+
         await self.bot.http.request(
             nextcord.http.Route("POST", f"/interactions/{interaction.id}/{interaction.token}/callback"),
-            json=self.__edit_interaction_payload(components=component_holder.serialize(), content=content)
+            json=self.__edit_interaction_payload(components=payload, content=content)
         )

{componentsv2-0.2.3 → componentsv2-0.3.0}/componentsv2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: componentsv2
-Version: 0.2.3
+Version: 0.3.0
 License-File: LICENSE.txt
 Requires-Dist: nextcord
 Dynamic: license-file

{componentsv2-0.2.3 → componentsv2-0.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "componentsv2"
-version = "0.2.3"
+version = "0.3.0"
 
 dependencies = [
     "nextcord"