Refactor & cleanup return types

osu/objects/beatmap.py

@@ -20,7 +20,7 @@ class BeatmapInfo:
     checksum: str
 
     @classmethod
-    def decode(cls, stream: StreamIn):
+    def decode(cls, stream: StreamIn) -> "BeatmapInfo":
         return BeatmapInfo(
             stream.s16(),
             stream.s32(),
@@ -53,7 +53,7 @@ class OnlineBeatmap:
     difficulties: List[Tuple[str, Mode]]
 
     @classmethod
-    def parse(cls, string: str):
+    def parse(cls, string: str) -> "OnlineBeatmap":
         args = string.split("|")
         return OnlineBeatmap(
             args[0],

osu/objects/channel.py

@@ -26,7 +26,7 @@ def __hash__(self) -> int:
     def __eq__(self, other: object) -> bool:
         return self.name == other.name
 
-    def join(self):
+    def join(self) -> None:
         """Join this channel"""
         if self.joined:
             return
@@ -39,7 +39,7 @@ def join(self):
 
         self.game.bancho.enqueue(ClientPackets.CHANNEL_JOIN, stream.get())
 
-    def leave(self):
+    def leave(self) -> None:
         """Leave this channel"""
         if not self.joined:
             return
@@ -52,7 +52,7 @@ def leave(self):
 
         self.game.bancho.enqueue(ClientPackets.CHANNEL_PART, stream.get())
 
-    def join_success(self):
+    def join_success(self) -> None:
         """Will be called by the server, when you successfully joined a channel"""
         if not self.joined:
             self.logger.info(f"Joined {self.name}!")
@@ -64,7 +64,7 @@ def join_success(self):
             # Load players
             self.game.bancho.players.load()
 
-    def send_message(self, message: str, force=False):
+    def send_message(self, message: str, force=False) -> None:
         """Send a message inside this channel
 
         Args:

osu/objects/collections.py

@@ -49,7 +49,7 @@ def by_name(self, name: str) -> Optional[Player]:
                 return p
         return None
 
-    def load(self):
+    def load(self) -> None:
         # Split players into chunks of 255
         player_chunks = [
             self.pending[i : i + 255] for i in range(0, len(self.pending), 255)

osu/objects/comment.py

@@ -10,6 +10,6 @@ class Comment:
     text: str
 
     @classmethod
-    def from_string(cls, string: str):
+    def from_string(cls, string: str) -> "Comment":
         line = string.split("\t")
         return Comment(int(line[0]), CommentTarget(line[1]), line[2], line[3])

osu/objects/player.py

@@ -1,4 +1,4 @@
-from typing import Set, List, Optional
+from typing import Set, Optional
 
 from .status import Status
 from ..game import Game
@@ -61,6 +61,10 @@ def mode(self, value: Mode):
     def loaded(self) -> bool:
         return bool(self.name)
 
+    @property
+    def country(self) -> str:
+        return list(CountryCodes.keys())[self.country_code]
+
     @property
     def level(self) -> int:
         if self.tscore <= 0:
@@ -75,23 +79,19 @@ def level(self) -> int:
 
         return 1
 
-    @property
-    def country(self) -> str:
-        return list(CountryCodes.keys())[self.country_code]
-
-    def request_presence(self):
+    def request_presence(self) -> None:
         """Request a presence update for this player"""
         self.game.bancho.request_presence([self.id])
 
-    def request_stats(self):
+    def request_stats(self) -> None:
         """Request a stats update for this player"""
         self.game.bancho.request_stats([self.id])
 
     def avatar(self) -> Optional[bytes]:
         """Get the avatar for this player"""
         return self.game.api.get_avatar(self.id)
 
-    def send_message(self, message: str):
+    def send_message(self, message: str) -> None:
         """Send a PM to this player"""
         if not (player := self.game.bancho.player):
             return
@@ -113,7 +113,7 @@ def send_message(self, message: str):
 
         self.game.bancho.enqueue(ClientPackets.SEND_PRIVATE_MESSAGE, stream.get())
 
-    def add_friend(self):
+    def add_friend(self) -> None:
         """Add this player to the friends list"""
         if self.id in self.game.bancho.friends:
             self.game.logger.warning(
@@ -128,7 +128,7 @@ def add_friend(self):
             ClientPackets.FRIEND_ADD, int(self.id).to_bytes(4, "little")
         )
 
-    def remove_friend(self):
+    def remove_friend(self) -> None:
         """Remove this player from the friends list"""
         if self.id not in self.game.bancho.friends:
             self.game.logger.warning(

osu/objects/replays.py

@@ -21,7 +21,7 @@ def encode(self) -> bytes:
         return stream.get()
 
     @classmethod
-    def decode(cls, stream: StreamIn):
+    def decode(cls, stream: StreamIn) -> "ReplayFrame":
         button_state = ButtonState(stream.u8())
 
         # This byte is now unused and was replaced by the ButtonState flag
@@ -84,7 +84,7 @@ def encode(self) -> bytes:
         return stream.get()
 
     @classmethod
-    def decode(cls, stream: StreamIn):
+    def decode(cls, stream: StreamIn) -> "ScoreFrame":
         return ScoreFrame(
             stream.s32(),
             stream.u8(),

osu/objects/score.py

@@ -27,7 +27,7 @@ class Score:
     has_replay: bool
 
     @classmethod
-    def from_string(cls, string: str, mode: Mode):
+    def from_string(cls, string: str, mode: Mode) -> "Score":
         lines = string.split("|")
 
         return Score(
@@ -70,7 +70,7 @@ class ScoreResponse:
     scores: List[Score]
 
     @classmethod
-    def from_string(cls, string: str, mode: Mode):
+    def from_string(cls, string: str, mode: Mode) -> "ScoreResponse":
         result = string.split("\n")
 
         if len(result) <= 0: