From b1b8b67fe3585f9cde7a2c66f7ea52bb94db9974 Mon Sep 17 00:00:00 2001
From: Jennifer Taylor <dragonminded@dragonminded.com>
Date: Mon, 31 May 2021 18:14:51 +0000
Subject: [PATCH] Fix a few more optional type errors.

---
 bemani/data/mysql/machine.py | 5 ++++-
 bemani/data/mysql/music.py   | 3 +--
 bemani/protocol/binary.py    | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/bemani/data/mysql/machine.py b/bemani/data/mysql/machine.py
index 71504d1..43a7382 100644
--- a/bemani/data/mysql/machine.py
+++ b/bemani/data/mysql/machine.py
@@ -313,7 +313,10 @@ class MachineData(BaseData):
         for owner in owners:
             sql = "INSERT INTO arcade_owner (userid, arcadeid) VALUES(:userid, :arcadeid)"
             self.execute(sql, {'userid': owner, 'arcadeid': arcadeid})
-        return self.get_arcade(arcadeid)
+        new_arcade = self.get_arcade(arcadeid)
+        if new_arcade is None:
+            raise Exception("Failed to create an arcade!")
+        return new_arcade
 
     def get_arcade(self, arcadeid: ArcadeID) -> Optional[Arcade]:
         """
diff --git a/bemani/data/mysql/music.py b/bemani/data/mysql/music.py
index c71697c..83848d9 100644
--- a/bemani/data/mysql/music.py
+++ b/bemani/data/mysql/music.py
@@ -447,12 +447,11 @@ class MusicData(BaseData):
             "SELECT music.songid AS songid, COUNT(score_history.timestamp) AS plays FROM score_history, music " +
             "WHERE score_history.musicid = music.id AND music.game = :game AND music.version = :version "
         )
+        timestamp: Optional[int] = None
         if days is not None:
             # Only select the last X days of hit chart
             sql = sql + "AND score_history.timestamp > :timestamp "
             timestamp = Time.now() - (Time.SECONDS_IN_DAY * days)
-        else:
-            timestamp = None
 
         sql = sql + "GROUP BY songid ORDER BY plays DESC LIMIT :count"
         cursor = self.execute(sql, {'game': game, 'version': version, 'count': count, 'timestamp': timestamp})
diff --git a/bemani/protocol/binary.py b/bemani/protocol/binary.py
index 3dcaccd..2866ae9 100644
--- a/bemani/protocol/binary.py
+++ b/bemani/protocol/binary.py
@@ -788,7 +788,7 @@ class BinaryEncoding:
         else:
             return None
 
-    def encode(self, tree: Node, encoding: str=None) -> bytes:
+    def encode(self, tree: Node, encoding: Optional[str]=None) -> bytes:
         """
         Given a tree of Node objects, encode the data with the current encoding.