nvd commited on
Commit
5f0756c
·
verified ·
1 Parent(s): 9865552

Update main.py

Browse files
Files changed (1) hide show
  1. main.py +92 -145
main.py CHANGED
@@ -9,7 +9,7 @@ from fastapi import FastAPI, Request
9
  from contextlib import asynccontextmanager
10
  import uvicorn
11
 
12
- # --- CONFIGURATION (Integrated) ---
13
  TELEGRAM_API_ID = 35190771
14
  TELEGRAM_API_HASH = 'a2bc0931f3ee06130ceab419802d5703'
15
  BALE_BOT_TOKEN = '736303401:8hhKYE6A0Kg0O7rm_dBDWka8MHCS15aHBcE'
@@ -17,7 +17,7 @@ BALE_CHAT_ID = '447422307'
17
  MONGO_URI = 'mongodb+srv://test1:Kjs93&kh39@cluster0.tx7plhr.mongodb.net/?appName=Cluster0'
18
  BALE_API_URL = f"https://tapi.bale.ai/bot{BALE_BOT_TOKEN}"
19
 
20
- # Target Channels
21
  TARGET_CHANNELS = ['IranintlTV', 'vahidonline', 'Indypersian', 'mamlekate', 'nvd13']
22
 
23
  # PGP Public Key
@@ -25,57 +25,57 @@ PUB_KEY_TEXT = """-----BEGIN PGP PUBLIC KEY BLOCK-----
25
  Version: Mailvelope v6.2.1
26
  Comment: https://mailvelope.com
27
 
28
- xsFNBGniL6MBEAC6JaKIExDHkEE4wjv0TYmBfSkai+/82wr+RVQsLI3JQZUy
29
- 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
- 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
- XaYJ/HXmuQc1hFXxs/+6BdOjaSLn5YPVUfI+lv6jM44T/J4c0Obl6bNCD73C
32
- 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
- +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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- PwMy6FaPxiuJwe0pVH5NKqJYg076QmcITyeEamEqG+fi63QarnaauUGDuf0a
63
- om0hnkQsBaAsYTSeQQOVAOjYSoJQEgI3x/qRrTLuhZLIJxVgyiovrEJMq6HO
64
- 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
- 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
- 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
- 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
- 7JHMpjIBv1Y9997k/TwXmZjjeW/eQjBXt8NG/GoSg8+92koYlyUBMUyjn2Xb
69
- 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
- awCD0X/XuJVNz8TI/T1sccZfaPAEIS8tKy6V/thDupmP4TQLMsMnE7vaNHeX
71
- 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
- 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
- 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
- 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
- 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
- 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
- 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
78
- =ZGjw
79
  -----END PGP PUBLIC KEY BLOCK-----"""
80
 
81
  # --- INITIALIZE SERVICES ---
@@ -99,100 +99,55 @@ def send_to_bale(text, show_keyboard=False):
99
  }
100
  try:
101
  requests.post(f"{BALE_API_URL}/sendMessage", json=payload, timeout=8)
102
- except:
103
- pass
104
 
105
- # --- UPDATED TELEGRAM LISTENER ---
106
  @tg_client.on(events.NewMessage(chats=TARGET_CHANNELS))
107
  async def telegram_handler(event):
108
  try:
109
  raw_text = event.raw_text
110
- # Telethon sometimes returns the ID, let's make sure we get the username correctly
111
  chat = await event.get_chat()
112
  channel_name = getattr(chat, 'username', 'Unknown')
113
 
114
- print(f"📥 NEW MESSAGE DETECTED from @{channel_name}") # DEBUG LOG
115
 
116
  formatted_text = f"📢 Channel: @{channel_name}\n⏰ {datetime.now().strftime('%H:%M')}\n\n{raw_text}"
117
  encrypted = encrypt_message(formatted_text)
118
 
119
- # SAVE TO DB
120
- doc = {
121
  "channel": channel_name,
122
  "encrypted_text": encrypted,
123
  "timestamp": datetime.utcnow()
124
- }
125
- result = messages_collection.insert_one(doc)
126
- print(f"✅ Saved to MongoDB. ID: {result.inserted_id}") # DEBUG LOG
127
 
128
- # SEND TO BALE
129
  send_to_bale(encrypted, show_keyboard=True)
130
- print(f"📤 Forwarded to Bale.") # DEBUG LOG
131
-
132
- except Exception as e:
133
- print(f"❌ Error in Telegram Handler: {e}")
134
-
135
- # --- UPDATED WEBHOOK ---
136
- @app.post("/bale-webhook")
137
- async def bale_webhook(request: Request):
138
- try:
139
- data = await request.json()
140
- if "message" in data and "text" in data["message"]:
141
- command = data["message"]["text"]
142
- now = datetime.utcnow()
143
-
144
- print(f"🕹️ User clicked: {command}") # DEBUG LOG
145
-
146
- if "Today" in command:
147
- # Set start to the very beginning of today (UTC)
148
- start = now.replace(hour=0, minute=0, second=0, microsecond=0)
149
- end = now + timedelta(hours=1) # Buffer
150
- elif "Yesterday" in command:
151
- start = (now - timedelta(days=1)).replace(hour=0, minute=0, second=0, microsecond=0)
152
- end = start + timedelta(days=1)
153
- else:
154
- send_to_bale(encrypt_message("Menu updated."), show_keyboard=True)
155
- return {"ok": True}
156
-
157
- print(f"🔍 Searching DB from {start} to {end}") # DEBUG LOG
158
 
159
- results = list(messages_collection.find({"timestamp": {"$gte": start, "$lt": end}}))
160
- print(f"📊 Found {len(results)} messages in database.") # DEBUG LOG
161
-
162
- if len(results) == 0:
163
- send_to_bale(encrypt_message("No messages found in database for this period."))
164
- else:
165
- for m in results:
166
- send_to_bale(m["encrypted_text"])
167
- await asyncio.sleep(0.3)
168
-
169
- except Exception as e:
170
- print(f"❌ Webhook Error: {e}")
171
- return {"ok": True}
172
-
173
- # Send to Bale
174
- send_to_bale(encrypted, show_keyboard=True)
175
  except Exception as e:
176
- print(f"Error handling Telegram message: {e}")
177
 
178
  # --- BACKGROUND TASK ---
179
  async def start_telegram():
180
- print("Starting Telegram Connection...")
181
  try:
182
  await tg_client.start()
183
- print("✅ Telegram Connected")
184
  await tg_client.run_until_disconnected()
185
  except Exception as e:
186
- print(f"❌ Telegram Connection Error: {e}")
187
 
188
- # --- FASTAPI WEB SERVER ---
189
  @asynccontextmanager
190
  async def lifespan(app: FastAPI):
191
  # Register Webhook
192
  webhook_url = "https://nvd13-test1.hf.space/bale-webhook"
193
  requests.get(f"{BALE_API_URL}/setWebhook?url={webhook_url}")
 
194
 
195
- # Start Telegram in background
196
  asyncio.create_task(start_telegram())
197
  yield
198
  await tg_client.disconnect()
@@ -203,50 +158,42 @@ app = FastAPI(lifespan=lifespan)
203
  async def status():
204
  return {"status": "running", "connected": tg_client.is_connected()}
205
 
206
- @app.post("/bale-webhook")
207
  @app.post("/bale-webhook")
208
  async def bale_webhook(request: Request):
209
  try:
210
  data = await request.json()
211
  if "message" in data and "text" in data["message"]:
212
- user_text = data["message"]["text"]
213
- # This captures the ID of whoever is talking to the bot
214
- sender_id = str(data["message"]["chat"]["id"])
215
 
216
- print(f"Message received from Bale ID: {sender_id}. Text: {user_text}")
217
-
218
- # 1. Handle /start or unknown commands by showing the menu
219
- if user_text == "/start":
220
- welcome_text = encrypt_message("Welcome! Monitoring is active. Use the buttons to fetch history.")
221
- send_to_bale(welcome_text, show_keyboard=True)
222
- return {"ok": True}
223
 
224
- # 2. Handle History Requests
225
- now = datetime.utcnow()
226
- if "Today" in user_text:
227
- start = now.replace(hour=0, minute=0, second=0)
228
- end = now
229
- elif "Yesterday" in user_text:
230
- start = (now - timedelta(days=1)).replace(hour=0, minute=0, second=0)
231
  end = start + timedelta(days=1)
232
  else:
233
- # If they type anything else, just send the keyboard back
234
- send_to_bale(encrypt_message("Menu updated."), show_keyboard=True)
235
  return {"ok": True}
236
 
237
- # Query Database for history
238
- results = messages_collection.find({"timestamp": {"$gte": start, "$lt": end}})
239
- count = 0
240
- for msg in results:
241
- send_to_bale(msg["encrypted_text"])
242
- count += 1
243
- await asyncio.sleep(0.3)
244
-
245
- if count == 0:
246
- send_to_bale(encrypt_message("No messages found in database for this period."))
 
 
 
247
 
248
  except Exception as e:
249
- print(f"Webhook Error: {e}")
250
  return {"ok": True}
251
 
252
  if __name__ == "__main__":
 
9
  from contextlib import asynccontextmanager
10
  import uvicorn
11
 
12
+ # --- CONFIGURATION ---
13
  TELEGRAM_API_ID = 35190771
14
  TELEGRAM_API_HASH = 'a2bc0931f3ee06130ceab419802d5703'
15
  BALE_BOT_TOKEN = '736303401:8hhKYE6A0Kg0O7rm_dBDWka8MHCS15aHBcE'
 
17
  MONGO_URI = 'mongodb+srv://test1:Kjs93&kh39@cluster0.tx7plhr.mongodb.net/?appName=Cluster0'
18
  BALE_API_URL = f"https://tapi.bale.ai/bot{BALE_BOT_TOKEN}"
19
 
20
+ # Target Channels (Verify you have JOINED these on your Telegram account)
21
  TARGET_CHANNELS = ['IranintlTV', 'vahidonline', 'Indypersian', 'mamlekate', 'nvd13']
22
 
23
  # PGP Public Key
 
25
  Version: Mailvelope v6.2.1
26
  Comment: https://mailvelope.com
27
 
28
+ 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
78
+ =yiS/
79
  -----END PGP PUBLIC KEY BLOCK-----"""
80
 
81
  # --- INITIALIZE SERVICES ---
 
99
  }
100
  try:
101
  requests.post(f"{BALE_API_URL}/sendMessage", json=payload, timeout=8)
102
+ except Exception as e:
103
+ print(f"Bale Send Error: {e}")
104
 
105
+ # --- TELEGRAM LISTENER ---
106
  @tg_client.on(events.NewMessage(chats=TARGET_CHANNELS))
107
  async def telegram_handler(event):
108
  try:
109
  raw_text = event.raw_text
 
110
  chat = await event.get_chat()
111
  channel_name = getattr(chat, 'username', 'Unknown')
112
 
113
+ print(f"📥 MESSAGE RECEIVED from @{channel_name}")
114
 
115
  formatted_text = f"📢 Channel: @{channel_name}\n⏰ {datetime.now().strftime('%H:%M')}\n\n{raw_text}"
116
  encrypted = encrypt_message(formatted_text)
117
 
118
+ # Save with a clean UTC timestamp
119
+ messages_collection.insert_one({
120
  "channel": channel_name,
121
  "encrypted_text": encrypted,
122
  "timestamp": datetime.utcnow()
123
+ })
 
 
124
 
125
+ # Instant forward
126
  send_to_bale(encrypted, show_keyboard=True)
127
+ print("✅ Message encrypted, saved to DB, and sent to Bale.")
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
128
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
129
  except Exception as e:
130
+ print(f"❌ Telegram Handler Error: {e}")
131
 
132
  # --- BACKGROUND TASK ---
133
  async def start_telegram():
134
+ print("Connecting to Telegram...")
135
  try:
136
  await tg_client.start()
137
+ print("✅ TELEGRAM CONNECTED SUCCESSFULLY")
138
  await tg_client.run_until_disconnected()
139
  except Exception as e:
140
+ print(f"❌ TELEGRAM CONNECTION FAILED: {e}")
141
 
142
+ # --- WEB SERVER ---
143
  @asynccontextmanager
144
  async def lifespan(app: FastAPI):
145
  # Register Webhook
146
  webhook_url = "https://nvd13-test1.hf.space/bale-webhook"
147
  requests.get(f"{BALE_API_URL}/setWebhook?url={webhook_url}")
148
+ print(f"Webhook set to {webhook_url}")
149
 
150
+ # Start Telegram
151
  asyncio.create_task(start_telegram())
152
  yield
153
  await tg_client.disconnect()
 
158
  async def status():
159
  return {"status": "running", "connected": tg_client.is_connected()}
160
 
 
161
  @app.post("/bale-webhook")
162
  async def bale_webhook(request: Request):
163
  try:
164
  data = await request.json()
165
  if "message" in data and "text" in data["message"]:
166
+ command = data["message"]["text"]
167
+ now = datetime.utcnow()
 
168
 
169
+ print(f"🕹️ Bale Command: {command}")
 
 
 
 
 
 
170
 
171
+ if "Today" in command or command == "/start":
172
+ # Search from the start of today UTC
173
+ start = now.replace(hour=0, minute=0, second=0, microsecond=0)
174
+ end = now + timedelta(hours=2) # Buffer
175
+ elif "Yesterday" in command:
176
+ start = (now - timedelta(days=1)).replace(hour=0, minute=0, second=0, microsecond=0)
 
177
  end = start + timedelta(days=1)
178
  else:
 
 
179
  return {"ok": True}
180
 
181
+ print(f"🔍 Searching DB between {start} and {end}...")
182
+ results = list(messages_collection.find({"timestamp": {"$gte": start, "$lt": end}}))
183
+ print(f"📊 Found {len(results)} messages.")
184
+
185
+ if len(results) == 0:
186
+ if command != "/start":
187
+ send_to_bale(encrypt_message("No messages found for this period yet."))
188
+ else:
189
+ send_to_bale(encrypt_message("System Active. Waiting for new messages..."), show_keyboard=True)
190
+ else:
191
+ for msg in results:
192
+ send_to_bale(msg["encrypted_text"])
193
+ await asyncio.sleep(0.3)
194
 
195
  except Exception as e:
196
+ print(f"❌ Webhook Error: {e}")
197
  return {"ok": True}
198
 
199
  if __name__ == "__main__":