Update dmsender.py

dmsender.py

@@ -3,14 +3,12 @@ import requests
 import os
 
 BASE_URL = "https://desk-api.channel.io/desk/channels/200605"
-MEDIA_BASE = "https://media.channel.io/cht/v1"
+MEDIA_BASE_URL = "https://media.channel.io/cht/v1"
 
-CHANNEL_ID = "200605"
 TARGET_FORWARD_CHAT_ID = "463667"
 SKIP_PERSON_ID = 604730
 
 HEADERS = {
-    "Content-Type": "application/json",
     "accept-language": "ja",
     "x-account": os.getenv("dmsendertoken")
 }
@@ -55,7 +53,7 @@ def post_message(chat_id, body):
     return r.json()
 
 
-def post_message2(chat_id, body):
+def post_group_message(chat_id, body):
     url = f"{BASE_URL}/groups/{chat_id}/messages"
     r = requests.post(url, headers=HEADERS, json=body)
     r.raise_for_status()
@@ -82,30 +80,28 @@ def find_latest_message(messages):
     return max(messages, key=lambda m: m.get("updatedAt", 0))
 
 
-# ===== ファイル関連 =====
-def download_file(group_chat_id, file_key):
+def fetch_original_file(chat_id, file_key):
     url = (
-        f"{MEDIA_BASE}/desk/channels/{CHANNEL_ID}"
-        f"/groups/{group_chat_id}/messages/file"
+        f"{MEDIA_BASE_URL}/desk/channels/200605/"
+        f"direct-chats/{chat_id}/messages/file"
     )
-    params = {"key": file_key}
-    r = requests.get(url, headers=HEADERS, params=params)
+    r = requests.get(url, headers=HEADERS, params={"key": file_key})
     r.raise_for_status()
-    return r.content  # バイナリ
+    return r.content
 
 
-def upload_file_to_target(file_name, file_content):
+def upload_file_to_group(file_name, file_bytes):
     url = (
-        f"{MEDIA_BASE}/pri-file/{CHANNEL_ID}"
-        f"/groups/{TARGET_FORWARD_CHAT_ID}/message/{file_name}"
+        f"{MEDIA_BASE_URL}/pri-file/200605/"
+        f"groups/{TARGET_FORWARD_CHAT_ID}/message/{file_name}"
     )
-
-    headers = HEADERS.copy()
-    headers.pop("Content-Type", None)
-
-    r = requests.post(url, headers=headers, data=file_content)
+    headers = {
+        "x-account": os.getenv("dmsendertoken"),
+        "Content-Type": "application/octet-stream"
+    }
+    r = requests.post(url, headers=headers, data=file_bytes)
     r.raise_for_status()
-    return r.json()  # files にそのまま使う
+    return r.json()
 
 
 def main_loop():
@@ -115,8 +111,7 @@ def main_loop():
             sessions = data.get("sessions", [])
 
             for session in sessions:
-                unread = session.get("unread", 0)
-                if unread < 1:
+                if session.get("unread", 0) < 1:
                     continue
 
                 chat_id = session.get("chatId")
@@ -130,43 +125,31 @@ def main_loop():
 
                 latest = find_latest_message(messages)
 
-                person_id = latest.get("personId")
-                if person_id == SKIP_PERSON_ID:
+                if latest.get("personId") == SKIP_PERSON_ID:
                     mark_messages_read(chat_id)
                     continue
 
                 # ① 送信しました
                 post_message(chat_id, SEND_BODY_TEMPLATE)
 
-                blocks = latest.get("blocks")
-                files = latest.get("files")
-                new_files = []
-
-                # ===== ファイル転送処理 =====
-                if files:
-                    source_group_id = latest.get("chatId")
-
-                    for f in files:
-                        file_key = f.get("key")
-                        file_name = f.get("name")
-
-                        if not file_key or not file_name:
-                            continue
-
-                        file_content = download_file(source_group_id, file_key)
-                        uploaded_file_json = upload_file_to_target(
-                            file_name, file_content
-                        )
-                        new_files.append(uploaded_file_json)
-
-                # ===== 固定IDへ転送 =====
+                # ② ファイル処理
+                uploaded_files = []
+                for f in latest.get("files", []) or []:
+                    original_bytes = fetch_original_file(chat_id, f["key"])
+                    uploaded_file = upload_file_to_group(
+                        f["name"],
+                        original_bytes
+                    )
+                    uploaded_files.append(uploaded_file)
+
+                # ③ 転送
                 forward_body = FORWARD_BODY_TEMPLATE.copy()
-                forward_body["blocks"] = blocks
-                forward_body["files"] = new_files if new_files else None
+                forward_body["blocks"] = latest.get("blocks")
+                forward_body["files"] = uploaded_files if uploaded_files else None
 
-                post_message2(TARGET_FORWARD_CHAT_ID, forward_body)
+                post_group_message(TARGET_FORWARD_CHAT_ID, forward_body)
 
-                # 既読
+                # ④ 既読
                 mark_messages_read(chat_id)
 
         except Exception as e: