yeref 0.24.25__tar.gz → 0.24.26__tar.gz

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

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

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

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

{yeref-0.24.25 → yeref-0.24.26}/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_TXS": []}'
+USER_LSTS_ = '{"USER_UTMREF": [], "USER_PAYMENTS": [], "USER_TXS": [], "USER_DAU": [], "USER_MAU": []}'
 
 UB_CONFIG_ = '☑☑☑☐☐☑☑☐☐☐☐☐☐'
 UB_CMONITOR_ = '☐'
@@ -15511,124 +15511,141 @@ async def get_vars_web_main(chat_id, username, full_name, lc, is_premium, utm_we
         return is_paid, till_paid, lz
 
 
-# endregion
+async def upd_user_data_main(data, web_app_init_data, BASE_P, BOT_TOKEN_E18B, 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 = {}
+    balls = 1
+    is_paid = False
+    till_paid = ''
 
-# region notes
-# sys.path.append('../hub')
-# print("In module products sys.path[0], __package__ ==", sys.path[-1], __package__)
-# from .. .hub import xtra
-# dp.register_chosen_inline_handler(chosen_inline_handler_fun, lambda chosen_inline_result: True)
-# dp.register_inline_handler(inline_handler_main, lambda inline_handler_main_: True)
-# channel_post_handler
-# edited_channel_post_handler
-# poll_handler - а это получается реакция на размещение опроса
-# poll_answer_handler - реакция на голосование
-# chat_join_request_handler
-# errors_handler
-# current_state
+    print(f"upd_user_data_main: {USER_LSTS=}")
+    try:
+        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)
 
-# apt install redis -y
-# nano /etc/redis/redis.conf
-# systemctl restart redis.service
-# systemctl status redis
-# redis-cli
-# netstat -lnp | grep redis
+        if len(data_user):
+            USER_TID, USER_GAMES, USER_VARS, USER_LSTS = data_user[0]
+            USER_GAMES = json.loads(USER_GAMES)
+            USER_VARS = json.loads(USER_VARS)
+            USER_LSTS = json.loads(USER_LSTS)
+            if page in ['msg', 'pst']: USER_GAMES = await ch_games(USER_GAMES, 'web', True, balls)
 
-# apt update && apt upgrade -y
-# curl -fsSL https://deb.nodesource.com/setup_current.x | sudo -E bash -
-# apt install -y nodejs build-essential nginx yarn
-# npm install -g npm pm2@latest -g
-# ufw allow 'Nginx Full'
-# curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /usr/share/keyrings/yarnkey.gpg >/dev/null
-# echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" | tee /etc/apt/sources.list.d/yarn.list
-# node -v
-# nginx -v
-# yarn -v
+            # region lz
+            if lc:
+                USER_VARS['USER_LC'] = lc
+                lz = 'en'
+                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'
+                USER_VARS['USER_LZ'] = lz
+            # endregion
+            print(f"{USER_VARS=}, {lc=}")
 
-# systemctl restart nginx
-# systemctl reload nginx
-# snap install core;  snap refresh core
-# apt remove python3-certbot-nginx certbot -y
-# rm -rf /etc/letsencrypt/renewal/
-# rm -rf /etc/letsencrypt/archive/
-# rm -rf /etc/letsencrypt/live/
-# rm -rf /opt/letsencrypt
-# rm -rf /etc/letsencrypt
-# snap install --classic certbot
-# ln -s /snap/bin/certbot /usr/bin/certbot
-# endregion
+        # region tx
+        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", [])
 
-# region pst
-async def ch_games(USER_GAMES, game, condition, balls=-1):
-    try:
-        dt = datetime.now(timezone.utc)
-        dt_ = dt.strftime('%d-%m-%Y_%H-%M-%S')
+                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=}")
+        # endregion
 
-        print(f"Текущее время: {dt_}")
-        print(f"Игровые данные: {USER_GAMES}")
-        print(f"Игра: {game}, Условие: {condition}, Баллы: {balls}")
+        # region pay
+        pays = USER_LSTS.get('USER_PAYMENTS', [])
+        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 condition:
-            # if game not in USER_GAMES:
-            #     USER_GAMES[game] = {'date': datetime.now(timezone.utc)}
-            # dt_game = USER_GAMES[game].get('date')
-            # print(f"Дата игры: {dt_game}")
+        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
+                print(f"get_vars_web_main -> get_chat_member {is_paid=}")
+            except Exception as e:
+                logger.info(log_ % str(e))
+            finally:
+                if extra_bot: await extra_bot.session.close()
+        # endregion
 
-            if game not in USER_GAMES or not USER_GAMES[game].get('date', None):
-                print("Нет даты, устанавливаем новую")
-                USER_GAMES[game] = {'date': dt_, 'balls': balls}
-                print(f"Добавлена новая игра: {USER_GAMES[game]}")
-            else:
-                dt_game = USER_GAMES[game].get('date')
-                dt_game = datetime.strptime(dt_game, "%d-%m-%Y_%H-%M-%S").replace(tzinfo=timezone.utc)
-                print(f"Дата игры в datetime: {dt_game}")
+        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
 
-                if (dt - dt_game).days >= 1 or balls == -1:
-                    print("Прошел день, обновляем данные")
-                    USER_GAMES[game]['date'] = dt_
-                    USER_GAMES[game]['balls'] = balls
-                else:
-                    print("День не прошел, данные не меняем")
-        else:
-            print("Условие не выполнено, обнуляем баллы")
-            if isinstance(USER_GAMES.get(game), dict):
-                USER_GAMES[game]['balls'] = 0
-            else:
-                USER_GAMES[game] = {'date': dt_, 'balls': 0}
+        sql = f""" 
+        INSERT INTO \"USER\" (
+            USER_TID, USER_USERNAME, USER_FULLNAME, USER_GAMES, USER_VARS, USER_LSTS
+        )
+        VALUES ($1, $2, $3, $4, $5, $6)
+        ON CONFLICT (USER_TID) DO UPDATE
+        SET 
+            USER_USERNAME = EXCLUDED.USER_USERNAME,
+            USER_FULLNAME = EXCLUDED.USER_FULLNAME,
+            USER_GAMES = EXCLUDED.USER_GAMES,
+            USER_VARS = EXCLUDED.USER_VARS,
+            USER_LSTS = EXCLUDED.USER_LSTS
+        """
+        await db_change_pg(sql, (USER_TID, username, full_name,
+                                 json.dumps(USER_GAMES, ensure_ascii=False),
+                                 json.dumps(USER_VARS, ensure_ascii=False),
+                                 json.dumps(USER_LSTS, ensure_ascii=False),), BASE_P)
     except Exception as e:
         logger.info(log_ % str(e))
-        print(f"Ошибка: {e}")
         await asyncio.sleep(round(random.uniform(0, 1), 2))
     finally:
-        print(f"Финальные данные: {USER_GAMES}")
-        return USER_GAMES
-
-
-# async def ch_games(USER_GAMES, game, condition, balls=1):
-#     try:
-#         dt = datetime.now(timezone.utc)
-#         dt_ = dt.strftime('%d-%m-%Y_%H-%M-%S')
-#
-#         if condition:
-#             dt_game = USER_GAMES[game].get('date')
-#
-#             if not dt_game:
-#                 USER_GAMES[game]['date'] = dt_
-#                 USER_GAMES[game]['balls'] = balls
-#             else:
-#                 dt_game = datetime.strptime(dt_game, "%d-%m-%Y_%H-%M-%S").replace(tzinfo=timezone.utc)
-#                 if (dt - dt_game).days >= 1:
-#                     USER_GAMES[game]['date'] = dt_
-#                     USER_GAMES[game]['balls'] = balls
-#         else:
-#             USER_GAMES[game]['balls'] = 0
-#     except Exception as e:
-#         logger.info(log_ % str(e))
-#         await asyncio.sleep(round(random.uniform(0, 1), 2))
-#     finally:
-#         return USER_GAMES
+        return USER_TID, username, full_name, USER_GAMES, USER_VARS, USER_LSTS, is_paid, till_paid
 
 
 async def upd_user_data(ENT_TID, data, web_app_init_data, PROJECT_USERNAME, BASE_P, req_url=''):
@@ -15641,18 +15658,18 @@ async def upd_user_data(ENT_TID, data, web_app_init_data, PROJECT_USERNAME, BASE
     is_premium = web_app_init_data.get('user', {}).get('is_premium', None)
     usr_sig = web_app_init_data.get('signature', '')
 
+    tid = str(ENT_TID).replace('-', '')
     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=}")
+    balls = 1
+
+    print(f"upd_user_data: {USER_LSTS=}")
     try:
-        tid = str(ENT_TID).replace('-', '')
         schema_name = 'USER'
-        balls = 1
         if PROJECT_USERNAME == 'FereyBotBot':
             schema_name = 'BOT'
             balls = -1
@@ -15692,9 +15709,8 @@ async def upd_user_data(ENT_TID, data, web_app_init_data, PROJECT_USERNAME, BASE
                 USER_VARS['USER_LZ'] = lz
             # endregion
             print(f"{USER_VARS=}, {lc=}")
-        USER_VARS['USER_SIG'] = usr_sig
-        USER_VARS['USER_ISPREMIUM'] = is_premium
 
+        # region tx
         if connectedAddress:
             print(f"{connectedAddress=}, {USER_VARS=}")
             USER_VARS['USER_WALLET'] = connectedAddress
@@ -15715,6 +15731,13 @@ async def upd_user_data(ENT_TID, data, web_app_init_data, PROJECT_USERNAME, BASE
                 })
                 USER_LSTS["USER_TXS"] = USER_TXS
                 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 (
@@ -15738,37 +15761,99 @@ async def upd_user_data(ENT_TID, data, web_app_init_data, PROJECT_USERNAME, BASE
         await asyncio.sleep(round(random.uniform(0, 1), 2))
     finally:
         return USER_TID, username, full_name, USER_GAMES, USER_VARS, USER_LSTS
+# endregion
 
 
-async def get_user_vars2(chat_id, ENT_TID, BASE_D, PROJECT_USERNAME):
-    USER_GAMES = {}
-    USER_VARS = {}
-    USER_ISPAID = 0
+# region notes
+# sys.path.append('../hub')
+# print("In module products sys.path[0], __package__ ==", sys.path[-1], __package__)
+# from .. .hub import xtra
+# dp.register_chosen_inline_handler(chosen_inline_handler_fun, lambda chosen_inline_result: True)
+# dp.register_inline_handler(inline_handler_main, lambda inline_handler_main_: True)
+# channel_post_handler
+# edited_channel_post_handler
+# poll_handler - а это получается реакция на размещение опроса
+# poll_answer_handler - реакция на голосование
+# chat_join_request_handler
+# errors_handler
+# current_state
+
+# apt install redis -y
+# nano /etc/redis/redis.conf
+# systemctl restart redis.service
+# systemctl status redis
+# redis-cli
+# netstat -lnp | grep redis
+
+# apt update && apt upgrade -y
+# curl -fsSL https://deb.nodesource.com/setup_current.x | sudo -E bash -
+# apt install -y nodejs build-essential nginx yarn
+# npm install -g npm pm2@latest -g
+# ufw allow 'Nginx Full'
+# curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /usr/share/keyrings/yarnkey.gpg >/dev/null
+# echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" | tee /etc/apt/sources.list.d/yarn.list
+# node -v
+# nginx -v
+# yarn -v
+
+# systemctl restart nginx
+# systemctl reload nginx
+# snap install core;  snap refresh core
+# apt remove python3-certbot-nginx certbot -y
+# rm -rf /etc/letsencrypt/renewal/
+# rm -rf /etc/letsencrypt/archive/
+# rm -rf /etc/letsencrypt/live/
+# rm -rf /opt/letsencrypt
+# rm -rf /etc/letsencrypt
+# snap install --classic certbot
+# ln -s /snap/bin/certbot /usr/bin/certbot
+# endregion
+
+
+# region pst
+async def ch_games(USER_GAMES, game, condition, balls=-1):
     try:
-        schema_name = 'USER'
-        if PROJECT_USERNAME == 'FereyBotBot':
-            schema_name = 'BOT'
-        elif PROJECT_USERNAME == 'FereyChannelBot':
-            schema_name = 'CHANNEL'
-        elif PROJECT_USERNAME == 'FereyGroupBot':
-            schema_name = 'GROUPP'
+        dt = datetime.now(timezone.utc)
+        dt_ = dt.strftime('%d-%m-%Y_%H-%M-%S')
 
-        sql = f"SELECT USER_GAMES, USER_VARS, USER_ISPAID FROM {schema_name}_{str(ENT_TID).replace('-', '')}.USER WHERE USER_TID=$1"
-        data_usr = await db_select_pg(sql, (chat_id,), BASE_D)
-        if not len(data_usr) or not data_usr[0][0]:
-            if not len(data_usr):
-                dt_now = datetime.now(timezone.utc).strftime('%d-%m-%Y_%H-%M-%S')
-                sql = f"INSERT INTO {schema_name}_{str(ENT_TID).replace('-', '')}.USER (USER_TID, USER_DT) VALUES ($1, $2) ON CONFLICT DO NOTHING"
-                await db_change_pg(sql, (chat_id, dt_now,), BASE_D)
+        print(f"Текущее время: {dt_}")
+        print(f"Игровые данные: {USER_GAMES}")
+        print(f"Игра: {game}, Условие: {condition}, Баллы: {balls}")
+
+        if condition:
+            # if game not in USER_GAMES:
+            #     USER_GAMES[game] = {'date': datetime.now(timezone.utc)}
+            # dt_game = USER_GAMES[game].get('date')
+            # print(f"Дата игры: {dt_game}")
+
+            if game not in USER_GAMES or not USER_GAMES[game].get('date', None):
+                print("Нет даты, устанавливаем новую")
+                USER_GAMES[game] = {'date': dt_, 'balls': balls}
+                print(f"Добавлена новая игра: {USER_GAMES[game]}")
+            else:
+                dt_game = USER_GAMES[game].get('date')
+                dt_game = datetime.strptime(dt_game, "%d-%m-%Y_%H-%M-%S").replace(tzinfo=timezone.utc)
+                print(f"Дата игры в datetime: {dt_game}")
+
+                if (dt - dt_game).days >= 1 or balls == -1:
+                    print("Прошел день, обновляем данные")
+                    USER_GAMES[game]['date'] = dt_
+                    USER_GAMES[game]['balls'] = balls
+                else:
+                    print("День не прошел, данные не меняем")
         else:
-            USER_GAMES, USER_VARS, USER_ISPAID = data_usr[0]
-            USER_GAMES = json.loads(USER_GAMES) if USER_GAMES else {}
-            USER_VARS = json.loads(USER_VARS) if USER_VARS else {}
+            print("Условие не выполнено, обнуляем баллы")
+            if isinstance(USER_GAMES.get(game), dict):
+                USER_GAMES[game]['balls'] = 0
+            else:
+                USER_GAMES[game] = {'date': dt_, 'balls': 0}
     except Exception as e:
         logger.info(log_ % str(e))
+        print(f"Ошибка: {e}")
         await asyncio.sleep(round(random.uniform(0, 1), 2))
     finally:
-        return USER_GAMES, USER_VARS, USER_ISPAID
+        print(f"Финальные данные: {USER_GAMES}")
+        return USER_GAMES
 
 
 async def post_save(bot, data_user, data_web, MEDIA_D, BASE_P, KEYS_JSON, PROJECT_USERNAME, PROJECT_TYPE, is_paid=False):

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

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