fix: Use PUT for update for Mastodon-fork compatibility

neet · neet · commit 304d2fdd37d9 · 2024-02-29T22:27:49.000+09:00
diff --git a/src/adapters/action/dispatcher-http-hook-mastodon.ts b/src/adapters/action/dispatcher-http-hook-mastodon.ts
@@ -99,9 +99,21 @@ export class HttpActionDispatcherHookMastodon
       : action.path + "/" + snakeCase(action.type);
     const encoding = inferEncoding(type, path);
     const meta: HttpMetaParams<Encoding> = { ...action.meta, encoding };
+
     return { type, path, data: action.data, meta };
   }
 
+  dispatch(action: AnyAction): false | Promise<unknown> {
+    if (
+      action.type === "update" &&
+      action.path === "/api/v1/accounts/update_credentials"
+    ) {
+      return this.http.patch(action.path, action.data, action.meta);
+    }
+
+    return false;
+  }
+
   afterDispatch(action: AnyAction, result: unknown): unknown {
     if (action.type === "create" && action.path === "/api/v2/media") {
       const media = result as mastodon.v1.MediaAttachment;
diff --git a/src/adapters/action/dispatcher-http.ts b/src/adapters/action/dispatcher-http.ts
@@ -20,7 +20,10 @@ export class HttpActionDispatcher implements ActionDispatcher<HttpAction> {
       action = this.hook.beforeDispatch(action);
     }
 
-    let result: T | Promise<T>;
+    let result = this.hook.dispatch(action) as T | Promise<T> | false;
+    if (result !== false) {
+      return result;
+    }
 
     switch (action.type) {
       case "fetch": {
@@ -32,7 +35,7 @@ export class HttpActionDispatcher implements ActionDispatcher<HttpAction> {
         break;
       }
       case "update": {
-        result = this.http.patch(action.path, action.data, action.meta);
+        result = this.http.put(action.path, action.data, action.meta);
         break;
       }
       case "remove": {
diff --git a/src/adapters/http/base-http.ts b/src/adapters/http/base-http.ts
@@ -48,7 +48,6 @@ export abstract class BaseHttp implements Http {
     }).then((response) => response.data as T);
   }
 
-  /* istanbul ignore next */
   put<T>(
     path: string,
     data?: unknown,
diff --git a/src/interfaces/action.ts b/src/interfaces/action.ts
@@ -17,5 +17,6 @@ export interface ActionDispatcher<T extends AnyAction> {
 
 export interface ActionDispatcherHook<T extends AnyAction, U = unknown> {
   beforeDispatch(action: T): T;
+  dispatch(action: T): U | Promise<U> | false;
   afterDispatch(action: T, result: U | Promise<U>): U;
 }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,10 @@ export class HttpActionDispatcher implements ActionDispatcher<HttpAction> {`
`20`	`20`	`action = this.hook.beforeDispatch(action);`
`21`	`21`	`}`
`22`	`22`
`23`		`- let result: T \| Promise<T>;`
	`23`	`+ let result = this.hook.dispatch(action) as T \| Promise<T> \| false;`
	`24`	`+ if (result !== false) {`
	`25`	`+ return result;`
	`26`	`+ }`
`24`	`27`
`25`	`28`	`switch (action.type) {`
`26`	`29`	`case "fetch": {`
`@@ -32,7 +35,7 @@ export class HttpActionDispatcher implements ActionDispatcher<HttpAction> {`
`32`	`35`	`break;`
`33`	`36`	`}`
`34`	`37`	`case "update": {`
`35`		`- result = this.http.patch(action.path, action.data, action.meta);`
	`38`	`+ result = this.http.put(action.path, action.data, action.meta);`
`36`	`39`	`break;`
`37`	`40`	`}`
`38`	`41`	`case "remove": {`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@ export abstract class BaseHttp implements Http {`
`48`	`48`	`}).then((response) => response.data as T);`
`49`	`49`	`}`
`50`	`50`
`51`		`- /* istanbul ignore next */`
`52`	`51`	`put<T>(`
`53`	`52`	`path: string,`
`54`	`53`	`data?: unknown,`
Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,6 @@ export interface ActionDispatcher<T extends AnyAction> {`
`17`	`17`
`18`	`18`	`export interface ActionDispatcherHook<T extends AnyAction, U = unknown> {`
`19`	`19`	`beforeDispatch(action: T): T;`
	`20`	`+ dispatch(action: T): U \| Promise<U> \| false;`
`20`	`21`	`afterDispatch(action: T, result: U \| Promise<U>): U;`
`21`	`22`	`}`