Merge branch 'master' into fix-interaction-channel-perms

Signed-off-by: Paillat <[email protected]>

Author: Paillat-dev

CHANGELOG.md

@@ -62,9 +62,11 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2624](https://github.com/Pycord-Development/pycord/pull/2624))
 - Fixed `AttributeError` when accessing `Member.guild_permissions` for user installed
   apps. ([#2650](https://github.com/Pycord-Development/pycord/pull/2650))
+- Fixed type annotations of cached properties.
+  ([#2635](https://github.com/Pycord-Development/pycord/issues/2635))
 - Fixed malformed properties in `Interaction.channel`.
   ([#2658](https://github.com/Pycord-Development/pycord/pull/2658))
-
+ 
 ### Changed
 
 - Renamed `cover` property of `ScheduledEvent` and `cover` argument of

discord/client.py

@@ -310,7 +310,8 @@ def _handle_ready(self) -> None:
 
     @property
     def latency(self) -> float:
-        """Measures latency between a HEARTBEAT and a HEARTBEAT_ACK in seconds.
+        """Measures latency between a HEARTBEAT and a HEARTBEAT_ACK in seconds. If no websocket
+        is present, this returns ``nan``, and if no heartbeat has been received yet, this returns ``float('inf')``.
 
         This could be referred to as the Discord WebSocket protocol latency.
         """

discord/gateway.py

@@ -581,7 +581,9 @@ async def received_message(self, msg, /):
 
     @property
     def latency(self) -> float:
-        """Measures latency between a HEARTBEAT and a HEARTBEAT_ACK in seconds."""
+        """Measures latency between a HEARTBEAT and a HEARTBEAT_ACK in seconds. If no heartbeat
+        has been received yet this returns ``float('inf')``.
+        """
         heartbeat = self._keep_alive
         return float("inf") if heartbeat is None else heartbeat.latency
 

discord/shard.py

@@ -294,7 +294,9 @@ async def connect(self) -> None:
 
     @property
     def latency(self) -> float:
-        """Measures latency between a HEARTBEAT and a HEARTBEAT_ACK in seconds for this shard."""
+        """Measures latency between a HEARTBEAT and a HEARTBEAT_ACK in seconds for this shard. If no heartbeat
+        has been received yet this returns ``float('inf')``.
+        """
         return self._parent.ws.latency
 
     def is_ws_ratelimited(self) -> bool:

discord/utils.py

@@ -56,7 +56,6 @@
     Iterator,
     Literal,
     Mapping,
-    NewType,
     Protocol,
     Sequence,
     TypeVar,
@@ -151,7 +150,7 @@ def __get__(self, instance, owner):
     class _RequestLike(Protocol):
         headers: Mapping[str, Any]
 
-    cached_property = NewType("cached_property", property)
+    cached_property = property
 
     P = ParamSpec("P")