Update app.py

app.py

@@ -660,9 +660,6 @@ async def process_album_group(media_group_id: str):
         if token:
             # Will be handled separately
             data['msg_id'] = msg_id  # store msg_id for later use
-            # Don't send prompt here, we'll do it after
-            # We'll add to a list and process later
-            pass
         else:
             non_dup.append((msg_id, filename, file_id, size))
 
@@ -958,7 +955,15 @@ async def cb_dup_keep(_, query: CallbackQuery):
     data = duplicate_prompt_map.pop(token, None)
     if not data:
         return await query.answer("This prompt is no longer valid.", show_alert=True)
-    # Rename the file to avoid collision
+
+    # FIXED: If file_obj is None (from album prompt), retrieve the actual message
+    file_obj = data.get('file_obj')
+    if file_obj is None:
+        try:
+            file_obj = await app.get_messages(data['chat_id'], data['msg_id'])
+        except Exception:
+            return await query.answer("Original message no longer available.", show_alert=True)
+
     base, ext = os.path.splitext(data['orig_filename'])
     new_filename = f"{base}_1{ext}"
     job_id = data['job_id']
@@ -966,7 +971,7 @@ async def cb_dup_keep(_, query: CallbackQuery):
     await upload_queue.put((
         data['user_id'],
         data['chat_id'],
-        data['file_obj'],
+        file_obj,
         new_filename,
         job_id,
         data['file_id'],
@@ -1058,8 +1063,12 @@ async def cb_upload(_, query: CallbackQuery):
                 )
                 continue
         else:
-            # Remote file: (user_id, file_id, filename, expected_size)
-            file_id, filename, expected_size = entry[1], entry[2], entry[3] if len(entry) == 4 else (entry[1], entry[2], None)
+            # FIXED: Correctly handle remote file entries
+            if len(entry) == 4:
+                file_id, filename, expected_size = entry[1], entry[2], entry[3]
+            else:
+                file_id, filename = entry[1], entry[2]
+                expected_size = None
             limit_err = check_file_size_limit(filename, expected_size)
             if limit_err:
                 await query.message.reply_text(limit_err)
@@ -1102,7 +1111,12 @@ async def cb_upload_all(_, query: CallbackQuery):
                 )
                 continue
         else:
-            file_id, filename, expected_size = entry[1], entry[2], entry[3] if len(entry) == 4 else (entry[1], entry[2], None)
+            # FIXED: Correctly handle remote file entries
+            if len(entry) == 4:
+                file_id, filename, expected_size = entry[1], entry[2], entry[3]
+            else:
+                file_id, filename = entry[1], entry[2]
+                expected_size = None
             limit_err = check_file_size_limit(filename, expected_size)
             if limit_err:
                 await query.message.reply_text(limit_err)