From f75902a97eb329e61718a472e167e8c42f1d3208 Mon Sep 17 00:00:00 2001 From: user Date: Fri, 5 Apr 2024 14:48:10 +0300 Subject: [PATCH] fix --- app/bot/routers/content.py | 2 +- app/core/models/_telegram/templates/player.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/bot/routers/content.py b/app/bot/routers/content.py index 6984203..d6c7206 100644 --- a/app/bot/routers/content.py +++ b/app/bot/routers/content.py @@ -62,7 +62,7 @@ async def t_callback_owned_content(query: types.CallbackQuery, memory=None, user async def t_callback_node_content(query: types.CallbackQuery, memory=None, user=None, db_session=None, chat_wrap=None, **extra): content_oid = int(query.data.split('_')[1]) return await chat_wrap.send_content( - db_session.query(StoredContent).filter_by( + db_session, db_session.query(StoredContent).filter_by( id=content_oid ).first(), message_id=query.message.message_id diff --git a/app/core/models/_telegram/templates/player.py b/app/core/models/_telegram/templates/player.py index f9719cb..08a60d8 100644 --- a/app/core/models/_telegram/templates/player.py +++ b/app/core/models/_telegram/templates/player.py @@ -7,7 +7,7 @@ from app.core._keyboards import get_inline_keyboard class PlayerTemplates: - async def send_content(self, content: StoredContent, extra_buttons=None, message_id=None): + async def send_content(self, db_session, content: StoredContent, extra_buttons=None, message_id=None): local_content = None content_type, content_encoding = 'application', 'x-binary' cd_log = "" @@ -19,7 +19,9 @@ class PlayerTemplates: if not content.encrypted: local_content = content else: - local_content = content.decrypted_content + local_content = db_session.query(StoredContent).filter_by( + id=content.decrypted_content_id + ).first() # TODO: add check decrypted_content by .format_json()['content_cid'] if local_content: cd_log += f"Decrypted: {local_content.hash}. "