yeref 0.29.27__tar.gz → 0.29.29__tar.gz

{yeref-0.29.27 → yeref-0.29.29}/PKG-INFO

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

{yeref-0.29.27 → yeref-0.29.29}/setup.py

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

{yeref-0.29.27 → yeref-0.29.29}/yeref/yeref.py

@@ -7753,13 +7753,14 @@ async def upd_user_data_main(data, web_app_init_data, BASE_P, BOT_TOKEN_E18B, re
     page = data.get('page', '')
     connectedAddress = data.get('connectedAddress', '')
     USER_TID = chat_id
-    USER_HID = USER_LZ = None
+    USER_HID = USER_LZ = USER_DT = None
     USER_VARS = json.loads(USER_VARS_)
     USER_LSTS = json.loads(USER_LSTS_)
     USER_GAMES = {}
     balls = 1
     is_paid = False
     till_paid = ''
+    now_ = datetime.now(timezone.utc)
 
     print(f"upd_user_data_main: {lc=}, {USER_LSTS=}")
     try:
@@ -7793,14 +7794,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_LZ = lz
-        if not USER_VARS.get('USER_DT', None):
+        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()
             if utm: USER_VARS['USER_UTM'] = utm
 
-        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_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
         USER_VARS['USER_LZ'] = USER_LZ
@@ -7862,9 +7863,9 @@ async def upd_user_data_main(data, web_app_init_data, BASE_P, BOT_TOKEN_E18B, re
         sql = f""" 
         INSERT INTO \"USER\" (
             USER_TID, USER_HID, USER_USERNAME, USER_FULLNAME, USER_ISPREMIUM, 
-            USER_LZ, USER_GAMES, USER_VARS, USER_LSTS
+            USER_LZ, USER_DT, USER_GAMES, USER_VARS, USER_LSTS
         )
-        VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
+        VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
         ON CONFLICT (USER_TID) DO UPDATE
         SET 
             USER_HID = EXCLUDED.USER_HID,
@@ -7877,7 +7878,7 @@ async def upd_user_data_main(data, web_app_init_data, BASE_P, BOT_TOKEN_E18B, re
             USER_VARS = EXCLUDED.USER_VARS,
             USER_LSTS = EXCLUDED.USER_LSTS
         """
-        await db_change_pg(sql, (USER_TID, USER_HID, username, full_name, is_premium, USER_LZ,
+        await db_change_pg(sql, (USER_TID, USER_HID, username, full_name, is_premium, USER_LZ, USER_DT,
                                  json.dumps(USER_GAMES, ensure_ascii=False),
                                  json.dumps(USER_VARS, ensure_ascii=False),
                                  json.dumps(USER_LSTS, ensure_ascii=False),), BASE_P)
@@ -7901,11 +7902,12 @@ async def upd_user_data(ENT_TID, data, web_app_init_data, PROJECT_USERNAME, BASE
     page = data.get('page', '')
     connectedAddress = data.get('connectedAddress', '')
     USER_TID = chat_id
-    USER_HID = USER_LZ = None
+    USER_HID = USER_LZ = USER_DT = None
     USER_VARS = json.loads(USER_VARS_)
     USER_LSTS = json.loads(USER_LSTS_)
     USER_GAMES = {}
     balls = 1
+    now_ = datetime.now(timezone.utc)
 
     print(f"upd_user_data: {USER_LSTS=}")
     try:
@@ -7950,13 +7952,15 @@ 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_LZ = lz
-        if not USER_VARS.get('USER_DT', None):
+        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()
+            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()
 
-        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_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
         USER_VARS['USER_LZ'] = USER_LZ
@@ -7988,9 +7992,9 @@ async def upd_user_data(ENT_TID, data, web_app_init_data, PROJECT_USERNAME, BASE
         sql = f""" 
         INSERT INTO {schema_name}_{tid}.USER (
             USER_TID, USER_HID, USER_USERNAME, USER_FULLNAME, USER_ISPREMIUM, 
-            USER_LZ, USER_GAMES, USER_VARS, USER_LSTS
+            USER_LZ, USER_DT, USER_GAMES, USER_VARS, USER_LSTS
         )
-        VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
+        VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
         ON CONFLICT (USER_TID) DO UPDATE
         SET 
             USER_HID = EXCLUDED.USER_HID,
@@ -8003,7 +8007,7 @@ async def upd_user_data(ENT_TID, data, web_app_init_data, PROJECT_USERNAME, BASE
             USER_VARS = EXCLUDED.USER_VARS,
             USER_LSTS = EXCLUDED.USER_LSTS
         """
-        await db_change_pg(sql, (USER_TID, USER_HID, username, full_name, is_premium, USER_LZ,
+        await db_change_pg(sql, (USER_TID, USER_HID, username, full_name, is_premium, USER_LZ, USER_DT,
                                  json.dumps(USER_GAMES, ensure_ascii=False),
                                  json.dumps(USER_VARS, ensure_ascii=False),
                                  json.dumps(USER_LSTS, ensure_ascii=False),), BASE_P)
@@ -8086,53 +8090,6 @@ async def is_subscription_expired(USER_VARS, USER_LSTS):
 
 
 # region pay
-async def update_subscribe(bot, BASE_P, BOT_TOKEN_E18B):
-    result = []
-    try:
-        dt_ = datetime.now(timezone.utc)
-        if not (dt_.hour % 2 == 0 and dt_.minute % 2 == 0 and dt_.second % 2 == 0): return result
-        sql = "SELECT USER_TID, USER_LZ, USER_DTPAID, USER_ISPAID FROM USER"
-        data = await db_select_pg(sql, (), BASE_P)
-
-        for item in data:
-            try:
-                USER_TID, USER_LZ, USER_DTPAID, USER_ISPAID = item
-                dtpt_ = datetime.strptime(USER_DTPAID, '%d-%m-%Y_%H-%M-%S').replace(tzinfo=timezone.utc)
-
-                if USER_ISPAID == 1 and USER_DTPAID and (dt_ - dtpt_).days > 31:
-                    await asyncio.sleep(round(random.uniform(0, 1), 2))
-                    get_ = await bot.get_chat(chat_id=USER_TID)
-                    chan_private_donate = channel_library_ru if USER_LZ == 'ru' else channel_library_en
-                    extra_bot = Bot(token=BOT_TOKEN_E18B)
-                    get_chat_member_ = await extra_bot.get_chat_member(chat_id=chan_private_donate, user_id=USER_TID)
-                    await extra_bot.session.close()
-
-                    if get_chat_member_.status in ['member', 'administrator', 'creator']:
-                        USER_DTPAID = datetime.now(timezone.utc).strftime('%d-%m-%Y_%H-%M-%S')
-                        sql = "UPDATE USER SET USER_ISPAID=1, USER_USERNAME=$1, USER_FULLNAME=$2, USER_DTPAID=$3 " \
-                              "WHERE USER_TID=$4"
-                        await db_change_pg(sql, (get_.username, get_.full_name, USER_DTPAID, USER_TID,), BASE_P)
-                    else:
-                        sql = "UPDATE USER SET USER_ISPAID=0, USER_USERNAME=$1, USER_FULLNAME=$2 WHERE USER_TID=$3"
-                        await db_change_pg(sql, (get_.username, get_.full_name, USER_TID,), BASE_P)
-                elif USER_ISPAID == -1 and USER_DTPAID and (dt_ - dtpt_).days > 31:
-                    result.append(
-                        item)  # else:  #     sql = "UPDATE USER SET USER_USERNAME=$1, USER_FULLNAME=$2 WHERE USER_TID=$3"  #     await db_change_pg(sql, (get_.username, get_.full_name, USER_TID,), BASE_P)
-            except TelegramRetryAfter as e:
-                logger.info(log_ % f"TelegramRetryAfter {e.retry_after}")
-                await asyncio.sleep(e.retry_after + 1)
-            except Exception as e:
-                logger.info(log_ % str(e))
-                await asyncio.sleep(round(random.uniform(0, 1), 2))
-    except TelegramRetryAfter as e:
-        logger.info(log_ % f"TelegramRetryAfter {e.retry_after}")
-        await asyncio.sleep(e.retry_after + 1)
-    except Exception as e:
-        logger.info(log_ % str(e))
-        await asyncio.sleep(round(random.uniform(0, 1), 2))
-    return result
-
-
 async def convert_domain_to_currency(domain):
     result = 'EUR'
     try:
@@ -8368,61 +8325,6 @@ async def create_invoice_link_my(BOT_TID, BOT_LC, msg_text, msg_btns, POST_LNK,
     return result
 
 
-async def check_sub_pay(chat_id, lz, BOT_TOKEN_E18B, BASE_P):
-    is_paid = False
-    till_paid = ''
-    try:
-        USER_ISPAID = 0
-        USER_DTPAID = ''
-        dt_now = datetime.now(timezone.utc)
-        extra_bot = None
-        try:
-            lib_id = channel_library_ru if lz == 'ru' else channel_library_en
-            extra_bot = Bot(token=BOT_TOKEN_E18B)
-            member_ = await extra_bot.get_chat_member(chat_id=lib_id, user_id=chat_id)
-            if member_.status in ['member', 'administrator', 'creator']: is_paid = True
-            print(f"check_sub_pay {is_paid=}")
-        except Exception as e:
-            logger.info(log_ % str(e))
-        finally:
-            if extra_bot: await extra_bot.session.close()
-
-        sql = "SELECT USER_ISPAID, USER_DTPAID, USER_TYPAID, USER_LZ FROM USER WHERE USER_TID=$1"
-        data_usr = await db_select_pg(sql, (chat_id,), BASE_P)
-
-        if not len(data_usr):
-            sql = "INSERT INTO USER (USER_TID) VALUES ($1, $2) ON CONFLICT DO NOTHING"
-            await db_change_pg(sql, (chat_id,), BASE_P)
-        else:
-            USER_ISPAID, USER_DTPAID, USER_TYPAID, lz = data_usr[0]
-
-        if is_paid:
-            sql = "UPDATE USER SET USER_ISPAID=1, USER_DTPAID='', USER_TYPAID='all' WHERE USER_TID=$1"
-            await db_change_pg(sql, (chat_id,), BASE_P)
-        elif USER_ISPAID and USER_DTPAID:
-            till_paid = dt_now.strptime(USER_DTPAID, "%d-%m-%Y_%H-%M-%S").replace(tzinfo=timezone.utc)
-            print(f"{till_paid=}")
-
-            if dt_now > till_paid:
-                sql = "UPDATE USER SET USER_ISPAID=0, USER_DTPAID='', USER_TYPAID='' WHERE USER_TID=$1"
-                await db_change_pg(sql, (chat_id,), BASE_P)
-                till_paid = ''
-            else:
-                is_paid = True
-                till_paid = till_paid.strftime('%d.%m.%Y')
-        else:
-            sql = "UPDATE USER SET USER_ISPAID=0, USER_DTPAID='', USER_TYPAID='' WHERE USER_TID=$1"
-            await db_change_pg(sql, (chat_id,), BASE_P)
-        print(f"check_sub_pay {is_paid=}, {till_paid=}")
-    except TelegramRetryAfter as e:
-        logger.info(log_ % f"TelegramRetryAfter {e.retry_after}")
-        await asyncio.sleep(e.retry_after + 1)
-    except Exception as e:
-        logger.info(log_ % str(e))
-        await asyncio.sleep(round(random.uniform(0, 1), 2))
-    return is_paid, till_paid
-
-
 async def pay_handler_for_all(bot, message, ideas_en, ideas_ru, PROJECT_USERNAME, EXTRA_D, BASE_P):
     try:
         successful_payment_data = {k: v for k, v in message.successful_payment.model_dump().items() if v is not None}

{yeref-0.29.27 → yeref-0.29.29}/yeref.egg-info/PKG-INFO

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