Update forwarder.py

forwarder.py

@@ -40,25 +40,20 @@ async def save_last_ids(last_ids):
         json.dump(last_ids, f)
 
 def extract_slugs_from_text(text):
-    """从文本中提取所有可能的 slug (32位十六进制)"""
     if not text:
         return []
-    # 匹配 hdhive.com 的资源链接
     hdhive_pattern = r"https?://hdhive\.com/resource/(?:[^/]+/)?([a-f0-9]{32})"
     matches = re.findall(hdhive_pattern, text, re.IGNORECASE)
     if matches:
         return matches
-    # 匹配任何 32 位十六进制字符串
     plain_pattern = r"\b([a-f0-9]{32})\b"
     matches = re.findall(plain_pattern, text, re.IGNORECASE)
     return matches
 
 def get_first_slug_from_message(message):
-    """从消息中提取第一个 slug，并打印调试信息"""
     preview = message.text[:200] if message.text else "[无文本]"
     print(f"消息 {message.id} 内容预览: {preview}")
     
-    # 1. 从消息实体中的链接 URL 提取
     if message.entities:
         print(f"  消息包含 {len(message.entities)} 个实体")
         for idx, entity in enumerate(message.entities):
@@ -66,12 +61,10 @@ def get_first_slug_from_message(message):
             print(f"    实体 {idx}: 类型 {entity_type}")
             entity_text = message.text[entity.offset:entity.offset+entity.length] if message.text else ""
             print(f"      实体文本: '{entity_text}'")
-            # 获取 URL (MessageEntityTextUrl 有 url 属性，MessageEntityUrl 有 url 属性吗？)
             url = None
             if hasattr(entity, 'url'):
                 url = entity.url
             elif entity_type == 'MessageEntityUrl':
-                # 对于 MessageEntityUrl，url 就是实体文本本身
                 url = entity_text
             if url:
                 print(f"      实体 URL: {url}")
@@ -79,7 +72,6 @@ def get_first_slug_from_message(message):
                 if slugs:
                     print(f"      从实体提取到 slug: {slugs[0]}")
                     return slugs[0]
-    # 2. 从消息纯文本中提取
     if message.text:
         slugs = extract_slugs_from_text(message.text)
         if slugs:
@@ -114,15 +106,13 @@ def get_direct_link(slug):
     return None
 
 def replace_links_in_text(text, slug, direct_link):
-    """将文本中所有出现的该 slug 对应的完整链接替换为直链"""
     if not text:
         return text
-    # 匹配包含该 slug 的完整链接（包含 /resource/.../slug 形式）
-    pattern = rf"(https?://hdhive\.com/resource/(?:[^/]+/)?{slug}|{slug})"
+    # 匹配完整的 HDHive 链接
+    pattern = rf"(https?://hdhive\.com/resource/(?:[^/]+/)?{slug})"
     return re.sub(pattern, direct_link, text, flags=re.IGNORECASE)
 
 async def send_modified_message(client, dest_entity, original_msg):
-    # 跳过服务消息
     if isinstance(original_msg, MessageService):
         print(f"跳过服务消息 {original_msg.id}")
         return
@@ -140,17 +130,46 @@ async def send_modified_message(client, dest_entity, original_msg):
             print(f"直接转发消息 {original_msg.id}（解锁失败）")
             return
 
-        # 有直链，需要替换文本
         if original_msg.text:
             new_text = replace_links_in_text(original_msg.text, slug, direct_link)
             if original_msg.media:
-                # 发送替换后的文本，同时转发原消息（带媒体）
-                await client.send_message(dest_entity, new_text)
-                await client.forward_messages(dest_entity, original_msg)
-                print(f"已发送替换文本并转发带媒体的原消息 {original_msg.id}")
+                try:
+                    # 下载原图片
+                    file_data = await client.download_media(original_msg.media, bytes)
+                    # 获取原文件名或生成一个
+                    file_name = None
+                    if hasattr(original_msg.media, 'document') and original_msg.media.document:
+                        attrs = original_msg.media.document.attributes
+                        for attr in attrs:
+                            if hasattr(attr, 'file_name') and attr.file_name:
+                                file_name = attr.file_name
+                                break
+                    if not file_name:
+                        ext = "jpg"
+                        if hasattr(original_msg.media, 'photo'):
+                            ext = "jpg"
+                        elif hasattr(original_msg.media, 'document') and original_msg.media.document:
+                            mime = original_msg.media.document.mime_type
+                            if mime == 'image/png':
+                                ext = 'png'
+                            elif mime == 'video/mp4':
+                                ext = 'mp4'
+                        file_name = f"image_{original_msg.id}.{ext}"
+                    
+                    await client.send_file(
+                        dest_entity,
+                        file_data,
+                        caption=new_text,
+                        force_document=False,
+                        file_name=file_name
+                    )
+                    print(f"已发送替换后的消息（带图片） {original_msg.id}")
+                except Exception as e:
+                    print(f"图片处理失败: {e}，发送纯文本")
+                    await client.send_message(dest_entity, new_text)
             else:
                 await client.send_message(dest_entity, new_text)
-                print(f"已发送替换后的消息 {original_msg.id}")
+                print(f"已发送替换后的文本消息 {original_msg.id}")
         else:
             await client.forward_messages(dest_entity, original_msg)
             print(f"直接转发无文本消息 {original_msg.id}")
@@ -259,7 +278,6 @@ async def main():
 
     for entity in source_entities:
         try:
-            # 尝试实时监听（需要是公开频道或机器人有权限）
             await client.get_permissions(entity)
             @client.on(events.NewMessage(chats=entity))
             async def handler(event, dest=dest_entity):