paillait comment

Lumabots · Lumabots · commit 4742b6512f20 · 2026-05-23T12:31:42.000+03:00
diff --git a/discord/guild.py b/discord/guild.py
@@ -4330,7 +4330,7 @@ async def create_scheduled_event(
         entity_type: ScheduledEventEntityType = MISSING,
         entity_metadata: ScheduledEventEntityMetadata | None = MISSING,
         channel_id: int = MISSING,
-        privacy_level: ScheduledEventPrivacyLevel = MISSING,
+        privacy_level: ScheduledEventPrivacyLevel = ScheduledEventPrivacyLevel.guild_only,
         reason: str | None = None,
         image: bytes = MISSING,
         start_time: datetime.datetime = MISSING,
@@ -4382,26 +4382,19 @@ async def create_scheduled_event(
         ValidationError
             Invalid parameters for the event type.
         """
-        if privacy_level is not MISSING:
-            warn_deprecated(
-                "privacy_level",
-                None,
-                "3.0",
-                extra="It is ignored by the API and will be removed in a future version.",
-            )
         if location is MISSING and entity_type is MISSING:
             raise TypeError("Either location or entity_type must be provided.")
         if start_time is MISSING and scheduled_start_time is MISSING:
             raise TypeError(
                 "Either start_time or scheduled_start_time must be provided."
             )
         if start_time is not MISSING:
-            warn_deprecated("start_time", "scheduled_start_time", "2.7")
+            warn_deprecated("start_time", "scheduled_start_time", "2.7", "3.0")
             if scheduled_start_time is MISSING:
                 scheduled_start_time = start_time
 
         if end_time is not MISSING:
-            warn_deprecated("end_time", "scheduled_end_time", "2.7")
+            warn_deprecated("end_time", "scheduled_end_time", "2.7", "3.0")
             if scheduled_end_time is MISSING:
                 scheduled_end_time = end_time
 
@@ -4422,10 +4415,12 @@ async def create_scheduled_event(
                 "entity_type could not be resolved. Pass entity_type explicitly "
                 "or provide a location with a resolvable type."
             )
+        
         payload: dict[str, str | int] = {
             "name": name,
             "scheduled_start_time": scheduled_start_time.isoformat(),
             "entity_type": int(entity_type),
+            "privacy_level": int(privacy_level),
         }
 
         if scheduled_end_time is not MISSING:
diff --git a/discord/scheduled_events.py b/discord/scheduled_events.py
@@ -56,10 +56,7 @@
     from .member import Member
     from .state import ConnectionState
     from .types.scheduled_events import ScheduledEvent as ScheduledEventPayload
-else:
-    ConnectionState = None
-    StageChannel = None
-    VoiceChannel = None
+
 
 MISSING = utils.MISSING
 
@@ -100,10 +97,12 @@ def __init__(
         *,
         state: ConnectionState | None = None,
         value: str | int | StageChannel | VoiceChannel | None = None,
+        _suppress_deprecation: bool = False,
     ) -> None:
-        warn_deprecated("ScheduledEventLocation", "ScheduledEventEntityMetadata", "2.7")
+        if not _suppress_deprecation:
+            warn_deprecated("ScheduledEventLocation", "ScheduledEventEntityMetadata", "2.7")
         self._state: ConnectionState | None = state
-        self.value: str | StageChannel | VoiceChannel | Object | None
+        self.value: str | "StageChannel" | "VoiceChannel" | Object | None
         if value is None:
             self.value = None
         elif isinstance(value, int):
@@ -161,12 +160,12 @@ def __repr__(self) -> str:
     def __str__(self) -> str:
         return self.location or ""
 
-    def to_payload(self) -> dict[str, str]:
+    def to_payload(self) -> dict[str, str | None]:
         """Converts the entity metadata to a Discord API payload.
 
         Returns
         -------
-        dict[str, str]
+        dict[str, str | None]
             A dictionary with the entity metadata fields for the API.
         """
         return {"location": self.location}
@@ -322,9 +321,9 @@ def location(self) -> ScheduledEventLocation | None:
             if self.entity_metadata is None:
                 return None
             return ScheduledEventLocation(
-                state=self._state, value=self.entity_metadata.location
+                state=self._state, value=self.entity_metadata.location, _suppress_deprecation=True
             )
-        return ScheduledEventLocation(state=self._state, value=self.channel_id)
+        return ScheduledEventLocation(state=self._state, value=self.channel_id, _suppress_deprecation=True)
 
     @property
     def created_at(self) -> datetime.datetime:
@@ -422,6 +421,8 @@ async def edit(
         privacy_level: ScheduledEventPrivacyLevel = MISSING,
         entity_type: ScheduledEventEntityType = MISSING,
         entity_metadata: ScheduledEventEntityMetadata | None = MISSING,
+        start_time: datetime.datetime = MISSING,
+        end_time: datetime.datetime = MISSING,
     ) -> ScheduledEvent | None:
         """|coro|
 
@@ -519,6 +520,16 @@ async def edit(
             if image is MISSING:
                 image = cover
 
+        if start_time is not MISSING:
+            warn_deprecated("start_time", "scheduled_start_time", "2.7", "3.0")
+            if scheduled_start_time is MISSING:
+                scheduled_start_time = start_time
+
+        if end_time is not MISSING:
+            warn_deprecated("end_time", "scheduled_end_time", "2.7", "3.0")
+            if scheduled_end_time is MISSING:
+                scheduled_end_time = end_time
+
         if entity_type is not MISSING:
             payload["entity_type"] = int(entity_type)
 
@@ -563,12 +574,13 @@ async def edit(
 
             payload["channel_id"] = None
 
-        data = await self._state.http.edit_scheduled_event(
-            self.guild.id, self.id, **payload, reason=reason
-        )
-        return ScheduledEvent(
-            data=data, guild=self.guild, creator=self.creator, state=self._state
-        )
+        if payload != {}:
+            data = await self._state.http.edit_scheduled_event(
+                self.guild.id, self.id, **payload, reason=reason
+            )
+            return ScheduledEvent(
+                data=data, guild=self.guild, creator=self.creator, state=self._state
+            )
 
     async def delete(self) -> None:
         """|coro|
diff --git a/discord/ui/checkbox.py b/discord/ui/checkbox.py
@@ -29,6 +29,7 @@
 
 from ..components import Checkbox as CheckboxComponent
 from ..enums import ComponentType
+from .core import ComponentLimits
 from .item import ModalItem
 
 __all__ = ("Checkbox",)
@@ -105,8 +106,10 @@ def custom_id(self) -> str:
     def custom_id(self, value: str):
         if not isinstance(value, str):
             raise TypeError(f"custom_id must be str not {value.__class__.__name__}")
-        if len(value) > 100:
-            raise ValueError("custom_id must be 100 characters or fewer")
+        if len(value) > ComponentLimits.CUSTOM_ID_MAX:
+            raise ValueError(
+                f"custom_id must be {ComponentLimits.CUSTOM_ID_MAX} characters or fewer"
+            )
         self.underlying.custom_id = value
 
     @property
diff --git a/discord/ui/core.py b/discord/ui/core.py
@@ -34,6 +34,77 @@
 
 __all__ = ("ItemInterface",)
 
+class ComponentLimits:
+    # View constraints
+    VIEW_CHILDREN_MAX = 40
+
+    # ActionRow constraints
+    ACTION_ROW_CHILDREN_MAX = 5
+
+    # Button constraints
+    BUTTON_LABEL_MAX = 80
+
+    # MediaGallery constraints
+    MEDIA_GALLERY_ITEMS_MIN = 1
+    MEDIA_GALLERY_ITEMS_MAX = 10
+
+    # MediaGalleryItem constraints
+    MEDIA_GALLERY_ITEM_DESCRIPTION_MAX = 256
+
+    # Select constraints
+    SELECT_PLACEHOLDER_MAX = 150
+    SELECT_OPTIONS_MAX = 25
+    SELECT_DEFAULT_VALUES_MAX = 25
+
+    # Select option constraints
+    SELECT_OPTION_LABEL_MAX = 100
+    SELECT_OPTION_VALUE_MAX = 100
+    SELECT_OPTION_DESCRIPTION_MAX = 100
+
+    # Section constraints
+    SECTION_ACCESSORY_MAX = 1
+    SECTION_CHILDREN_MIN = 1
+    SECTION_CHILDREN_MAX = 3
+
+    # TextInput constraints
+    TEXT_INPUT_MAX_COUNT = 5
+    TEXT_INPUT_LABEL_MAX = 45
+    TEXT_INPUT_PLACEHOLDER_MAX = 100
+    TEXT_INPUT_MIN_LENGTH_MIN = 0
+    TEXT_INPUT_MIN_LENGTH_MAX = 4000
+    TEXT_INPUT_MAX_LENGTH_MIN = 1
+    TEXT_INPUT_MAX_LENGTH_MAX = 4000
+    TEXT_INPUT_VALUE_MAX = 4000
+
+    # TextDisplay constraints
+    TEXT_DISPLAY_CONTENT_MAX = 4000
+
+    # Thumbnail constraints
+    THUMBNAIL_DESCRIPTION_MAX = 256
+
+    # Custom ID constraints
+    CUSTOM_ID_MIN = 1
+    CUSTOM_ID_MAX = 100
+
+    # RadioGroup constraints
+    RADIO_OPTIONS_MAX = 10
+
+    # CheckboxGroup constraints
+    CHECKBOX_OPTIONS_MAX = 10
+    CHECKBOX_MIN_VALUES_MIN = 0
+    CHECKBOX_MIN_VALUES_MAX = 10
+    CHECKBOX_MAX_VALUES_MIN = 1
+    CHECKBOX_MAX_VALUES_MAX = 10
+
+    # FileUpload constraints
+    FILE_UPLOAD_MIN_FILES = 0
+    FILE_UPLOAD_MAX_FILES_MIN = 1
+    FILE_UPLOAD_MAX_FILES_MAX = 10
+
+    # Modal constraints
+    MODAL_TITLE_MAX = 45
+    MODAL_ROWS_MAX = 5
+
 
 if TYPE_CHECKING:
     from typing_extensions import Self
diff --git a/discord/ui/select.py b/discord/ui/select.py
@@ -45,6 +45,7 @@
 from ..threads import Thread
 from ..user import User
 from ..utils import MISSING
+from .core import ComponentLimits
 from .item import ItemCallbackType, ModalItem, ViewItem
 
 __all__ = (
@@ -265,12 +266,24 @@ def __init__(
         super().__init__()
         self._selected_values: list[str] = []
         self._interaction: Interaction | None = None
-        if min_values < 0 or min_values > 25:
-            raise ValueError("min_values must be between 0 and 25")
-        if max_values < 1 or max_values > 25:
-            raise ValueError("max_values must be between 1 and 25")
-        if placeholder and len(placeholder) > 150:
-            raise ValueError("placeholder must be 150 characters or fewer")
+        if (
+            min_values < ComponentLimits.SELECT_MIN_VALUE_MIN
+            or min_values > ComponentLimits.SELECT_MIN_VALUE_MAX
+        ):
+            raise ValueError(
+                f"min_values must be between {ComponentLimits.SELECT_MIN_VALUE_MIN} and {ComponentLimits.SELECT_MIN_VALUE_MAX}"
+            )
+        if (
+            max_values < ComponentLimits.SELECT_MAX_VALUE_MIN
+            or max_values > ComponentLimits.SELECT_MAX_VALUE_MAX
+        ):
+            raise ValueError(
+                f"max_values must be between {ComponentLimits.SELECT_MAX_VALUE_MIN} and {ComponentLimits.SELECT_MAX_VALUE_MAX}"
+            )
+        if placeholder and len(placeholder) > ComponentLimits.SELECT_PLACEHOLDER_MAX:
+            raise ValueError(
+                f"placeholder must be {ComponentLimits.SELECT_PLACEHOLDER_MAX} characters or fewer"
+            )
         if not isinstance(custom_id, str) and custom_id is not None:
             raise TypeError(
                 f"expected custom_id to be str, not {custom_id.__class__.__name__}"
@@ -377,8 +390,10 @@ def custom_id(self) -> str:
     def custom_id(self, value: str):
         if not isinstance(value, str):
             raise TypeError("custom_id must be None or str")
-        if len(value) > 100:
-            raise ValueError("custom_id must be 100 characters or fewer")
+        if len(value) > ComponentLimits.CUSTOM_ID_MAX:
+            raise ValueError(
+                f"custom_id must be {ComponentLimits.CUSTOM_ID_MAX} characters or fewer"
+            )
         self.underlying.custom_id = value
         self._provided_custom_id = value is not None
 
@@ -391,8 +406,10 @@ def placeholder(self) -> str | None:
     def placeholder(self, value: str | None):
         if value is not None and not isinstance(value, str):
             raise TypeError("placeholder must be None or str")
-        if value and len(value) > 150:
-            raise ValueError("placeholder must be 150 characters or fewer")
+        if value and len(value) > ComponentLimits.SELECT_PLACEHOLDER_MAX:
+            raise ValueError(
+                f"placeholder must be {ComponentLimits.SELECT_PLACEHOLDER_MAX} characters or fewer"
+            )
 
         self.underlying.placeholder = value
 
@@ -403,8 +420,13 @@ def min_values(self) -> int:
 
     @min_values.setter
     def min_values(self, value: int):
-        if value < 0 or value > 25:
-            raise ValueError("min_values must be between 0 and 25")
+        if (
+            value < ComponentLimits.SELECT_MIN_VALUE_MIN
+            or value > ComponentLimits.SELECT_MIN_VALUE_MAX
+        ):
+            raise ValueError(
+                f"min_values must be between {ComponentLimits.SELECT_MIN_VALUE_MIN} and {ComponentLimits.SELECT_MIN_VALUE_MAX}"
+            )
         self.underlying.min_values = int(value)
 
     @property
@@ -414,8 +436,13 @@ def max_values(self) -> int:
 
     @max_values.setter
     def max_values(self, value: int):
-        if value < 1 or value > 25:
-            raise ValueError("max_values must be between 1 and 25")
+        if (
+            value < ComponentLimits.SELECT_MAX_VALUE_MIN
+            or value > ComponentLimits.SELECT_MAX_VALUE_MAX
+        ):
+            raise ValueError(
+                f"max_values must be between {ComponentLimits.SELECT_MAX_VALUE_MIN} and {ComponentLimits.SELECT_MAX_VALUE_MAX}"
+            )
         self.underlying.max_values = int(value)
 
     @property
@@ -575,8 +602,10 @@ def append_default_value(
         if self.type is ComponentType.string_select:
             raise TypeError("string_select selects do not allow default_values")
 
-        if len(self.default_values) >= 25:
-            raise ValueError("maximum number of default values exceeded (25)")
+        if len(self.default_values) >= ComponentLimits.SELECT_DEFAULT_VALUES_MAX:
+            raise ValueError(
+                f"maximum number of default values exceeded ({ComponentLimits.SELECT_DEFAULT_VALUES_MAX})"
+            )
 
         if not isinstance(value, SelectDefaultValue):
             value = SelectDefaultValue._handle_model(value)
@@ -654,7 +683,7 @@ def append_option(self, option: SelectOption) -> Self:
         if self.underlying.type is not ComponentType.string_select:
             raise Exception("options can only be set on string selects")
 
-        if len(self.underlying.options) > 25:
+        if len(self.underlying.options) > ComponentLimits.SELECT_OPTIONS_MAX:
             raise ValueError("maximum number of options already provided")
 
         self.underlying.options.append(option)
