yeref 0.29.26__tar.gz → 0.29.28__tar.gz

{yeref-0.29.26 → yeref-0.29.28}/PKG-INFO

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

{yeref-0.29.26 → yeref-0.29.28}/setup.py

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

{yeref-0.29.26 → yeref-0.29.28}/yeref/yeref.py

@@ -7740,98 +7740,6 @@ async def check_webapp_hash(init_data, TOKEN_BOT, BOT_TOKEN_MAIN=None, extra=Non
     return result
 
 
-async def get_vars_web_main(chat_id, username, full_name, lc, is_premium, utm_web, BASE_P, BOT_TOKEN_E18B):
-    is_paid = False
-    till_paid = ''
-    lz = 'en'
-    try:
-        dt = lz = utm = None
-        pays = []
-
-        sql = "SELECT USER_TID, USER_LZ, USER_DT, USER_UTM, USER_PAY FROM \"USER\" WHERE USER_TID=$1"
-        data_user = await db_select_pg(sql, (chat_id,), BASE_P)
-        if len(data_user): USER_TID, lz, dt, utm, pays = data_user[0]
-
-        if not dt:
-            dt = datetime.now(timezone.utc).strftime('%d-%m-%Y_%H-%M-%S')
-        if not utm:
-            utm = utm_web
-        if not lz:
-            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']:
-                lz = 'ar'
-            # spanish   # portugal: 'pt', 'br', 'ao', 'mz'
-            elif lc in ['es', 'ar', 'cl', 'co', 'cu', 've', 'bo', 'pe', 'ec', 'pt', 'br', 'ao', 'mz']:
-                lz = 'es'
-            # french
-            elif lc in ['fr', 'ch', 'be', 'ca']:
-                lz = 'fr'
-            # europe
-            elif lc in ['ru', 'kz', 'kg', 'uz', 'tm', 'md', 'am', 'uk-UA', 'uk', 'kk', 'tk', 'ky']:
-                lz = 'ru'
-            else:
-                lz = 'en'
-
-        if utm_web not in ['@FereyPostBot', '']:
-            sql = """
-                    INSERT INTO "USER" (USER_TID, USER_USERNAME, USER_FULLNAME, USER_LZ, USER_LC, USER_UTM, USER_ISPREMIUM, USER_DT) 
-                    VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
-                    ON CONFLICT (USER_TID) 
-                    DO UPDATE SET 
-                        USER_USERNAME = EXCLUDED.USER_USERNAME, 
-                        USER_FULLNAME = EXCLUDED.USER_FULLNAME, 
-                        USER_LZ = EXCLUDED.USER_LZ, 
-                        USER_LC = EXCLUDED.USER_LC, 
-                        USER_UTM = EXCLUDED.USER_UTM, 
-                        USER_ISPREMIUM = EXCLUDED.USER_ISPREMIUM,
-                        USER_DT = EXCLUDED.USER_DT
-                """
-            await db_change_pg(sql, (chat_id, username, full_name, lz, lc, utm, is_premium, dt,), BASE_P)
-
-        try:
-            print(f"{pays=}")
-            if not pays: pays = '[]'
-            pays = json.loads(pays)
-        except Exception as e:
-            logger.info(log_ % str(e))
-            pays = []
-
-        print(f"{pays=}")
-        for pay in pays:
-            try:
-                if not (pay.get('TYPE', '') == 'SUB' and pay.get('DT_END', '')): continue
-                DT_END = datetime.strptime(pay.get('DT_END'), '%d-%m-%Y_%H-%M-%S').replace(tzinfo=timezone.utc)
-                print(f"{DT_END=}")
-                if datetime.now(timezone.utc) <= DT_END:
-                    is_paid = True
-                    till_paid = DT_END.strftime('%d.%m.%Y')
-            except Exception as e:
-                logger.info(log_ % str(e))
-                pass
-
-        if not is_paid:
-            extra_bot = None
-            try:
-                lib_id = channel_library_ru if lz == 'ru' else channel_library_en
-                print(f"{channel_library_ru=}, {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
-            except Exception as e:
-                logger.info(log_ % str(e))
-            finally:
-                if extra_bot: await extra_bot.session.close()
-    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, lz
-
-
 async def upd_user_data_main(data, web_app_init_data, BASE_P, BOT_TOKEN_E18B, req_url='', utm=''):
     chat_id = int(web_app_init_data.get('user', {}).get('id'))
     username = web_app_init_data.get('user', {}).get('username', None)
@@ -7845,7 +7753,7 @@ 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 = USER_DT = None
+    USER_HID = USER_LZ = None
     USER_VARS = json.loads(USER_VARS_)
     USER_LSTS = json.loads(USER_LSTS_)
     USER_GAMES = {}
@@ -7885,8 +7793,8 @@ 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_DT:
-            USER_VARS['USER_DT'] = USER_DT = datetime.now(timezone.utc).strftime("%d-%m-%Y_%H-%M-%S")
+        if not USER_VARS.get('USER_DT', None):
+            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
 
@@ -7954,9 +7862,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_DT, USER_GAMES, USER_VARS, USER_LSTS
+            USER_LZ, USER_GAMES, USER_VARS, USER_LSTS
         )
-        VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
+        VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
         ON CONFLICT (USER_TID) DO UPDATE
         SET 
             USER_HID = EXCLUDED.USER_HID,
@@ -7964,13 +7872,12 @@ async def upd_user_data_main(data, web_app_init_data, BASE_P, BOT_TOKEN_E18B, re
             USER_FULLNAME = EXCLUDED.USER_FULLNAME,
             USER_ISPREMIUM = EXCLUDED.USER_ISPREMIUM,
             USER_LZ = EXCLUDED.USER_LZ,
-            USER_DT = EXCLUDED.USER_DT,
             
             USER_GAMES = EXCLUDED.USER_GAMES,
             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, USER_DT,
+        await db_change_pg(sql, (USER_TID, USER_HID, username, full_name, is_premium, USER_LZ,
                                  json.dumps(USER_GAMES, ensure_ascii=False),
                                  json.dumps(USER_VARS, ensure_ascii=False),
                                  json.dumps(USER_LSTS, ensure_ascii=False),), BASE_P)
@@ -7994,7 +7901,7 @@ 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 = USER_DT = None
+    USER_HID = USER_LZ = None
     USER_VARS = json.loads(USER_VARS_)
     USER_LSTS = json.loads(USER_LSTS_)
     USER_GAMES = {}
@@ -8043,7 +7950,8 @@ 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_DT: USER_VARS['USER_DT'] = USER_DT = datetime.now(timezone.utc).strftime("%d-%m-%Y_%H-%M-%S")
+        if not USER_VARS.get('USER_DT', None):
+            USER_VARS['USER_DT'] = USER_DT.strftime("%d-%m-%Y_%H-%M-%S")
         if not USER_HID: USER_HID = hashlib.blake2b(f"{tid}-{chat_id}".encode('utf-8'), digest_size=4).hexdigest()
 
         now = datetime.now(timezone.utc)
@@ -8080,9 +7988,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_DT, USER_GAMES, USER_VARS, USER_LSTS
+            USER_LZ, USER_GAMES, USER_VARS, USER_LSTS
         )
-        VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
+        VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
         ON CONFLICT (USER_TID) DO UPDATE
         SET 
             USER_HID = EXCLUDED.USER_HID,
@@ -8090,13 +7998,12 @@ async def upd_user_data(ENT_TID, data, web_app_init_data, PROJECT_USERNAME, BASE
             USER_FULLNAME = EXCLUDED.USER_FULLNAME,
             USER_ISPREMIUM = EXCLUDED.USER_ISPREMIUM,
             USER_LZ = EXCLUDED.USER_LZ,
-            USER_DT = EXCLUDED.USER_DT,
             
             USER_GAMES = EXCLUDED.USER_GAMES,
             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, USER_DT,
+        await db_change_pg(sql, (USER_TID, USER_HID, username, full_name, is_premium, USER_LZ,
                                  json.dumps(USER_GAMES, ensure_ascii=False),
                                  json.dumps(USER_VARS, ensure_ascii=False),
                                  json.dumps(USER_LSTS, ensure_ascii=False),), BASE_P)
@@ -8179,53 +8086,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:
@@ -8461,62 +8321,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)
-        USER_DT = dt_now.strftime('%d-%m-%Y_%H-%M-%S')
-        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_DT, 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, USER_DT) VALUES ($1, $2) ON CONFLICT DO NOTHING"
-            await db_change_pg(sql, (chat_id, USER_DT,), BASE_P)
-        else:
-            USER_ISPAID, USER_DTPAID, USER_TYPAID, USER_DT, 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}
@@ -8553,8 +8357,8 @@ async def pay_handler_for_all(bot, message, ideas_en, ideas_ru, PROJECT_USERNAME
         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, USER_DT) VALUES ($1, $2) ON CONFLICT DO NOTHING"
-            await db_change_pg(sql, (chat_id, dt_,), BASE_P)
+            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'
@@ -8902,6 +8706,7 @@ async def calc_metrics(bot, PROJECT_USERNAME, dataroom_folder_id, EXTRA_D, BASE_
 
             data_users.append((
                 random.randint(100000, 999999),
+                entry_dt_obj,
                 json.dumps({"USER_WALLET": wallet, "USER_UTM": utm, "USER_DT": entry_dt}),
                 json.dumps({"USER_DAU": user_dau, "USER_MAU": user_mau, "USER_TXS": txs,
                             "USER_PAYMENTS": payments, "USER_STATUSES": USER_STATUSES})
@@ -9033,7 +8838,6 @@ async def return_activity_metrics(bot, data_users, EXTRA_D, BASE_P, data_ents, s
                 USER_LSTS = json.loads(USER_LSTS or "{}")
                 USER_WALLET = USER_VARS.get('USER_WALLET', '')
                 USER_UTM = USER_VARS.get('USER_UTM', '')
-                USER_DT = USER_VARS.get('USER_DT', '')
                 USER_DAU = USER_LSTS.get("USER_DAU", [])
                 USER_MAU = USER_LSTS.get("USER_MAU", [])
                 USER_TXS = USER_LSTS.get("USER_TXS", [])
@@ -9077,11 +8881,9 @@ async def return_activity_metrics(bot, data_users, EXTRA_D, BASE_P, data_ents, s
                     month_key = dt_tx.strftime("%Y-%m")
                     metrics_by_month[month_key]["pay"] += 1
 
-                if USER_DT:
-                    dt_obj = datetime.strptime(USER_DT, "%d-%m-%Y_%H-%M-%S")
-                    month_key = dt_obj.strftime("%Y-%m")
-                    key = "/startapp" if USER_UTM == "/startapp" else "/start"
-                    metrics_by_month[month_key][key] += 1
+                month_key = USER_DT.strftime("%Y-%m")
+                key = "/startapp" if USER_UTM == "/startapp" else "/start"
+                metrics_by_month[month_key][key] += 1
 
         process_user_rows(data_users)
 
@@ -9137,15 +8939,13 @@ async def return_unit_metrics(bot, data_users, EXTRA_D):
         for USER_TID, USER_VARS, USER_LSTS in data_users:
             USER_VARS = json.loads(USER_VARS or "{}")
             USER_LSTS = json.loads(USER_LSTS or "{}")
-            USER_DT = USER_VARS.get("USER_DT", "")
             USER_PAYMENTS = USER_LSTS.get("USER_PAYMENTS", [])
             USER_STATUSES = USER_LSTS.get("USER_STATUSES", [])
 
-            if USER_DT:
-                mo = datetime.strptime(USER_DT, "%d-%m-%Y_%H-%M-%S").strftime("%Y-%m")
-                if (USER_TID, mo) not in seen_new:
-                    seen_new.add((USER_TID, mo))
-                    metrics[mo]["new_users"] += 1
+            mo = USER_DT.strftime("%Y-%m")
+            if (USER_TID, mo) not in seen_new:
+                seen_new.add((USER_TID, mo))
+                metrics[mo]["new_users"] += 1
 
             for pay in USER_PAYMENTS:
                 dt_p = datetime.strptime(pay.get("DT_START", ""), "%d-%m-%Y_%H-%M-%S")
@@ -9249,13 +9049,12 @@ async def return_cohort_metrics(bot, data_users, EXTRA_D):
         cohorts = defaultdict(set)
         activity_months = defaultdict(set)
 
-        for USER_TID, USER_VARS, USER_LSTS in data_users:
+        for USER_TID, USER_DT, USER_VARS, USER_LSTS in data_users:
             USER_VARS = json.loads(USER_VARS or "{}")
             USER_LSTS = json.loads(USER_LSTS or "{}")
-            USER_DT = USER_VARS.get("USER_DT", "")
             USER_DAU = USER_LSTS.get("USER_DAU", [])
 
-            entry_mo = datetime.strptime(USER_DT, "%d-%m-%Y_%H-%M-%S").strftime("%Y-%m")
+            entry_mo = USER_DT.strftime("%Y-%m")
             cohorts[entry_mo].add(USER_TID)
 
             for day_str in USER_DAU:
@@ -9338,13 +9137,11 @@ async def return_retention_metrics(bot, data_users, EXTRA_D):
         rev_by_cohort = defaultdict(lambda: defaultdict(float))
         cohort_users = defaultdict(set)
 
-        for USER_TID, USER_VARS, USER_LSTS in data_users:
+        for USER_TID, USER_DT, USER_VARS, USER_LSTS in data_users:
             USER_VARS = json.loads(USER_VARS or "{}")
             USER_LSTS = json.loads(USER_LSTS or "{}")
-            dt_entry_raw = USER_VARS.get("USER_DT", "").split("_")[0]
-            if not dt_entry_raw:
-                continue
-            cohort_mo = datetime.strptime(dt_entry_raw, "%d-%m-%Y").strftime("%Y-%m")
+
+            cohort_mo = USER_DT.strftime("%Y-%m")
             cohort_users[cohort_mo].add(USER_TID)
 
             for pay in USER_LSTS.get("USER_PAYMENTS", []):
@@ -9431,15 +9228,11 @@ async def return_acquisition_retention_metrics(bot, data_users, EXTRA_D):
         user_signup = {}
         user_activity = defaultdict(set)
 
-        for USER_TID, USER_VARS, USER_LSTS in data_users:
+        for USER_TID, USER_DT, USER_VARS, USER_LSTS in data_users:
             vars_ = json.loads(USER_VARS or "{}")
             lsts = json.loads(USER_LSTS or "{}")
-            dt0_str = vars_.get("USER_DT", "").split("_")[0]
-            if not dt0_str:
-                print(f"Skip USER_TID={USER_TID}, no signup date")
-                continue
-            dt0 = datetime.strptime(dt0_str, "%d-%m-%Y")
-            user_signup[USER_TID] = dt0
+
+            user_signup[USER_TID] = USER_DT
             for day in lsts.get("USER_DAU", []):
                 try:
                     d = datetime.strptime(day, "%Y-%m-%d")
@@ -9454,8 +9247,8 @@ async def return_acquisition_retention_metrics(bot, data_users, EXTRA_D):
 
         # group by cohort month
         cohorts = defaultdict(list)
-        for uid, dt0 in user_signup.items():
-            mo = dt0.strftime("%Y-%m")
+        for uid, USER_DT in user_signup.items():
+            mo = USER_DT.strftime("%Y-%m")
             cohorts[mo].append(uid)
         print("Cohorts by month:", {k: len(v) for k, v in cohorts.items()})
 
@@ -14482,62 +14275,6 @@ async def lz_code_pg(chat_id, lan, BASE_P):
     return result
 
 
-async def check_sub_pay_pg(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)
-        USER_DT = dt_now.strftime('%d-%m-%Y_%H-%M-%S')
-        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_DT, 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, USER_DT) VALUES ($1, $2) ON CONFLICT DO NOTHING"
-            await db_change_pg(sql, (chat_id, USER_DT,), BASE_P)
-        else:
-            USER_ISPAID, USER_DTPAID, USER_TYPAID, USER_DT, 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 no_new_text(txt):
     result = txt
     try:

{yeref-0.29.26 → yeref-0.29.28}/yeref.egg-info/PKG-INFO

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