PycordViews 1.2.16__tar.gz → 1.2.19__tar.gz

{pycordviews-1.2.16 → pycordviews-1.2.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PycordViews
-Version: 1.2.16
+Version: 1.2.19
 Summary: Views and multibot for py-cord library
 Home-page: https://github.com/BOXERRMD/Py-cord_Views
 Author: Chronos (alias BOXERRMD)
@@ -95,7 +95,7 @@ The SelectMenu instance is used to create drop-down menus that can be easily mod
 > 
 > > **Method** `add_mentionnable_select_menu(custom_id: str = None, placeholder: str = None, min_values: int = 1, max_values: int = 1, disabled=False, row=None) -> Menu` : Add a mentionable select menu in the ui. Return Menu instance to set options
 > 
-> > **Method** `set_callable(*custom_ids: str, _callable: Union[Callable, None]) -> SelectMenu` : Set a callable for menus associated with custom_ids. This callable _(async function)_ will be set to respond at selected menus interactions
+> > **Method** `set_callable(*custom_ids: str, _callable: Union[Callable, None], data: Optional[dict[str, Any]]) -> SelectMenu` : Set a callable for menus associated with custom_ids. This callable _(async function)_ will be set to respond at selected menus interactions. _data_ parameter is a dict fill with any values to pass in _(async function)_ parameters
 > 
 > > **Method** `send(target: Union[Member, TextChannel]) -> Any` : Send the selectmenu in dm member or channels
 > 

{pycordviews-1.2.16 → pycordviews-1.2.19}/PycordViews.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PycordViews
-Version: 1.2.16
+Version: 1.2.19
 Summary: Views and multibot for py-cord library
 Home-page: https://github.com/BOXERRMD/Py-cord_Views
 Author: Chronos (alias BOXERRMD)
@@ -95,7 +95,7 @@ The SelectMenu instance is used to create drop-down menus that can be easily mod
 > 
 > > **Method** `add_mentionnable_select_menu(custom_id: str = None, placeholder: str = None, min_values: int = 1, max_values: int = 1, disabled=False, row=None) -> Menu` : Add a mentionable select menu in the ui. Return Menu instance to set options
 > 
-> > **Method** `set_callable(*custom_ids: str, _callable: Union[Callable, None]) -> SelectMenu` : Set a callable for menus associated with custom_ids. This callable _(async function)_ will be set to respond at selected menus interactions
+> > **Method** `set_callable(*custom_ids: str, _callable: Union[Callable, None], data: Optional[dict[str, Any]]) -> SelectMenu` : Set a callable for menus associated with custom_ids. This callable _(async function)_ will be set to respond at selected menus interactions. _data_ parameter is a dict fill with any values to pass in _(async function)_ parameters
 > 
 > > **Method** `send(target: Union[Member, TextChannel]) -> Any` : Send the selectmenu in dm member or channels
 > 

{pycordviews-1.2.16 → pycordviews-1.2.19}/README.md

@@ -61,7 +61,7 @@ The SelectMenu instance is used to create drop-down menus that can be easily mod
 > 
 > > **Method** `add_mentionnable_select_menu(custom_id: str = None, placeholder: str = None, min_values: int = 1, max_values: int = 1, disabled=False, row=None) -> Menu` : Add a mentionable select menu in the ui. Return Menu instance to set options
 > 
-> > **Method** `set_callable(*custom_ids: str, _callable: Union[Callable, None]) -> SelectMenu` : Set a callable for menus associated with custom_ids. This callable _(async function)_ will be set to respond at selected menus interactions
+> > **Method** `set_callable(*custom_ids: str, _callable: Union[Callable, None], data: Optional[dict[str, Any]]) -> SelectMenu` : Set a callable for menus associated with custom_ids. This callable _(async function)_ will be set to respond at selected menus interactions. _data_ parameter is a dict fill with any values to pass in _(async function)_ parameters
 > 
 > > **Method** `send(target: Union[Member, TextChannel]) -> Any` : Send the selectmenu in dm member or channels
 > 

{pycordviews-1.2.16 → pycordviews-1.2.19}/pycordViews/views/easy_modified_view.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from discord import Interaction, ApplicationContext, Message, Member
+from discord import Interaction, ApplicationContext, Message, Member, Role
 from discord.abc import GuildChannel
 from discord.ui import View, Item
 from typing import Union, Callable, TYPE_CHECKING, Optional, Any
@@ -68,11 +68,14 @@ class EasyModifiedViews(View):
 
             if type(ui).__name__ in ('SelectMenu', 'Pagination', 'Confirm', 'Poll', 'EasyModifiedViews'):
                 for item in ui.get_view.items:
+                    if type(ui).__name__ in ('SelectMenu', 'Pagination', 'Confirm', 'Poll', 'EasyModifiedViews'):
+                        self.add_items(item)
+                        continue
                     self.add_items(item)
                     self.set_callable(item.custom_id, _callable=ui.get_callable(item.custom_id), data=ui.get_callable_data(item.custom_id))
 
             else:
-                self.__callback[ui.custom_id] = {'ui': ui, 'func': None, 'data': {}}
+                self.__callback[ui.custom_id] = {'ui': ui, 'func': None, 'data': {}, 'autorised_roles': None, 'autorised_key': None}
                 self.add_item(ui)
 
         return self
@@ -96,7 +99,10 @@ class EasyModifiedViews(View):
         await self._update()
         return self
 
-    def set_callable_decorator(self, custom_id: str, data: Optional[dict[str, Any]] = None):
+    def set_callable_decorator(self, custom_id: str,
+                               data: Optional[dict[str, Any]] = None,
+                               autorised_roles : Optional[list[Union[int, Role]]] = None,
+                               autorised_key: Optional[Callable] = None):
         """
         Decorator to set up a callable for the item
 
@@ -114,20 +120,32 @@ class EasyModifiedViews(View):
 
         :param custom_id: item ID of the view
         :param data: Add any data to pass in called function.
+        :param autorised_roles: Any role ID allowed to interact with the view
+        :param autorised_key: Callable function to check anything. The function get the current interaction passed in parameter
         """
 
         def decorator(_callable: Callable):
-            self.set_callable(custom_id, _callable=_callable, data=data)
+            self.set_callable(custom_id,
+                              _callable=_callable,
+                              data=data,
+                              autorised_roles=autorised_roles,
+                              autorised_key=autorised_key)
             return _callable
 
         return decorator
 
-    def set_callable(self, *custom_ids: str, _callable: Callable, data: Optional[dict[str, Any]] = None):
+    def set_callable(self, *custom_ids: str,
+                     _callable: Callable,
+                     data: Optional[dict[str, Any]] = None,
+                     autorised_roles : Optional[list[Union[int, Role]]] = None,
+                     autorised_key: Optional[Callable] = None):
         """
         set up a callable for items
         :param custom_ids: items IDs of the view
         :param _callable: The asynchronous callable linked. Take UI (Button, Select...) and Interaction parameters.
         :param data: Add any data to pass in called function.
+        :param autorised_roles: Any role ID allowed to interact with the view
+        :param autorised_key: Callable function to check anything. The function get the current interaction passed in parameter
 
         **UI and Interaction parameter is required in callable function !**
 
@@ -146,6 +164,11 @@ class EasyModifiedViews(View):
 
             self.__callback[custom_id]['func'] = _callable
             self.__callback[custom_id]['data'] = data if data is not None else {}
+            self.__callback[custom_id]['autorised_key'] = autorised_key
+            if autorised_roles is not None:
+                self.__callback[custom_id]['autorised_roles'] = [role.id if isinstance(role, Role) else role for role in autorised_roles if isinstance(role, (Role, int))]
+            else:
+                self.__callback[custom_id]['autorised_roles'] = None
 
     def get_callable(self, custom_id: str) -> Union[Callable, None]:
         """
@@ -161,8 +184,19 @@ class EasyModifiedViews(View):
         """
         func = self.__callback[interaction.custom_id]['func']
         data = self.__callback[interaction.custom_id]['data']
+        autorised_roles = self.__callback[interaction.custom_id]['autorised_roles']
+        autorised_key = self.__callback[interaction.custom_id]['autorised_key']
 
         if func is not None:
+            if autorised_roles is not None: # si des rôles sont obligatoires
+                if not (set(autorised_roles) & set([i.id for i in interaction.user.roles])): # si aucun rôle de l'user est dans les rôles aubligatoires
+                    await interaction.response.defer(invisible=True)
+                    return False
+
+            if autorised_key is not None: # si une fonction est config pour la vérification
+                if not autorised_key(interaction): # Si la fonction renvoie False
+                    return False
+
             return await func(self.__callback[interaction.custom_id]['ui'], interaction, data)
 
         else:

{pycordviews-1.2.16 → pycordviews-1.2.19}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", encoding='utf-8') as file:
 
 setup(
     name="PycordViews",
-    version="1.2.16",
+    version="1.2.19",
     url="https://github.com/BOXERRMD/Py-cord_Views",
     author="Chronos (alias BOXERRMD)",
     author_email="vagabonwalybi@gmail.com",