yeref 0.29.58__tar.gz → 0.29.60__tar.gz

{yeref-0.29.58 → yeref-0.29.60}/PKG-INFO

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

{yeref-0.29.58 → yeref-0.29.60}/setup.py

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

{yeref-0.29.58 → yeref-0.29.60}/yeref/yeref.py

@@ -2586,7 +2586,7 @@ async def db_select_pg(sql, param=None, db_pool=None, db_config=None):
                     elif "SELECT NOTICE_ID, NOTICE_TYPE, NOTICE_TXT" in sql: pass
                     elif "<= NOW()" in sql: pass
                     elif "_LZ FROM" in sql: pass
-                    elif "GROUPP_CWORKPERMISSIONS FROM" in sql: pass
+                    elif "GROUPP_CVOTERESTRICT FROM" in sql: pass
                     else:
                         logger.info(log_ % f"SQL: {sql}, PARAM: {param}")
             else:
@@ -7800,7 +7800,7 @@ async def upd_user_data_main(data, web_app_init_data, BASE_P, BOT_TOKEN_E18B, re
         if not USER_DT:
             USER_DT = now_
             USER_VARS['USER_DT'] = USER_DT.strftime("%d-%m-%Y_%H-%M-%S")
-            USER_HID = hashlib.blake2b(f"{'tid'}-{chat_id}".encode('utf-8'), digest_size=4).hexdigest()
+            USER_HID = hashlib.blake2b(f"{chat_id}-{chat_id}".encode('utf-8'), digest_size=4).hexdigest()
             if utm: USER_VARS['USER_UTM'] = utm
 
         USER_LSTS["USER_DAU"] = list(set(USER_LSTS.get("USER_DAU", []) + [now_.strftime('%Y-%m-%d')]))
@@ -7959,9 +7959,10 @@ async def upd_user_data(ENT_TID, data, web_app_init_data, PROJECT_USERNAME, BASE
         if not USER_DT:
             USER_DT = now_
             USER_VARS['USER_DT'] = USER_DT.strftime("%d-%m-%Y_%H-%M-%S")
-            USER_HID = hashlib.blake2b(f"{'tid'}-{chat_id}".encode('utf-8'), digest_size=4).hexdigest()
+            USER_HID = hashlib.blake2b(f"{tid}-{chat_id}".encode('utf-8'), digest_size=4).hexdigest()
             if req_url: USER_VARS['USER_UTM'] = req_url
         if not USER_HID: USER_HID = hashlib.blake2b(f"{tid}-{chat_id}".encode('utf-8'), digest_size=4).hexdigest()
+        # USER_HID = hashlib.blake2b(f"{tid}-{chat_id}".encode('utf-8'), digest_size=4).hexdigest()
 
         print(f"out {USER_VARS=}")
         USER_LSTS["USER_DAU"] = list(set(USER_LSTS.get("USER_DAU", []) + [now_.strftime('%Y-%m-%d')]))
@@ -8365,9 +8366,6 @@ async def pay_handler_for_all(bot, message, ideas_en, ideas_ru, PROJECT_USERNAME
         sql = "SELECT USER_TID, USER_VARS, USER_LSTS FROM \"USER\" WHERE USER_TID=$1"
         data_usr = await db_select_pg(sql, (chat_id,), BASE_P)
         if not len(data_usr):
-            dt_ = datetime.now(timezone.utc).strftime('%d-%m-%Y_%H-%M-%S')
-            sql = "INSERT INTO \"USER\" (USER_TID) VALUES ($1) ON CONFLICT DO NOTHING"
-            await db_change_pg(sql, (chat_id,), BASE_P)
             USER_LSTS = json.loads(USER_LSTS_)
             USER_VARS = json.loads(USER_VARS_)
             if payload == 'gift': USER_VARS['USER_UTM'] = 'gift'
@@ -8438,8 +8436,14 @@ async def pay_handler_for_all(bot, message, ideas_en, ideas_ru, PROJECT_USERNAME
         USER_LSTS = json.dumps(USER_LSTS, ensure_ascii=False)
         USER_VARS = json.dumps(USER_VARS, ensure_ascii=False)
 
-        sql = f"UPDATE \"USER\" SET USER_VARS=$1, USER_LSTS=$2 WHERE USER_TID=$3"
-        await db_change_pg(sql, (USER_VARS, USER_LSTS, chat_id,), BASE_P)
+        sql = """
+            INSERT INTO "USER" (USER_TID, USER_VARS, USER_LSTS)
+            VALUES ($1, $2, $3)
+            ON CONFLICT (USER_TID) DO UPDATE
+            SET USER_VARS = EXCLUDED.USER_VARS,
+                USER_LSTS = EXCLUDED.USER_LSTS
+        """
+        await db_change_pg(sql, (chat_id, USER_VARS, USER_LSTS,), BASE_P)
 
         # , {payload_txt}
         text = f"{l_payment_success[lz]} ★{total_amount}\n\n♥️ @{PROJECT_USERNAME} {l_payment_hashtag[lz]}"
@@ -13764,6 +13768,7 @@ async def bots_by_inline(chat_id, message, BASE_P):
 async def get_buttons_main(lz, bot_un, BASE_P):
     result = []
     try:
+        # url_usr = f"tg://user?id={my_tid}" if random.choice([True, False]) else 'https://t.me/ferey_support?text=hi'
         url_usr = f"tg://user?id={my_tid}" if random.choice([True, False]) else 'https://t.me/ferey_support?text=hi'
         # url_share = f"https://t.me/FereySupportBot?profile"
         if random.choice([True, False]):
@@ -14264,8 +14269,8 @@ async def lz_code_pg(chat_id, lan, BASE_P):
             elif lan in ['ru', 'kz', 'kg', 'uz', 'tm', 'md', 'am', 'uk-UA', 'uk', 'kk', 'tk', 'ky']:
                 result = 'ru'
 
-            sql = "UPDATE \"USER\" SET USER_LZ=$1 WHERE USER_TID=$2"
-            await db_change_pg(sql, (result, chat_id,), BASE_P)
+            # sql = "UPDATE \"USER\" SET USER_LZ=$1 WHERE USER_TID=$2"
+            # await db_change_pg(sql, (result, chat_id,), BASE_P)
         else:
             result = data[0][0]
     except Exception as e:

{yeref-0.29.58 → yeref-0.29.60}/yeref.egg-info/PKG-INFO

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