fix: Fix v2.media.create nor working with $raw (#1376)

neet · web-flow · commit 7dbf15e16361 · 2025-12-06T10:29:48.000+09:00
diff --git a/src/adapters/action/dispatcher-http-hook-mastodon.spec.ts b/src/adapters/action/dispatcher-http-hook-mastodon.spec.ts
@@ -1,4 +1,5 @@
 import { httpGet, HttpMockImpl, httpPost } from "../../__mocks__/index.js";
+import { type HttpResponse } from "../../interfaces/http.js";
 import { MastoHttpError, MastoTimeoutError } from "../errors/index.js";
 import { HttpActionDispatcher } from "./dispatcher-http.js";
 import { HttpActionDispatcherHookMastodon } from "./dispatcher-http-hook-mastodon.js";
@@ -38,6 +39,7 @@ describe("DispatcherHttp", () => {
       path: "/api/v2/media",
       data: undefined,
       meta: {},
+      raw: false,
     });
 
     expect(media).toHaveProperty("id", "1");
@@ -65,6 +67,7 @@ describe("DispatcherHttp", () => {
       path: "/api/v2/media",
       data: undefined,
       meta: {},
+      raw: false,
     });
 
     await expect(promise).rejects.toBeInstanceOf(MastoTimeoutError);
@@ -91,6 +94,7 @@ describe("DispatcherHttp", () => {
       path: "/api/v2/media",
       data: undefined,
       meta: {},
+      raw: false,
     });
 
     await expect(promise).rejects.toBeInstanceOf(MastoTimeoutError);
@@ -114,6 +118,7 @@ describe("DispatcherHttp", () => {
       path: "/api/v2/media",
       data: undefined,
       meta: {},
+      raw: false,
     });
 
     await expect(promise).rejects.toBeInstanceOf(Error);
@@ -138,9 +143,41 @@ describe("DispatcherHttp", () => {
         skipPolling: true,
       },
       meta: {},
+      raw: false,
     });
 
     expect(media).toHaveProperty("id", "1");
     expect(httpGet).toHaveBeenCalledTimes(0);
   });
+
+  it("waits for media attachment to be created ($raw)", async () => {
+    const http = new HttpMockImpl();
+    const dispatcher = new HttpActionDispatcher(
+      http,
+      new HttpActionDispatcherHookMastodon(http),
+    );
+    const postHeaders = new Headers();
+
+    httpPost.mockResolvedValueOnce({
+      data: { id: "1" },
+      headers: postHeaders,
+    });
+
+    httpGet.mockResolvedValueOnce({
+      data: { id: "1", url: "https://example.com" },
+      headers: new Headers(),
+    });
+
+    const { data, headers } = await dispatcher.dispatch<HttpResponse<unknown>>({
+      type: "create",
+      path: "/api/v2/media",
+      data: undefined,
+      meta: {},
+      raw: true,
+    });
+
+    expect(data).toHaveProperty("id", "1");
+    expect(data).toHaveProperty("url", "https://example.com");
+    expect(headers).toBe(postHeaders);
+  });
 });
diff --git a/src/adapters/action/dispatcher-http-hook-mastodon.ts b/src/adapters/action/dispatcher-http-hook-mastodon.ts
@@ -6,6 +6,7 @@ import {
   type Encoding,
   type Http,
   type HttpMetaParams,
+  type HttpResponse,
 } from "../../interfaces/index.js";
 import { type mastodon } from "../../mastodon/index.js";
 import { isRecord, sleep } from "../../utils/index.js";
@@ -116,15 +117,29 @@ export class HttpActionDispatcherHookMastodon
     return false;
   }
 
-  afterDispatch(action: AnyAction, result: unknown): unknown {
+  afterDispatch(action: AnyAction, _result: unknown): unknown {
     if (action.type === "create" && action.path === "/api/v2/media") {
-      const media = result as mastodon.v1.MediaAttachment;
       if (isRecord(action.data) && action.data?.skipPolling === true) {
-        return media;
+        return _result;
+      }
+
+      if (action.raw) {
+        const result = _result as HttpResponse<mastodon.v1.MediaAttachment>;
+
+        return waitForMediaAttachment(
+          result.data.id,
+          this.mediaTimeout,
+          this.http,
+        ).then((data) => ({
+          headers: result.headers,
+          data,
+        }));
+      } else {
+        const result = _result as mastodon.v1.MediaAttachment;
+        return waitForMediaAttachment(result.id, this.mediaTimeout, this.http);
       }
-      return waitForMediaAttachment(media.id, this.mediaTimeout, this.http);
     }
 
-    return result;
+    return _result;
   }
 }
