From d06a50b47d6e5ef3440f9d1545823a574429ce93 Mon Sep 17 00:00:00 2001
From: John Cote <jwcotejr@gmail.com>
Date: Mon, 2 Dec 2019 18:29:08 -0500
Subject: [PATCH] login: update stuff

---
 otp/login/AstronLoginManager.py     | 17 +++++++++++++----
 toontown/toontowngui/TeaserPanel.py |  3 ++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/otp/login/AstronLoginManager.py b/otp/login/AstronLoginManager.py
index 1a71fb3..c4bde0f 100644
--- a/otp/login/AstronLoginManager.py
+++ b/otp/login/AstronLoginManager.py
@@ -26,6 +26,7 @@ class AstronLoginManager(DistributedObjectGlobal):
         self.sendUpdate('requestLogin', [playToken])
 
     def loginResponse(self, responseBlob):
+        self.notify.debug("loginResponse")
         responseData = json.loads(responseBlob)
         now = time.time()
         returnCode = responseData.get('returnCode')
@@ -38,8 +39,12 @@ class AstronLoginManager(DistributedObjectGlobal):
         createFriendsWithChat = responseData.get('createFriendsWithChat')
         canChat = createFriendsWithChat == "YES" or createFriendsWithChat == "CODE"
         self.cr.secretChatAllowed = canChat
+        if base.logPrivateInfo:
+            self.notify.info("CREATE_FRIENDS_WITH_CHAT from game server login: %s %s" % (createFriendsWithChat, canChat))
         chatCodeCreationRule = responseData.get('chatCodeCreationRule')
         self.cr.chatChatCodeCreationRule = chatCodeCreationRule
+        if base.logPrivateInfo:
+            self.notify.info("Chat code creation rule = %s" % chatCodeCreationRule)
         self.cr.secretChatNeedsParentPassword = chatCodeCreationRule == "PARENT"
         serverTime = responseData.get('serverTime')
         self.cr.serverTimeUponLogin = serverTime
@@ -56,6 +61,8 @@ class AstronLoginManager(DistributedObjectGlobal):
         self.cr.setIsPaid(isPaid)
         if isPaid:
             launcher.setPaidUserLoggedIn()
+        if base.logPrivateInfo:
+            self.notify.info("Paid from game server login: %s" % isPaid)
         WhiteListResponse = responseData.get('WhiteListResponse')
         if WhiteListResponse == "YES":
             self.cr.whiteListChatEnabled = 1
@@ -77,6 +84,8 @@ class AstronLoginManager(DistributedObjectGlobal):
             self.cr.withParentAccount = False
         else:
             self.notify.error("unknown toon account type %s" % toonAccountType)
+        if base.logPrivateInfo:
+            self.notify.info("toonAccountType=%s" % toonAccountType)
         self.userName = responseData.get('userName')
         self.cr.userName = self.userName
         self.notify.info("Login response return code %s" % returnCode)
@@ -84,7 +93,7 @@ class AstronLoginManager(DistributedObjectGlobal):
             self.__handleLoginSuccess()
         elif returnCode == -13:
             self.notify.info("Period Time Expired")
-            messenger.send(self.doneEvent, [{'mode': 'reject'}])
+            self.cr.loginScreen.request("showLoginFailDialog", [OTPLocalizer.LoginScreenPeriodTimeExpired])
         else:
             self.notify.info("Login failed: %s" % errorString)
             messenger.send(self.doneEvent, [{'mode': 'reject'}])
@@ -94,9 +103,9 @@ class AstronLoginManager(DistributedObjectGlobal):
         launcher.setGoUserName(self.userName)
         launcher.setLastLogin(self.userName)
         launcher.setUserLoggedIn()
-        if self.cr.loginInterface.freeTimeExpires == -1:
+        if self.cr.loginScreen.loginInterface.freeTimeExpires == -1:
             launcher.setPaidUserLoggedIn()
-        if self.cr.loginInterface.needToSetParentPassword():
+        if self.cr.loginScreen.loginInterface.needToSetParentPassword():
             messenger.send(self.doneEvent, [{'mode': 'getChatPassword'}])
         else:
             messenger.send(self.doneEvent, [{'mode': 'success'}])
@@ -106,7 +115,7 @@ class AstronLoginManager(DistributedObjectGlobal):
         if len(errorString) < len(prefix):
             return errorString
         if errorString[:len(prefix)] == prefix:
-            return '%s%s' % (errorString, ', address=%s' % self.cr.getServerAddress())
+            return '%s%s' % (errorString, ', address=%s' % base.cr.getServerAddress())
         return errorString
 
     def parseAccountDays(self, accountDays):
diff --git a/toontown/toontowngui/TeaserPanel.py b/toontown/toontowngui/TeaserPanel.py
index e4d1947..de466a3 100644
--- a/toontown/toontowngui/TeaserPanel.py
+++ b/toontown/toontowngui/TeaserPanel.py
@@ -160,7 +160,8 @@ class TeaserPanel(DirectObject):
 class FeatureBrowser(DirectScrolledList):
 
     def __init__(self, parent = aspect2dp, **kw):
-        optiondefs = (('parent', parent, None),
+        self._parent = parent
+        optiondefs = (('parent', self._parent, None),
          ('relief', None, None),
          ('numItemsVisible', 1, None),
          ('items', [], None))