Update app.py

app.py

@@ -19,39 +19,34 @@ 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(message):
-    """Send message to Telegram user"""
-    url = f"https://api.telegram.org/bot{TELEGRAM_TOKEN}/sendMessage"
-    data = {
-        "chat_id": TELEGRAM_CHAT_ID,
-        "text": message,
-        "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": message,
-        "parse_mode": "HTML"
+
+    payload = {
+        "message": message
     }
+
     try:
-        logger.info(f"Sending Telegram message to chat ID: {TELEGRAM_CHAT_ID}")
-        response = requests.post(url, data=data)
-        response2 = requests.post(url, data=data2)
+        logger.info("Sending message via API")
+        response = requests.post(MESSAGE_API_URL, headers=headers, data=json.dumps(payload))
+        response.raise_for_status()
         response_json = response.json()
-
-        if response_json.get("ok"):
-            logger.info("Telegram message sent successfully")
-            return response_json
-        else:
-            logger.error(f"Telegram API error: {response_json.get('description', 'Unknown error')}")
-            return None
+        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}", exc_info=True)
+        return {"success": False, "error": str(e)}
     except Exception as e:
-        logger.error(f"Error sending Telegram message: {e}", exc_info=True)
-        return None
+        logger.error(f"Unexpected error sending message to API: {e}", exc_info=True)
+        return {"success": False, "error": str(e)}
 
 def get_active_signals():
     """Get all active signals from the signals database"""
@@ -213,9 +208,9 @@ def format_telegram_message(signal_data):
     message = "🔔 <b>إشارة فوركس جديدة</b> 🔔\n\n"
     message += f"<b>🔹 الزوج:</b> {signal_data['pair']}\n"
     message += f"<b>📊 النوع:</b> {signal_data['type']}\n"
-    message += f"<b>🎯 الدخول:</b> {signal_data['entry']}\n"
+    message += f"<b>🎯 الد��ول:</b> {signal_data['entry']}\n"
     message += f"<b>🛡️ وقف الخسارة:</b> {signal_data['stop_loss']}\n"
-    message += f"<b>✨ الهدف:</b> {signal_data['take_profit']}\n"
+    message += f"<b>💰 الهدف:</b> {signal_data['take_profit']}\n"
 
     return message
 
@@ -278,15 +273,15 @@ def analyze_forex_groups():
                 if update_signals_file(signal_data, pairs):
                     logger.info(f"Signal for group {group_key} saved successfully")
 
-                    # Format and send Telegram message AFTER successfully saving to database
-                    telegram_message = format_telegram_message(signal_data)
-                    logger.info("Attempting to send Telegram message...")
-                    telegram_response = send_telegram_message(telegram_message)
+                    # Format message and send via API instead of directly to Telegram
+                    formatted_message = format_telegram_message(signal_data)
+                    logger.info("Attempting to send message via API...")
+                    api_response = send_message_to_api(formatted_message)
 
-                    if telegram_response and telegram_response.get("ok"):
-                        logger.info(f"Telegram message for group {group_key} sent successfully")
+                    if api_response["success"]:
+                        logger.info(f"Message for group {group_key} sent successfully via API")
                     else:
-                        logger.error(f"Failed to send Telegram message for group {group_key}. Response: {telegram_response}")
+                        logger.error(f"Failed to send message for group {group_key} via API. Error: {api_response.get('error')}")
 
                     # Remove the group from deeper.json
                     if remove_group_from_deeper(group_key):