Fixing some ruff check issues

src/spellbot/models/user.py

@@ -126,12 +126,10 @@ def waiting(self, channel_xid: int) -> bool:
             return False
         if game.status != GameStatus.PENDING.value:
             return False
-        if game.deleted_at is not None:
-            return False
         # Not required because self.game() already filters by posts + channel.
         # if not any(post.channel_xid == channel_xid for post in game.posts):
         #     return False
-        return True
+        return game.deleted_at is None
 
     def confirmed(self, channel_xid: int) -> bool:
         from spellbot.database import DatabaseSession

src/spellbot/services/games.py

@@ -495,9 +495,7 @@ def blocked(self, author_xid: int) -> bool:
         player_xids = self.game.player_xids
         if any(xid in player_xids for xid in users_author_has_blocked):
             return True
-        if any(xid in player_xids for xid in users_who_blocked_author):
-            return True
-        return False
+        return any(xid in player_xids for xid in users_who_blocked_author)
 
     @sync_to_async()
     @tracer.wrap()

src/spellbot/utils.py

@@ -85,9 +85,7 @@ def bot_can_role(guild: discord.Guild, role: discord.Role | None = None) -> bool
     req = "manage_roles"
     if not hasattr(perms, req) or not getattr(perms, req):
         return False
-    if role is not None and role > guild.me.top_role:
-        return False
-    return True
+    return not (role is not None and role > guild.me.top_role)
 
 
 def bot_can_read(channel: MessageableChannel) -> bool:
@@ -112,9 +110,7 @@ def bot_can_manage_channels(guild: discord.Guild) -> bool:
         return False
     perms = guild.me.guild_permissions
     req = "manage_channels"
-    if not hasattr(perms, req) or not getattr(perms, req):
-        return False
-    return True
+    return hasattr(perms, req) and getattr(perms, req)
 
 
 def bot_can_delete_message(message: discord.Message | discord.PartialMessage) -> bool:
@@ -125,9 +121,7 @@ def bot_can_delete_message(message: discord.Message | discord.PartialMessage) ->
         return False
     perms = guild.me.guild_permissions
     req = "manage_messages"
-    if hasattr(perms, req) and getattr(perms, req):
-        return True
-    return False
+    return hasattr(perms, req) and getattr(perms, req)
 
 
 def bot_can_delete_channel(channel: MessageableChannel) -> bool:
@@ -156,9 +150,7 @@ def bot_can_read_messages(guild: discord.Guild) -> bool:
         return False
     perms = guild.me.guild_permissions
     req = "read_messages"
-    if not hasattr(perms, req) or not getattr(perms, req):
-        return False
-    return True
+    return hasattr(perms, req) and getattr(perms, req)
 
 
 def is_admin(interaction: discord.Interaction) -> bool:

tests/test_codebase.py

@@ -23,9 +23,9 @@ class TestCodebase:
     def test_annotations(self) -> None:
         """Checks that all python modules import annotations from future."""
         chdir(REPO_ROOT)
-        output = getoutput(
+        output = getoutput(  # noqa: S605
             (
-                r"find . -type d \( "  # noqa: S607, S605
+                r"/usr/bin/find . -type d \( "
                 r"    -path ./env -o "
                 r"    -path ./venv -o "
                 r"    -path ./.venv -o "