feat:Add default userNam as params for login

isanwenyu · Jun 15, 2023 · 79549fa · 79549fa
1 parent da47386
commit 79549fa
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/itchat/async_components/hotreload.py b/lib/itchat/async_components/hotreload.py
@@ -79,7 +79,7 @@ async def load_login_status(self, fileDir,
         await self.start_receiving(exitCallback)
         logger.debug('loading login status succeeded.')
         if hasattr(loginCallback, '__call__'):
-            await loginCallback(self.storageClass.userName)
+            await loginCallback(self.storageClass.userName if self.storageClass.userName else self.storageClass.nickName)
         return ReturnValue({'BaseResponse': {
             'ErrMsg': 'loading login status succeeded.',
             'Ret': 0, }})

diff --git a/lib/itchat/async_components/login.py b/lib/itchat/async_components/login.py
@@ -114,7 +114,7 @@ async def login(self, enableCmdQR=False, picDir=None, qrCallback=None, EventScan
     await self.show_mobile_login()
     self.get_contact(True)
     if hasattr(loginCallback, '__call__'):
-        r = await loginCallback(self.storageClass.userName)
+        r = await loginCallback(self.storageClass.userName if self.storageClass.userName else self.storageClass.nickName)
     else:
         utils.clear_screen()
         if os.path.exists(picDir or config.DEFAULT_QR):

diff --git a/lib/itchat/components/login.py b/lib/itchat/components/login.py
@@ -83,7 +83,7 @@ def login(self, enableCmdQR=False, picDir=None, qrCallback=None,
     self.show_mobile_login()
     self.get_contact(True)
     if hasattr(loginCallback, '__call__'):
-        r = loginCallback()
+        r = loginCallback(self.storageClass.userName if self.storageClass.userName else self.storageClass.nickName)
     else:
         # utils.clear_screen()
         if os.path.exists(picDir or config.DEFAULT_QR):