diff --git a/telewarder/app.py b/telewarder/app.py index adc44f7..eefebda 100644 --- a/telewarder/app.py +++ b/telewarder/app.py @@ -4,6 +4,7 @@ import os import aiohttp import asyncio import logging +import json API_ID = os.getenv('API_ID') API_HASH = os.getenv('API_HASH') @@ -30,7 +31,7 @@ async def fetch_messages(session, url): async def forward_message(client, message_data): try: async with aiohttp.ClientSession() as session: - await session.post(SEND_ENDPOINT, data=message_data) + await session.post(url=SEND_ENDPOINT, data=message_data, headers={"Content-Type": "application/json"}) except Exception as e: logging.error(f"Error forwarding message to HTTP server: {e}") @@ -41,10 +42,13 @@ async def check_and_reply(app): messages = await fetch_messages(session, MESSAGES_ENDPOINT) if messages: for message_data in messages: - chat_id = message_data.get('chat_id') - message_id = message_data.get('message_id') - message_text = message_data.get('message') - await app.send_message(chat_id, message_text, reply_to_message_id=message_id) + try: + chat_id = message_data.get('chat_id') + message_id = message_data.get('message_id') + message_text = message_data.get('message_text') + await app.send_message(chat_id, message_text, reply_to_message_id=message_id) + except Exception as e: + logging.info(f"Something wrong occurred: {e}") await asyncio.sleep(10) # Adjust the time interval for checking (in seconds) #@app.on_message() @@ -53,10 +57,10 @@ async def forward(client, message): message_data = { "chat_id": message.chat.id, "message_id": message.id, - "message": message.text + "message_text": message.text } logging.info(f"Sending {message_data} to {SEND_ENDPOINT}") - await forward_message(client, message_data) + await forward_message(client, json.dumps(message_data)) async def main(): app = Client(os.environ.get('SESSION_NAME', '/data/telewarder'),