Fix circular imports

Author: MCausc78

pyvolt/cdn.py

@@ -11,7 +11,6 @@
 
 from . import core, utils
 from .errors import APIError
-from .http import _STATUS_TO_ERRORS
 
 if t.TYPE_CHECKING:
     from .state import State
@@ -333,6 +332,9 @@ async def request(
                 description = error.get("description")
                 j["type"] = "Rocket error"
                 j["err"] = f"{code} {reason}: {description}"
+
+            from .http import _STATUS_TO_ERRORS
+
             raise _STATUS_TO_ERRORS.get(response.status, APIError)(response, j)
         return response
 

pyvolt/events.py

@@ -33,7 +33,14 @@
 )
 from .shard import Shard
 from .user_settings import UserSettings
-from .user import UserFlags, RelationshipStatus, Relationship, PartialUser, User, SelfUser
+from .user import (
+    UserFlags,
+    RelationshipStatus,
+    Relationship,
+    PartialUser,
+    User,
+    SelfUser,
+)
 from .webhook import Webhook, PartialWebhook
 
 
@@ -662,7 +669,9 @@ def process(self) -> bool:
             if relation:
                 me.relations[self.new_user.id].status = self.new_user.relationship
             else:
-                me.relations[self.new_user.id] = Relationship(id=self.new_user.id, status=self.new_user.relationship)
+                me.relations[self.new_user.id] = Relationship(
+                    id=self.new_user.id, status=self.new_user.relationship
+                )
 
         cache = self.shard.state.cache
         if not cache:

pyvolt/http.py

@@ -2514,26 +2514,24 @@ async def get_unreads(self) -> list[ReadState]:
             self.state.parser.parse_read_state(rs)
             for rs in await self.request(routes.SYNC_GET_UNREADS.compile())
         ]
-    
+
     @t.overload
     async def edit_user_settings(
         self,
         timestamp: datetime | int | None = ...,
         dict_settings: dict[str, str] = ...,
         /,
         **kw_settings: str,
-    ) -> None:
-        ...
-    
+    ) -> None: ...
+
     @t.overload
     async def edit_user_settings(
         self,
         dict_settings: dict[str, str] = ...,
         timestamp: datetime | int | None = ...,
         /,
         **kw_settings: str,
-    ) -> None:
-        ...
+    ) -> None: ...
 
     @t.overload
     async def edit_user_settings(
@@ -2542,8 +2540,7 @@ async def edit_user_settings(
         a2: dict[str, str] | datetime | int | None = ...,
         /,
         **kwargs: str,
-    ) -> None:
-        ...
+    ) -> None: ...
 
     async def edit_user_settings(
         self,

pyvolt/parser.py

@@ -1149,7 +1149,7 @@ def parse_read_state(self, d: raw.ChannelUnread) -> ReadState:
         )
 
     def parse_ready_event(self, shard: Shard, d: raw.ClientReadyEvent) -> ReadyEvent:
-        read_states = [self.parse_read_state(rs) for rs in d["unreads"]]
+        read_states = [self.parse_read_state(rs) for rs in d.get("unreads", [])]
 
         return ReadyEvent(
             shard=shard,
@@ -1161,9 +1161,9 @@ def parse_ready_event(self, shard: Shard, d: raw.ClientReadyEvent) -> ReadyEvent
             channels=[self.parse_channel(c) for c in d["channels"]],
             members=[self.parse_member(m) for m in d["members"]],
             emojis=[self.parse_server_emoji(e) for e in d["emojis"]],
-            me=self.parse_self_user(d["me"]),
-            settings=self.parse_user_settings(d["settings"]),
-            read_states=[self.parse_read_state(rs) for rs in d["unreads"]],
+            me=self.parse_self_user(d.get("me", d["users"][-1])),
+            settings=self.parse_user_settings(d.get("settings", {})),
+            read_states=read_states,
         )
 
     def parse_relationship(self, d: raw.Relationship) -> Relationship:

pyvolt/server.py

@@ -5,19 +5,18 @@
 from enum import IntFlag, StrEnum
 import typing as t
 
-from .base import Base
-from .errors import NoData
-from .permissions import Permissions, PermissionOverride
-from .safety_reports import ContentReportReason
-from .state import State
-from .user import DisplayUser, User
-
 from . import (
     cache as caching,
     cdn,
     core,
     utils,
 )
+from .base import Base
+from .errors import NoData
+from .permissions import Permissions, PermissionOverride
+from .safety_reports import ContentReportReason
+from .state import State
+from .user import DisplayUser, User
 
 if t.TYPE_CHECKING:
     from .channel import ChannelType, ServerTextChannel, VoiceChannel, ServerChannel

pyvolt/user_settings.py

@@ -52,8 +52,7 @@ async def edit(
         .. note::
             This can only be used by non-bot accounts.
         """
-        return await self.state.http.edit_user_settings(
-            a1, a2, **kwargs
-        )
+        return await self.state.http.edit_user_settings(a1, a2, **kwargs)
+
 
 __all__ = ("UserSettings",)