fix: properly typehint Storage.get/pop (#910)

* fix: properly typehint Storage.get

* fix: fix Storage.pop's typehints

Author: AstreaTSS

interactions/api/cache.py

@@ -1,5 +1,16 @@
 from collections import defaultdict
-from typing import TYPE_CHECKING, Dict, Generic, List, Optional, Tuple, Type, TypeVar, Union
+from typing import (
+    TYPE_CHECKING,
+    Dict,
+    Generic,
+    List,
+    Optional,
+    Tuple,
+    Type,
+    TypeVar,
+    Union,
+    overload,
+)
 
 if TYPE_CHECKING:
     from .models import Snowflake
@@ -41,7 +52,15 @@ def add(self, item: _T, id: Optional["Key"] = None) -> None:
         """
         self.values[id or item.id] = item
 
-    def get(self, id: "Key", default: Optional[_P] = None) -> Union[_T, _P]:
+    @overload
+    def get(self, id: "Key") -> Optional[_T]:
+        ...
+
+    @overload
+    def get(self, id: "Key", default: _P) -> Union[_T, _P]:
+        ...
+
+    def get(self, id: "Key", default: Optional[_P] = None) -> Union[_T, _P, None]:
         """
         Gets an item from the storage.
 
@@ -63,7 +82,15 @@ def update(self, data: Dict["Key", _T]):
         """
         self.values.update(data)
 
-    def pop(self, key: "Key", default: Optional[_P] = None) -> Union[_T, _P]:
+    @overload
+    def pop(self, key: "Key") -> Optional[_T]:
+        ...
+
+    @overload
+    def pop(self, key: "Key", default: _P) -> Union[_T, _P]:
+        ...
+
+    def pop(self, key: "Key", default: Optional[_P] = None) -> Union[_T, _P, None]:
         try:
             return self.values.pop(key)
         except KeyError: