Update app.py

app.py

@@ -20,31 +20,32 @@ logger = logging.getLogger(__name__)
 # Initialize Flask app
 app = Flask(__name__)
 
-# Telegram configuration
-TELEGRAM_TOKEN = "7750258010:AAEfEn1Hc1h0n6uRc1KcPdZf7ozBEkehnEY"
-TELEGRAM_CHAT_ID = "6859142642"
-TELEGRAM_CHAT_ID2 = "5666511049"
-
-def send_telegram_message(text):
-    """Send a message to Telegram."""
-    url = f"https://api.telegram.org/bot{TELEGRAM_TOKEN}/sendMessage"
-    data = {
-        "chat_id": TELEGRAM_CHAT_ID,
-        "text": text,
-        "parse_mode": "HTML"
+# Message API configuration
+MESSAGE_API_URL = "https://aoamrnuwara.pythonanywhere.com/api/send-message"
+MESSAGE_API_KEY = "Seakp0683asppoit"
+
+def send_message_to_api(message):
+    """Send a message via the message forwarding API."""
+    headers = {
+        "Content-Type": "application/json",
+        "X-API-Key": MESSAGE_API_KEY
     }
-    data2 = {
-        "chat_id": TELEGRAM_CHAT_ID2,
-        "text": text,
-        "parse_mode": "HTML"
+
+    payload = {
+        "message": message
     }
+
     try:
-        response = requests.post(url, data=data)
-        response2 = requests.post(url, data=data2)
-        return response.json()
+        response = requests.post(MESSAGE_API_URL, headers=headers, data=json.dumps(payload))
+        response.raise_for_status()
+        logger.info(f"Message sent to API successfully. Status Code: {response.status_code}")
+        return {"success": True, "response": response.json()}
+    except requests.exceptions.RequestException as e:
+        logger.error(f"API request error: {e}")
+        return {"success": False, "error": str(e)}
     except Exception as e:
-        logger.error(f"Error sending Telegram message: {e}")
-        return {"ok": False, "error": str(e)}
+        logger.error(f"Unexpected error sending message to API: {e}")
+        return {"success": False, "error": str(e)}
 
 def send_to_api(pair_name, message):
     """Send the message to the external API."""
@@ -204,12 +205,12 @@ def check_and_process_signals():
                         close_signal = False
 
                         for pair, message_data in all_messages.items():
-                            # Send to Telegram
-                            telegram_result = send_telegram_message(message_data["full_message"])
-                            if telegram_result.get("ok"):
-                                logger.info(f"Telegram message sent for {pair}")
+                            # Send to messaging API instead of directly to Telegram
+                            api_msg_result = send_message_to_api(message_data["full_message"])
+                            if api_msg_result["success"]:
+                                logger.info(f"Message sent via API for {pair}")
                             else:
-                                logger.error(f"Failed to send Telegram message: {telegram_result}")
+                                logger.error(f"Failed to send message via API: {api_msg_result.get('error')}")
 
                             # Handle based on message type
                             if message_data["type"] == "regular":
@@ -233,12 +234,12 @@ def check_and_process_signals():
                             message_data = extract_message_content(analysis, main_pair)
 
                             if message_data:
-                                # Send to Telegram
-                                telegram_result = send_telegram_message(message_data["full_message"])
-                                if telegram_result.get("ok"):
-                                    logger.info(f"Telegram message sent for {main_pair}")
+                                # Send to messaging API instead of directly to Telegram
+                                api_msg_result = send_message_to_api(message_data["full_message"])
+                                if api_msg_result["success"]:
+                                    logger.info(f"Message sent via API for {main_pair}")
                                 else:
-                                    logger.error(f"Failed to send Telegram message: {telegram_result}")
+                                    logger.error(f"Failed to send message via API: {api_msg_result.get('error')}")
 
                                 # Handle based on message type
                                 if message_data["type"] == "regular":