yeref 0.24.24__tar.gz → 0.24.25__tar.gz

{yeref-0.24.24 → yeref-0.24.25}/PKG-INFO

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

{yeref-0.24.24 → yeref-0.24.25}/setup.py

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

{yeref-0.24.24 → yeref-0.24.25}/yeref/yeref.py

@@ -211,7 +211,7 @@ BOT_CADMIN_ = '☐☑'
 BOT_VARS_ = '{"BOT_PROMO": "#911", "BOT_CHANNEL": 0, "BOT_CHANNELTID": 0, "BOT_GROUP": 0, "BOT_GROUPTID": 0, "BOT_CHATGPT": "", "BOT_GEO": 0, "BOT_TZ": "+00:00", "BOT_DT": "", "BOT_LZ": "en", "BOT_LC": "en", "BOT_ISSTARTED": 0, "BOT_ISMENTIONED": 0}'
 BOT_LSTS_ = '{"BOT_ADMINS": [], "BOT_COMMANDS": ["/start"]}'
 USER_VARS_ = '{"USER_TEXT": "", "USER_REACTION": "", "USER_PUSH": "", "USER_EMAIL": "", "USER_PROMO": "", "USER_CONTACT": "", "USER_GEO": "", "USER_UTM": "", "USER_ID": 0, "USER_DT": "", "USER_TZ": "+00:00", "USER_LC": "en", "USER_LZ": "en", "USER_ISADMIN": 0, "USER_ISBLOG": 0, "USER_ISPREMIUM": 0, "USER_BALL": 0, "USER_RAND": 0, "USER_QUIZ": 0, "USER_DICE": 0, "MSGID_PAID": 0, "DATE_TIME": 0}'
-USER_LSTS_ = '{"USER_UTMREF": [], "USER_PAYMENTS": []}'
+USER_LSTS_ = '{"USER_UTMREF": [], "USER_PAYMENTS": [], "USER_TXS": []}'
 
 UB_CONFIG_ = '☑☑☑☐☐☑☑☐☐☐☐☐☐'
 UB_CMONITOR_ = '☐'
@@ -15631,14 +15631,26 @@ async def ch_games(USER_GAMES, game, condition, balls=-1):
 #         return USER_GAMES
 
 
-async def get_user_vars(PROJECT_USERNAME, BASE_P, ENT_TID, chat_id, lc, username, full_name, is_premium=False, usr_sig='',
-                        page=''):
+async def upd_user_data(ENT_TID, data, web_app_init_data, PROJECT_USERNAME, BASE_P, req_url=''):
+    chat_id = int(web_app_init_data.get('user', {}).get('id'))
+    username = web_app_init_data.get('user', {}).get('username', None)
+    first_name = web_app_init_data.get('user', {}).get('first_name', '')
+    last_name = web_app_init_data.get('user', {}).get('last_name', '')
+    full_name = f"{first_name} {last_name}".strip()
+    lc = web_app_init_data.get('user', {}).get('language_code', 'en')
+    is_premium = web_app_init_data.get('user', {}).get('is_premium', None)
+    usr_sig = web_app_init_data.get('signature', '')
+
+    page = data.get('page', '')
+    connectedAddress = data.get('connectedAddress', '')
+
     USER_TID = chat_id
     USER_VARS = json.loads(USER_VARS_)
     USER_LSTS = json.loads(USER_LSTS_)
     USER_GAMES = {}
     print(f"start get usernv a, {USER_LSTS=}")
     try:
+        tid = str(ENT_TID).replace('-', '')
         schema_name = 'USER'
         balls = 1
         if PROJECT_USERNAME == 'FereyBotBot':
@@ -15649,7 +15661,7 @@ async def get_user_vars(PROJECT_USERNAME, BASE_P, ENT_TID, chat_id, lc, username
         elif PROJECT_USERNAME == 'FereyGroupBot':
             schema_name = 'GROUPP'
 
-        sql = f"SELECT USER_TID, USER_GAMES, USER_VARS, USER_LSTS FROM {schema_name}_{str(ENT_TID).replace('-', '')}.USER WHERE USER_TID=$1"
+        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=}")
         if len(data_user):
@@ -15666,8 +15678,7 @@ async def get_user_vars(PROJECT_USERNAME, BASE_P, ENT_TID, chat_id, lc, username
                 if lc in ['zh', 'zh-chs', 'zh-cht', 'ja', 'ko', 'zh-CN', 'zh-TW', 'th', 'vi', 'tw', 'sg']:
                     lz = 'zh'
                 # arabic    # ir, af
-                elif lc in ['ar-XA', 'ar', 'tr', 'ur', 'fa', 'tj', 'dz', 'eg', 'iq', 'sy', 'ae', 'sa', 'tn', 'ir',
-                            'af']:
+                elif lc in ['ar-XA', 'ar', 'tr', 'ur', 'fa', 'tj', 'dz', 'eg', 'iq', 'sy', 'ae', 'sa', 'tn', 'ir', 'af']:
                     lz = 'ar'
                 # spanish   # portugal: 'pt', 'br', 'ao', 'mz'
                 elif lc in ['es', 'ar', 'cl', 'co', 'cu', 've', 'bo', 'pe', 'ec', 'pt', 'br', 'ao', 'mz']:
@@ -15684,8 +15695,29 @@ async def get_user_vars(PROJECT_USERNAME, BASE_P, ENT_TID, chat_id, lc, username
         USER_VARS['USER_SIG'] = usr_sig
         USER_VARS['USER_ISPREMIUM'] = is_premium
 
+        if connectedAddress:
+            print(f"{connectedAddress=}, {USER_VARS=}")
+            USER_VARS['USER_WALLET'] = connectedAddress
+            print(f"after {req_url=}, {USER_VARS=}")
+            print(f"after {data.get('amount', None)=}, {data=}")
+
+            if req_url and data.get('amount', None):
+                amount = data.get('amount', None)
+                address = data.get('address', '')
+                DT_START = datetime.now(timezone.utc).strftime('%d-%m-%Y_%H-%M-%S')
+                USER_TXS = USER_LSTS.get("USER_TXS", [])
+
+                USER_TXS.append({
+                    'TYPE': req_url,
+                    'AMOUNT': amount,
+                    'ADDRESS': address,
+                    'DT_START': DT_START,
+                })
+                USER_LSTS["USER_TXS"] = USER_TXS
+                print(f"{USER_TXS=}, {USER_LSTS=}")
+
         sql = f""" 
-        INSERT INTO {schema_name}_{str(ENT_TID).replace('-', '')}.USER (
+        INSERT INTO {schema_name}_{tid}.USER (
             USER_TID, USER_USERNAME, USER_FULLNAME, USER_GAMES, USER_VARS, USER_LSTS
         )
         VALUES ($1, $2, $3, $4, $5, $6)

{yeref-0.24.24 → yeref-0.24.25}/yeref.egg-info/PKG-INFO

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