yeref 0.24.26__tar.gz → 0.24.27__tar.gz

{yeref-0.24.26 → yeref-0.24.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yeref
-Version: 0.24.26
+Version: 0.24.27
 Summary: desc-f
 Author: john smith
 Dynamic: author

{yeref-0.24.26 → yeref-0.24.27}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name='yeref',
-    version='0.24.26',
+    version='0.24.27',
     description='desc-f',
     author='john smith',
     packages=['yeref'],

{yeref-0.24.26 → yeref-0.24.27}/yeref/yeref.py

@@ -15536,6 +15536,7 @@ async def upd_user_data_main(data, web_app_init_data, BASE_P, BOT_TOKEN_E18B, re
         sql = f"SELECT USER_TID, USER_GAMES, USER_VARS, USER_LSTS FROM \"USER\" WHERE USER_TID=$1"
         data_user = await db_select_pg(sql, (chat_id,), BASE_P)
 
+        # region data
         if len(data_user):
             USER_TID, USER_GAMES, USER_VARS, USER_LSTS = data_user[0]
             USER_GAMES = json.loads(USER_GAMES)
@@ -15543,7 +15544,6 @@ async def upd_user_data_main(data, web_app_init_data, BASE_P, BOT_TOKEN_E18B, re
             USER_LSTS = json.loads(USER_LSTS)
             if page in ['msg', 'pst']: USER_GAMES = await ch_games(USER_GAMES, 'web', True, balls)
 
-            # region lz
             if lc:
                 USER_VARS['USER_LC'] = lc
                 lz = 'en'
@@ -15562,8 +15562,14 @@ async def upd_user_data_main(data, web_app_init_data, BASE_P, BOT_TOKEN_E18B, re
                 elif lc in ['ru', 'kz', 'kg', 'uz', 'tm', 'md', 'am', 'uk-UA', 'uk', 'kk', 'tk', 'ky']:
                     lz = 'ru'
                 USER_VARS['USER_LZ'] = lz
-            # endregion
-            print(f"{USER_VARS=}, {lc=}")
+
+        now = datetime.now(timezone.utc)
+        USER_LSTS["USER_DAU"] = list(set(USER_LSTS.get("USER_DAU", []) + [now.strftime('%Y-%m-%d')]))
+        USER_LSTS["USER_MAU"] = list(set(USER_LSTS.get("USER_MAU", []) + [now.strftime('%Y-%m')]))
+        USER_VARS['USER_SIG'] = usr_sig
+        USER_VARS['USER_ISPREMIUM'] = is_premium
+        lz = USER_VARS.get('USER_LZ', 'en')
+        # endregion
 
         # region tx
         if connectedAddress:
@@ -15618,12 +15624,6 @@ async def upd_user_data_main(data, web_app_init_data, BASE_P, BOT_TOKEN_E18B, re
                 if extra_bot: await extra_bot.session.close()
         # endregion
 
-        now = datetime.now(timezone.utc)
-        USER_LSTS["USER_DAU"] = list(set(USER_LSTS.get("USER_DAU", []) + [now.strftime('%Y-%m-%d')]))
-        USER_LSTS["USER_MAU"] = list(set(USER_LSTS.get("USER_MAU", []) + [now.strftime('%Y-%m')]))
-        USER_VARS['USER_SIG'] = usr_sig
-        USER_VARS['USER_ISPREMIUM'] = is_premium
-
         sql = f""" 
         INSERT INTO \"USER\" (
             USER_TID, USER_USERNAME, USER_FULLNAME, USER_GAMES, USER_VARS, USER_LSTS
@@ -15680,7 +15680,8 @@ async def upd_user_data(ENT_TID, data, web_app_init_data, PROJECT_USERNAME, BASE
 
         sql = f"SELECT USER_TID, USER_GAMES, USER_VARS, USER_LSTS FROM {schema_name}_{tid}.USER WHERE USER_TID=$1"
         data_user = await db_select_pg(sql, (chat_id,), BASE_P)
-        print(f"{data_user=}")
+
+        # region data
         if len(data_user):
             USER_TID, USER_GAMES, USER_VARS, USER_LSTS = data_user[0]
             USER_GAMES = json.loads(USER_GAMES)
@@ -15688,7 +15689,6 @@ async def upd_user_data(ENT_TID, data, web_app_init_data, PROJECT_USERNAME, BASE
             USER_LSTS = json.loads(USER_LSTS)
             if page in ['msg', 'pst']: USER_GAMES = await ch_games(USER_GAMES, 'web', True, balls)
 
-            # region lz
             if lc:
                 USER_VARS['USER_LC'] = lc
                 lz = 'en'
@@ -15707,8 +15707,13 @@ async def upd_user_data(ENT_TID, data, web_app_init_data, PROJECT_USERNAME, BASE
                 elif lc in ['ru', 'kz', 'kg', 'uz', 'tm', 'md', 'am', 'uk-UA', 'uk', 'kk', 'tk', 'ky']:
                     lz = 'ru'
                 USER_VARS['USER_LZ'] = lz
-            # endregion
-            print(f"{USER_VARS=}, {lc=}")
+
+        now = datetime.now(timezone.utc)
+        USER_LSTS["USER_DAU"] = list(set(USER_LSTS.get("USER_DAU", []) + [now.strftime('%Y-%m-%d')]))
+        USER_LSTS["USER_MAU"] = list(set(USER_LSTS.get("USER_MAU", []) + [now.strftime('%Y-%m')]))
+        USER_VARS['USER_SIG'] = usr_sig
+        USER_VARS['USER_ISPREMIUM'] = is_premium
+        # endregion
 
         # region tx
         if connectedAddress:
@@ -15733,12 +15738,6 @@ async def upd_user_data(ENT_TID, data, web_app_init_data, PROJECT_USERNAME, BASE
                 print(f"{USER_TXS=}, {USER_LSTS=}")
         # endregion
 
-        now = datetime.now(timezone.utc)
-        USER_LSTS["USER_DAU"] = list(set(USER_LSTS.get("USER_DAU", []) + [now.strftime('%Y-%m-%d')]))
-        USER_LSTS["USER_MAU"] = list(set(USER_LSTS.get("USER_MAU", []) + [now.strftime('%Y-%m')]))
-        USER_VARS['USER_SIG'] = usr_sig
-        USER_VARS['USER_ISPREMIUM'] = is_premium
-
         sql = f""" 
         INSERT INTO {schema_name}_{tid}.USER (
             USER_TID, USER_USERNAME, USER_FULLNAME, USER_GAMES, USER_VARS, USER_LSTS

{yeref-0.24.26 → yeref-0.24.27}/yeref.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yeref
-Version: 0.24.26
+Version: 0.24.27
 Summary: desc-f
 Author: john smith
 Dynamic: author