feat(auth): support interactive telegram in-chat login code submission
This commit is contained in:
+61
-8
@@ -1,7 +1,8 @@
|
||||
import os
|
||||
import logging
|
||||
from typing import Optional
|
||||
from typing import Optional, Callable, Awaitable
|
||||
from telethon import TelegramClient, events
|
||||
from telethon.errors import SessionPasswordNeededError
|
||||
from telethon.tl.types import MessageMediaPhoto, MessageMediaDocument
|
||||
from db.repository import Repository
|
||||
from core.dedup import compute_content_hash, compute_file_hash
|
||||
@@ -33,19 +34,71 @@ class CollectorService:
|
||||
os.makedirs(os.path.dirname(self.session_name), exist_ok=True)
|
||||
os.makedirs(MEDIA_DIR, exist_ok=True)
|
||||
self.client = TelegramClient(self.session_name, self.api_id, self.api_hash, proxy=get_telegram_proxy())
|
||||
self.phone_code_hash: Optional[str] = None
|
||||
self._handlers_registered = False
|
||||
|
||||
async def start(self):
|
||||
logger.info("Starting Collector Userbot...")
|
||||
if self.phone:
|
||||
await self.client.start(phone=self.phone)
|
||||
else:
|
||||
await self.client.start()
|
||||
logger.info("Collector Userbot connected successfully.")
|
||||
async def start(self, notify_fn: Optional[Callable[[str], Awaitable[None]]] = None):
|
||||
logger.info("Initializing Collector Userbot client...")
|
||||
await self.client.connect()
|
||||
|
||||
if await self.client.is_user_authorized():
|
||||
me = await self.client.get_me()
|
||||
logger.info(f"Collector Userbot is authorized as: {me.first_name} (@{me.username})")
|
||||
self._register_handlers()
|
||||
return True
|
||||
|
||||
logger.warning("Collector Userbot is not authorized. Requesting login code...")
|
||||
if self.phone and notify_fn:
|
||||
try:
|
||||
sent = await self.client.send_code_request(self.phone)
|
||||
self.phone_code_hash = sent.phone_code_hash
|
||||
await notify_fn(
|
||||
f"🔐 <b>Collector Userbot Login Required</b>\n\n"
|
||||
f"A login code was sent to phone <code>{self.phone}</code>.\n\n"
|
||||
f"Please reply with: <code>/code <your_code></code>\n"
|
||||
f"(Or <code>/password <2fa_password></code> if 2FA is enabled)."
|
||||
)
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to send login code request: {e}")
|
||||
await notify_fn(f"❌ Failed to request login code: {e}")
|
||||
return False
|
||||
|
||||
async def submit_code(self, code: str) -> str:
|
||||
if not self.phone or not self.phone_code_hash:
|
||||
# Re-request code
|
||||
sent = await self.client.send_code_request(self.phone)
|
||||
self.phone_code_hash = sent.phone_code_hash
|
||||
|
||||
try:
|
||||
await self.client.sign_in(phone=self.phone, code=code, phone_code_hash=self.phone_code_hash)
|
||||
me = await self.client.get_me()
|
||||
self._register_handlers()
|
||||
return f"✅ Logged in successfully as <b>{me.first_name}</b> (@{me.username or 'none'}). Collector is now active!"
|
||||
except SessionPasswordNeededError:
|
||||
return "🔐 <b>Two-Factor Authentication (2FA) is enabled.</b> Please send: <code>/password <your_2fa_password></code>"
|
||||
except Exception as e:
|
||||
return f"❌ Login failed: {e}"
|
||||
|
||||
async def submit_password(self, password: str) -> str:
|
||||
try:
|
||||
await self.client.sign_in(password=password)
|
||||
me = await self.client.get_me()
|
||||
self._register_handlers()
|
||||
return f"✅ 2FA Verified! Logged in as <b>{me.first_name}</b> (@{me.username or 'none'}). Collector is now active!"
|
||||
except Exception as e:
|
||||
return f"❌ 2FA verification failed: {e}"
|
||||
|
||||
def _register_handlers(self):
|
||||
if self._handlers_registered:
|
||||
return
|
||||
|
||||
@self.client.on(events.NewMessage)
|
||||
async def on_new_message(event: events.NewMessage.Event):
|
||||
await self._handle_message(event)
|
||||
|
||||
self._handlers_registered = True
|
||||
logger.info("Collector real-time event handlers registered.")
|
||||
|
||||
async def _handle_message(self, event: events.NewMessage.Event):
|
||||
try:
|
||||
chat_id = event.chat_id
|
||||
|
||||
Reference in New Issue
Block a user