yeref 0.24.26__py3-none-any.whl → 0.24.28__py3-none-any.whl

yeref/yeref.py

@@ -15536,6 +15536,7 @@ async def upd_user_data_main(data, web_app_init_data, BASE_P, BOT_TOKEN_E18B, re
         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)
 
+        # region data
         if len(data_user):
             USER_TID, USER_GAMES, USER_VARS, USER_LSTS = data_user[0]
             USER_GAMES = json.loads(USER_GAMES)
@@ -15543,7 +15544,6 @@ async def upd_user_data_main(data, web_app_init_data, BASE_P, BOT_TOKEN_E18B, re
             USER_LSTS = json.loads(USER_LSTS)
             if page in ['msg', 'pst']: USER_GAMES = await ch_games(USER_GAMES, 'web', True, balls)
 
-            # region lz
             if lc:
                 USER_VARS['USER_LC'] = lc
                 lz = 'en'
@@ -15562,8 +15562,19 @@ 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_VARS['USER_LZ'] = lz
-            # endregion
-            print(f"{USER_VARS=}, {lc=}")
+
+        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
+        lz = USER_VARS.get('USER_LZ', 'en')
+
+        if USER_VARS['USER_DT'] == '':
+            USER_VARS['USER_DT'] = datetime.now(timezone.utc).strftime("%d-%m-%Y_%H-%M-%S")
+        # if utm != '':
+        #     USER_VARS['USER_UTM'] = utm
+        # endregion
 
         # region tx
         if connectedAddress:
@@ -15618,12 +15629,6 @@ async def upd_user_data_main(data, web_app_init_data, BASE_P, BOT_TOKEN_E18B, re
                 if extra_bot: await extra_bot.session.close()
         # 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 \"USER\" (
             USER_TID, USER_USERNAME, USER_FULLNAME, USER_GAMES, USER_VARS, USER_LSTS
@@ -15680,7 +15685,8 @@ async def upd_user_data(ENT_TID, data, web_app_init_data, PROJECT_USERNAME, BASE
 
         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=}")
+
+        # region data
         if len(data_user):
             USER_TID, USER_GAMES, USER_VARS, USER_LSTS = data_user[0]
             USER_GAMES = json.loads(USER_GAMES)
@@ -15688,7 +15694,6 @@ async def upd_user_data(ENT_TID, data, web_app_init_data, PROJECT_USERNAME, BASE
             USER_LSTS = json.loads(USER_LSTS)
             if page in ['msg', 'pst']: USER_GAMES = await ch_games(USER_GAMES, 'web', True, balls)
 
-            # region lz
             if lc:
                 USER_VARS['USER_LC'] = lc
                 lz = 'en'
@@ -15707,8 +15712,13 @@ 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_VARS['USER_LZ'] = lz
-            # endregion
-            print(f"{USER_VARS=}, {lc=}")
+
+        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
+        # endregion
 
         # region tx
         if connectedAddress:
@@ -15733,12 +15743,6 @@ async def upd_user_data(ENT_TID, data, web_app_init_data, PROJECT_USERNAME, BASE
                 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 (
             USER_TID, USER_USERNAME, USER_FULLNAME, USER_GAMES, USER_VARS, USER_LSTS
@@ -15978,6 +15982,9 @@ async def post_save(bot, data_user, data_web, MEDIA_D, BASE_P, KEYS_JSON, PROJEC
             print(f"--------------------------------------------------------")
             print(f"after {POST_MEDIA=}")
 
+        if PROJECT_USERNAME == 'FereyPostBot' and POST_TYPE in ['voice', 'audio'] and 'filev_id' not in POST_MEDIA[0]:
+            asyncio.create_task(convert_to_vinyl(bot, chat_id, ENT_TID, MEDIA_D, EXTRA_D, POST_MEDIA))
+
         # region pay
         for button in POST_BUTTONS:
             try:
@@ -17582,6 +17589,45 @@ async def pst_inline(chat_id, POST_TID, data_bot, BASE_P, PROJECT_USERNAME, is_m
         await asyncio.sleep(round(random.uniform(1, 2), 2))
     finally:
         return result
+
+
+async def convert_to_vinyl(bot, chat_id, ENT_TID, POST_TID, MEDIA_D, EXTRA_D, POST_MEDIA, BASE_P):
+    full_file_name = os.path.join(MEDIA_D, str(ENT_TID), POST_MEDIA[0]['file_name'])
+    file_name_video = full_file_name[: full_file_name.rfind('.')] + '.mp4'
+    try:
+        file = await bot.get_file(POST_MEDIA[0]['file_id'])
+        await bot.download_file(file.file_path, full_file_name)
+        print(f"{full_file_name=} dl ok..")
+
+        vinyl_file = os.path.join(EXTRA_D, 'vinyl.mp4')
+        print(f"Итоговый путь для нового видео с заменённым звуком {file_name_video=}")
+
+        audio_clip = AudioFileClip(full_file_name)
+        if audio_clip.duration > 59: audio_clip = audio_clip.subclipped(0, 59)
+        target_duration = 59 if audio_clip.duration > 59 else audio_clip.duration
+        print(f"{target_duration=}")
+
+        video_template = VideoFileClip(vinyl_file)
+        video_template = video_template.subclipped(0, target_duration)
+        video_with_audio = video_template.with_audio(audio_clip)
+        video_with_audio.write_videofile(file_name_video, codec="libx264", audio_codec="aac", fps=24)
+        print(f"{file_name_video=} write_videofile ok..")
+
+        r = await bot.send_video_note(chat_id=chat_id, video_note=types.FSInputFile(file_name_video))
+        await bot.delete_message(chat_id, r.message_id)
+
+        if r.video_note:
+            print(f"{r.video_note.file_id=}")
+            POST_MEDIA[0]['filev_id'] = r.video_note.file_id
+
+            sql = f"UPDATE USER_{chat_id}.POST SET POST_MEDIA=$1 WHERE POST_TID=$2"
+            await db_change_pg(sql, (json.dumps(POST_MEDIA, ensure_ascii=False), POST_TID,), BASE_P)
+    except Exception as e:
+        logger.info(log_ % str(e))
+        await asyncio.sleep(round(random.uniform(1, 2), 2))
+    finally:
+        if os.path.exists(full_file_name): os.remove(full_file_name)
+        if os.path.exists(file_name_video): os.remove(file_name_video)
 # endregion
 
 

{yeref-0.24.26.dist-info → yeref-0.24.28.dist-info}/METADATA

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

yeref-0.24.28.dist-info/RECORD

@@ -0,0 +1,8 @@
+yeref/__init__.py,sha256=Qpv3o6Xa78VdLcsSRmctGtpnYE9btpAkCekgGhgJyXM,49
+yeref/l_.py,sha256=LMX_olmJwq-tgoALJCnhV_fGrL_i_43yBLkLIcEVqGo,1176743
+yeref/tonweb.js,sha256=Jf6aFOQ1OIY4q7fINYz-m5LsI3seMus124M5SYYZmtE,443659
+yeref/yeref.py,sha256=yGrIAWvIBhy1PuwKn5fdSKpL3GbvZ2xMzVKmgrPqWVc,1021571
+yeref-0.24.28.dist-info/METADATA,sha256=4Ue09_m-KIRZZN6h5dd1qlFyhT50u0LUPjPvBnFQuDo,119
+yeref-0.24.28.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+yeref-0.24.28.dist-info/top_level.txt,sha256=yCQKchWHbfV-3OuQPYRdi2loypD-nmbDJbtt3OuKKkY,6
+yeref-0.24.28.dist-info/RECORD,,

yeref-0.24.26.dist-info/RECORD

@@ -1,8 +0,0 @@
-yeref/__init__.py,sha256=Qpv3o6Xa78VdLcsSRmctGtpnYE9btpAkCekgGhgJyXM,49
-yeref/l_.py,sha256=LMX_olmJwq-tgoALJCnhV_fGrL_i_43yBLkLIcEVqGo,1176743
-yeref/tonweb.js,sha256=Jf6aFOQ1OIY4q7fINYz-m5LsI3seMus124M5SYYZmtE,443659
-yeref/yeref.py,sha256=77MykHInANF3ubzX10vZ18jpcbqBzbnmjktQj6_qtYo,1019255
-yeref-0.24.26.dist-info/METADATA,sha256=bFSO0qZ49MFXMV0kSK8Ol2hbtnucCIEvePIpazBTe28,119
-yeref-0.24.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-yeref-0.24.26.dist-info/top_level.txt,sha256=yCQKchWHbfV-3OuQPYRdi2loypD-nmbDJbtt3OuKKkY,6
-yeref-0.24.26.dist-info/RECORD,,