Restructure to activeclient so it always has DiscordId object for active token (if active)

app/internal/types.py

@@ -191,22 +191,22 @@ class ActiveClient:
     """
     client_id: str = None
     websocket = None
-    active_token: str = None
+    active_token: DiscordId = None
     nickname: str = None
     access_token: str = None
 
-    def __init__(self, client_id: str=None, websocket=None, active_token: str = None, nickname: str = None, access_token: str = None):
+    def __init__(self, client_id: str=None, websocket=None, active_token: DiscordId = None, nickname: str = None, access_token: str = None):
         self.client_id = client_id
         self.active_token = active_token
         self.websocket = websocket
         self.nickname = nickname
         self.access_token = access_token
 
-    def json(self):
+    def to_dict(self):
         return {
             "client_id": self.client_id,
             "nickname": self.nickname,
-            "active_token": self.active_token
+            "active_token": self.active_token.to_dict()
         }
 
     def __str__(self):