fix content streaming
This commit is contained in:
1 parent
6e4893f59d
commit
9f949b3c09
2 files changed
+38
-6
No files matched your search
@@ -270,7 +270,20 @@ async def indexer_loop(memory, platform_found: bool, seqno: int) -> [bool, int]:
|
||||
user = await session.get(User, user_wallet_connection.user_id)
|
||||
|
||||
if user:
|
||||
user_uploader_wrapper = Wrapped_CBotChat(memory._telegram_bot, chat_id=user.telegram_id, user=user, db_session=session)
|
||||
# Notify user about indexed content via client bot (main UX bot),
|
||||
# but keep ability to clean up uploader-bot hint messages.
|
||||
user_client_wrapper = Wrapped_CBotChat(
|
||||
memory._client_telegram_bot,
|
||||
chat_id=user.telegram_id,
|
||||
user=user,
|
||||
db_session=session,
|
||||
)
|
||||
user_uploader_wrapper = Wrapped_CBotChat(
|
||||
memory._telegram_bot,
|
||||
chat_id=user.telegram_id,
|
||||
user=user,
|
||||
db_session=session,
|
||||
)
|
||||
ref_id = (user.meta or {}).get('ref_id')
|
||||
if not ref_id:
|
||||
ref_id = user.ensure_ref_id()
|
||||
@@ -281,12 +294,12 @@ async def indexer_loop(memory, platform_found: bool, seqno: int) -> [bool, int]:
|
||||
item_index=item_index,
|
||||
)
|
||||
|
||||
await user_uploader_wrapper.send_message(
|
||||
await user_client_wrapper.send_message(
|
||||
message_text,
|
||||
message_type='notification'
|
||||
)
|
||||
|
||||
await user_uploader_wrapper.send_content(
|
||||
await user_client_wrapper.send_content(
|
||||
session,
|
||||
encrypted_stored_content
|
||||
)
|
||||
@@ -301,7 +314,11 @@ async def indexer_loop(memory, platform_found: bool, seqno: int) -> [bool, int]:
|
||||
)
|
||||
))
|
||||
for hint_message in result.scalars().all():
|
||||
await user_uploader_wrapper.delete_message(hint_message.message_id)
|
||||
# Delete the hint with the bot that originally sent it.
|
||||
if hint_message.bot_id == user_client_wrapper.bot_id:
|
||||
await user_client_wrapper.delete_message(hint_message.message_id)
|
||||
elif hint_message.bot_id == user_uploader_wrapper.bot_id:
|
||||
await user_uploader_wrapper.delete_message(hint_message.message_id)
|
||||
except BaseException as e:
|
||||
make_log("Indexer", f"Error while deleting hint messages: {e}" + '\n' + traceback.format_exc(), level="error")
|
||||
elif encrypted_stored_content.type.startswith('onchain') and encrypted_stored_content.onchain_index == item_index:
|
||||
|
||||
Reference in new issue
Block a user