Implement some suggestions

hikari-py · Jan 21, 2024 · a50991b · a50991b
1 parent 844d757
commit a50991b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/hikari/events/monetization_events.py b/hikari/events/monetization_events.py
@@ -52,7 +52,7 @@ class EntitlementEvent(shard_events.ShardEvent):
     # <<inherited docstring from Event>>.
 
     shard: gateway_shard.GatewayShard = attrs.field(metadata={attrs_extensions.SKIP_DEEP_COPY: True})
-    """Shard that received this event."""
+    # <<inherited docstring from ShardEvent>>.
 
     entitlement: monetization.Entitlement = attrs.field()
     """The entitlement that changed."""

diff --git a/hikari/impl/entity_factory.py b/hikari/impl/entity_factory.py
@@ -2552,6 +2552,9 @@ def deserialize_command_interaction(
             target_id = snowflakes.Snowflake(raw_target_id)
 
         app_perms = payload.get("app_permissions")
+
+        entitlements = [self.deserialize_entitlement(entitlement) for entitlement in payload.get("entitlements", [])]
+
         return command_interactions.CommandInteraction(
             app=self._app,
             application_id=snowflakes.Snowflake(payload["application_id"]),
@@ -2572,7 +2575,7 @@ def deserialize_command_interaction(
             resolved=resolved,
             target_id=target_id,
             app_permissions=permission_models.Permissions(app_perms) if app_perms else None,
-            entitlements=[self.deserialize_entitlement(entitlement) for entitlement in payload.get("entitlements", [])],
+            entitlements=entitlements,
         )
 
     def deserialize_autocomplete_interaction(
@@ -3715,6 +3718,8 @@ def deserialize_webhook(self, payload: data_binding.JSONObject) -> webhook_model
     ##################
 
     def deserialize_entitlement(self, payload: data_binding.JSONObject) -> monetization_models.Entitlement:
+        starts_at = time.iso8601_datetime_string_to_datetime(payload["starts_at"]) if "starts_at" in payload else None
+
         return monetization_models.Entitlement(
             id=snowflakes.Snowflake(payload["id"]),
             type=monetization_models.EntitlementType(payload["type"]),
@@ -3723,9 +3728,7 @@ def deserialize_entitlement(self, payload: data_binding.JSONObject) -> monetizat
             guild_id=snowflakes.Snowflake(payload["guild_id"]),
             user_id=snowflakes.Snowflake(payload["user_id"]),
             is_deleted=payload["deleted"],
-            starts_at=time.iso8601_datetime_string_to_datetime(payload["starts_at"])
-            if "starts_at" in payload
-            else None,
+            starts_at=starts_at,
             ends_at=time.iso8601_datetime_string_to_datetime(payload["ends_at"]) if "ends_at" in payload else None,
             subscription_id=snowflakes.Snowflake(payload["subscription_id"]) if "subscription_id" in payload else None,
         )

diff --git a/hikari/impl/event_factory.py b/hikari/impl/event_factory.py
@@ -24,8 +24,6 @@
 
 from __future__ import annotations
 
-from hikari.api.shard import GatewayShard
-
 __all__: typing.Sequence[str] = ("EventFactoryImpl",)
 
 import datetime
@@ -937,21 +935,21 @@ def deserialize_voice_server_update_event(
     ################
 
     def deserialize_entitlement_create_event(
-        self, shard: GatewayShard, payload: data_binding.JSONObject
+        self, shard: gateway_shard.GatewayShard, payload: data_binding.JSONObject
     ) -> monetization_events.EntitlementCreateEvent:
         return monetization_events.EntitlementCreateEvent(
             app=self._app, shard=shard, entitlement=self._app.entity_factory.deserialize_entitlement(payload)
         )
 
     def deserialize_entitlement_update_event(
-        self, shard: GatewayShard, payload: data_binding.JSONObject
+        self, shard: gateway_shard.GatewayShard, payload: data_binding.JSONObject
     ) -> monetization_events.EntitlementUpdateEvent:
         return monetization_events.EntitlementUpdateEvent(
             app=self._app, shard=shard, entitlement=self._app.entity_factory.deserialize_entitlement(payload)
         )
 
     def deserialize_entitlement_delete_event(
-        self, shard: GatewayShard, payload: data_binding.JSONObject
+        self, shard: gateway_shard.GatewayShard, payload: data_binding.JSONObject
     ) -> monetization_events.EntitlementDeleteEvent:
         return monetization_events.EntitlementDeleteEvent(
             app=self._app, shard=shard, entitlement=self._app.entity_factory.deserialize_entitlement(payload)

diff --git a/hikari/interactions/base_interactions.py b/hikari/interactions/base_interactions.py
@@ -150,7 +150,6 @@ class ResponseType(int, enums.Enum):
     * `InteractionType.APPLICATION_COMMAND`
     * `InteractionType.MESSAGE_COMPONENT`
     * `InteractionType.MODAL_SUBMIT`
-
     """
-Original file line number
+Diff line change
@@ Expand Up / @@ -150,7 +150,6 @@ class ResponseType(int, enums.Enum): @@
         * `InteractionType.APPLICATION_COMMAND`
         * `InteractionType.MESSAGE_COMPONENT`
         * `InteractionType.MODAL_SUBMIT`
         """
@@ Expand Down @@